diff options
Diffstat (limited to 'IRC.hs')
| -rw-r--r-- | IRC.hs | 39 |
1 files changed, 19 insertions, 20 deletions
@@ -70,28 +70,27 @@ ircEvalLoop h env = do env' <- branch s ircEvalLoop h env' where - branch s = if ping s then do { pong s; return (env) } else ircEval h msg env - where - ping x = "PING :" `isPrefixOf` x - pong x = ircWrite h "PONG" (':' : drop 6 x) - from = drop 1 . takeWhile (/= '!') - clean = drop 1 . dropWhile (/= ':') . drop 1 - isQuery x = split x ' ' !! 2 == (envGet "ircNick" env) - msg = IrcMessage { raw = s, from = from s, clean = clean s, isQuery = isQuery s } + branch s + | ping s = do { pong s; return (env) } + | otherwise = ircEval h (msg s) env + ping x = "PING :" `isPrefixOf` x + pong x = ircWrite h "PONG" (':' : drop 6 x) + from = drop 1 . takeWhile (/= '!') + clean = drop 1 . dropWhile (/= ':') . drop 1 + isQuery x = split x ' ' !! 2 == (envGet "ircNick" env) + msg s = IrcMessage { + raw = s, from = from s, + clean = clean s, isQuery = isQuery s + } ircEval :: Handle -> IrcMessage -> Env -> IO Env -ircEval h msg env@(DispatchEnv state _ dispatch) = - case isCommand (clean msg) of - Just cmd -> do - dispatch cmd sendReplyMsg (castEnv env) - return (env) - Nothing -> do - evalMessage (clean msg) - return (env) +ircEval h msg env@(DispatchEnv state _ dispatch) = ircEval' (clean msg) where - isCommand ('!':xs) = Just xs - isCommand _ = Nothing - evalMessage "+x" = ircWrite h "JOIN" (currentChannel state) - evalMessage _ = putStrLn $ "foo" ++ (show msg) + ircEval' "+x" = do + ircWrite h "JOIN" (currentChannel state) + return (env) + ircEval' cleanMsg = do + (Env s c) <- dispatch cleanMsg sendReplyMsg (castEnv env) + return (DispatchEnv s c dispatch) sendReplyMsg = ircPrivMsg h msg (castEnv env) |