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

No longer tries to identify without a password, and added a test for

Browse source 
nickserv identification.
This commit is contained in:
Aaron Weiss 2014-12-09 17:25:22 -05:00
parent 3146d6a87f
commit 7464dc2f0f
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/server/mod.rs
View file

@ -138,9 +138,11 @@ impl<T: IrcReader, U: IrcWriter> IrcServer<T, U> {
}
}
} else if resp == Response::RPL_ENDOFMOTD || resp == Response::ERR_NOMOTD {
self.send(NICKSERV(
if self.config.nick_password() != "" {
self.send(NICKSERV(
format!("IDENTIFY {}", self.config.nick_password())[]
)).unwrap();
)).unwrap();
}
for chan in self.config.channels().into_iter() {
self.send(JOIN(chan[], None)).unwrap();
}
@ -250,7 +252,6 @@ mod test {
}
}
pub fn get_server_value<T: IrcReader>(server: IrcServer<T, MemWriter>) -> String {
String::from_utf8((*server.conn().writer().deref()).get_ref().to_vec()).unwrap()
}
@ -282,6 +283,23 @@ mod test {
"PONG :irc.test.net\r\nJOIN #test\r\nJOIN #test2\r\n");
}
#[test]
fn handle_end_motd_with_nick_password() {
let value = ":irc.test.net 376 test :End of /MOTD command.\r\n";
let server = IrcServer::from_connection(Config {
nick_password: Some(format!("password")),
channels: Some(vec![format!("#test"), format!("#test2")]),
.. Default::default()
}, Connection::new(
MemReader::new(value.as_bytes().to_vec()), MemWriter::new()
));
for message in server.iter() {
println!("{}", message);
}
assert_eq!(get_server_value(server)[],
"NICKSERV IDENTIFY password\r\nJOIN #test\r\nJOIN #test2\r\n");
}
#[test]
fn nickname_in_use() {
let value = ":irc.pdgn.co 433 * test :Nickname is already in use.";