From 738ad9e9bbbefb43a7889a458ff1c326a324eb9a Mon Sep 17 00:00:00 2001
From: Julien Dessaux
Date: Sun, 16 May 2010 17:58:38 +0200
Subject: Removed thread ids from plugins data structure.

---
 Hsbot/Irc/Plugin.hs | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'Hsbot/Irc/Plugin.hs')

diff --git a/Hsbot/Irc/Plugin.hs b/Hsbot/Irc/Plugin.hs
index b12d922..525ab8f 100644
--- a/Hsbot/Irc/Plugin.hs
+++ b/Hsbot/Irc/Plugin.hs
@@ -48,14 +48,13 @@ loadIrcPlugin pluginName = do
     let oldPlugins = ircBotPlugins ircbot
     -- We check for unicity
     case M.lookup pluginName oldPlugins of
-        Just plugin -> return ()
-        Nothing     -> do
+        Just _  -> return ()
+        Nothing -> do
             threadId <- liftIO $ forkIO (entryPoint pluginChan masterChan)
             let plugin  = IrcPluginState { ircPluginName       = pluginName
-                                         , ircPluginThreadId   = threadId
                                          , ircPluginChan       = pluginChan
                                          , ircPluginMasterChan = masterChan }
-            put $ ircbot { ircBotPlugins = M.insert pluginName plugin oldPlugins }
+            put $ ircbot { ircBotPlugins = M.insert pluginName (plugin, threadId) oldPlugins }
 
 -- | Sends a list of loaded plugins
 listPlugins :: IrcMsg -> String -> IrcBot ()
@@ -63,8 +62,8 @@ listPlugins originalRequest dest = do
     plugins <- gets ircBotPlugins
     let listing = unwords $ M.keys plugins
     case M.lookup dest plugins of
-        Just plugin -> sendToPlugin (IntIrcCmd $ IrcCmd "ANSWER" "CORE" dest listing originalRequest) plugin
-        Nothing     -> return ()
+        Just (plugin, _) -> sendToPlugin (IntIrcCmd $ IrcCmd "ANSWER" "CORE" dest listing originalRequest) plugin
+        Nothing          -> return ()
 
 -- | Unloads a plugin
 unloadPlugin :: String -> IrcBot ()
@@ -72,9 +71,9 @@ unloadPlugin name = do
     bot <- get
     let oldPlugins = ircBotPlugins bot
     case M.lookup name oldPlugins of
-        Just plugin -> do
+        Just (_, threadId) -> do
             let newPlugins = M.delete name oldPlugins
-            liftIO $ throwTo (ircPluginThreadId plugin) UserInterrupt
+            liftIO $ throwTo threadId UserInterrupt
             put $ bot { ircBotPlugins = newPlugins }
         Nothing     -> return ()
 
-- 
cgit v1.2.3