using generic CallbackFunction type in callbacks now

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

5 files changed, 13 insertions, 5 deletions

diff --git a/HsBot/Callbacks.hs b/HsBot/Callbacks.hs
index 763289b..7caff19 100644
--- a/HsBot/Callbacks.hs
+++ b/HsBot/Callbacks.hs
@@ -12,7 +12,7 @@ registeredCallbacks = [
   messageCounter,
   printMessages, 
   storeMessages, 
-  dummy,
+  dummy
   ]
 
 callbacksRun :: String -> SendMessage -> Env -> IO Env
diff --git a/HsBot/Callbacks/Dummy.hs b/HsBot/Callbacks/Dummy.hs
index 071a9f4..5d83ade 100644
--- a/HsBot/Callbacks/Dummy.hs
+++ b/HsBot/Callbacks/Dummy.hs
@@ -1,8 +1,10 @@
 module HsBot.Callbacks.Dummy (dummy) where
 
+import HsBot.Callbacks.Callback
+
 import HsBot.Base.Env
 import HsBot.Base.State
 
-dummy :: String -> SendMessage -> Env -> IO Env
+dummy :: CallbackFunction
 dummy str sendMessage env@(Env state _) = return (env)
 
diff --git a/HsBot/Callbacks/MessageCounter.hs b/HsBot/Callbacks/MessageCounter.hs
index 1f12e62..a2782a8 100644
--- a/HsBot/Callbacks/MessageCounter.hs
+++ b/HsBot/Callbacks/MessageCounter.hs
@@ -1,5 +1,7 @@
 module HsBot.Callbacks.MessageCounter (messageCounter) where
 
+import HsBot.Callbacks.Callback
+
 import HsBot.Base.Env
 import HsBot.Base.State
 
@@ -7,6 +9,6 @@ import HsBot.IRC.User
 
 update user = user { userMessages = 1 + userMessages user }
 
-messageCounter :: String -> SendMessage -> Env -> IO Env
+messageCounter :: CallbackFunction
 messageCounter str sendMessage (Env state conf) = do
    return (Env (stateUpdateUser state (currentSender state) update) conf)
diff --git a/HsBot/Callbacks/PrintMessages.hs b/HsBot/Callbacks/PrintMessages.hs
index 0ce57c6..456d46d 100644
--- a/HsBot/Callbacks/PrintMessages.hs
+++ b/HsBot/Callbacks/PrintMessages.hs
@@ -1,9 +1,11 @@
 module HsBot.Callbacks.PrintMessages (printMessages) where
 
+import HsBot.Callbacks.Callback
+
 import HsBot.Base.Env
 import HsBot.Base.State
 
-printMessages :: String -> SendMessage -> Env -> IO Env
+printMessages :: CallbackFunction
 printMessages str sendMessage env@(Env state _) = do
    putStrLn $ (currentChannel state) ++ " "
       ++ (currentSender state) ++ ": "
diff --git a/HsBot/Callbacks/StoreMessages.hs b/HsBot/Callbacks/StoreMessages.hs
index b5d043a..673cc38 100644
--- a/HsBot/Callbacks/StoreMessages.hs
+++ b/HsBot/Callbacks/StoreMessages.hs
@@ -1,9 +1,11 @@
 module HsBot.Callbacks.StoreMessages (storeMessages) where
 
+import HsBot.Callbacks.Callback
+
 import HsBot.Base.Env
 import HsBot.Base.State
 
-storeMessages :: String -> SendMessage -> Env -> IO Env
+storeMessages :: CallbackFunction
 storeMessages str sendMessage env@(Env state _) = do
    return (env)