DGNum/rust-irc
6
0
Fork 0
Code Issues 1 Pull requests 3 Projects Releases Packages Wiki Activity Actions

Made colon before last argument optional depending on message type.

Browse source
This commit is contained in:
Aaron Weiss 2014-10-29 03:43:15 -04:00
parent 445cfb1405
commit 3ee6ec76f1
3 changed files with 25 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/bot.rs
View file

@ -27,52 +27,52 @@ impl<'a> IrcBot<'a, BufferedWriter<TcpStream>, BufferedReader<TcpStream>> {
impl<'a, T, U> Bot for IrcBot<'a, T, U> where T: IrcWriter, U: IrcReader {
fn send_sanick(&self, old_nick: &str, new_nick: &str) -> IoResult<()> {
self.conn.send(Message::new(None, "SANICK", [old_nick, new_nick]))
self.conn.send(Message::new(None, "SANICK", [old_nick, new_nick], false))
}
fn send_nick(&self, nick: &str) -> IoResult<()> {
self.conn.send(Message::new(None, "NICK", [nick]))
self.conn.send(Message::new(None, "NICK", [nick], true))
}
fn send_user(&self, username: &str, real_name: &str) -> IoResult<()> {
self.conn.send(Message::new(None, "USER", [username, "0", "*", real_name]))
self.conn.send(Message::new(None, "USER", [username, "0", "*", real_name], true))
}
fn send_join(&self, chan: &str) -> IoResult<()> {
self.conn.send(Message::new(None, "JOIN", [chan]))
self.conn.send(Message::new(None, "JOIN", [chan], true))
}
fn send_samode(&self, target: &str, mode: &str) -> IoResult<()> {
self.conn.send(Message::new(None, "SAMODE", [target, mode]))
self.conn.send(Message::new(None, "SAMODE", [target, mode], false))
}
fn send_mode(&self, target: &str, mode: &str) -> IoResult<()> {
self.conn.send(Message::new(None, "MODE", [target, mode]))
self.conn.send(Message::new(None, "MODE", [target, mode], false))
}
fn send_oper(&self, name: &str, password: &str) -> IoResult<()> {
self.conn.send(Message::new(None, "OPER", [name, password]))
self.conn.send(Message::new(None, "OPER", [name, password], false))
}
fn send_topic(&self, chan: &str, topic: &str) -> IoResult<()> {
self.conn.send(Message::new(None, "TOPIC", [chan, topic]))
self.conn.send(Message::new(None, "TOPIC", [chan, topic], true))
}
fn send_invite(&self, person: &str, chan: &str) -> IoResult<()> {
self.conn.send(Message::new(None, "INVITE", [person, chan]))
self.conn.send(Message::new(None, "INVITE", [person, chan], true))
}
fn send_kick(&self, chan: &str, user: &str, msg: &str) -> IoResult<()> {
self.conn.send(Message::new(None, "KICK", [chan, user, msg]))
self.conn.send(Message::new(None, "KICK", [chan, user, msg], true))
}
fn send_kill(&self, nick: &str, msg: &str) -> IoResult<()> {
self.conn.send(Message::new(None, "KILL", [nick, msg]))
self.conn.send(Message::new(None, "KILL", [nick, msg], true))
}
fn send_privmsg(&self, chan: &str, msg: &str) -> IoResult<()> {
for line in msg.split_str("\r\n") {
try!(self.conn.send(Message::new(None, "PRIVMSG", [chan, line])));
try!(self.conn.send(Message::new(None, "PRIVMSG", [chan, line], true)));
}
Ok(())
}
@ -122,7 +122,7 @@ impl<'a, T, U> IrcBot<'a, T, U> where T: IrcWriter, U: IrcReader {
fn handle_command(&self, source: &str, command: &str, args: &[&str]) -> IoResult<()> {
match (command, args) {
("PING", [msg]) => {
try!(self.conn.send(Message::new(None, "PONG", [msg])));
try!(self.conn.send(Message::new(None, "PONG", [msg], true)));
},
("376", _) => { // End of MOTD
for chan in self.config.channels.iter() {
@ -192,7 +192,7 @@ mod test {
let c = Connection::new(MemWriter::new(), NullReader).unwrap();
let b = IrcBot::from_connection(c, |_, _, _, _| { Ok(()) }).unwrap();
b.send_sanick("test", "test2").unwrap();
assert_eq!(data(b.conn), format!("SANICK test :test2\r\n"));
assert_eq!(data(b.conn), format!("SANICK test test2\r\n"));
}
#[test]
@ -224,7 +224,7 @@ mod test {
let c = Connection::new(MemWriter::new(), NullReader).unwrap();
let b = IrcBot::from_connection(c, |_, _, _, _| { Ok(()) }).unwrap();
b.send_samode("#test", "+i").unwrap();
assert_eq!(data(b.conn), format!("SAMODE #test :+i\r\n"));
assert_eq!(data(b.conn), format!("SAMODE #test +i\r\n"));
}
#[test]
@ -232,7 +232,7 @@ mod test {
let c = Connection::new(MemWriter::new(), NullReader).unwrap();
let b = IrcBot::from_connection(c, |_, _, _, _| { Ok(()) }).unwrap();
b.send_mode("#test", "+i").unwrap();
assert_eq!(data(b.conn), format!("MODE #test :+i\r\n"));
assert_eq!(data(b.conn), format!("MODE #test +i\r\n"));
}
#[test]
@ -240,7 +240,7 @@ mod test {
let c = Connection::new(MemWriter::new(), NullReader).unwrap();
let b = IrcBot::from_connection(c, |_, _, _, _| { Ok(()) }).unwrap();
b.send_oper("test", "test").unwrap();
assert_eq!(data(b.conn), format!("OPER test :test\r\n"));
assert_eq!(data(b.conn), format!("OPER test test\r\n"));
}
#[test]

5
src/conn.rs
View file

@ -34,7 +34,8 @@ impl<T, U> Connection<T, U> where T: IrcWriter, U: IrcReader {
send.push_str(" ");
send.push_str(msg.args.init().connect(" ")[]);
}
send.push_str(" :");
send.push_str(" ");
if msg.colon_flag { send.push_str(":") }
send.push_str(*msg.args.last().unwrap());
send.push_str("\r\n");
self.send_internal(send[])
@ -76,7 +77,7 @@ mod test {
fn send() {
let c = Connection::new(MemWriter::new(), NullReader).unwrap();
let args = ["flare.to.ca.fyrechat.net"];
c.send(Message::new(None, "PING", args)).unwrap();
c.send(Message::new(None, "PING", args, true)).unwrap();
assert_eq!(data(c), format!("PING :flare.to.ca.fyrechat.net\r\n"));
}
}

7
src/data.rs
View file

@ -58,14 +58,16 @@ pub struct Message<'a> {
pub source: Option<&'a str>,
pub command: &'a str,
pub args: &'a [&'a str],
pub colon_flag: bool,
}
impl<'a> Message<'a> {
pub fn new(source: Option<&'a str>, command: &'a str, args: &'a [&'a str]) -> Message<'a> {
pub fn new(source: Option<&'a str>, command: &'a str, args: &'a [&'a str], colon_flag: bool) -> Message<'a> {
Message {
source: source,
command: command,
args: args,
colon_flag: colon_flag,
}
}
}
@ -106,11 +108,12 @@ mod test {
#[test]
fn new_message() {
let args = ["flare.to.ca.fyrechat.net"];
let m = Message::new(None, "PING", args);
let m = Message::new(None, "PING", args, true);
assert_eq!(m, Message {
source: None,
command: "PING",
args: args,
colon_flag: true,
});
}