Merge pull request #132 from Gamegoo-repo/fix/#130

[Fix] 채팅 온오프 친구, 채팅 메시지 오류 수정
Gamegoo-repo · Oct 15, 2024 · 3a1597c · 3a1597c
2 parents bd7f935 + 1d25a2e
commit 3a1597c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/src/components/chat/MessageList.tsx b/src/components/chat/MessageList.tsx
@@ -386,7 +386,7 @@ const MessageList = (props: MessageListProps) => {
                       {showTime ? <YourDate>{setChatTimeFormatter(message.createdAt)}</YourDate> : null}
                     </YourDiv>
                   </YourMessageContainer>
-                ) : (
+                ) : message.senderId !== chatEnterData?.memberId && message.senderId !== 0 && (
                   <MyMessageContainer>
                     <MyDiv>
                       {showTime ? <MyDate>{setChatTimeFormatter(message.createdAt)}</MyDate> : null}

diff --git a/src/hooks/useChatFriend.ts b/src/hooks/useChatFriend.ts
@@ -1,12 +1,15 @@
 import { useEffect, useState } from 'react';
 import { useDispatch } from 'react-redux';
-import { socket } from '@/socket';
+import { connectSocket, socket } from '@/socket';
 import { setFriendOffline, setFriendOnline, setMemberId } from '@/redux/slices/chatSlice';
 
 const useChatFriend = () => {
     const dispatch = useDispatch();
 
     useEffect(() => {
+        // 소켓 연결되어 있지 않으면 소켓 연결
+        connectSocket();
+
         const handleMemberInfo = (res: any) => {
             const memberId = res.data.memberId;
             dispatch(setMemberId(memberId));

diff --git a/src/hooks/useChatList.ts b/src/hooks/useChatList.ts
@@ -1,10 +1,14 @@
 import { useEffect } from 'react';
-import { socket } from '@/socket';
+import { connectSocket, socket } from '@/socket';
 import { getChatrooms } from '@/api/chat';
 import { ChatroomList } from '@/interface/chat';
 
 const useChatList = (setChatrooms: (chatrooms: ChatroomList[]) => void) => {
+
     useEffect(() => {
+        // 소켓 연결되어 있지 않으면 소켓 연결
+        connectSocket();
+
         const handleJoinedNewChatroom = async () => {
             try {
                 const data = await getChatrooms();

diff --git a/src/hooks/useChatMessage.ts b/src/hooks/useChatMessage.ts
@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { RootState } from '@/redux/store';
-import { socket } from '@/socket';
+import { connectSocket, socket } from '@/socket';
 import { setUnreadUuid } from '@/redux/slices/chatSlice';
 import { markChatAsRead } from '@/api/chat';
 import { SystemMessage, ChatMessageDto } from '@/interface/chat';
@@ -16,6 +16,9 @@ const useChatMessage = () => {
     const unreadChatUuids = useSelector((state: RootState) => state.chat.unreadUuids);
 
     useEffect(() => {
+        // 소켓 연결되어 있지 않으면 소켓 연결
+        connectSocket();
+
         const handleChatMessage = (res: any) => {
             const chatroomUuid = res.data.chatroomUuid;
             const newChatTimestamp = res.data.timestamp;
@@ -44,9 +47,9 @@ const useChatMessage = () => {
         };
 
         const handleMyMessage = (res: any) => {
-            if(res.data.
+            if (res.data.
                 chatroomUuid
-            ===currentChatUuid){
+                === currentChatUuid) {
                 const newMessage = res.data;
                 // 새로운 메시지 저장 (내가 쓴 메시지)
                 setNewMessage(newMessage);