adyxax/hsbot
Archived
1
0
Fork 0
Code Issues Activity

Removed thread ids from plugins data structure.

Browse source
This commit is contained in:
Julien Dessaux 2010-05-16 17:58:38 +02:00
parent c1662ba7b9
commit 738ad9e9bb
11 changed files with 37 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Hsbot/Irc/Core.hs
View file

@ -1,5 +1,5 @@
module Hsbot.Irc.Core
( ircbot
( startIrcbot
) where
import Control.Concurrent
@ -21,8 +21,8 @@ import Hsbot.Irc.Types
import Hsbot.Message (BotMsg)
-- | IrcBot's main entry point
ircbot :: IrcConfig -> Chan BotMsg -> Chan BotMsg -> IO ()
ircbot config masterChan myChan = do
startIrcbot :: IrcConfig -> Chan BotMsg -> Chan BotMsg -> IO ()
startIrcbot config masterChan myChan = do
startTime <- getCurrentTime
putStrLn "[IrcBot] Opening communication channel... "
chan <- newChan :: IO (Chan IrcBotMsg)
@ -55,6 +55,9 @@ ircbot config masterChan myChan = do
_ <- ircBotLoop ircBotState' `catch` (\(_ :: IOException) -> return ())
return ()
--resumeIrcBot
--resumeIrcBot
-- | Runs the IrcBot's reader loop
ircBotReader :: Handle -> Chan IrcBotMsg -> ThreadId -> IO ()
ircBotReader handle chan fatherThreadId = forever $ do
@ -126,9 +129,9 @@ dispatchMessage (InIrcMsg inIrcMsg) = do
let key = tail . head $ words getMsgContent
pluginNames = fromMaybe [] $ M.lookup key cmds
plugins' = fromMaybe [] $ mapM (flip M.lookup plugins) pluginNames
in mapM_ (sendRunCommand $ tail getMsgContent) plugins'
in mapM_ (sendRunCommand (tail getMsgContent) . fst) plugins'
else
mapM_ (sendToPlugin $ InIrcMsg inIrcMsg) (M.elems plugins)
mapM_ (sendToPlugin (InIrcMsg inIrcMsg) . fst) (M.elems plugins)
where
isPluginCommand :: IrcConfig -> Bool
isPluginCommand config =