neale
/
irc-bot
mirror of https://github.com/nealey/irc-bot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor how commands are handled. 

I may refactor it again.
This commit is contained in:
Neale Pickett 2008-05-10 21:10:45 -06:00
parent 2ff9e84199
commit cf9bdcb93a
5 changed files with 51 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
channel.ml
View File

@ -50,38 +50,39 @@ let broadcast ?(metoo=false) chan sender command args text =
let reply iobuf nick num ?(args=[]) text =
write iobuf num (nick :: args) (Some text)
let handle_command cli nuhost cmd =
match (Command.as_tuple cmd) with
| (None, ("NOTICE" as cmd_name), [name], Some text)
| (None, ("PRIVMSG" as cmd_name), [name], Some text) ->
let nick = Irc.nick nuhost in
(try
let chan = String_map.find name !by_name in
let handle_action (cli_iobuf, cli_nuhost) chan_name action args text =
let chanopt = try
Some (String_map.find chan_name !by_name)
with Not_found ->
None
in
let nick = Irc.nick cli_nuhost in
match (action, chanopt, args, text) with
| ("NOTICE", Some chan, [], Some text)
| ("PRIVMSG", Some chan, [], Some text) ->
if String_map.mem nick !(chan.clients) then
broadcast chan (cli, nuhost) cmd_name [name] (Some text)
broadcast chan (cli_iobuf, cli_nuhost) action [chan_name] (Some text)
else
reply cli nick "404" ~args:[name] "Cannot send to channel"
with Not_found ->
reply cli nick "403" ~args:[name] "No such channel")
| (None, "JOIN", ["0"], None) ->
(* Leave all channels *)
failwith "XXX: JOIN 0"
| (None, "JOIN", [name], None) ->
let nick = Irc.nick nuhost in
reply cli_iobuf nick "404" ~args:[chan_name] "Cannot send to channel (join first)"
| ("JOIN", _, _, None) ->
let chan =
try
String_map.find name !by_name
with Not_found ->
let c = {name = name; modes = ref ""; clients = ref String_map.empty} in
by_name := String_map.add name c !by_name;
match chanopt with
| Some chan ->
chan
| None ->
let c = {name = chan_name; modes = ref ""; clients = ref String_map.empty} in
by_name := String_map.add chan_name c !by_name;
c
in
if String_map.mem nick !(chan.clients) then
(* Apparently we're expected to drop the command *)
()
else
let me = (cli, nuhost) in
let me = (cli_iobuf, cli_nuhost) in
chan.clients := String_map.add nick me !(chan.clients);
broadcast ~metoo:true chan me "JOIN" [name] None
broadcast ~metoo:true chan me "JOIN" [chan.name] None
| (_, None, _, _) ->
reply cli_iobuf nick "403" ~args:[chan_name] "No such channel"
| _ ->
()

5
channel.mli
View File

@ -2,6 +2,9 @@ type t
val modes : string
val handle_command : Iobuf.t -> Irc.nuhost -> Command.t -> unit
(** [handle_action (cli_iobuf, cli_nuhost) chan_name action args text]
handles [action] on [chan_name] with arguments [args] and text
[text], sent by [cli_nuhost] from [cli_iobuf] *)
val handle_action : (Iobuf.t * Irc.nuhost) -> string -> string -> string list -> string option -> unit
val is_channel_name : string -> bool

12
client.ml
View File

@ -56,8 +56,8 @@ let handle_command cli iobuf cmd =
Iobuf.close iobuf message
| (None, "JOIN", ["0"], None) ->
()
| (None, "JOIN", [channels], None) ->
Channel.handle_command cli.iobuf (nuhost cli) cmd
| (None, "JOIN", [chan_name], None) ->
Channel.handle_action (cli.iobuf, (nuhost cli)) chan_name "JOIN" [] None
| (None, "JOIN", [channels; keys], None) ->
()
| (None, "PART", [channels], message) ->
@ -74,17 +74,17 @@ let handle_command cli iobuf cmd =
()
| (None, "KICK", [channels; users], comment) ->
()
| (None, ("PRIVMSG" as command), [target], Some text)
| (None, ("NOTICE" as command), [target], Some text) ->
| (None, ("PRIVMSG" as action), [target], Some text)
| (None, ("NOTICE" as action), [target], Some text) ->
if Channel.is_channel_name target then
Channel.handle_command cli.iobuf (nuhost cli) cmd
Channel.handle_action (cli.iobuf, (nuhost cli)) target action [] (Some text)
else
begin
try
let peer = lookup target in
write peer
(Some (Irc.string_of_nuhost (nuhost cli)))
command [target] (Some text)
action [target] (Some text)
with Not_found ->
reply cli "401" ~args:[target] "No such nick/channel"
end

12
tests.ml
View File

@ -414,9 +414,13 @@ let regression_tests =
[
Send "ISON bob\r\n";
Recv ":testserver.test 303 alice :bob\r\n";
Send "PRIVMSG #foo :snot\r\n";
Recv ":testserver.test 403 alice #foo :No such channel\r\n";
Send "NOTICE #foo :snot\r\n";
Recv ":testserver.test 403 alice #foo :No such channel\r\n";
Send "JOIN #foo\r\n";
Recv ":alice!alice@UDS JOIN #foo\r\n";
Send "PRIVMSG bob :Hi Bob!\r\n";
Send "PRIVMSG bob :Come to #foo\r\n";
Recv ":bob!bob@UDS JOIN #foo\r\n";
Send "PRIVMSG #foo :hello bob\r\n";
Recv ":bob!bob@UDS NOTICE #foo :hello alice\r\n";
@ -429,11 +433,7 @@ let regression_tests =
[
Send "ISON alice charlie\r\n";
Recv ":testserver.test 303 bob :alice\r\n";
Recv ":alice!alice@UDS PRIVMSG bob :Hi Bob!\r\n";
Send "PRIVMSG #foo :snot\r\n";
Recv ":testserver.test 404 bob #foo :Cannot send to channel\r\n";
Send "NOTICE #foo :snot\r\n";
Recv ":testserver.test 404 bob #foo :Cannot send to channel\r\n";
Recv ":alice!alice@UDS PRIVMSG bob :Come to #foo\r\n";
Send "JOIN #foo\r\n";
Recv ":bob!bob@UDS JOIN #foo\r\n";
Recv ":alice!alice@UDS PRIVMSG #foo :hello bob\r\n";