adyxax/hsbot
Archived
1
0
Fork 0
Code Issues Activity

Updated to support the latest version of the tls module.

Browse source
This commit is contained in:
Julien Dessaux 2011-11-03 18:49:43 +01:00
parent 7cefea4cbc
commit 50c8c0801e
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Hsbot/Core.hs
View file

@ -103,7 +103,7 @@ runHsbot die_msgs = do
-- TODO : kill plugin threads
return code
botReader :: BotEnv -> Handle -> Maybe TLSCtx -> Chan Message -> IO ()
botReader :: BotEnv -> Handle -> Maybe (TLSCtx Handle) -> Chan Message -> IO ()
botReader env _ (Just ctx) chan = forever $
fmap L.toString (recvData ctx) `catch` handleIOException env "botReader died" >>= handleIncomingStr chan
botReader env handle Nothing chan = forever $

2
Hsbot/Types.hs
View file

@ -34,7 +34,7 @@ data BotEnv = BotEnv
, envThreadIdsMv :: MVar [ThreadId]
, envConfig :: Config
, envTLS :: Maybe TLSParams
, envTLSCtx :: Maybe TLSCtx
, envTLSCtx :: Maybe (TLSCtx Handle)
}
-- The bot monad

2
Hsbot/Utils.hs
View file

@ -48,7 +48,7 @@ hasAccess (Just mask) right =
| otherwise = False
-- Helpers
sendStr :: BotEnv -> Handle -> Maybe TLSCtx -> String -> IO ()
sendStr :: BotEnv -> Handle -> Maybe (TLSCtx Handle) -> String -> IO ()
sendStr env _ (Just ctx) msg = sendData ctx (L.fromString $ msg ++ "\r\n") `catch` handleIOException env ("sendStr " ++ msg)
sendStr env handle Nothing msg = hPutStrLn handle (msg ++ "\r\n") `catch` handleIOException env ("sendStr " ++ msg)