undo changes to client

matrix-org · Jan 6, 2023 · 2eef226 · 2eef226
1 parent 435f485
commit 2eef226
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/src/client.ts b/src/client.ts
@@ -601,9 +601,9 @@ interface IJoinRequestBody {
     third_party_signed?: IThirdPartySigned;
 }
 
-export interface ITagMetadata {
+interface ITagMetadata {
     [key: string]: any;
-    order?: number;
+    order: number;
 }
 
 interface IMessagesResponse {

diff --git a/src/models/thread.ts b/src/models/thread.ts
@@ -517,19 +517,19 @@ export class Thread extends ReadReceipt<EmittedEvents, EventHandlerMap> {
 
         const readUpToId = super.getEventReadUpTo(userId, ignoreSynthesized);
 
-        // Checking whether the unthreaded read receipt for that user is more recent
-        // than the read receipt inside that thread.
-        if (this.lastReply()) {
-            if (!this.room.unthreadedReceipts.has(userId)) {
-                return readUpToId;
-            }
+        const isLastTimelineEvent = readUpToId === this.timeline.at(-1)?.getId();
+        const hasAnUnthreadedReceipt = this.room.unthreadedReceipts.has(userId);
+        if (isLastTimelineEvent && !hasAnUnthreadedReceipt) {
+            return readUpToId;
+        }
 
-            const unthreadedReceiptTs = this.room.unthreadedReceipts.get(userId)!.ts;
-            for (let i = this.timeline?.length - 1; i >= 0; --i) {
-                const ev = this.timeline[i];
-                if (ev.getId() === readUpToId) return readUpToId;
-                if (ev.getTs() < unthreadedReceiptTs) return ev.getId() ?? readUpToId;
-            }
+        // Check whether the unthreaded receipt finds a more recent `readUpToId`
+        // If so, return that value.
+        const unthreadedReceiptTs = this.room.unthreadedReceipts.get(userId)!.ts;
+        for (let i = this.timeline?.length - 1; i >= 0; --i) {
+            const ev = this.timeline[i];
+            if (ev.getId() === readUpToId) return readUpToId;
+            if (ev.getTs() < unthreadedReceiptTs) return ev.getId() ?? readUpToId;
         }
 
         return readUpToId;