feat: create a isSystem method on user

destinygg · Dec 27, 2023 · e9bc315 · e9bc315
1 parent 4e14f3a
commit e9bc315
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 21 deletions.
diff --git a/assets/chat/js/messages/ChatBroadcastMessage.js b/assets/chat/js/messages/ChatBroadcastMessage.js
@@ -10,31 +10,30 @@ export default class ChatBroadcastMessage extends ChatEventMessage {
   }
 
   buildUserTemplate(chat = null) {
-    // User with an id of -1 is the dummy system user used for server broadcasts
-    if (this.user.id !== -1) {
-      const colorFlair = usernameColorFlair(chat.flairs, this.user);
-
-      /** @type HTMLAnchorElement */
-      const user = document
-        .querySelector('#user-template')
-        ?.content.cloneNode(true).firstElementChild;
-      user.title = this.title;
-      user.classList.add(colorFlair?.name);
-      user.innerText = this.user.displayName;
+    if (this.user.isSystem()) {
+      return [];
+    }
 
-      const ctrl = document.createElement('span');
-      ctrl.classList.toggle('ctrl');
+    const colorFlair = usernameColorFlair(chat.flairs, this.user);
 
-      if (this.slashme) {
-        return [user, ctrl, ' '];
-      }
+    /** @type HTMLAnchorElement */
+    const user = document
+      .querySelector('#user-template')
+      ?.content.cloneNode(true).firstElementChild;
+    user.title = this.title;
+    user.classList.add(colorFlair?.name);
+    user.innerText = this.user.displayName;
 
-      ctrl.innerText = ': ';
+    const ctrl = document.createElement('span');
+    ctrl.classList.toggle('ctrl');
 
-      return [user, ctrl];
+    if (this.slashme) {
+      return [user, ctrl, ' '];
     }
 
-    return [];
+    ctrl.innerText = ': ';
+
+    return [user, ctrl];
   }
 
   html(chat = null) {

diff --git a/assets/chat/js/messages/ChatEventMessage.js b/assets/chat/js/messages/ChatEventMessage.js
@@ -16,7 +16,7 @@ export default class ChatEventMessage extends ChatMessage {
       .querySelector('#event-template')
       ?.content.cloneNode(true).firstElementChild;
 
-    if (this.user && this.user.username && this.user.id !== -1)
+    if (this.user && this.user.username && !this.user.isSystem())
       eventTemplate.dataset.username = this.user.username;
     if (this.mentioned && this.mentioned.length > 0)
       eventTemplate.dataset.mentioned = this.mentioned.join(' ').toLowerCase();

diff --git a/assets/chat/js/user.js b/assets/chat/js/user.js
@@ -125,6 +125,10 @@ class ChatUser {
       this.watching?.id === embed?.id
     );
   }
+
+  isSystem() {
+    return this.id === -1;
+  }
 }
 
 export default ChatUser;
diff --git a/assets/chat/js/window.js b/assets/chat/js/window.js
@@ -127,7 +127,7 @@ class ChatWindow extends EventEmitter {
         message.updateTimeFormat();
       }
 
-      if (message.user && message.user.id !== -1) {
+      if (message.user && !message.user.isSystem()) {
         const { username } = message.user;
 
         message.setOwnMessage(username === chat.user.username);