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

Added IRCv3 ACCOUNT command for account-notify support.

Browse source
This commit is contained in:
Aaron Weiss 2015-05-21 22:07:36 -04:00
parent 7bf6bf48e1
commit b6526465dd
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -144,9 +144,11 @@ pub enum Command {
/// MEMOSERV message /// MEMOSERV message
MEMOSERV(String), MEMOSERV(String),
// Capabilities extension to IRCv3 // IRCv3 support
/// CAP [*] COMMAND [*] :[param] /// CAP [*] COMMAND [*] :[param]
CAP(Option<String>, CapSubCommand, Option<String>, Option<String>), CAP(Option<String>, CapSubCommand, Option<String>, Option<String>),
/// ACCOUNT [account name]
ACCOUNT(String),
} }
impl Into<Message> for Command { impl Into<Message> for Command {
@ -316,6 +318,8 @@ impl Into<Message> for Command {
Message::from_owned(None, string("CAP"), Some(vec![s.string(), c]), p), Message::from_owned(None, string("CAP"), Some(vec![s.string(), c]), p),
Command::CAP(Some(k), s, Some(c), p) => Command::CAP(Some(k), s, Some(c), p) =>
Message::from_owned(None, string("CAP"), Some(vec![k, s.string(), c]), p), Message::from_owned(None, string("CAP"), Some(vec![k, s.string(), c]), p),
Command::ACCOUNT(a) =>
Message::from_owned(None, string("ACCOUNT"), Some(vec![a]), None),
} }
} }
} }
@ -1038,6 +1042,19 @@ impl Command {
} else { } else {
return Err(invalid_input()) return Err(invalid_input())
} }
} else if let "ACCOUNT" = &m.command[..] {
match m.suffix {
Some(ref suffix) => if m.args.len() == 0 {
Command::ACCOUNT(suffix.clone())
} else {
return Err(invalid_input())
},
None => if m.args.len() == 1 {
Command::ACCOUNT(m.args[0].clone())
} else {
return Err(invalid_input())
}
}
} else { } else {
return Err(invalid_input()) return Err(invalid_input())
}) })