Don't pass the channel around, Why am I passing this around?

Author: jappeace

src/Bot.hs

@@ -63,8 +63,8 @@ import Transport
 
 type Bot = InEvent -> Effect ()
 
-builtinCommands :: ChannelName -> CommandTable
-builtinCommands channel =
+builtinCommands :: CommandTable
+builtinCommands =
   M.fromList
     [ ( "russify"
       , mkBuiltinCommand
@@ -114,7 +114,7 @@ builtinCommands channel =
       , mkBuiltinCommand
           ( "Send help"
           , $githubLinkLocationStr
-          , helpCommand $ builtinCommands channel))
+          , helpCommand builtinCommands))
     , ( "poll"
       , mkBuiltinCommand
           ( "Starts a poll. !poll <duration:secs> option1; option2; ...; option3"
@@ -227,14 +227,14 @@ builtinCommands channel =
             replyOnNothing "Only for mods" $
             regexArgs "([a-zA-Z0-9]+) ?(.*)" $
             replyLeft $
-            pairArgs $ replyLeft $ addCustomCommand $ builtinCommands channel))
+            pairArgs $ replyLeft $ addCustomCommand builtinCommands))
     , ( "delcmd"
       , mkBuiltinCommand
           ( "Delete custom command"
           , $githubLinkLocationStr
           , authorizeSender senderAuthority $
             replyOnNothing "Only for mods" $
-            deleteCustomCommand $ builtinCommands channel))
+            deleteCustomCommand builtinCommands))
     , ( "updcmd"
       , mkBuiltinCommand
           ( "Update custom command"
@@ -243,7 +243,7 @@ builtinCommands channel =
             replyOnNothing "Only for mods" $
             regexArgs "([a-zA-Z0-9]+) ?(.*)" $
             replyLeft $
-            pairArgs $ replyLeft $ updateCustomCommand $ builtinCommands channel))
+            pairArgs $ replyLeft $ updateCustomCommand builtinCommands))
                -- TODO(#337): use help instead of !showcmd
     , ( "showcmd"
       , mkBuiltinCommand
@@ -253,7 +253,7 @@ builtinCommands channel =
             replyLeft $
             cmapR headMay $
             replyOnNothing "Not enough arguments" $
-            showCustomCommand $ builtinCommands channel))
+            showCustomCommand builtinCommands))
     , ( "timescmd"
       , mkBuiltinCommand
           ( "Show amount of times the custom commands was invoked"
@@ -262,7 +262,7 @@ builtinCommands channel =
             replyLeft $
             cmapR headMay $
             replyOnNothing "Not enough arguments" $
-            timesCustomCommand $ builtinCommands channel))
+            timesCustomCommand builtinCommands))
     , ( "song"
       , mkBuiltinCommand
           ( "Print currently playing song"
@@ -407,9 +407,7 @@ builtinCommands channel =
           ( "Suggest video for the friday stream"
           , $githubLinkLocationStr
           , nonEmptyRoles
-              [qms|You have to be trusted to use this command.
-                   Subscribe to gain the trust instantly:
-                   https://twitch.tv/{channel'}/subscribe|]
+              
               fridayCommand))
     , ( "videoq"
       , mkBuiltinCommand
@@ -511,14 +509,8 @@ builtinCommands channel =
       , mkBuiltinCommand
           ( "Asciify Twitch, BTTV or FFZ emote"
           , $githubLinkLocationStr
-          , nonEmptyRoles
-              [qms|You have to be trusted to use this command.
-                   Subscribe to gain the trust instantly:
-                   https://twitch.tv/{channel'}/subscribe|]
-              asciifyReaction))
+          , nonEmptyRoles asciifyReaction))
     ]
-  where
-    channel' = unChannel channel
 
 nextStreamCommand :: Reaction Message a
 nextStreamCommand =
@@ -636,18 +628,18 @@ mention =
          else Nothing <$ msg) $
   ignoreNothing markov
 
