1 files changed, 15 insertions, 60 deletions
diff --git a/Hsbot/Main.hs b/Hsbot/Main.hs
index 8972022..3cb0ce5 100644
--- a/Hsbot/Main.hs
+++ b/Hsbot/Main.hs
@@ -1,71 +1,26 @@
 module Hsbot.Main
     ( imain
-    , imain'
     ) where
 
-import Control.Concurrent
-import Control.Concurrent.Chan
-import Control.Monad
-import qualified Data.Map as M
+import Control.Monad.State
 import System.IO
-import System.Plugins
 
-import qualified Config as C
+import Config
 import Hsbot.Core
 import Hsbot.IRC
-
-type Reboot = (Module -> Bot -> (Chan IrcLine) -> IO ())
-
--- | Bot's first main entry point
-imain :: Module -> Reboot -> IO ()
-imain modul' reboot = do
-    chan <- newChan :: IO (Chan IrcLine)
-    imain' modul' reboot newbot chan
+import Hsbot.Plugin
 
 -- | Bot's main entry point
-imain' :: Module -> Reboot -> Bot -> (Chan IrcLine) -> IO ()
-imain' modul' reboot bot chan = do
-    -- The chan passing to reboot (or another way to keep it) is still missing
-    let newServers = filter (not . isConnected bot) (ircServers C.config)
-    putStrLn $ "Connecting servers : " ++ show (map address newServers)
-    newServers' <- mapM connectServer newServers
-    putStrLn $ "Joining channels : " ++ show (map channels newServers) 
-    mapM_ initServer newServers'
-    putStrLn "Spawning threads..."
-    let bot'  = saveServersStates newServers' bot
-        Bot x = bot'
-    mapM_ (forkIO . listener chan) newServers' -- (M.toList x)
-    bot'' <- monitor chan bot'
-    reboot modul' bot'' chan
-
--- | Bot main loop, monitors the threads states and handle reboot
-monitor :: (Chan IrcLine) -> Bot -> IO Bot
-monitor chan bot = do
-    loop bot
-    where
-        loop bot' = do
-            input <- readChan chan :: IO IrcLine
-            case input of
-                 Reboot  -> do
-                        putStrLn "Got reboot message, rebooting"
-                        return bot'
-                 _       -> loop bot'
-
--- | Thread entry point for socket listeners
-listener :: (Chan IrcLine) -> (IrcServer, Handle) -> IO ()
-listener chan (server, handle) = forever $ do
-    str <- hGetLine handle
-    let msg = parseIrcMsg str
-    writeChan chan msg
-    eval msg
-    where
-        eval :: IrcLine -> IO ()
-        eval (Privmsg (statement, stuff')) = sendPrivmsg (server, handle) stuff'
-        eval (Quit (ircServer, handle')) = return ()
-        eval (Join (ircServer, handle')) = return ()
-        eval (Part (ircServer, handle')) = return ()
-        eval (Ping (string)) = do pong handle string
-        eval stuff' = case stuff' of
-                        Reboot -> return ()
-                        Nil    -> return ()
+imain :: IO ()
+imain = do
+    bot <- connectServer $ ircServer config
+    (runStateT run bot) `catch` (const $ return ((), bot))
+    disconnectServer bot
+
+-- | The Bot monad main function
+run :: IrcBot ()
+run = do
+    initServer
+    mapM_ loadPlugin defaultPlugins
+    runServer