fix: ensure presence is fetched for multiple other members in a conve…

…rsation
zer0-os · Oct 17, 2023 · 04488f9 · 04488f9
1 parent cb025dd
commit 04488f9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/src/lib/chat/matrix-client.ts b/src/lib/chat/matrix-client.ts
@@ -80,10 +80,15 @@ export class MatrixClient implements IChatClient {
 
     try {
       const userPresenceData = await this.matrix.getPresence(userId);
-      const isOnline = userPresenceData?.presence === 'online';
-      const lastSeenAt = userPresenceData?.last_active_ago
-        ? new Date(Date.now() - userPresenceData.last_active_ago).toISOString()
-        : null;
+
+      if (!userPresenceData) {
+        return { lastSeenAt: null, isOnline: false };
+      }
+
+      const { presence, last_active_ago } = userPresenceData;
+
+      const isOnline = presence === 'online';
+      const lastSeenAt = last_active_ago ? new Date(Date.now() - last_active_ago).toISOString() : null;
 
       return { lastSeenAt, isOnline };
     } catch (error) {

diff --git a/src/store/channels-list/saga.ts b/src/store/channels-list/saga.ts
@@ -70,19 +70,22 @@ export function* updateUserPresence(conversations) {
 
   const chatClient = yield call(chat.get);
   for (let conversation of conversations) {
-    const { isOneOnOne, otherMembers } = conversation;
-    const matrixId = otherMembers?.[0]?.matrixId;
+    const { otherMembers } = conversation;
+
+    for (let member of otherMembers) {
+      const matrixId = member?.matrixId;
+      if (!matrixId) continue;
 
-    if (isOneOnOne && matrixId) {
       const presenceData = yield call([chatClient, chatClient.getUserPresence], matrixId);
+      if (!presenceData) continue;
+
+      const { lastSeenAt, isOnline } = presenceData;
 
-      if (presenceData) {
-        if (presenceData.lastSeenAt) {
-          conversation.otherMembers[0].lastSeenAt = presenceData.lastSeenAt;
-        }
-        if (presenceData.isOnline) {
-          conversation.otherMembers[0].isOnline = presenceData.isOnline;
-        }
+      if (lastSeenAt) {
+        member.lastSeenAt = lastSeenAt;
+      }
+      if (isOnline) {
+        member.isOnline = isOnline;
       }
     }
   }