refactor: moved user presence logic from saga to matrix client

zer0-os · Oct 12, 2023 · adf6924 · adf6924
1 parent a2a7a04
commit adf6924
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/lib/chat/matrix-client.ts b/src/lib/chat/matrix-client.ts
@@ -72,7 +72,19 @@ export class MatrixClient implements IChatClient {
 
   async getUserPresence(userId: string) {
     await this.waitForConnection();
-    return await this.matrix.getPresence(userId);
+
+    try {
+      const userPresenceData = await this.matrix.getPresence(userId);
+      const isOnline = userPresenceData?.currently_active || false;
+      const lastSeenAt = userPresenceData?.last_active_ago
+        ? new Date(Date.now() - userPresenceData.last_active_ago).toISOString()
+        : null;
+
+      return { lastSeenAt, isOnline };
+    } catch (error) {
+      console.error(error);
+      return { lastSeenAt: null, isOnline: false };
+    }
   }
 
   async getChannels(_id: string) {

diff --git a/src/store/channels-list/saga.ts b/src/store/channels-list/saga.ts
@@ -73,9 +73,9 @@ export function* updateOtherMembersLastSeenAt(conversations) {
     const matrixId = conversation?.otherMembers?.[0]?.matrixId;
 
     if (conversation.isOneOnOne && matrixId) {
-      const userPresenceData = yield call([chatClient, chatClient.getUserPresence], matrixId);
-      if (userPresenceData?.last_active_ago) {
-        conversation.otherMembers[0].lastSeenAt = new Date(Date.now() - userPresenceData.last_active_ago).toISOString();
+      const presenceData = yield call([chatClient, chatClient.getUserPresence], matrixId);
+      if (presenceData && presenceData.lastSeenAt) {
+        conversation.otherMembers[0].lastSeenAt = presenceData.lastSeenAt;
       }
     }
   }