From: dopefishh Date: Thu, 13 Jul 2017 10:22:26 +0000 (+0200) Subject: Merge pull request #7 from clean-cloogle/private-messages X-Git-Url: https://git.martlubbers.net/?p=cloogle-irc.git;a=commitdiff_plain;h=acc4a4b8ccd8040dda61dfd1f05cdb1ee55d16bf;hp=1547e1cacf063d05c1ae686e6a1047792e13ef60 Merge pull request #7 from clean-cloogle/private-messages Fix #4: reply to private messages --- diff --git a/cloogle.icl b/cloogle.icl index 35b71c2..c4c93d9 100644 --- a/cloogle.icl +++ b/cloogle.icl @@ -111,18 +111,22 @@ Start w = bot ("irc.freenode.net", 6667) startup shutdown () process w process :: IRCMessage () *World -> (Maybe [IRCMessage], (), *World) process im s w = case im.irc_command of Left numr = (Just [], (), w) - Right cmd = case process` cmd w of + Right cmd = case process` im.irc_prefix cmd w of (Nothing, w) = (Nothing, (), w) (Just cs, w) = (Just $ map toPrefix cs, (), w) - process` :: IRCCommand *World -> (Maybe [IRCCommand], *World) - process` (PRIVMSG t m) w + process` :: (Maybe (Either IRCUser String)) IRCCommand *World -> (Maybe [IRCCommand], *World) + process` (Just (Left user)) (PRIVMSG t m) w | m.[0] == '!' # (msgs, w) = realProcess (split " " $ m % (1, size m)) w - = (Just $ map (PRIVMSG t) msgs, w) + = (Just $ map (PRIVMSG recipient) msgs, w) = (Just [], w) - process` (PING t mt) w = (Just [PONG t mt], w) - process` _ w = (Just [], w) + where + recipient = case (\(CSepList [t:_]) -> t.[0]) t of + '#' -> t + _ -> CSepList [user.irc_nick] + process` _ (PING t mt) w = (Just [PONG t mt], w) + process` _ _ w = (Just [], w) realProcess :: [String] *World -> ([String], *World) realProcess ["help",x:xs] w = ((case x of