Store messages in EmoteMessage not just md5

destinygg · Nov 21, 2024 · 2bff2f0 · 2bff2f0
1 parent 503db3b
commit 2bff2f0
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/assets/chat/js/chat.js b/assets/chat/js/chat.js
@@ -1157,7 +1157,7 @@ class Chat {
       this.removeSlashCmdFromText(win.lastmessage?.message) === textonly;
 
     if (isCombo && win.lastmessage?.type === MessageTypes.EMOTE) {
-      win.lastmessage.add(message.md5);
+      win.lastmessage.add(message);
 
       if (this.user.equalWatching(usr.watching)) {
         win.lastmessage.ui.classList.toggle('watching-same', true);
@@ -1168,12 +1168,12 @@ class Chat {
     }
 
     if (isCombo && win.lastmessage?.type === MessageTypes.USER) {
-      const lastMessageMd5 = win.lastmessage.md5;
+      const lastMessage = win.lastmessage;
       win.removeLastMessage();
       const msg = MessageBuilder.emote(
         textonly,
-        data.timestamp,
-        [lastMessageMd5, message.md5],
+        lastMessage.timestamp,
+        [lastMessage, message],
         2,
       ).into(this);
 

diff --git a/assets/chat/js/messages/ChatEmoteMessage.js b/assets/chat/js/messages/ChatEmoteMessage.js
@@ -27,12 +27,14 @@ function ChatEmoteMessageCount(message) {
 const ChatEmoteMessageCountThrottle = throttle(63, ChatEmoteMessageCount);
 
 export default class ChatEmoteMessage extends ChatMessage {
-  md5List = [];
+  messages = [];
 
-  constructor(emote, timestamp, md5List, count = 1) {
+  emotecount = 0;
+
+  constructor(emote, timestamp, messages) {
     super(emote, timestamp, MessageTypes.EMOTE);
-    this.md5List = md5List;
-    this.emotecount = count;
+    this.messages = messages;
+    this.emotecount = messages.length;
     this.emoteFormatter = new EmoteFormatter();
   }
 
@@ -65,12 +67,16 @@ export default class ChatEmoteMessage extends ChatMessage {
     this.ui.append(this.text.get(0), this.combo.get(0));
   }
 
-  add(md5) {
-    this.md5List.push(md5);
+  add(message) {
+    this.messages.push(message);
     this.emotecount += 1;
     ChatEmoteMessageCountThrottle(this);
   }
 
+  containsMessage(message) {
+    return this.messages.find((msg) => msg.md5 === message.md5);
+  }
+
   completeCombo() {
     ChatEmoteMessageCount(this);
     this.combo.attr('class', `${this.combo.attr('class')} combo-complete`);

diff --git a/assets/chat/js/messages/MessageBuilder.js b/assets/chat/js/messages/MessageBuilder.js
@@ -41,8 +41,8 @@ export default class MessageBuilder {
     return new ChatUserMessage(message, user, timestamp);
   }
 
-  static emote(emote, timestamp, md5List, count = 1) {
-    return new ChatEmoteMessage(emote, timestamp, md5List, count);
+  static emote(emote, timestamp, messages) {
+    return new ChatEmoteMessage(emote, timestamp, messages);
   }
 
   static whisper(message, user, target, timestamp = null, id = null) {

diff --git a/assets/chat/js/window.js b/assets/chat/js/window.js
@@ -89,7 +89,7 @@ class ChatWindow extends EventEmitter {
   containsMessage(message) {
     return this.messages.find((msg) => {
       if (msg.type === MessageTypes.EMOTE) {
-        return msg.md5List.includes(message.md5);
+        return msg.containsMessage(message);
       }
       return msg.md5 === message.md5;
     });