Merge pull request #583 from vyneer/fix/event-uuid

fix: add uuids to broadcasts
destinygg · Dec 24, 2024 · cf225e7 · cf225e7
2 parents 9420d27 + 008fc7f
commit cf225e7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/assets/chat/js/chat.js b/assets/chat/js/chat.js
@@ -1376,6 +1376,7 @@ class Chat {
     MessageBuilder.broadcast(
       data.data,
       new ChatUser(data.user),
+      data.uuid,
       data.timestamp,
     ).into(this);
   }
@@ -1390,6 +1391,7 @@ class Chat {
         nick: 'System',
         id: -1,
       }),
+      '',
     ).into(this);
   }
 

diff --git a/assets/chat/js/messages/ChatBroadcastMessage.js b/assets/chat/js/messages/ChatBroadcastMessage.js
@@ -3,8 +3,8 @@ import ChatEventMessage from './ChatEventMessage';
 import MessageTypes from './MessageTypes';
 
 export default class ChatBroadcastMessage extends ChatEventMessage {
-  constructor(message, user, timestamp = null) {
-    super(message, timestamp);
+  constructor(message, user, uuid, timestamp = null) {
+    super(message, timestamp, uuid);
     this.type = MessageTypes.BROADCAST;
     this.user = user;
 

diff --git a/assets/chat/js/messages/MessageBuilder.js b/assets/chat/js/messages/MessageBuilder.js
@@ -29,8 +29,8 @@ export default class MessageBuilder {
     return new ChatMessage(message, timestamp, MessageTypes.INFO);
   }
 
-  static broadcast(message, user, timestamp = null) {
-    return new ChatBroadcastMessage(message, user, timestamp);
+  static broadcast(message, user, uuid, timestamp = null) {
+    return new ChatBroadcastMessage(message, user, uuid, timestamp);
   }
 
   static command(message, timestamp = null) {