X-Git-Url: https://git.martlubbers.net/?p=cloogle-irc.git;a=blobdiff_plain;f=IRCBot.icl;h=3ea2f76e7c97ddb832741db81b267bfc7372463a;hp=2be18ad094a2effd60625405a6cc437ec05e6b65;hb=7d7475a1a10b1371d2bc7b2276914e9d3fdfee6a;hpb=2b051d8c52d1d999a5ca902ef75f99635c80f540

diff --git a/IRCBot.icl b/IRCBot.icl
index 2be18ad..3ea2f76 100644
--- a/IRCBot.icl
+++ b/IRCBot.icl
@@ -14,31 +14,31 @@ import StdBool
 
 TIMEOUT :== Just 1000
 
-bot :: (String, Int) [IRCMessage] [IRCMessage] .a (IRCMessage .a *World -> .(Maybe [IRCMessage], .a, *World)) *World -> *(Maybe String, .a, *World)
+bot :: (String, Int) [IRCMessage] [IRCMessage] .a (IRCMessage -> (.a -> .(*World -> *(Maybe [IRCMessage], .a, *World)))) *World -> *(Maybe String, .a, *World)
 bot (host, port) start end state bot w
 //Lookup hostname
 # (ip, w) = lookupIPAddress host w
 | isNothing ip
-	= (Error $ "DNS lookup for " +++ host +++ " failed", state, w)
+	= (Just $ "DNS lookup for " +++ host +++ " failed", state, w)
 //Connect
 # (rpt,chan,w) = connectTCP_MT TIMEOUT (fromJust ip, port) w
 | rpt == TR_Expired
-	= (Error $ "Connection to " +++ host +++ " timed out", state, w)
+	= (Just $ "Connection to " +++ host +++ " timed out", state, w)
 | rpt == TR_NoSuccess
-	= (Error $ "Could not connect to " +++ host, state, w)
+	= (Just $ "Could not connect to " +++ host, state, w)
 // Send startup commands
-# (merr, chan, w) = send (map toString start) (fromJust chan) w
-| isError merr = (Error $ fromError merr, state, w)
+# (merr, chan, w) = send [toString s +++ "\r\n" \\ s <- start] (fromJust chan) w
+| isError merr = (Just $ fromError merr, state, w)
 //Start processing function
 # (mer, chan, state, w) = process chan "" state bot w
-| isError mer = (Error $ fromError mer, state, w)
+| isError mer = (Just $ fromError mer, state, w)
 // Send shutdown commands
 # (merr, {rChannel,sChannel}, w) = send (map toString end) chan w
-| isError merr = (Error $ fromError merr, state, w)
+| isError merr = (Just $ fromError merr, state, w)
 //Close channels
-= (Ok state, state, closeChannel sChannel (closeRChannel rChannel w))
+= (Nothing, state, closeChannel sChannel (closeRChannel rChannel w))
 
-process :: TCP_DuplexChannel String .a (IRCMessage .a *World -> *(Maybe [IRCMessage], .a, *World)) *World -> *(MaybeErrorString (), TCP_DuplexChannel, .a, *World)
+process :: TCP_DuplexChannel String .a (IRCMessage -> (.a -> .(*World -> *(Maybe [IRCMessage], .a, *World)))) *World -> (MaybeErrorString (), TCP_DuplexChannel, .a, *World)
 process chan acc state bot w
 //See if we have a message
 = case split "\r\n" acc of
@@ -59,7 +59,7 @@ process chan acc state bot w
 			# (mircc, state, w) = bot msg state w
 			| isNothing mircc = (Ok (), chan, state, w) // Bot asks to quit
 			//Possible send the commands
-			# (merr, chan, w) = send (map toString $ fromJust mircc) chan w
+			# (merr, chan, w) = send [toString c +++ "\r\n" \\ c <- fromJust mircc] chan w
 			| isError merr = (Error $ fromError merr, chan, state, w)
 			//Recurse
 			= process chan acc state bot w