Ensure consistent string case for channel name checks

alveusgg · Aug 2, 2024 · 6c5177b · 6c5177b
1 parent 013e296
commit 6c5177b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/src/hooks/useChannel.ts b/src/hooks/useChannel.ts
@@ -13,8 +13,8 @@ export default () => {
 
     fetchCurrentChannelInfo(auth)
       .then((newChannelInfo) => {
-        if (typeof newChannelInfo?.broadcaster_name === "string") {
-          setChannelName(newChannelInfo.broadcaster_name);
+        if (typeof newChannelInfo?.broadcaster_login === "string") {
+          setChannelName(newChannelInfo.broadcaster_login.toLowerCase());
         }
       })
       .catch((e) => {

diff --git a/src/hooks/useChatCommand.ts b/src/hooks/useChatCommand.ts
@@ -6,14 +6,19 @@ import { typeSafeObjectEntries } from "../utils/helpers";
 
 import useChannel from "./useChannel";
 
-const testChannelNames =
-  process.env.REACT_APP_TEST_CHANNEL_NAMES?.split(",") ?? [];
-const defaultChannelNames =
-  process.env.REACT_APP_DEFAULT_CHANNEL_NAMES?.split(",") ?? [];
-const extraChannelNames =
-  process.env.REACT_APP_EXTRA_CHANNEL_NAMES?.split(",") ?? [];
-const privilegedUsers =
-  process.env.REACT_APP_CHAT_COMMANDS_PRIVILEGED_USERS?.split(",") ?? [];
+const parseCsvEnv = (env: string | undefined): string[] =>
+  env?.split(",").map((str) => str.toLowerCase()) ?? [];
+
+const testChannelNames = parseCsvEnv(process.env.REACT_APP_TEST_CHANNEL_NAMES);
+const defaultChannelNames = parseCsvEnv(
+  process.env.REACT_APP_DEFAULT_CHANNEL_NAMES,
+);
+const extraChannelNames = parseCsvEnv(
+  process.env.REACT_APP_EXTRA_CHANNEL_NAMES,
+);
+const privilegedUsers = parseCsvEnv(
+  process.env.REACT_APP_CHAT_COMMANDS_PRIVILEGED_USERS,
+);
 
 const getAmbassadorCommandsMap = (): Map<string, AmbassadorKey> => {
   const commandMap = new Map<string, AmbassadorKey>();
@@ -67,7 +72,7 @@ export default function useChatCommand(callback: (command: string) => void) {
       if (
         !tags.mod &&
         !tags.badges?.broadcaster &&
-        !privilegedUsers.includes(tags.username ?? "")
+        !privilegedUsers.includes(tags.username?.toLowerCase() ?? "")
       )
         return;
       // Ignore echoed messages (messages sent by the bot) and messages that don't start with '!'