From 336ec596894a41cb0fa55fd9e1a76f6f62c9364f Mon Sep 17 00:00:00 2001
From: Julien Dessaux
Date: Fri, 17 Jun 2011 13:07:25 +0200
Subject: Fixed a bug in command parsing

---
 Hsbot/Message.hs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Hsbot/Message.hs b/Hsbot/Message.hs
index 14488a1..a34659d 100644
--- a/Hsbot/Message.hs
+++ b/Hsbot/Message.hs
@@ -30,12 +30,15 @@ answerMsg _ _ = return ()
 
 -- | Get the command in the IRC message if there is one
 getCommand :: IRC.Message -> Env IO [String]
-getCommand (IRC.Message _ _ (_:msg:[])) = do
-    currentBotState <- asks envBotState >>= liftIO . readMVar
-    let cmd:stuff = if msg /= "" then words msg else ["",""]
-    if botNickname currentBotState `L.isPrefixOf` cmd
-        then return stuff
-        else return []
+getCommand (IRC.Message _ _ (_:msg:[])) = getCommandFrom $ words msg
+  where
+    getCommandFrom :: [String] -> Env IO [String]
+    getCommandFrom (cmd:stuff) = do
+        currentBotState <- asks envBotState >>= liftIO . readMVar
+        if botNickname currentBotState `L.isPrefixOf` cmd
+            then return stuff
+            else return []
+    getCommandFrom _ = return []
 getCommand _ = return []
 
 getSender :: IRC.Message -> String
-- 
cgit v1.2.3