Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Quick pong message fix (1->2 params). #40

Merged
merged 1 commit into from
Oct 19, 2017
Merged

Quick pong message fix (1->2 params). #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/irc_client.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ module Make(Io: Irc_transport.IO) = struct
send ~connection (M.ping message)

let send_pong ~connection ~message =
send ~connection (M.pong message)
send ~connection (M.pong ~middle:"ocaml-irc-client" ~trailer:message)

let send_privmsg ~connection ~target ~message =
send ~connection (M.privmsg ~target message)
Expand Down
10 changes: 6 additions & 4 deletions lib/irc_message.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ type command =
| PRIVMSG of string * string (** target * message *)
| NOTICE of string * string (** target * message *)
| PING of string
| PONG of string
| PONG of string * string
| Other of string * (string list) (** command name * parameters *)

type t = {
Expand Down Expand Up @@ -49,7 +49,7 @@ let kick ~chans ~nick ~comment = make_ (KICK (chans, nick, unwrap_ "" comment))
let privmsg ~target msg = make_ (PRIVMSG (target, msg))
let notice ~target msg = make_ (NOTICE (target, msg))
let ping s = make_ (PING s)
let pong s = make_ (PONG s)
let pong ~middle ~trailer = make_ (PONG (middle, trailer))

let other ~cmd ~params = make_other_ cmd params

Expand Down Expand Up @@ -163,7 +163,9 @@ let parse_exn msg =
let target, msg = expect2 msg params in
NOTICE (target, msg)
| "PING" -> PING (expect1 msg params)
| "PONG" -> PONG (expect1 msg params)
| "PONG" ->
let middle, trailer = expect1or2 msg params in
PONG (middle, trailer)
| other -> Other (other, params)
in
{ prefix; command }
Expand Down Expand Up @@ -216,7 +218,7 @@ let write_cmd_buf buf t =
| PRIVMSG (a,b) -> pp "PRIVMSG %s %a" a write_trail b
| NOTICE (a,b) -> pp "NOTICE %s %a" a write_trail b
| PING a -> pp "PING %a" write_trail a
| PONG a -> pp "PONG %a" write_trail a
| PONG (a,b) -> pp "PONG %s %a" a write_trail b
| Other (command_name, params) ->
Printf.bprintf buf "%s %a" command_name (write_list ~trail:true ' ') params

Expand Down
4 changes: 2 additions & 2 deletions lib/irc_message.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ type command =
| PRIVMSG of string * string (** target * message *)
| NOTICE of string * string (** target * message *)
| PING of string
| PONG of string
| PONG of string * string
| Other of string * string list (** other cases *)

type t = {
Expand All @@ -48,7 +48,7 @@ val kick : chans:string list -> nick:string -> comment:string option -> t
val privmsg : target:string -> string -> t
val notice : target:string -> string -> t
val ping : string -> t
val pong : string -> t
val pong : middle:string -> trailer:string -> t

val other : cmd:string -> params:string list -> t

Expand Down