From d80cee1ecddeb75e54de767c35f04a9a004eed12 Mon Sep 17 00:00:00 2001 From: pb Date: Sat, 15 May 2010 17:26:52 +0000 Subject: * renamed HsBot.Callbacks.Callback into HsBot.Callbacks.Base * all callbacks are now stored in the datatype Callback. git-svn-id: https://ssl.buetow.org/repos/hsbot/trunk@66 9f8f72e9-4bf4-416e-b76e-7d4203597157 --- HsBot/Callbacks.hs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'HsBot/Callbacks.hs') diff --git a/HsBot/Callbacks.hs b/HsBot/Callbacks.hs index 7caff19..0bbf08f 100644 --- a/HsBot/Callbacks.hs +++ b/HsBot/Callbacks.hs @@ -3,16 +3,17 @@ module HsBot.Callbacks (callbacksRun) where import HsBot.Base.Env import HsBot.Base.State +import HsBot.Callbacks.Base import HsBot.Callbacks.MessageCounter import HsBot.Callbacks.PrintMessages import HsBot.Callbacks.StoreMessages import HsBot.Callbacks.Dummy registeredCallbacks = [ - messageCounter, - printMessages, - storeMessages, - dummy + makeMessageCounter, + makePrintMessages, + makeStoreMessages, + makeDummy ] callbacksRun :: String -> SendMessage -> Env -> IO Env @@ -22,6 +23,6 @@ callbacksRun str sendMessage env@(Env state _) where callbackAll [] env = return (env) callbackAll (callback:restCallbacks) env = do - env' <- callback str sendMessage env + env' <- (cbFunction callback) str sendMessage env callbackAll restCallbacks env' -- cgit v1.2.3