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

Updated parsing to support colons within arguments.

Browse source
This commit is contained in:
Aaron Weiss 2015-03-09 22:06:43 -04:00
parent c5d2cdb891
commit aaf5013407
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -83,9 +83,9 @@ impl FromStr for Message {
} else { } else {
None None
}; };
let suffix = if state.contains(":") { let suffix = if state.contains(" :") {
let suffix = state.find(':').map(|i| &state[i+1..state.len()-2]); let suffix = state.find(" :").map(|i| &state[i+2..state.len()-2]);
state = state.find(':').map_or("", |i| &state[..i]); state = state.find(" :").map_or("", |i| &state[..i+1]);
suffix suffix
} else { } else {
None None
@ -196,6 +196,19 @@ mod test {
assert_eq!(":test!test@test PRIVMSG test :Still testing!\r\n".to_message(), message); assert_eq!(":test!test@test PRIVMSG test :Still testing!\r\n".to_message(), message);
} }
#[test]
fn to_message_with_colon_in_arg() {
// Apparently, UnrealIRCd (and perhaps some others) send some messages that include
// colons within individual parameters. So, let's make sure it parses correctly.
let message = Message {
prefix: Some(format!("test!test@test")),
command: format!("COMMAND"),
args: vec![format!("ARG:test")],
suffix: Some(format!("Still testing!")),
};
assert_eq!(":test!test@test COMMAND ARG:test :Still testing!\r\n".to_message(), message);
}
#[test] #[test]
#[should_fail] #[should_fail]
fn to_message_invalid_format() { fn to_message_invalid_format() {