mirror of
https://gitlab.com/xmpp-rs/xmpp-rs.git
synced 2024-07-12 22:21:53 +00:00
message: Switch to Into/TryFrom.
This commit is contained in:
parent
fffaca316f
commit
f971cbd5c9
2 changed files with 96 additions and 98 deletions
|
@ -11,7 +11,7 @@ use minidom::Element;
|
||||||
use error::Error;
|
use error::Error;
|
||||||
|
|
||||||
use delay::Delay;
|
use delay::Delay;
|
||||||
use message;
|
use message::Message;
|
||||||
|
|
||||||
use ns;
|
use ns;
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ use ns;
|
||||||
pub struct Forwarded {
|
pub struct Forwarded {
|
||||||
pub delay: Option<Delay>,
|
pub delay: Option<Delay>,
|
||||||
// XXX: really? Option?
|
// XXX: really? Option?
|
||||||
pub stanza: Option<message::Message>,
|
pub stanza: Option<Message>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> TryFrom<&'a Element> for Forwarded {
|
impl<'a> TryFrom<&'a Element> for Forwarded {
|
||||||
|
@ -35,7 +35,7 @@ impl<'a> TryFrom<&'a Element> for Forwarded {
|
||||||
if child.is("delay", ns::DELAY) {
|
if child.is("delay", ns::DELAY) {
|
||||||
delay = Some(Delay::try_from(child)?);
|
delay = Some(Delay::try_from(child)?);
|
||||||
} else if child.is("message", ns::JABBER_CLIENT) {
|
} else if child.is("message", ns::JABBER_CLIENT) {
|
||||||
stanza = Some(message::parse_message(child)?);
|
stanza = Some(Message::try_from(child)?);
|
||||||
// TODO: also handle the five other possibilities.
|
// TODO: also handle the five other possibilities.
|
||||||
} else {
|
} else {
|
||||||
return Err(Error::ParseError("Unknown child in forwarded element."));
|
return Err(Error::ParseError("Unknown child in forwarded element."));
|
||||||
|
@ -53,7 +53,7 @@ impl<'a> Into<Element> for &'a Forwarded {
|
||||||
Element::builder("forwarded")
|
Element::builder("forwarded")
|
||||||
.ns(ns::FORWARD)
|
.ns(ns::FORWARD)
|
||||||
.append(match self.delay { Some(ref delay) => { let elem: Element = delay.into(); Some(elem) }, None => None })
|
.append(match self.delay { Some(ref delay) => { let elem: Element = delay.into(); Some(elem) }, None => None })
|
||||||
.append(self.stanza.clone())
|
.append(match self.stanza { Some(ref stanza) => { let elem: Element = stanza.into(); Some(elem) }, None => None })
|
||||||
.build()
|
.build()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
186
src/message.rs
186
src/message.rs
|
@ -7,7 +7,7 @@
|
||||||
use std::convert::TryFrom;
|
use std::convert::TryFrom;
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
|
|
||||||
use minidom::{Element, IntoElements, IntoAttributeValue, ElementEmitter};
|
use minidom::{Element, IntoAttributeValue};
|
||||||
|
|
||||||
use jid::Jid;
|
use jid::Jid;
|
||||||
|
|
||||||
|
@ -95,152 +95,150 @@ pub struct Message {
|
||||||
pub payloads: Vec<MessagePayloadType>,
|
pub payloads: Vec<MessagePayloadType>,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn parse_message(root: &Element) -> Result<Message, Error> {
|
impl<'a> TryFrom<&'a Element> for Message {
|
||||||
if !root.is("message", ns::JABBER_CLIENT) {
|
type Error = Error;
|
||||||
return Err(Error::ParseError("This is not a message element."));
|
|
||||||
}
|
fn try_from(root: &'a Element) -> Result<Message, Error> {
|
||||||
let from = root.attr("from")
|
if !root.is("message", ns::JABBER_CLIENT) {
|
||||||
.and_then(|value| value.parse().ok());
|
return Err(Error::ParseError("This is not a message element."));
|
||||||
let to = root.attr("to")
|
}
|
||||||
.and_then(|value| value.parse().ok());
|
let from = root.attr("from")
|
||||||
let id = root.attr("id")
|
.and_then(|value| value.parse().ok());
|
||||||
.and_then(|value| value.parse().ok());
|
let to = root.attr("to")
|
||||||
let type_ = match root.attr("type") {
|
.and_then(|value| value.parse().ok());
|
||||||
Some(type_) => type_.parse()?,
|
let id = root.attr("id")
|
||||||
None => Default::default(),
|
.and_then(|value| value.parse().ok());
|
||||||
};
|
let type_ = match root.attr("type") {
|
||||||
let mut payloads = vec!();
|
Some(type_) => type_.parse()?,
|
||||||
for elem in root.children() {
|
None => Default::default(),
|
||||||
let payload = if let Ok(body) = body::parse_body(elem) {
|
|
||||||
Some(MessagePayload::Body(body))
|
|
||||||
} else if let Ok(stanza_error) = StanzaError::try_from(elem) {
|
|
||||||
Some(MessagePayload::StanzaError(stanza_error))
|
|
||||||
} else if let Ok(chatstate) = ChatState::try_from(elem) {
|
|
||||||
Some(MessagePayload::ChatState(chatstate))
|
|
||||||
} else if let Ok(receipt) = Receipt::try_from(elem) {
|
|
||||||
Some(MessagePayload::Receipt(receipt))
|
|
||||||
} else if let Ok(delay) = Delay::try_from(elem) {
|
|
||||||
Some(MessagePayload::Delay(delay))
|
|
||||||
} else if let Ok(attention) = Attention::try_from(elem) {
|
|
||||||
Some(MessagePayload::Attention(attention))
|
|
||||||
} else if let Ok(replace) = Replace::try_from(elem) {
|
|
||||||
Some(MessagePayload::MessageCorrect(replace))
|
|
||||||
} else if let Ok(eme) = ExplicitMessageEncryption::try_from(elem) {
|
|
||||||
Some(MessagePayload::ExplicitMessageEncryption(eme))
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
};
|
};
|
||||||
payloads.push(match payload {
|
let mut payloads = vec!();
|
||||||
Some(payload) => MessagePayloadType::Parsed(payload),
|
for elem in root.children() {
|
||||||
None => MessagePayloadType::XML(elem.clone()),
|
let payload = if let Ok(body) = body::parse_body(elem) {
|
||||||
});
|
Some(MessagePayload::Body(body))
|
||||||
}
|
} else if let Ok(stanza_error) = StanzaError::try_from(elem) {
|
||||||
Ok(Message {
|
Some(MessagePayload::StanzaError(stanza_error))
|
||||||
from: from,
|
} else if let Ok(chatstate) = ChatState::try_from(elem) {
|
||||||
to: to,
|
Some(MessagePayload::ChatState(chatstate))
|
||||||
id: id,
|
} else if let Ok(receipt) = Receipt::try_from(elem) {
|
||||||
type_: type_,
|
Some(MessagePayload::Receipt(receipt))
|
||||||
payloads: payloads,
|
} else if let Ok(delay) = Delay::try_from(elem) {
|
||||||
})
|
Some(MessagePayload::Delay(delay))
|
||||||
}
|
} else if let Ok(attention) = Attention::try_from(elem) {
|
||||||
|
Some(MessagePayload::Attention(attention))
|
||||||
pub fn serialise_payload(payload: &MessagePayload) -> Element {
|
} else if let Ok(replace) = Replace::try_from(elem) {
|
||||||
match *payload {
|
Some(MessagePayload::MessageCorrect(replace))
|
||||||
MessagePayload::Body(ref body) => body::serialise(body),
|
} else if let Ok(eme) = ExplicitMessageEncryption::try_from(elem) {
|
||||||
MessagePayload::StanzaError(ref stanza_error) => stanza_error.into(),
|
Some(MessagePayload::ExplicitMessageEncryption(eme))
|
||||||
MessagePayload::Attention(ref attention) => attention.into(),
|
} else {
|
||||||
MessagePayload::ChatState(ref chatstate) => chatstate.into(),
|
None
|
||||||
MessagePayload::Receipt(ref receipt) => receipt.into(),
|
};
|
||||||
MessagePayload::Delay(ref delay) => delay.into(),
|
payloads.push(match payload {
|
||||||
MessagePayload::MessageCorrect(ref replace) => replace.into(),
|
Some(payload) => MessagePayloadType::Parsed(payload),
|
||||||
MessagePayload::ExplicitMessageEncryption(ref eme) => eme.into(),
|
None => MessagePayloadType::XML(elem.clone()),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
Ok(Message {
|
||||||
|
from: from,
|
||||||
|
to: to,
|
||||||
|
id: id,
|
||||||
|
type_: type_,
|
||||||
|
payloads: payloads,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn serialise(message: &Message) -> Element {
|
impl<'a> Into<Element> for &'a MessagePayload {
|
||||||
let mut stanza = Element::builder("message")
|
fn into(self) -> Element {
|
||||||
.ns(ns::JABBER_CLIENT)
|
match *self {
|
||||||
.attr("from", message.from.clone().and_then(|value| Some(String::from(value))))
|
MessagePayload::Body(ref body) => body::serialise(body),
|
||||||
.attr("to", message.to.clone().and_then(|value| Some(String::from(value))))
|
MessagePayload::StanzaError(ref stanza_error) => stanza_error.into(),
|
||||||
.attr("id", message.id.clone())
|
MessagePayload::Attention(ref attention) => attention.into(),
|
||||||
.attr("type", message.type_.clone())
|
MessagePayload::ChatState(ref chatstate) => chatstate.into(),
|
||||||
.build();
|
MessagePayload::Receipt(ref receipt) => receipt.into(),
|
||||||
for child in message.payloads.clone() {
|
MessagePayload::Delay(ref delay) => delay.into(),
|
||||||
let elem = match child {
|
MessagePayload::MessageCorrect(ref replace) => replace.into(),
|
||||||
MessagePayloadType::XML(elem) => elem,
|
MessagePayload::ExplicitMessageEncryption(ref eme) => eme.into(),
|
||||||
MessagePayloadType::Parsed(payload) => serialise_payload(&payload),
|
}
|
||||||
};
|
|
||||||
stanza.append_child(elem);
|
|
||||||
}
|
}
|
||||||
stanza
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl IntoElements for Message {
|
impl<'a> Into<Element> for &'a Message {
|
||||||
fn into_elements(self, emitter: &mut ElementEmitter) {
|
fn into(self) -> Element {
|
||||||
let elem = serialise(&self);
|
let mut stanza = Element::builder("message")
|
||||||
emitter.append_child(elem);
|
.ns(ns::JABBER_CLIENT)
|
||||||
|
.attr("from", self.from.clone().and_then(|value| Some(String::from(value))))
|
||||||
|
.attr("to", self.to.clone().and_then(|value| Some(String::from(value))))
|
||||||
|
.attr("id", self.id.clone())
|
||||||
|
.attr("type", self.type_.clone())
|
||||||
|
.build();
|
||||||
|
for child in self.payloads.clone() {
|
||||||
|
let elem = match child {
|
||||||
|
MessagePayloadType::XML(elem) => elem,
|
||||||
|
MessagePayloadType::Parsed(payload) => (&payload).into(),
|
||||||
|
};
|
||||||
|
stanza.append_child(elem);
|
||||||
|
}
|
||||||
|
stanza
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use std::str::FromStr;
|
use super::*;
|
||||||
use minidom::Element;
|
|
||||||
use jid::Jid;
|
|
||||||
use message;
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_simple() {
|
fn test_simple() {
|
||||||
let elem: Element = "<message xmlns='jabber:client'/>".parse().unwrap();
|
let elem: Element = "<message xmlns='jabber:client'/>".parse().unwrap();
|
||||||
let message = message::parse_message(&elem).unwrap();
|
let message = Message::try_from(&elem).unwrap();
|
||||||
assert_eq!(message.from, None);
|
assert_eq!(message.from, None);
|
||||||
assert_eq!(message.to, None);
|
assert_eq!(message.to, None);
|
||||||
assert_eq!(message.id, None);
|
assert_eq!(message.id, None);
|
||||||
assert_eq!(message.type_, message::MessageType::Normal);
|
assert_eq!(message.type_, MessageType::Normal);
|
||||||
assert!(message.payloads.is_empty());
|
assert!(message.payloads.is_empty());
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_serialise() {
|
fn test_serialise() {
|
||||||
let elem: Element = "<message xmlns='jabber:client' type='normal'/>".parse().unwrap();
|
let elem: Element = "<message xmlns='jabber:client' type='normal'/>".parse().unwrap();
|
||||||
let message = message::Message {
|
let message = Message {
|
||||||
from: None,
|
from: None,
|
||||||
to: None,
|
to: None,
|
||||||
id: None,
|
id: None,
|
||||||
type_: message::MessageType::Normal,
|
type_: MessageType::Normal,
|
||||||
payloads: vec!(),
|
payloads: vec!(),
|
||||||
};
|
};
|
||||||
let elem2 = message::serialise(&message);
|
let elem2 = (&message).into();
|
||||||
assert_eq!(elem, elem2);
|
assert_eq!(elem, elem2);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_body() {
|
fn test_body() {
|
||||||
let elem: Element = "<message xmlns='jabber:client' to='coucou@example.org' type='chat'><body>Hello world!</body></message>".parse().unwrap();
|
let elem: Element = "<message xmlns='jabber:client' to='coucou@example.org' type='chat'><body>Hello world!</body></message>".parse().unwrap();
|
||||||
message::parse_message(&elem).unwrap();
|
Message::try_from(&elem).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_serialise_body() {
|
fn test_serialise_body() {
|
||||||
let elem: Element = "<message xmlns='jabber:client' to='coucou@example.org' type='chat'><body>Hello world!</body></message>".parse().unwrap();
|
let elem: Element = "<message xmlns='jabber:client' to='coucou@example.org' type='chat'><body>Hello world!</body></message>".parse().unwrap();
|
||||||
let message = message::Message {
|
let message = Message {
|
||||||
from: None,
|
from: None,
|
||||||
to: Some(Jid::from_str("coucou@example.org").unwrap()),
|
to: Some(Jid::from_str("coucou@example.org").unwrap()),
|
||||||
id: None,
|
id: None,
|
||||||
type_: message::MessageType::Chat,
|
type_: MessageType::Chat,
|
||||||
payloads: vec!(
|
payloads: vec!(
|
||||||
message::MessagePayloadType::Parsed(message::MessagePayload::Body("Hello world!".to_owned())),
|
MessagePayloadType::Parsed(MessagePayload::Body("Hello world!".to_owned())),
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
let elem2 = message::serialise(&message);
|
let elem2 = (&message).into();
|
||||||
assert_eq!(elem, elem2);
|
assert_eq!(elem, elem2);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_attention() {
|
fn test_attention() {
|
||||||
let elem: Element = "<message xmlns='jabber:client' to='coucou@example.org' type='chat'><attention xmlns='urn:xmpp:attention:0'/></message>".parse().unwrap();
|
let elem: Element = "<message xmlns='jabber:client' to='coucou@example.org' type='chat'><attention xmlns='urn:xmpp:attention:0'/></message>".parse().unwrap();
|
||||||
let message = message::parse_message(&elem).unwrap();
|
let message = Message::try_from(&elem).unwrap();
|
||||||
let elem2 = message::serialise(&message);
|
let elem2 = (&message).into();
|
||||||
assert_eq!(elem, elem2);
|
assert_eq!(elem, elem2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue