Iterate

src/models/event.ts

@@ -579,16 +579,8 @@ export class MatrixEvent extends TypedEventEmitter<MatrixEventEmittedEvents, Mat
  const relatesTo = this.getWireContent()?.["m.relates_to"];
  if (relatesTo?.rel_type === THREAD_RELATION_TYPE.name) {
  return relatesTo.event_id;
- }
- if (this.thread) {
- return this.thread.id;
- }
- if (this.threadId) {
- return this.threadId;
- }
- const unsigned = this.getUnsigned();
- if (typeof unsigned[UNSIGNED_THREAD_ID_FIELD.name] === "string") {
- return unsigned[UNSIGNED_THREAD_ID_FIELD.name];
+ } else {
+ return this.getThread()?.id || this.threadId;
  }
  }
 

src/models/room.ts

@@ -39,6 +39,7 @@ import {
  UNSTABLE_ELEMENT_FUNCTIONAL_USERS,
  EVENT_VISIBILITY_CHANGE_TYPE,
  RelationType,
+ UNSIGNED_THREAD_ID_FIELD,
 } from "../@types/event";
 import { IRoomVersionsCapability, MatrixClient, PendingEventOrdering, RoomVersionStability } from "../client";
 import { GuestAccess, HistoryVisibility, JoinRule, ResizeMethod } from "../@types/partials";
@@ -2113,12 +2114,11 @@ export class Room extends ReadReceipt<RoomEmittedEvents, RoomEventHandlerMap> {
  }
 
  // A thread relation is always only shown in a thread
- const threadRootId = event.threadRootId;
- if (threadRootId != undefined) {
+ if (event.isRelation(THREAD_RELATION_TYPE.name)) {
  return {
  shouldLiveInRoom: false,
  shouldLiveInThread: true,
- threadId: threadRootId,
+ threadId: event.threadRootId,
  };
  }
 
@@ -2149,6 +2149,15 @@ export class Room extends ReadReceipt<RoomEmittedEvents, RoomEventHandlerMap> {
  };
  }
 
+ const unsigned = event.getUnsigned();
+ if (typeof unsigned[UNSIGNED_THREAD_ID_FIELD.name] === "string") {
+ return {
+ shouldLiveInRoom: false,
+ shouldLiveInThread: true,
+ threadId: unsigned[UNSIGNED_THREAD_ID_FIELD.name],
+ };
+ }
+
  // We've exhausted all scenarios,
  // we cannot assume that it lives in the main timeline as this may be a relation for an unknown thread
  // adding the event in the wrong timeline causes stuck notifications and can break ability to send read receipts
@@ -2804,7 +2813,7 @@ export class Room extends ReadReceipt<RoomEmittedEvents, RoomEventHandlerMap> {
  if (parentEvent.threadRootId) {
  threadRoots.add(parentEvent.threadRootId);
  const unsigned = event.getUnsigned();
- unsigned["org.matrix.msc4023.thread_id"] = parentEvent.threadRootId;
+ unsigned[UNSIGNED_THREAD_ID_FIELD.name] = parentEvent.threadRootId;
  event.setUnsigned(unsigned);
  }
 
@@ -2881,9 +2890,12 @@ export class Room extends ReadReceipt<RoomEmittedEvents, RoomEventHandlerMap> {
  private findThreadRoots(events: MatrixEvent[]): Set<string> {
  const threadRoots = new Set<string>();
  for (const event of events) {
- const threadRootId = event.threadRootId;
- if (threadRootId != undefined) {
- threadRoots.add(threadRootId);
+ if (event.isRelation(THREAD_RELATION_TYPE.name)) {
+ threadRoots.add(event.relationEventId ?? "");
+ }
+ const unsigned = event.getUnsigned();
+ if (typeof unsigned[UNSIGNED_THREAD_ID_FIELD.name] === "string") {
+ threadRoots.add(unsigned[UNSIGNED_THREAD_ID_FIELD.name]!);
  }
  }
  return threadRoots;