-bot :: ChannelName -> Bot
-bot channel Started = do
+bot :: Bot
+bot Started = do
   startRefreshFridayGistTimer
-  startRefreshHelpGistTimer $ builtinCommands channel
+  startRefreshHelpGistTimer builtinCommands 
 -- TODO(#656): Restarted Twitch transport thread can duplicate timers
-bot _ (Joined channel@(TwitchChannel _)) = do
+bot (Joined channel@(TwitchChannel _)) = do
   startPeriodicCommands channel dispatchCommand
   periodicEffect (60 * 1000) (Just channel) (announceRunningPoll channel)
 -- TODO(#550): Periodic commands don't work in Discord channels
-bot _ (Joined channel@(DiscordChannel _)) =
+bot (Joined channel@(DiscordChannel _)) =
   periodicEffect (60 * 1000) (Just channel) (announceRunningPoll channel)
-bot _ (InMsg msg) =
+bot (InMsg msg) =
   runReaction
     (dupLiftExtractR internalMessageRoles $
      copyPastaFilter $ linkFilter messageReaction)
@@ -714,12 +706,12 @@ dispatchCommand message = do
   dispatchCustomCommand message
 
 dispatchBuiltinCommand :: Message (Command T.Text) -> Effect ()
-dispatchBuiltinCommand message@Message { messageSender = sender
+dispatchBuiltinCommand message@Message { messageSender = _
                                        , messageContent = Command { commandName = name
                                                                   , commandArgs = args
                                                                   }
                                        } =
   maybe
     (return ())
     (\bc -> runReaction (bcReaction bc) $ fmap (const args) message)
-    (M.lookup name $ builtinCommands $ channelToName $ senderChannel sender)
+    (M.lookup name builtinCommands)

src/Bot/Replies.hs

@@ -79,13 +79,21 @@ onlyForRoles reply roles reaction =
 onlyForMods :: Reaction Message a -> Reaction Message a
 onlyForMods = onlyForRoles "Only for mods" authorityRoles
 
-nonEmptyRoles :: T.Text -> Reaction Message a -> Reaction Message a
-nonEmptyRoles reply reaction =
+nonEmptyRoles :: Reaction Message a -> Reaction Message a
+nonEmptyRoles reaction =
   transR duplicate $
   ifR
     (null . senderRoles . messageSender)
-    (cmapR (const reply) $ Reaction replyMessage)
+    (Reaction noTrust)
     (cmapR extract reaction)
+        
+noTrust :: Message a -> Effect ()
+noTrust msg = replyToSender (messageSender msg) reply
+  where
+      reply = [qms|You have to be trusted to use this command.
+                   Subscribe to gain the trust instantly:
+                   https://twitch.tv/{channel'}/subscribe|]
+      channel' = unChannel $ channelToName $ senderChannel $ messageSender msg
 
 onlyForTwitch :: Reaction Message a -> Reaction Message a
 onlyForTwitch reaction =

src/Main.hs

@@ -12,7 +12,6 @@ import Control.Concurrent.STM
 import Control.Monad
 import Data.Foldable
 import Data.Maybe
-import qualified Data.Text as T
 import System.Clock
 import System.Environment
 import Text.InterpolatedString.QM
@@ -35,12 +34,7 @@ eventLoop b prevCPUTime botState = do
 logicEntry :: BotState -> IO ()
 logicEntry botState = do
   currCPUTime <- getTime Monotonic
-  handleInEvent bot' Started botState >>= eventLoop bot' currCPUTime
-  where
-    channelName =
-      ChannelName $
-      maybe "tsoding" (T.drop 1 . tcChannel) $ configTwitch $ bsConfig botState
-    bot' = bot channelName
+  handleInEvent bot Started botState >>= eventLoop bot currCPUTime
 
 -- TODO(#399): supervisor is vulnerable to errors that happen at the start of the action
 supavisah :: Show a => IO a -> IO ()