fix: ignore combos

destinygg · Jul 1, 2024 · 6f3fc1c · 6f3fc1c
1 parent 19d966e
commit 6f3fc1c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/assets/chat/js/chat.js b/assets/chat/js/chat.js
@@ -1129,7 +1129,9 @@ class Chat {
 
     if (isCombo && win.lastmessage?.type === MessageTypes.USER) {
       win.removeLastMessage();
-      const msg = MessageBuilder.emote(textonly, data.timestamp, 2).into(this);
+      const msg = MessageBuilder.emote(textonly, usr, data.timestamp, 2).into(
+        this,
+      );
 
       if (this.user.equalWatching(usr.watching)) {
         msg.ui.classList.add('watching-same');

diff --git a/assets/chat/js/messages/ChatEmoteMessage.js b/assets/chat/js/messages/ChatEmoteMessage.js
@@ -27,8 +27,9 @@ function ChatEmoteMessageCount(message) {
 const ChatEmoteMessageCountThrottle = throttle(63, ChatEmoteMessageCount);
 
 export default class ChatEmoteMessage extends ChatMessage {
-  constructor(emote, timestamp, count = 1) {
+  constructor(emote, user, timestamp, count = 1) {
     super(emote, timestamp, MessageTypes.EMOTE);
+    this.user = user;
     this.emotecount = count;
     this.emoteFormatter = new EmoteFormatter();
   }