Merge branch 'main' of https://github.com/InSange/PigBrothers

Author: InSange

frontend/app/room/[roomId]/_related/ChatProvider.tsx

@@ -37,10 +37,7 @@ interface ChatContextType {
   handleLeaveRoom: () => Promise<void>;
   canSpeak: boolean;
   canVote: boolean;
-  subject: string | null;
   isLiar: boolean;
-  currentUserList: User[];
-  handleChangeUserMemo: (userID: string) => void;
   handleVote: (userID: string) => void;
   handleKill: (userID: string) => void;
   votedId: string | null;
@@ -60,10 +57,7 @@ export const ChatContext = createContext<ChatContextType>({
   handleLeaveRoom: async () => {},
   canSpeak: false,
   canVote: false,
-  subject: null,
   isLiar: false,
-  currentUserList: [],
-  handleChangeUserMemo: () => {},
   votedId: null,
   handleVote: () => {},
   handleKill: () => {},
@@ -83,12 +77,10 @@ export const ChatProvider = ({ children }: { children: ReactNode }) => {
   const [canSpeak, setCanSpeak] = useState(false);
   const [canVote, setCanVote] = useState(false);
   const [canKill, setCanKill] = useState(false);
-  const [subject, setSubject] = useState<string | null>(null);
   const [isLiar, setIsLiar] = useState<boolean>(false);
   const [background, setBackground] =
     useState<ChatContextType['background']>(null);
   const [votedId, setVotedId] = useState<string | null>(null);
-  const [currentUserList, setCurrentUserList] = useState<User[]>([]);
   const [roomInfo, setRoomInfo] = useState<RoomModel | null>(null);
   const [gameInfo, setGameInfo] = useState<GameInfoMessage | null>(null);
 
@@ -100,12 +92,8 @@ export const ChatProvider = ({ children }: { children: ReactNode }) => {
     setCanKill(false);
     setBackground(null);
     setIsLiar(false);
-    setSubject(null);
     setGameInfo(null);
     setRoomInfo(null);
-    setCurrentUserList((prevUser) =>
-      prevUser?.map((user) => ({ ...user, memo: 'pig' }))
-    );
   };
 
   useEffect(() => {
@@ -157,32 +145,12 @@ export const ChatProvider = ({ children }: { children: ReactNode }) => {
             setMessages((prev: Message[]) => [...(prev ?? []), message]);
           } else if (message.type === ROOM_INFO) {
             setRoomInfo(message.room);
-            const updatedUserList = message?.room?.UserList?.map((newUser) => {
-              // 현재 유저 리스트에 이 유저가 있는지 확인
-              const existingUser = currentUserList.find(
-                (user) => user.UserID === newUser.UserID
-              );
-
-              // 유저가 있으면 그대로 반환
-              if (existingUser) {
-                return existingUser;
-              }
-
-              // 없다면 'pig'의 역할로 추가
-              return {
-                ...newUser,
-                memo: 'pig' as 'pig',
-              };
-            });
-
-            setCurrentUserList(updatedUserList ?? []);
           } else if (message.type === GAME_INFO) {
             setGameInfo(message);
           } else if (message.type === STATE) {
             setCanSpeak(message.speak);
           } else if (message.type === ROLE) {
             setIsLiar(message.role === 'wolf');
-            setSubject(message.word);
           } else if (message.type === PROCESS) {
             setVotedId(null);
             if (message.state === 'start') {
@@ -239,18 +207,6 @@ export const ChatProvider = ({ children }: { children: ReactNode }) => {
     };
   }, [roomId, userId, isConnecting]);
 
-  const handleChangeUserMemo: ChatContextType['handleChangeUserMemo'] = (
-    userID
-  ) => {
-    setCurrentUserList((prev) =>
-      prev.map((user) =>
-        user.UserID === userID
-          ? { ...user, memo: user.memo === 'pig' ? 'wolf' : 'pig' }
-          : user
-      )
-    );
-  };
-
   const handleLeaveRoom = async () => {
     if (!userId) {
       enqueueSnackbar({ variant: 'error', message: '유저 정보가 없습니다.' });
@@ -326,12 +282,9 @@ export const ChatProvider = ({ children }: { children: ReactNode }) => {
       messages,
       sendMessage,
       handleLeaveRoom,
-      handleChangeUserMemo,
       canSpeak,
       canVote,
-      subject,
       isLiar,
-      currentUserList,
       votedId,
       canKill,
       handleVote,
@@ -345,9 +298,7 @@ export const ChatProvider = ({ children }: { children: ReactNode }) => {
       canSpeak,
       canVote,
       canKill,
-      subject,
       isLiar,
-      currentUserList,
       handleVote,
       handleKill,
       background,

frontend/app/room/[roomId]/_sections/Chatting.tsx

@@ -13,9 +13,11 @@ import MyChat from './MyChat';
 import OtherUserChat from './OtherUserChat';
 
 const Chatting = () => {
-  const { messages, subject } = useContext(ChatContext);
+  const { messages, gameInfo } = useContext(ChatContext);
   const { userId: myId } = useContext(GlobalContext);
   const messagesEndRef = useRef<HTMLDivElement>(null);
+  const isMeLiar = gameInfo?.wolf === myId;
+  const subject = isMeLiar ? gameInfo?.wolfSubject : gameInfo?.pigSubject;
 
   // 새로운 메시지가 추가되면 스크롤을 최신 메시지로 이동
   useEffect(() => {

frontend/app/room/[roomId]/_sections/UserComponent.tsx

@@ -12,7 +12,6 @@ import {
 
 export const UserComponent = ({ user }: { user: User }) => {
   const {
-    handleChangeUserMemo,
     isLiar,
     canVote,
     votedId,
@@ -36,7 +35,6 @@ export const UserComponent = ({ user }: { user: User }) => {
         <UserImage src={'/died.jpeg'} />
       ) : (
         <UserImage
-          onClick={() => handleChangeUserMemo(user.UserID)}
           src={(isLiar && isMe) || isWolf ? '/wolf.png' : '/pig.webp'}
         />
       )}

frontend/app/room/[roomId]/_sections/Users.tsx

@@ -6,9 +6,10 @@ import { RoomTitle, UserCard, UserImage } from '../_related/session.styled';
 import { UserComponent } from './UserComponent';
 
 const Users = () => {
-  const { currentUserList, roomInfo } = useContext(ChatContext);
+  const { roomInfo } = useContext(ChatContext);
   const MAX_USERS = 8;
   const USERS_PER_ROW = 4;
+  const currentUserList = roomInfo?.UserList ?? [];
 
   const remainingSlots = MAX_USERS - currentUserList.length;
   const allSlots: User[] = [