Merge pull request #6547 from Exairnous/fix-discord-bot-mixing-chat-messages

Exairnous · web-flow · commit 13684456ad53 · 2025-05-30T02:26:16.000-04:00
Fix incorrect chat grouping of Discord messages
diff --git a/src/react-components/room/contexts/ChatContext.tsx b/src/react-components/room/contexts/ChatContext.tsx
@@ -30,7 +30,7 @@ function shouldCreateNewMessageGroup(messageGroups: NewMessageT[], newMessage: N
 
   const lastMessageGroup = messageGroups[messageGroups.length - 1];
 
-  if (lastMessageGroup.senderSessionId !== newMessage.sessionId) {
+  if (lastMessageGroup.senderSessionId !== newMessage.sessionId || lastMessageGroup.sender !== newMessage.name) {
     return true;
   }
   if (lastMessageGroup.type !== newMessage.type) {

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ function shouldCreateNewMessageGroup(messageGroups: NewMessageT[], newMessage: N`
`30`	`30`
`31`	`31`	`const lastMessageGroup = messageGroups[messageGroups.length - 1];`
`32`	`32`
`33`		`- if (lastMessageGroup.senderSessionId !== newMessage.sessionId) {`
	`33`	`+ if (lastMessageGroup.senderSessionId !== newMessage.sessionId \|\| lastMessageGroup.sender !== newMessage.name) {`
`34`	`34`	`return true;`
`35`	`35`	`}`
`36`	`36`	`if (lastMessageGroup.type !== newMessage.type) {`