Skip to content

[FIX] 채팅 슬래시 명령어 버그 수정 #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DDINGJOO merged 10 commits into from
Jan 24, 2026
Merged

[FIX] 채팅 슬래시 명령어 버그 수정 #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3cfeb15
[FEAT] 채팅 슬래시 명령어 시스템 구현 (#200)
DDINGJOO Jan 24, 2026
f8cb767
[FIX] 시스템 명령어 메시지 백엔드 응답 구조 대응
DDINGJOO Jan 24, 2026
1d3f4f6
[FIX] 시스템 명령어 content 필드 매핑 수정
DDINGJOO Jan 24, 2026
9db32f3
[DEBUG] 시스템 명령어 메시지 디버깅 로그 추가
DDINGJOO Jan 24, 2026
93e2462
[DEBUG] 시스템 명령어 메시지 추가 로그
DDINGJOO Jan 24, 2026
f6f276f
[DEBUG] ChatRoomPage 메시지 렌더링 로그 추가
DDINGJOO Jan 24, 2026
084201f
[DEBUG] SYSTEM_COMMAND 조건 체크 로그
DDINGJOO Jan 24, 2026
42146a1
[FIX] ChatRoomModal에 SYSTEM_COMMAND 메시지 렌더링 추가
DDINGJOO Jan 24, 2026
9aff729
[CLEANUP] 디버깅 로그 제거
DDINGJOO Jan 24, 2026
f652aac
Merge origin/develop - 충돌 해결
DDINGJOO Jan 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/domains/freetalk/components/ChatRoomModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ import {useAuth} from '../../../contexts/AuthContext'
import {useThemeMode} from '../../../contexts/ThemeContext'
import {DESIGN_TOKENS, getChatStyles} from '../../../theme/theme'
import {useChatWebSocket} from '../hooks/useChatWebSocket'
import SystemCommandMessage from './SystemCommandMessage'
import {MessageType} from '../types/chatCommandTypes'

const ChatRoomModal = ({open, onClose, room, onLeave}) => {
const theme = useTheme()
Expand Down Expand Up @@ -456,7 +458,15 @@ const ChatRoomModal = ({open, onClose, room, onLeave}) => {
</Typography>
</Box>
) : (
messages.map((message) => (
messages.map((message) => {
// 시스템 명령어 메시지 (SYSTEM_COMMAND)
if (message.messageType === MessageType.SYSTEM_COMMAND || message.messageType === 'SYSTEM_COMMAND') {
return (
<SystemCommandMessage key={message.id} data={message.data} />
)
}

return (
<Box
key={message.id}
sx={{
Expand Down Expand Up @@ -594,7 +604,7 @@ const ChatRoomModal = ({open, onClose, room, onLeave}) => {
</>
)}
</Box>
))
)})
)}
<div ref={messagesEndRef}/>
</Box>
Expand Down
49 changes: 32 additions & 17 deletions src/domains/freetalk/components/SystemCommandMessage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,18 @@ const SystemCommandMessage = ({ data }) => {
const { mode } = useThemeMode()
const isDark = mode === 'dark'

const config = SystemCommandConfig[data.commandType] || SystemCommandConfig.help
// 명령어 타입 추출
const commandType = data?.commandType || data?.type || data?.raw?.type || 'help'
const config = SystemCommandConfig[commandType] || SystemCommandConfig.help
const { icon, color, bgColor } = config

// 표시 텍스트 추출
const displayText = data?.displayText || data?.message || data?.content || ''
const userId = data?.userId || data?.nickname || ''

// 결과 값 추출
const result = data?.result || data?.raw || {}

return (
<Box sx={{ width: '100%', display: 'flex', justifyContent: 'center', py: 1 }}>
<Paper
Expand Down Expand Up @@ -49,29 +58,35 @@ const SystemCommandMessage = ({ data }) => {

{/* 내용 */}
<Box sx={{ flex: 1 }}>
<Box sx={{ display: 'flex', alignItems: 'baseline', gap: 1 }}>
<Typography
variant="caption"
sx={{
fontWeight: 600,
color: isDark ? '#9ca3af' : 'text.secondary',
}}
>
{data.userId}
</Typography>
{/* displayText가 있으면 그대로 표시 (백엔드에서 이미 포맷팅됨) */}
{displayText ? (
<Typography
variant="body2"
sx={{
fontWeight: 500,
color: isDark ? '#fafaf9' : color,
color: isDark ? '#fafaf9' : 'text.primary',
whiteSpace: 'pre-wrap',
}}
>
{data.displayText}
{displayText}
</Typography>
</Box>

{/* 추가 결과 정보 */}
{renderCommandResult(data.commandType, data.result, isDark)}
) : (
<>
<Box sx={{ display: 'flex', alignItems: 'baseline', gap: 1 }}>
<Typography
variant="caption"
sx={{
fontWeight: 600,
color: isDark ? '#9ca3af' : 'text.secondary',
}}
>
{userId}
</Typography>
</Box>
{/* 추가 결과 정보 */}
{renderCommandResult(commandType, result, isDark)}
</>
)}
</Box>
</Box>
</Paper>
Expand Down
17 changes: 12 additions & 5 deletions src/domains/freetalk/hooks/useChatWebSocket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,14 +165,21 @@ export function useChatWebSocket(roomId, userId) {
},

onSystemCommand: (data) => {
console.log('[useChatWebSocket] System command:', data)
const commandData = data.data || data
const commandData = data.data || {}
const commandMessage = {
id: `syscmd-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`,
messageType: 'SYSTEM_COMMAND',
userId: commandData.userId,
createdAt: new Date().toISOString(),
data: commandData,
userId: commandData.userId || commandData.nickname || data.userId,
createdAt: data.createdAt || new Date().toISOString(),
data: {
commandType: commandData.type || 'help',
userId: commandData.userId || commandData.nickname,
displayText: data.content || data.message || '',
result: typeof commandData.result === 'object'
? commandData.result
: { value: commandData.result },
raw: commandData,
},
}
setMessages((prev) => [...prev, commandMessage])
},
Expand Down