feat: set isOnline status with user presence data

zer0-os · Oct 16, 2023 · cb025dd · cb025dd
1 parent d61983e
commit cb025dd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/lib/chat/matrix-client.ts b/src/lib/chat/matrix-client.ts
@@ -508,7 +508,7 @@ export class MatrixClient implements IChatClient {
       firstName: user?.displayName,
       lastName: '',
       profileId: '',
-      isOnline: user?.presence === 'online',
+      isOnline: false,
       profileImage: user?.avatarUrl,
       lastSeenAt: '',
     };

diff --git a/src/store/channels-list/saga.ts b/src/store/channels-list/saga.ts
@@ -63,19 +63,26 @@ export function* mapToZeroUsers(channels: any[]) {
   return;
 }
 
-export function* updateOtherMembersLastSeenAt(conversations) {
+export function* updateUserPresence(conversations) {
   if (!featureFlags.enableMatrix) {
     return;
   }
 
   const chatClient = yield call(chat.get);
   for (let conversation of conversations) {
-    const matrixId = conversation?.otherMembers?.[0]?.matrixId;
+    const { isOneOnOne, otherMembers } = conversation;
+    const matrixId = otherMembers?.[0]?.matrixId;
 
-    if (conversation.isOneOnOne && matrixId) {
+    if (isOneOnOne && matrixId) {
       const presenceData = yield call([chatClient, chatClient.getUserPresence], matrixId);
-      if (presenceData && presenceData.lastSeenAt) {
-        conversation.otherMembers[0].lastSeenAt = presenceData.lastSeenAt;
+
+      if (presenceData) {
+        if (presenceData.lastSeenAt) {
+          conversation.otherMembers[0].lastSeenAt = presenceData.lastSeenAt;
+        }
+        if (presenceData.isOnline) {
+          conversation.otherMembers[0].isOnline = presenceData.isOnline;
+        }
       }
     }
   }
@@ -113,7 +120,7 @@ export function* fetchConversations() {
     chatClient.getConversations,
   ]);
   yield call(mapToZeroUsers, conversations);
-  yield call(updateOtherMembersLastSeenAt, conversations);
+  yield call(updateUserPresence, conversations);
 
   const existingConversationList = yield select(denormalizeConversations);
   const optimisticConversationIds = existingConversationList