Add the IrcMsg as an optional parameter for an internal command.

Hsbot/Command.hs

@@ -56,7 +56,7 @@ dispatchMessage (InputMsg inputMsg) = do
             , (head getMsgContent) == (commandPrefix config) ]
     sendRunCommand :: String -> Plugin -> IrcBot ()
     sendRunCommand cmd plugin = do
-        sendToPlugin (InternalCmd $ IntCmd "RUN" "CORE" (pluginName plugin) cmd) plugin
+        sendToPlugin (InternalCmd $ IntCmd "RUN" "CORE" (pluginName plugin) cmd (Just inputMsg)) plugin
     getMsgContent :: String
     getMsgContent = unwords . tail $ parameters inputMsg
 dispatchMessage _ = return ()

Hsbot/IRCPlugin.hs

@@ -28,7 +28,7 @@ sendCommand :: String -> String -> String -> IrcPlugin ()
 sendCommand cmd to params = do
     serverChan <- gets instanceServerChan
     from       <- gets instanceName
-    liftIO $ writeChan serverChan $ InternalCmd $ IntCmd cmd from to params
+    liftIO $ writeChan serverChan $ InternalCmd $ IntCmd cmd from to params Nothing
 
 sendRegisterCommand :: String -> IrcPlugin ()
 sendRegisterCommand cmd = sendCommand "REGISTER" "CORE" cmd

Hsbot/Types.hs

@@ -90,10 +90,11 @@ data IrcMsg = IrcMsg
 
 -- | An internal command
 data IntCmd = IntCmd
-    { intCmdCmd  :: String -- the internal command
-    , intCmdFrom :: String -- who issues it
-    , intCmdTo   :: String -- who it is destinated to
-    , intCmdMsg  :: String -- the IrcMsg associated with the command
+    { intCmdCmd    :: String       -- the internal command
+    , intCmdFrom   :: String       -- who issues it
+    , intCmdTo     :: String       -- who it is destinated to
+    , intCmdMsg    :: String       -- the message to be transfered
+    , intCmdBotMsg :: Maybe IrcMsg -- An IrcMsg attached to the command
     } deriving (Show)
 
 data BotMsg = InputMsg IrcMsg | OutputMsg IrcMsg | InternalCmd IntCmd deriving (Show)

TODO

@@ -1,6 +1,5 @@
 :julien!~julien@ogu21.corp PRIVMSG #shbot :@quote graou snif
 
-* Add the IrcMsg as an optional parameter for an internal command
 * Solve the catching that never happen in main
 * throwto exception to main thread
 * write a safe reload : try reload before unloading