From 5c2a7b654ea3c71dbbe365fc7508189ba3ef7bab Mon Sep 17 00:00:00 2001 From: Germain Souquet Date: Mon, 29 Nov 2021 15:25:36 +0000 Subject: [PATCH 1/2] Emit thread update after event decryption --- src/models/thread.ts | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/models/thread.ts b/src/models/thread.ts index a47b8fefe3a..112a99ccad4 100644 --- a/src/models/thread.ts +++ b/src/models/thread.ts @@ -107,9 +107,7 @@ export class Thread extends TypedEventEmitter { this._currentUserParticipated = true; } - if (this.ready) { - this.client.decryptEventIfNeeded(event, {}); - } + await this.client.decryptEventIfNeeded(event, {}); this.emit(ThreadEvent.Update, this); } @@ -129,13 +127,6 @@ export class Thread extends TypedEventEmitter { return threadReplies[threadReplies.length - 1]; } - /** - * Determines thread's ready status - */ - public get ready(): boolean { - return this.rootEvent !== undefined; - } - /** * The thread ID, which is the same as the root event ID */ From 0bbc5b88dd77eca1a8eebe1307ee184c05ccd900 Mon Sep 17 00:00:00 2001 From: Germain Souquet Date: Tue, 30 Nov 2021 08:38:40 +0000 Subject: [PATCH 2/2] remove deprecated thread.ready --- src/models/room.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/models/room.ts b/src/models/room.ts index d6127e79284..b655384b6ea 100644 --- a/src/models/room.ts +++ b/src/models/room.ts @@ -1748,7 +1748,7 @@ export class Room extends EventEmitter { // types X Y Z to the timeline". this.addLiveEvent(events[i], duplicateStrategy, fromCache); const thread = this.threads.get(events[i].getId()); - if (thread && !thread.ready) { + if (thread) { thread.addEvent(events[i], true); } }