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

Merge pull request #161 from FauxFaux/parse-user

Browse source 
parse traditional USER form
This commit is contained in:
Aaron Weiss 2018-10-21 13:36:00 -04:00 committed by GitHub
commit e3decd470d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/proto/command.rs
View file

@ -503,17 +503,17 @@ impl Command {
} else if cmd.eq_ignore_ascii_case("USER") {
match suffix {
Some(suffix) => {
if args.len() != 2 {
if args.len() != 3 {
raw(cmd, args, Some(suffix))
} else {
Command::USER(args[0].to_owned(), args[1].to_owned(), suffix.to_owned())
}
}
None => {
if args.len() != 3 {
if args.len() != 4 {
raw(cmd, args, suffix)
} else {
Command::USER(args[0].to_owned(), args[1].to_owned(), args[2].to_owned())
Command::USER(args[0].to_owned(), args[1].to_owned(), args[3].to_owned())
}
}
}
@ -1785,6 +1785,7 @@ impl FromStr for BatchSubCommand {
#[cfg(test)]
mod test {
use proto::Message;
use super::Response;
use super::Command;
@ -1794,4 +1795,18 @@ mod test {
vec!["foo".into()],
None)) == "001 foo");
}
#[test]
fn user_round_trip() {
let cmd = Command::USER("a".to_string(), "b".to_string(), "c".to_string());
let line = Message::from(cmd.clone()).to_string();
let returned_cmd = line.parse::<Message>().unwrap().command;
assert_eq!(cmd, returned_cmd);
}
#[test]
fn parse_user_message() {
let cmd = "USER a 0 * b".parse::<Message>().unwrap().command;
assert_eq!(Command::USER("a".to_string(), "0".to_string(), "b".to_string()), cmd);
}
}