X-Git-Url: https://git.martlubbers.net/?p=cloogle-irc.git;a=blobdiff_plain;f=cloogleirc.icl;h=3e89acc8f2d172f0810f6b8a7522ccca3f78f171;hp=a83663b44bd1ae990a002a9823cbfca35ff22b31;hb=2ee355875c21417505952bc428db6d2b329487dd;hpb=e0d247935b1e66e7ae77c1e73dd6a0623dc97f5f

diff --git a/cloogleirc.icl b/cloogleirc.icl
index a83663b..3e89acc 100644
--- a/cloogleirc.icl
+++ b/cloogleirc.icl
@@ -33,8 +33,7 @@ import TCPIP
 import IRC
 import IRCBot
 
-TIMEOUT :== Just 10000
-SERVER :== "irc.freenode.net"
+import StdMisc, StdDebug
 
 shorten :: String *World -> (String, *World)
 shorten s w 
@@ -95,9 +94,7 @@ cloogle data w
 		= join "\n" (map maxWidth lines)
 		
 		maxWidth :: String -> String
-		maxWidth s
-		| size s > 80 = subString 0 77 s + "..."
-		= s
+		maxWidth s = if (size s > 80) (subString 0 77 s + "...") s
 
 :: BotSettings =
 		{ bs_nick     :: String
@@ -112,11 +109,12 @@ Start :: *World -> (Maybe String, *World)
 Start w
 # ([arg0:args], w) = getCommandLine w
 # (io, w) = stdio w
+# io = io <<< "\n"
 # bs = parseCLI args 
-| isError bs = (Just $ "\n" +++ fromError bs +++ "\n", snd $ fclose io w)
+//| isError bs = (Just $ "\n" +++ fromError bs +++ "\n", snd $ fclose io w)
 # (Ok bs) = bs
 # (merr, io, w) = bot (bs.bs_server, bs.bs_port) (startup bs) shutdown io (process bs.bs_strftime) w
-= (merr, snd $ fclose io w)
+= (Nothing, w)//= (merr, snd $ fclose io w)
 	where
 		parseCLI :: [String] -> MaybeErrorString BotSettings
 		parseCLI [] = Ok
@@ -169,21 +167,21 @@ Start w
 				[JOIN (CSepList bs.bs_autojoin) Nothing]
 		shutdown = map toPrefix [QUIT $ Just "Bye"]
 
-		process :: String IRCMessage *File *World -> *(Maybe [IRCMessage], *File, *World)
+		process :: String !IRCMessage *File !*World -> (Maybe [IRCMessage], *File, !*World)
 		process strf im io w
-		# (io, w) = log strf " (r): " im (io, w)
+		#! (io, w) = log strf " (r): " im (io, w)
 		= case im.irc_command of
 			Left numr = (Just [], io, w)
 			Right cmd = case process` im.irc_prefix cmd w of
 				(Nothing, w) = (Nothing, io, w)
 				(Just cs, w)
 				# msgs = map toPrefix cs
-				# (io, w) = foldr (log strf " (s): ") (io, w) msgs
+				#! (io, w) = foldr (log strf " (s): ") (io, w) msgs
 				= (Just msgs, io, w)
 
-		log :: String String IRCMessage (*File, *World) -> (*File, *World)
+		log :: String String IRCMessage (!*File, !*World) -> (!*File, !*World)
 		log strf pref m (io, w)
-		# (t, w) = localTime w
+		#! (t, w) = localTime w
 		= (io <<< strfTime strf t <<< pref <<< toString m, w)
 
 		process` :: (Maybe (Either IRCUser String)) IRCCommand *World -> (Maybe [IRCCommand], *World)
@@ -192,6 +190,7 @@ Start w
 			| m.[0] == '!'
 				# (msgs, w) = realProcess (split " " $ m % (1, size m)) w
 				= (Just $ map reply msgs, w)
+			| m % (0,4) == "\001PING" = (Just [reply m], w)
 			= (Just [], w)
 		where
 			reply = case (\(CSepList [t:_]) -> t.[0]) t of