Merge pull request #168 from boostcampwm-2021/hotfix/profile-socket

[Fix] 채팅방 썸네일 색 수정, 초대시 event 안가는 오류 수정
boostcampwm-2021 · Nov 25, 2021 · 00efd61 · 00efd61
2 parents 025a145 + ee949ff
commit 00efd61
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/backend/src/sockets/chat.ts b/backend/src/sockets/chat.ts
@@ -57,6 +57,7 @@ const initChat = (socket: Socket, namespace: Namespace) => {
 		});
 	});
 
+	// 초대받은 사람들 chat room users refresh
 	socket.on('invite users', ({ chatRoomId, userList, teamId }) => {
 		userList.forEach((user: { userId: number }) => {
 			const onlineInvitedUser = Object.keys(onlineUsersInfo).find((socketId) => {
@@ -67,6 +68,7 @@ const initChat = (socket: Socket, namespace: Namespace) => {
 				socket.to(onlineInvitedUser).emit('refresh chat rooms');
 			}
 		});
+		namespace.to(`chat-${chatRoomId}`).emit('refresh chat room users', { chatRoomId });
 	});
 
 	socket.on('exit chat room', ({ chatRoomId }) => {

diff --git a/frontend/src/components/Chat/ChatContent/Message/index.tsx b/frontend/src/components/Chat/ChatContent/Message/index.tsx
@@ -24,7 +24,13 @@ const Message: React.FC<Props> = ({ teamId, message }) => {
 		<Container myChat={isMyChat()}>
 			{!isMyChat() && (
 				<ChatIconWrapper>
-					<ProfileIcon name={teamUsers[message.userId].name} color={0} status='none' width={3.2} isHover={false} />
+					<ProfileIcon
+						name={teamUsers[message.userId].name}
+						color={teamUsers[message.userId].color}
+						status='none'
+						width={3.2}
+						isHover={false}
+					/>
 				</ChatIconWrapper>
 			)}
 			<MessageContainer myChat={isMyChat()}>