From 040c838881c55c2cca454eb52979d5f955873556 Mon Sep 17 00:00:00 2001
From: Gabe Kangas <gabek@real-ity.com>
Date: Wed, 17 Nov 2021 17:19:55 -0800
Subject: [PATCH] Keep list of renderable message types and check against them

---
 webroot/js/components/chat/chat.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/webroot/js/components/chat/chat.js b/webroot/js/components/chat/chat.js
index d7408ad43..2f5d956d7 100644
--- a/webroot/js/components/chat/chat.js
+++ b/webroot/js/components/chat/chat.js
@@ -15,6 +15,7 @@ import {
   MESSAGE_JUMPTOBOTTOM_BUFFER,
 } from '../../utils/constants.js';
 
+const renderableChatStyleMessages = ['CHAT', 'SYSTEM', 'USER_JOINED'];
 export default class Chat extends Component {
   constructor(props, context) {
     super(props, context);
@@ -218,14 +219,13 @@ export default class Chat extends Component {
       });
       this.forceRender = true;
     } else if (
-      messageType === 'CHAT' &&
+      renderableChatStyleMessages.includes(messageType) &&
       existingIndex === -1 &&
       messageVisible
     ) {
       // insert message at timestamp
       const convertedMessage = {
         ...message,
-        type: 'CHAT',
       };
       const insertAtIndex = curMessages.findIndex((item, index) => {
         const time = item.timestamp || messageTimestamp;
@@ -247,7 +247,10 @@ export default class Chat extends Component {
       this.setState({
         messages: updatedMessageList,
       });
-    } else if (messageType === 'CHAT' && existingIndex === -1) {
+    } else if (
+      renderableChatStyleMessages.includes(messageType) &&
+      existingIndex === -1
+    ) {
       // else if message doesn't exist, add it and extra username
       const newState = {
         messages: [...curMessages, message],