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

Merge branch 'master' into async

Browse source
This commit is contained in:
Aaron Weiss 2017-03-15 12:44:46 -04:00
commit 6a0f2a184f
No known key found for this signature in database
GPG key ID: 0237035D9BF03AE2
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -26,7 +26,7 @@ fn main() {
let cfg = Config { let cfg = Config {
nickname: Some(format!("irc-rs")), nickname: Some(format!("irc-rs")),
server: Some(format!("irc.example.com")), server: Some(format!("irc.example.com")),
channels: Some(vec![format!("#test")]) channels: Some(vec![format!("#test")]),
.. Default::default() .. Default::default()
}; };
let server = IrcServer::from_config(cfg).unwrap(); let server = IrcServer::from_config(cfg).unwrap();

17
src/client/server/mod.rs
View file

@ -463,7 +463,9 @@ impl IrcServer {
try!(self.send_ctcp_internal(resp, "SOURCE https://github.com/aatxe/irc")); try!(self.send_ctcp_internal(resp, "SOURCE https://github.com/aatxe/irc"));
self.send_ctcp_internal(resp, "SOURCE") self.send_ctcp_internal(resp, "SOURCE")
}, },
"PING" => self.send_ctcp_internal(resp, &format!("PING {}", tokens[1])), "PING" if tokens.len() > 1 => {
self.send_ctcp_internal(resp, &format!("PING {}", tokens[1]))
},
"TIME" => self.send_ctcp_internal(resp, &format!( "TIME" => self.send_ctcp_internal(resp, &format!(
"TIME :{}", now().rfc822z() "TIME :{}", now().rfc822z()
)), )),
@ -687,7 +689,7 @@ mod test {
} }
#[test] #[test]
#[should_panic(message = "All specified nicknames were in use.")] #[should_panic(expected = "All specified nicknames were in use or disallowed.")]
fn ran_out_of_nicknames() { fn ran_out_of_nicknames() {
let value = ":irc.pdgn.co 433 * test :Nickname is already in use.\r\n\ let value = ":irc.pdgn.co 433 * test :Nickname is already in use.\r\n\
:irc.pdgn.co 433 * test2 :Nickname is already in use.\r\n"; :irc.pdgn.co 433 * test2 :Nickname is already in use.\r\n";
@ -847,4 +849,15 @@ mod test {
assert_eq!(&get_server_value(server)[..], "NOTICE test :\u{001}USERINFO :Testing.\u{001}\ assert_eq!(&get_server_value(server)[..], "NOTICE test :\u{001}USERINFO :Testing.\u{001}\
\r\n"); \r\n");
} }
#[test]
#[cfg(feature = "ctcp")]
fn ctcp_ping_no_timestamp() {
let value = ":test!test@test PRIVMSG test :\u{001}PING\u{001}\r\n";
let server = IrcServer::from_connection(test_config(), MockConnection::new(value));
for message in server.iter() {
println!("{:?}", message);
}
assert_eq!(&get_server_value(server)[..], "");
}
} }