xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

presence: Make PresencePayload a trait, and implement it on every payload.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2018-09-20 20:51:48 +02:00
commit e41de29d9d
7 changed files with 20 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/presence.rs
View file

@ -19,12 +19,8 @@ use error::Error;
use ns;
use stanza_error::StanzaError;
use muc::Muc;
use caps::Caps;
use delay::Delay;
use idle::Idle;
use ecaps2::ECaps2;
/// Should be implemented on every known payload of a `<presence/>`.
pub trait PresencePayload: TryFrom<Element> + Into<Element> {}
#[derive(Debug, Clone, PartialEq)]
pub enum Show {
@ -79,61 +75,6 @@ pub type Status = String;
pub type Priority = i8;
/// Lists every known payload of a `<presence/>`.
#[derive(Debug, Clone)]
pub enum PresencePayload {
StanzaError(StanzaError),
Muc(Muc),
Caps(Caps),
Delay(Delay),
Idle(Idle),
ECaps2(ECaps2),
Unknown(Element),
}
impl TryFrom<Element> for PresencePayload {
type Err = Error;
fn try_from(elem: Element) -> Result<PresencePayload, Error> {
Ok(match (elem.name().as_ref(), elem.ns().unwrap().as_ref()) {
("error", ns::DEFAULT_NS) => PresencePayload::StanzaError(StanzaError::try_from(elem)?),
// XEP-0045
("x", ns::MUC) => PresencePayload::Muc(Muc::try_from(elem)?),
// XEP-0115
("c", ns::CAPS) => PresencePayload::Caps(Caps::try_from(elem)?),
// XEP-0203
("delay", ns::DELAY) => PresencePayload::Delay(Delay::try_from(elem)?),
// XEP-0319
("idle", ns::IDLE) => PresencePayload::Idle(Idle::try_from(elem)?),
// XEP-0390
("c", ns::ECAPS2) => PresencePayload::ECaps2(ECaps2::try_from(elem)?),
_ => PresencePayload::Unknown(elem),
})
}
}
impl From<PresencePayload> for Element {
fn from(payload: PresencePayload) -> Element {
match payload {
PresencePayload::StanzaError(stanza_error) => stanza_error.into(),
PresencePayload::Muc(muc) => muc.into(),
PresencePayload::Caps(caps) => caps.into(),
PresencePayload::Delay(delay) => delay.into(),
PresencePayload::Idle(idle) => idle.into(),
PresencePayload::ECaps2(ecaps2) => ecaps2.into(),
PresencePayload::Unknown(elem) => elem,
}
}
}
#[derive(Debug, Clone, PartialEq)]
pub enum Type {
/// This value is not an acceptable 'type' attribute, it is only used