diff options
Diffstat (limited to 'Hsbot/Irc/Plugin')
-rw-r--r-- | Hsbot/Irc/Plugin/Core.hs | 4 | ||||
-rw-r--r-- | Hsbot/Irc/Plugin/Dummy.hs | 3 | ||||
-rw-r--r-- | Hsbot/Irc/Plugin/Ping.hs | 3 | ||||
-rw-r--r-- | Hsbot/Irc/Plugin/Quote.hs | 3 |
4 files changed, 1 insertions, 12 deletions
diff --git a/Hsbot/Irc/Plugin/Core.hs b/Hsbot/Irc/Plugin/Core.hs index 5d69ca3..9987a89 100644 --- a/Hsbot/Irc/Plugin/Core.hs +++ b/Hsbot/Irc/Plugin/Core.hs @@ -2,7 +2,7 @@ module Hsbot.Irc.Plugin.Core ( ircBotPluginCore ) where -import Control.Concurrent (Chan, myThreadId) +import Control.Concurrent (Chan) import Control.Exception import Control.Monad.State import Prelude hiding (catch) @@ -13,9 +13,7 @@ import Hsbot.Irc.PluginCommons -- | The plugin's main entry point ircBotPluginCore :: Chan IrcBotMsg -> Chan IrcBotMsg -> IO () ircBotPluginCore myChan masterChan = do - threadId <- myThreadId let plugin = IrcPluginState { ircPluginName = "Core" - , ircPluginThreadId = threadId , ircPluginChan = myChan , ircPluginMasterChan = masterChan } evalStateT (mapM_ sendRegisterCommand ["list", "load", "reload", "unload"]) plugin diff --git a/Hsbot/Irc/Plugin/Dummy.hs b/Hsbot/Irc/Plugin/Dummy.hs index 48515ce..c543b90 100644 --- a/Hsbot/Irc/Plugin/Dummy.hs +++ b/Hsbot/Irc/Plugin/Dummy.hs @@ -2,7 +2,6 @@ module Hsbot.Irc.Plugin.Dummy ( ircBotPluginDummy ) where -import Control.Concurrent (myThreadId) import Control.Concurrent.Chan import Control.Exception import Control.Monad.State @@ -14,9 +13,7 @@ import Hsbot.Irc.PluginCommons -- | The plugin's main entry point ircBotPluginDummy :: Chan IrcBotMsg -> Chan IrcBotMsg -> IO () ircBotPluginDummy myChan masterChan = do - threadId <- myThreadId let plugin = IrcPluginState { ircPluginName = "Dummy" - , ircPluginThreadId = threadId , ircPluginChan = myChan , ircPluginMasterChan = masterChan } _ <- (execStateT run plugin) `catch` (\(_ :: AsyncException) -> return plugin) diff --git a/Hsbot/Irc/Plugin/Ping.hs b/Hsbot/Irc/Plugin/Ping.hs index 6a38f0d..90579c4 100644 --- a/Hsbot/Irc/Plugin/Ping.hs +++ b/Hsbot/Irc/Plugin/Ping.hs @@ -2,7 +2,6 @@ module Hsbot.Irc.Plugin.Ping ( ircBotPluginPing ) where -import Control.Concurrent (myThreadId) import Control.Concurrent.Chan import Control.Exception import Control.Monad.State @@ -14,9 +13,7 @@ import Hsbot.Irc.PluginCommons -- | The plugin's main entry point ircBotPluginPing :: Chan IrcBotMsg -> Chan IrcBotMsg -> IO () ircBotPluginPing myChan masterChan = do - threadId <- myThreadId let plugin = IrcPluginState { ircPluginName = "Ping" - , ircPluginThreadId = threadId , ircPluginChan = myChan , ircPluginMasterChan = masterChan } _ <- (execStateT run plugin) `catch` (\(_ :: AsyncException) -> return plugin) diff --git a/Hsbot/Irc/Plugin/Quote.hs b/Hsbot/Irc/Plugin/Quote.hs index ff037c7..31eaeaf 100644 --- a/Hsbot/Irc/Plugin/Quote.hs +++ b/Hsbot/Irc/Plugin/Quote.hs @@ -2,7 +2,6 @@ module Hsbot.Irc.Plugin.Quote ( ircBotPluginQuote ) where -import Control.Concurrent (myThreadId) import Control.Concurrent.Chan import Control.Exception import Control.Monad.State @@ -61,9 +60,7 @@ ircBotPluginQuote myChan masterChan = do txtQuoteBot <- TIO.readFile $ dbfile let quoteBot = read (T.unpack txtQuoteBot) :: QuoteBotState -- The plugin main loop - threadId <- myThreadId let plugin = IrcPluginState { ircPluginName = "Quote" - , ircPluginThreadId = threadId , ircPluginChan = myChan , ircPluginMasterChan = masterChan } evalStateT (mapM_ sendRegisterCommand ["quote"]) plugin |