Skip to content

Commit 4e72290

Browse files
author
Germain
authored
Null-guard for undefined rootEvent when creating a thread (#2187)
1 parent 7a7318b commit 4e72290

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

src/models/room.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1398,12 +1398,17 @@ export class Room extends EventEmitter {
13981398
this.emit(ThreadEvent.Update, thread);
13991399
}
14001400

1401-
public createThread(rootEvent: MatrixEvent, events: MatrixEvent[] = []): Thread | undefined {
1402-
const tl = this.getTimelineForEvent(rootEvent.getId());
1403-
const relatedEvents = tl?.getTimelineSet().getAllRelationsEventForEvent(rootEvent.getId()) ?? [];
1401+
public createThread(rootEvent: MatrixEvent | undefined, events: MatrixEvent[] = []): Thread | undefined {
1402+
if (rootEvent) {
1403+
const tl = this.getTimelineForEvent(rootEvent.getId());
1404+
const relatedEvents = tl?.getTimelineSet().getAllRelationsEventForEvent(rootEvent.getId());
1405+
if (relatedEvents) {
1406+
events = events.concat(relatedEvents);
1407+
}
1408+
}
14041409

14051410
const thread = new Thread(rootEvent, {
1406-
initialEvents: events.concat(relatedEvents),
1411+
initialEvents: events,
14071412
room: this,
14081413
client: this.client,
14091414
});

0 commit comments

Comments
 (0)