From 6d30de19f65f8d3fbeaa443039e41ba34d739175 Mon Sep 17 00:00:00 2001
From: Gabe Kangas <gabek@real-ity.com>
Date: Wed, 31 May 2023 16:54:30 -0700
Subject: [PATCH] fix(chat): cleanup of moderator flag check

---
 web/components/chat/ChatContainer/ChatContainer.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/components/chat/ChatContainer/ChatContainer.tsx b/web/components/chat/ChatContainer/ChatContainer.tsx
index efce42af9..40a8df8a3 100644
--- a/web/components/chat/ChatContainer/ChatContainer.tsx
+++ b/web/components/chat/ChatContainer/ChatContainer.tsx
@@ -82,7 +82,6 @@ function checkIsModerator(message: ChatMessage | ConnectedClientInfoEvent) {
   const { user } = message;
 
   const u = new User(user);
-
   return u.isModerator;
 }
 
@@ -155,6 +154,8 @@ export const ChatContainer: FC<ChatContainerProps> = ({
       collapsedMessageIds.add(message.id);
     }
 
+    const isAuthorModerator = checkIsModerator(message);
+
     return (
       <ChatUserMessage
         message={message}
@@ -162,7 +163,7 @@ export const ChatContainer: FC<ChatContainerProps> = ({
         highlightString={usernameToHighlight} // What to highlight in the message
         sentBySelf={message.user?.id === chatUserId} // The local user sent this message
         sameUserAsLast={collapsed}
-        isAuthorModerator={message.user?.isModerator}
+        isAuthorModerator={isAuthorModerator}
         isAuthorBot={message.user?.isBot}
         isAuthorAuthenticated={message.user?.authenticated}
         key={message.id}