From 6b018b692712c43d4064c65c1a79b170ef3cb135 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 24 Jul 2023 08:37:28 +0100
Subject: [PATCH] Fix how `Room::eventShouldLiveIn` handles replies to unknown
 parents (#3615)

* Add warning

* Fix how Room::eventShouldLiveIn handles replies to unknown parents
---
 spec/unit/room.spec.ts           |  8 ++++++++
 src/models/event-timeline-set.ts | 11 ++++++++++-
 src/models/room.ts               |  5 ++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/spec/unit/room.spec.ts b/spec/unit/room.spec.ts
index 7464faa41..a70e993ae 100644
--- a/spec/unit/room.spec.ts
+++ b/spec/unit/room.spec.ts
@@ -3018,6 +3018,14 @@ describe("Room", function () {
             expect(responseRelations![0][1].size).toEqual(1);
             expect(responseRelations![0][1].has(threadReaction)).toBeTruthy();
         });
+
+        it("a non-thread reply to an unknown parent event should live in the main timeline only", async () => {
+            const message = mkMessage(); // we do not add this message to any timelines
+            const reply = mkReply(message);
+
+            expect(room.eventShouldLiveIn(reply).shouldLiveInRoom).toBeTruthy();
+            expect(room.eventShouldLiveIn(reply).shouldLiveInThread).toBeFalsy();
+        });
     });
 
     describe("getEventReadUpTo()", () => {
diff --git a/src/models/event-timeline-set.ts b/src/models/event-timeline-set.ts
index cc41e543c..0427967fd 100644
--- a/src/models/event-timeline-set.ts
+++ b/src/models/event-timeline-set.ts
@@ -984,11 +984,20 @@ export class EventTimelineSet extends TypedEventEmitter<EmittedEvents, EventTime
             );
         }
 
-        const { threadId, shouldLiveInRoom } = this.room.eventShouldLiveIn(event);
+        const { threadId, shouldLiveInRoom, shouldLiveInThread } = this.room.eventShouldLiveIn(event);
 
         if (this.thread) {
             return this.thread.id === threadId;
         }
+
+        if (!shouldLiveInRoom && !shouldLiveInThread) {
+            logger.warn(
+                `EventTimelineSet:canContain event encountered which cannot be added to any timeline roomId=${
+                    this.room?.roomId
+                } eventId=${event.getId()} threadId=${event.threadRootId}`,
+            );
+        }
+
         return shouldLiveInRoom;
     }
 }
diff --git a/src/models/room.ts b/src/models/room.ts
index ac42eb834..001e5086e 100644
--- a/src/models/room.ts
+++ b/src/models/room.ts
@@ -2157,7 +2157,10 @@ export class Room extends ReadReceipt<RoomEmittedEvents, RoomEventHandlerMap> {
             };
         }
 
-        if (!parentEventId) {
+        // Due to replies not being typical relations and being used as fallbacks for threads relations
+        // If we bypass the if case above then we know we are not a thread, so if we are still a reply
+        // then we know that we must be in the main timeline. Same goes if we have no associated parent event.
+        if (!parentEventId || !!event.replyEventId) {
             return {
                 shouldLiveInRoom: true,
                 shouldLiveInThread: false,