repositories
/
cloogle-irc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Several interface improvements
[cloogle-irc.git]
/
cloogleirc.icl
diff --git
a/cloogleirc.icl
b/cloogleirc.icl
index
3e89acc
..
1241b7b
100644
(file)
--- a/
cloogleirc.icl
+++ b/
cloogleirc.icl
@@
-56,7
+56,7
@@
shorten s w
cloogle :: String *World -> (String, *World)
cloogle data w
cloogle :: String *World -> (String, *World)
cloogle data w
-# (mer, w) = doHTTPRequest
L
+# (mer, w) = doHTTPRequest
FollowRedirects
{ newHTTPRequest
& req_path = "/api.php"
, req_query = "?str=" + urlEncode data
{ newHTTPRequest
& req_path = "/api.php"
, req_query = "?str=" + urlEncode data
@@
-107,17
+107,18
@@
cloogle data w
Start :: *World -> (Maybe String, *World)
Start w
Start :: *World -> (Maybe String, *World)
Start w
-# ([
arg0
:args], w) = getCommandLine w
+# ([
cmd
:args], w) = getCommandLine w
# (io, w) = stdio w
# (io, w) = stdio w
-# io = io <<< "\n"
-# bs = parseCLI args
-//| isError bs = (Just $ "\n" +++ fromError bs +++ "\n", snd $ fclose io w)
+# bs = parseCLI cmd args
+| isError bs
+ # io = io <<< fromError bs <<< "\n"
+ = (Nothing, 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
# (Ok bs) = bs
# (merr, io, w) = bot (bs.bs_server, bs.bs_port) (startup bs) shutdown io (process bs.bs_strftime) w
-= (
Nothing, w)//= (
merr, snd $ fclose io w)
+= (merr, snd $ fclose io w)
where
where
- parseCLI :: [String] -> MaybeErrorString BotSettings
- parseCLI [] = Ok
+ parseCLI ::
String
[String] -> MaybeErrorString BotSettings
+ parseCLI
_
[] = Ok
{ bs_nick = "clooglebot"
, bs_nickserv = Nothing
, bs_autojoin = []
{ bs_nick = "clooglebot"
, bs_nickserv = Nothing
, bs_autojoin = []
@@
-125,7
+126,7
@@
Start w
, bs_server = "irc.freenode.net"
, bs_strftime = "%s"
}
, bs_server = "irc.freenode.net"
, bs_strftime = "%s"
}
- parseCLI [a:as]
+ parseCLI
cmd
[a:as]
| a == "-f" || a == "--strftime"
= arg1 "--strftime" as \a c->{c & bs_strftime=a}
| a == "-n" || a == "--nick"
| a == "-f" || a == "--strftime"
= arg1 "--strftime" as \a c->{c & bs_strftime=a}
| a == "-n" || a == "--nick"
@@
-139,7
+140,7
@@
Start w
| a == "-s" || a == "--server"
= arg1 "--server" as \a c->{c & bs_server=a}
| a == "-h" || a == "--help" = Error $ join "\n" $
| a == "-s" || a == "--server"
= arg1 "--server" as \a c->{c & bs_server=a}
| a == "-h" || a == "--help" = Error $ join "\n" $
- [ "Usage:
cloogle
[OPTS]"
+ [ "Usage:
" + cmd + "
[OPTS]"
, "Options:"
, "\t--strftime/-f FORMAT strftime format used in the output. default: %s\n"
, "\t--nick/-n NICKNAME Use the given nickname instead of clooglebot"
, "Options:"
, "\t--strftime/-f FORMAT strftime format used in the output. default: %s\n"
, "\t--nick/-n NICKNAME Use the given nickname instead of clooglebot"
@@
-151,9
+152,9
@@
Start w
, "\t has to be escaped in most shells"
]
= Error $ "Unknown option: " +++ a
, "\t has to be escaped in most shells"
]
= Error $ "Unknown option: " +++ a
-
- arg1 name [] _ = Error $ name +++ " requires an argument"
-
arg1 name [a:as] f = parseCLI
as >>= Ok o f a
+ where
+
arg1 name [] _ = Error $ name +++ " requires an argument"
+
arg1 name [a:as] f = parseCLI cmd
as >>= Ok o f a
nickserv pw = PRIVMSG (CSepList ["NickServ"]) $ "IDENTIFY " +++ pw
nickserv pw = PRIVMSG (CSepList ["NickServ"]) $ "IDENTIFY " +++ pw
@@
-182,7
+183,7
@@
Start w
log :: String String IRCMessage (!*File, !*World) -> (!*File, !*World)
log strf pref m (io, w)
#! (t, w) = localTime w
log :: String String IRCMessage (!*File, !*World) -> (!*File, !*World)
log strf pref m (io, w)
#! (t, w) = localTime w
- = (io <<< strfTime strf t <<< pref <<< toString m, w)
+ = (io <<< strfTime strf t <<< pref <<< toString m
<<< "\n"
, w)
process` :: (Maybe (Either IRCUser String)) IRCCommand *World -> (Maybe [IRCCommand], *World)
process` (Just (Left user)) (PRIVMSG t m) w
process` :: (Maybe (Either IRCUser String)) IRCCommand *World -> (Maybe [IRCCommand], *World)
process` (Just (Left user)) (PRIVMSG t m) w