summaryrefslogtreecommitdiff
path: root/Hsbot
diff options
context:
space:
mode:
authorJulien Dessaux2011-11-03 18:49:43 +0100
committerJulien Dessaux2011-11-03 18:50:44 +0100
commit50c8c0801ebc3707dfd86c2bc31a6768110d1821 (patch)
tree387104c5f2f41f484c7f5a425435b6589a94584f /Hsbot
parentOther cosmetics + version upgrade. (diff)
downloadhsbot-50c8c0801ebc3707dfd86c2bc31a6768110d1821.tar.gz
hsbot-50c8c0801ebc3707dfd86c2bc31a6768110d1821.tar.bz2
hsbot-50c8c0801ebc3707dfd86c2bc31a6768110d1821.zip
Updated to support the latest version of the tls module.
Diffstat (limited to '')
-rw-r--r--Hsbot/Core.hs2
-rw-r--r--Hsbot/Types.hs2
-rw-r--r--Hsbot/Utils.hs2
3 files changed, 3 insertions, 3 deletions
diff --git a/Hsbot/Core.hs b/Hsbot/Core.hs
index 4dc1e92..7f97918 100644
--- a/Hsbot/Core.hs
+++ b/Hsbot/Core.hs
@@ -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 $
diff --git a/Hsbot/Types.hs b/Hsbot/Types.hs
index 7ca9ee0..b0110c2 100644
--- a/Hsbot/Types.hs
+++ b/Hsbot/Types.hs
@@ -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
diff --git a/Hsbot/Utils.hs b/Hsbot/Utils.hs
index 5d5c424..d29345c 100644
--- a/Hsbot/Utils.hs
+++ b/Hsbot/Utils.hs
@@ -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)