Change how the example bot handles state

src/Haboli/Euphoria/Command.hs

@@ -32,10 +32,11 @@ runCommands (c:cs) msg = do
 -- 'nextEvent':
 --
 -- > event <- respondingToCommands commands nextEvent
-respondingToCommands :: [Command e] -> Client e Event -> Client e Event
+respondingToCommands :: Client e Event -> Client e [Command e] -> Client e Event
-respondingToCommands cmds holdingEvent = do
+respondingToCommands getEvent getCommands = do
-  event <- holdingEvent
+  event <- getEvent
+  commands <- getCommands
   case event of
-    EventSend e -> void $ runCommands cmds $ sendMessage e
+    EventSend e -> void $ runCommands commands $ sendMessage e
     _           -> pure ()
   pure event

src/Haboli/Euphoria/ExampleBot.hs

@@ -7,11 +7,10 @@ module Haboli.Euphoria.ExampleBot
   ( exampleBot
   ) where
 
+import           Control.Concurrent
 import           Control.Monad
 import           Control.Monad.IO.Class
-import           Control.Monad.Trans.Class
+import qualified Data.Text                as T
-import           Control.Monad.Trans.State
-import qualified Data.Text                 as T
 import           Data.Time
 
 import           Haboli.Euphoria
@@ -22,8 +21,6 @@ data BotState = BotState
   , botListing   :: Listing
   } deriving (Show)
 
-type Bot = StateT BotState (Client T.Text)
-
 -- | A small example bot. Takes a room password as its first argument. You can
 -- run this bot in [&test](https://euphoria.io/room/test) like this:
 --
@@ -35,21 +32,25 @@ exampleBot mPasswd = do
     respondingToBounce mPasswd $
     respondingToPing nextEvent
   listing <- preferNick "ExampleBot" $ newListing initialEvents
-  void $ runStateT botMain $ BotState startTime listing
+  stateVar <- liftIO $ newMVar $ BotState startTime listing
+  botMain stateVar
 
-botMain :: Bot ()
+botMain :: MVar BotState -> Client T.Text ()
-botMain = forever $ do
+botMain stateVar = forever $ respondingToPing $ respondingToCommands nextEvent $ do
-  s <- get
+  state <- liftIO $ readMVar stateVar
-  let name = svNick $ self $ botListing s
+  let name = svNick $ self $ botListing state
-  lift $ respondingToCommands
+  pure
     [ botrulezPingGeneral
     , botrulezPingSpecific name
     , botrulezHelpSpecific name "I am an example bot for https://github.com/Garmelon/haboli/."
-    , botrulezUptimeSpecific name $ botStartTime s
+    , botrulezUptimeSpecific name $ botStartTime state
     , botrulezKillSpecific name
+    , cmdSpecific "hug" name $ \msg -> void $ reply msg "/me hugs back"
     , cmdGeneral "hello" $ \msg ->
         void $ reply msg $ "Hi there, " <> nickMention (svNick $ msgSender msg) <> "!"
-    , cmdSpecific "hug" name $ \msg ->
+    , cmdSpecificArgs "nick" name $ \msg args -> do
-        void $ reply msg "/me hugs back"
+        s <- liftIO $ takeMVar stateVar
-    ] $ respondingToPing nextEvent
+        listing' <- preferNick args $ botListing s
-
+        liftIO $ putMVar stateVar s{botListing = listing'}
+        void $ reply msg "Is this better?"
+    ]