git-svn-id: https://ssl.buetow.org/repos/hsbot/trunk@53 9f8f72e9-4bf4-416e-b76e-7d4203597157

2 files changed, 14 insertions, 14 deletions

diff --git a/HsBot/Logics.hs b/HsBot/Logics.hs
index 9b98300..e66a238 100644
--- a/HsBot/Logics.hs
+++ b/HsBot/Logics.hs
@@ -1,15 +1,18 @@
-module HsBot.Logics (logicsRun) where
+module HsBot.Callbacks (logicsRun) where
 
 import HsBot.Base.Env
-import HsBot.Logics.Dummy
+import HsBot.Base.State
+import HsBot.Callbacks.Dummy
 
-registeredLogics = [dummyRun]
+registeredCallbacks = [dummyRun]
 
 logicsRun :: String -> SendMessage -> Env -> IO Env
-logicsRun = logicsRun' registeredLogics 
-	where
-		logicsRun' [] sendMessage str env = return (env)
-		logicsRun' (logic:ls) sendMessage str env = do
-			env' <- logic sendMessage str env
-			logicsRun' ls sendMessage str env'
+logicsRun str sendMessage env@(Env state _) 
+	| isReady state = logicsRun' registeredCallbacks env
+	| otherwise = do { putStrLn str; return (env) }
+		where
+			logicsRun' [] env = return (env)
+			logicsRun' (logic:rest) env = do
+				env' <- logic str sendMessage env
+				logicsRun' rest env'
 
diff --git a/HsBot/Logics/Dummy.hs b/HsBot/Logics/Dummy.hs
index be32a50..edc8056 100644
--- a/HsBot/Logics/Dummy.hs
+++ b/HsBot/Logics/Dummy.hs
@@ -1,13 +1,10 @@
-module HsBot.Logics.Dummy (dummyRun) where
+module HsBot.Callbacks.Dummy (dummyRun) where
 
 import HsBot.Base.Env
 import HsBot.Base.State
 
 dummyRun :: String -> SendMessage -> Env -> IO Env
 dummyRun str sendMessage env@(Env state _) = do
-	if isReady state 
-		--then sendMessage "Hello World"
-		then putStrLn $ "::::" ++ str
-		else putStrLn str
+	putStrLn $ "::::" ++ str
 	return (env)