Merge pull request #197 from fizruk/log-api-exceptions-from-action-ha…

…ndlers
fizruk · Nov 7, 2024 · 38be21d · 38be21d
2 parents 027648c + 4018bfd
commit 38be21d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/telegram-bot-simple/src/Telegram/Bot/Simple/BotApp/Internal.hs b/telegram-bot-simple/src/Telegram/Bot/Simple/BotApp/Internal.hs
@@ -109,7 +109,9 @@ processAction BotApp{..} botEnv@BotEnv{..} update action = do
       (newModel, effects) -> do
         writeTVar botModelVar newModel
         return effects
-  mapM_ ((liftIO . issueAction botEnv update) <=< runBotM (BotContext botUser update)) effects
+  let runBotAndIssueAction
+        = (liftIO . issueAction botEnv update) <=< runBotM (BotContext botUser update)
+  mapM_ runBotAndIssueAction effects
 
 -- | A job to wait for the next action and process it.
 processActionJob :: BotApp model action -> BotEnv model action -> ClientM ()
@@ -122,7 +124,10 @@ processActionsIndefinitely
   :: BotApp model action -> BotEnv model action -> IO ThreadId
 processActionsIndefinitely botApp botEnv = do
   a <- asyncLink $ forever $ do
-    runClientM (processActionJob botApp botEnv) (botClientEnv botEnv)
+    res <- runClientM (processActionJob botApp botEnv) (botClientEnv botEnv)
+    case res of
+      Left err -> print err
+      Right _ -> return ()
   return (asyncThreadId a)
 
 -- | Start 'Telegram.Update' polling for a bot.

diff --git a/telegram-bot-simple/src/Telegram/Bot/Simple/Eff.hs b/telegram-bot-simple/src/Telegram/Bot/Simple/Eff.hs
@@ -24,6 +24,9 @@ data BotContext = BotContext
   , botContextUpdate :: Maybe Telegram.Update
   }
 
+-- | To retain control over errors coming from Telegram API in `BotM`,
+-- consider using `liftIO . flip runClientM clientEnv` instead.
+-- Issues generated by servant-client will be logged, response failure errors will be ignored.
 liftClientM :: ClientM a -> BotM a
 liftClientM = BotM . lift