Force decrypt the events before we start processing the rooms

zer0-os · Oct 17, 2023 · 9f716d1 · 9f716d1
1 parent d61983e
commit 9f716d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/lib/chat/matrix-client.test.ts b/src/lib/chat/matrix-client.test.ts
@@ -18,6 +18,7 @@ const stubRoom = (attrs = {}) => ({
   getMembers: () => [],
   getDMInviter: () => undefined,
   loadMembersIfNeeded: () => undefined,
+  decryptAllEvents: () => undefined,
   getLiveTimeline: () => stubTimeline(),
   getMyMembership: () => 'join',
   getEvents: () => stubTimeline(),

diff --git a/src/lib/chat/matrix-client.ts b/src/lib/chat/matrix-client.ts
@@ -96,6 +96,7 @@ export class MatrixClient implements IChatClient {
     await this.waitForConnection();
     const rooms = await this.getFilteredRooms(this.isChannel);
     for (const room of rooms) {
+      await room.decryptAllEvents();
       await room.loadMembersIfNeeded();
     }
 
@@ -108,6 +109,7 @@ export class MatrixClient implements IChatClient {
 
     const failedToJoin = [];
     for (const room of rooms) {
+      await room.decryptAllEvents();
       await room.loadMembersIfNeeded();
       const membership = room.getMyMembership();
       if (membership === MembershipStateType.Invite) {