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

Fixes #18 by expanding the CAP command.

Browse source
This commit is contained in:
Aaron Weiss 2015-02-24 10:45:42 -05:00
parent 8cf7471af2
commit e1ab26a4bd
2 changed files with 51 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -204,7 +204,7 @@ pub enum Command {
// Capabilities extension to IRCv3 // Capabilities extension to IRCv3
/// CAP COMMAND :[param] /// CAP COMMAND :[param]
#[unstable = "This command is not entirely specification compliant."] #[unstable = "This command is not entirely specification compliant."]
CAP(CapSubCommand, Option<String>), CAP(Option<String>, CapSubCommand, Option<String>, Option<String>),
} }
impl ToMessage for Command { impl ToMessage for Command {
@ -455,8 +455,18 @@ impl ToMessage for Command {
Command::MEMOSERV(ref m) => Message::new(None, "MEMOSERV", Some(vec![&m[..]]), None), Command::MEMOSERV(ref m) => Message::new(None, "MEMOSERV", Some(vec![&m[..]]), None),
Command::CAP(ref s, ref p) => Message::new(None, "CAP", Some(vec![s.to_str()]), Command::CAP(None, ref s, None, ref p) => Message::new(None, "CAP",
(*p).as_ref().map(|m| m.as_slice())) Some(vec![s.to_str()]),
p.as_ref().map(|m| m.as_slice())),
Command::CAP(Some(ref k), ref s, None, ref p) => Message::new(None, "CAP",
Some(vec![&k, s.to_str()]),
p.as_ref().map(|m| m.as_slice())),
Command::CAP(None, ref s, Some(ref c), ref p) => Message::new(None, "CAP",
Some(vec![s.to_str(), &c]),
p.as_ref().map(|m| m.as_slice())),
Command::CAP(Some(ref k), ref s, Some(ref c), ref p) => Message::new(None, "CAP",
Some(vec![&k, s.to_str(), &c]),
p.as_ref().map(|m| m.as_slice())),
} }
} }
} }
@ -1136,11 +1146,42 @@ impl Command {
} }
} }
} else if let "CAP" = &m.command[..] { } else if let "CAP" = &m.command[..] {
if m.args.len() != 1 { return Err(invalid_input()) } if m.args.len() == 1 {
if let Ok(cmd) = m.args[0].parse() { if let Ok(cmd) = m.args[0].parse() {
match m.suffix { match m.suffix {
Some(ref suffix) => Command::CAP(cmd, Some(suffix.clone())), Some(ref suffix) => Command::CAP(None, cmd, None, Some(suffix.clone())),
None => Command::CAP(cmd, None), None => Command::CAP(None, cmd, None, None),
}
} else {
return Err(invalid_input())
}
} else if m.args.len() == 2 {
if let Ok(cmd) = m.args[0].parse() {
match m.suffix {
Some(ref suffix) => Command::CAP(None, cmd, Some(m.args[1].clone()),
Some(suffix.clone())),
None => Command::CAP(None, cmd, Some(m.args[1].clone()), None),
}
} else if let Ok(cmd) = m.args[1].parse() {
match m.suffix {
Some(ref suffix) => Command::CAP(Some(m.args[0].clone()), cmd, None,
Some(suffix.clone())),
None => Command::CAP(Some(m.args[0].clone()), cmd, None, None),
}
} else {
return Err(invalid_input())
}
} else if m.args.len() == 3 {
if let Ok(cmd) = m.args[1].parse() {
match m.suffix {
Some(ref suffix) => Command::CAP(Some(m.args[0].clone()), cmd,
Some(m.args[2].clone()),
Some(suffix.clone())),
None => Command::CAP(Some(m.args[0].clone()), cmd, Some(m.args[2].clone()),
None),
}
} else {
return Err(invalid_input())
} }
} else { } else {
return Err(invalid_input()) return Err(invalid_input())

4
src/client/server/utils.rs
View file

@ -17,8 +17,8 @@ pub trait ServerExt<'a, T, U>: Server<'a, T, U> {
#[unstable = "Capabilities requests may be moved outside of identify."] #[unstable = "Capabilities requests may be moved outside of identify."]
fn identify(&self) -> IoResult<()> { fn identify(&self) -> IoResult<()> {
// We'll issue a CAP REQ for multi-prefix support to improve access level tracking. // We'll issue a CAP REQ for multi-prefix support to improve access level tracking.
try!(self.send(CAP(REQ, Some("multi-prefix".to_owned())))); try!(self.send(CAP(None, REQ, None, Some("multi-prefix".to_owned()))));
try!(self.send(CAP(END, None))); // Then, send a CAP END to end the negotiation. try!(self.send(CAP(None, END, None, None))); // Then, send a CAP END to end the negotiation.
if self.config().password() != "" { if self.config().password() != "" {
try!(self.send(PASS(self.config().password().to_owned()))); try!(self.send(PASS(self.config().password().to_owned())));
} }