fix #586 error

Dun-sin · Jan 12, 2024 · dfe558c · dfe558c
1 parent 2868583
commit dfe558c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/src/lib/chatSocket.ts b/src/lib/chatSocket.ts
@@ -24,7 +24,7 @@ export default function useChatUtils(socket: Socket | undefined) {
               return;
             }
 
-            resolve(sentMessage);
+            resolve(message);
           }
         );
     });

diff --git a/src/lib/decryptMessage.ts b/src/lib/decryptMessage.ts
@@ -1,6 +1,6 @@
 import CryptoJS from 'crypto-js';
 
-const secretKey = process.env.SECRET_KEY;
+const secretKey = process.env.NEXT_PUBLIC_SECRET_KEY;
 
 export default (message: string) => {
   if (!secretKey) {

diff --git a/src/pages/anonymous.tsx b/src/pages/anonymous.tsx
@@ -305,7 +305,6 @@ const Anonymous = () => {
       socket?.io.off('reconnect_attempt', onReconnectAttempt);
       socket?.io.off('reconnect_error', onReconnectError);
 
-      socket?.disconnect();
 
       newMessageEvents.forEach(event => {
         socket?.off(event, onNewMessage);

diff --git a/src/server/handlers.ts b/src/server/handlers.ts
@@ -230,11 +230,11 @@ const messageCounts: {
   [id: string]: number;
 } = {};
 
-export const SendMessageHandler = (socket: Socket) => {
+export const SendMessageHandler = (io: Server, socket: Socket) => {
   socket.on(
     constants.NEW_EVENT_SEND_MESSAGE,
     async (
-      { senderId, message, time, chatId, containsBadword, replyTo },
+      { senderId, message, time, room, containsBadword, replyTo },
       returnMessageToSender
     ) => {
       // Below line is just a failed message simulator for testing purposes.
@@ -271,7 +271,7 @@ export const SendMessageHandler = (socket: Socket) => {
       /**
        * Cache the sent message in memory a nd persist to db
        */
-      const sentMessage = await addMessage(chatId, {
+      const sentMessage = await addMessage(room, {
         message,
         time,
         senderId,
@@ -282,14 +282,14 @@ export const SendMessageHandler = (socket: Socket) => {
 
       const messageDetails = {
         ...sentMessage,
-        room: chatId,
+        room,
         status: 'sent',
       };
 
       returnMessageToSender(messageDetails);
 
       socket.broadcast
-        .to(chatId)
+        .to(room)
         .emit(constants.NEW_EVENT_RECEIVE_MESSAGE, messageDetails);
 
       // Update the message count for the user

diff --git a/src/server/lib/lib.ts b/src/server/lib/lib.ts
@@ -14,7 +14,7 @@ import {
   MessageType,
 } from '@/types/types';
 
-const secretKey = process.env.SECRET_KEY;
+const secretKey = process.env.NEXT_PUBLIC_SECRET_KEY;
 
 const waitingUsers: activeUserIdType = {};
 

diff --git a/src/server/models/MessageModel.ts b/src/server/models/MessageModel.ts
@@ -59,7 +59,7 @@ const messageSchema = new Schema<MessageSchemaDocument>(
       default: false,
     },
     replyTo: {
-      type: Schema.Types.ObjectId,
+      type: String,
       ref: 'Message',
     },
   },
-Original file line number
+Diff line change
@@ Expand Up @@
                   return;
                 }
-                resolve(sentMessage);
+                resolve(message);
               }
             );
         });
@@ Expand Down @@