X-Git-Url: https://git.martlubbers.net/?p=cloogle-irc.git;a=blobdiff_plain;f=IRCBot.icl;h=df21c0a0ce31a2f2e179e73ad07027ecb3faf215;hp=1dfee115582b2aef4bb850d37076e99e0d376aab;hb=e0d247935b1e66e7ae77c1e73dd6a0623dc97f5f;hpb=ceec25a9ebb2fa231d68e58d05f77c449d7d7590

diff --git a/IRCBot.icl b/IRCBot.icl
index 1dfee11..df21c0a 100644
--- a/IRCBot.icl
+++ b/IRCBot.icl
@@ -14,29 +14,31 @@ import StdBool
 
 TIMEOUT :== Just 1000
 
-bot :: (String, Int) [IRCMessage] [IRCMessage] a (IRCMessage a *World -> (Maybe [IRCMessage], a, *World)) *World -> (MaybeErrorString 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", w)
+| isNothing ip
+	= (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", w)
-| rpt == TR_NoSuccess = (Error $ "Could not connect to " +++ host, w)
+| rpt == TR_Expired
+	= (Just $ "Connection to " +++ host +++ " timed out", (state, w))
+| rpt == TR_NoSuccess
+	= (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, 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, 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, w)
+| isError merr = (Just $ fromError merr, (state, w))
 //Close channels
-= (Ok state, closeChannel sChannel (closeRChannel rChannel w))
+= (Nothing, (state, closeChannel sChannel (closeRChannel rChannel w)))
 
-import StdDebug,StdMisc
-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
@@ -44,31 +46,30 @@ process chan acc state bot w
 	[m] 
 		//Receive
 		# (merr_resp, chan, w) = recv chan w
-		| isError merr_resp = (Error (fromError merr_resp), chan, state, w)
+		| isError merr_resp = (Error (fromError merr_resp), chan, (state, w))
 		# (Ok mresp) = merr_resp
 		| isNothing mresp = process chan acc state bot w
-		= process chan (m +++ fromJust mresp) state bot w
+		= process chan (m +++ fromJust mresp) (state, bot) w
 	//We have a successfull split and therefore we process at least one message
 	[m:xs]
 		# acc = join "\r\n" xs
-		| not (trace_tn $ "Full message: '" +++ m +++ "'") = undef
 		= case parseIRCMessage $ m +++ "\r\n" of
 			(Left err) = (Error $ "IRC Parsing error: " +++ join "\n" err, chan, state, w)
 			(Right msg)
-			# (mircc, state, w) = bot msg state w
-			| isNothing mircc = (Ok (), chan, state, w) // Bot asks to quit
+			# (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
-			| isError merr = (Error $ fromError merr, chan, state, w)
+			| isError merr = (Error $ fromError merr, chan, (state, w))
 			//Recurse
 			= process chan acc state bot w
 
-send :: [String] TCP_DuplexChannel *World -> (MaybeErrorString (), TCP_DuplexChannel, *World)
+send :: ![String] !TCP_DuplexChannel !*World -> (!MaybeErrorString (), !TCP_DuplexChannel, !*World)
 send [] chan w = (Ok (), chan, w)
 send [msg:msgs] {sChannel,rChannel} w
-# (_, w) = sleep 250000 w
 # (rpt,i,sChannel,w) = send_MT TIMEOUT (toByteSeq msg) sChannel w
 | rpt <> TR_Success = (Error "Could not send message", {sChannel=sChannel,rChannel=rChannel}, w)
+# (_, w) = sleep 500000 w
 = send msgs {sChannel=sChannel,rChannel=rChannel} w
 	where
 		sleep :: !Int !*World -> (!Int, *World)