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

Cleaned up new comments on source_nickname.

Browse source
This commit is contained in:
Aaron Weiss 2016-02-07 11:33:45 -05:00
parent b0ecd397ad
commit 2cf0b26dca
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/client/data/message.rs
View file

@ -38,10 +38,10 @@ impl Message {
// <servername> ::= <host> // <servername> ::= <host>
self.prefix.as_ref().and_then(|s| self.prefix.as_ref().and_then(|s|
match (s.find('!'), s.find('@'), s.find('.')) { match (s.find('!'), s.find('@'), s.find('.')) {
(Some(i), _, _) => Some(&s[..i]), // nick!user (Some(i), _, _) => Some(&s[..i]), // <nick> '!' <user> [ '@' <host> ]
(None, Some(i), _) => Some(&s[..i]), // nick@host (None, Some(i), _) => Some(&s[..i]), // <nick> '@' <host>
(None, None, None) => Some(&s), // nick (None, None, None) => Some(&s), // <nick>
_ => None // server.name _ => None // <servername>
} }
) )
} }
@ -157,7 +157,7 @@ mod test {
).unwrap().source_nickname(), Some("test")); ).unwrap().source_nickname(), Some("test"));
assert_eq!(Message::new( assert_eq!(Message::new(
Some("test!test@awe.did.you.know.irc.hostnames.have.dots"), "PING", vec![], Some("data") Some("test!test@irc.test.com"), "PING", vec![], Some("data")
).unwrap().source_nickname(), Some("test")); ).unwrap().source_nickname(), Some("test"));
assert_eq!(Message::new( assert_eq!(Message::new(