Fixed a bug with user status change in both socket-io-server and the …

…chat page
PezhmanGhavami · Jun 1, 2023 · 0bd7598 · 0bd7598
1 parent 2784a0a
commit 0bd7598
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/client/src/pages/chat/chat.page.tsx b/client/src/pages/chat/chat.page.tsx
@@ -243,10 +243,17 @@ function Chat() {
     // Recipient status change
     socket.on(
       `chat-${params.chatId}-recipient-status-change`,
-      ({ isOnline }) => {
+      ({ isOnline, lastOnline }) => {
+        const payload: {
+          isOnline: boolean;
+          lastOnline?: Date;
+        } = { isOnline };
+
+        if (lastOnline) payload.lastOnline = lastOnline;
+
         setCurrentRecipientUser((prev) => ({
           ...prev!,
-          isOnline,
+          ...payload,
         }));
       },
     );

diff --git a/server/socket.io-server.ts b/server/socket.io-server.ts
@@ -686,8 +686,9 @@ const startSocketServer = (
       socket.on("disconnect", async (reason) => {
         try {
           const activeSockets = io.sockets.adapter.rooms.get(id as string);
+          const lastOnline = new Date(Date.now());
+
           if (activeSockets?.size) {
-            const lastOnline = new Date(Date.now());
             await prisma.session.update({
               where: {
                 id: updatedSession.id,
@@ -709,10 +710,10 @@ const startSocketServer = (
                 .to(chat.id)
                 .emit(`chat-${chat.id}-recipient-status-change`, {
                   isOnline: false,
+                  lastOnline,
                 });
             }
           }
-          const lastOnline = new Date(Date.now());
           await prisma.session.update({
             where: {
               id: updatedSession.id,