pep/xmpp-rs-mirror
1
0
Fork 0
mirror of https://gitlab.com/xmpp-rs/xmpp-rs.git synced 2024-07-12 22:21:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

message: Add support for the <subject/> element.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-07 15:10:04 +01:00
parent 21137f7048
commit 4278c8ce2b
1 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/message.rs
View file

@ -87,6 +87,7 @@ pub enum MessagePayloadType {
type Lang = String; type Lang = String;
type Body = String; type Body = String;
type Subject = String;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct Message { pub struct Message {
@ -95,6 +96,7 @@ pub struct Message {
pub id: Option<String>, pub id: Option<String>,
pub type_: MessageType, pub type_: MessageType,
pub bodies: BTreeMap<Lang, Body>, pub bodies: BTreeMap<Lang, Body>,
pub subjects: BTreeMap<Lang, Subject>,
pub payloads: Vec<MessagePayloadType>, pub payloads: Vec<MessagePayloadType>,
} }
@ -116,6 +118,7 @@ impl<'a> TryFrom<&'a Element> for Message {
None => Default::default(), None => Default::default(),
}; };
let mut bodies = BTreeMap::new(); let mut bodies = BTreeMap::new();
let mut subjects = BTreeMap::new();
let mut payloads = vec!(); let mut payloads = vec!();
for elem in root.children() { for elem in root.children() {
if elem.is("body", ns::JABBER_CLIENT) { if elem.is("body", ns::JABBER_CLIENT) {
@ -126,6 +129,14 @@ impl<'a> TryFrom<&'a Element> for Message {
if let Some(_) = bodies.insert(lang, elem.text()) { if let Some(_) = bodies.insert(lang, elem.text()) {
return Err(Error::ParseError("Body element present twice for the same xml:lang.")); return Err(Error::ParseError("Body element present twice for the same xml:lang."));
} }
} else if elem.is("subject", ns::JABBER_CLIENT) {
for _ in elem.children() {
return Err(Error::ParseError("Unknown child in subject element."));
}
let lang = elem.attr("xml:lang").unwrap_or("").to_owned();
if let Some(_) = subjects.insert(lang, elem.text()) {
return Err(Error::ParseError("Subject element present twice for the same xml:lang."));
}
} else { } else {
let payload = if let Ok(stanza_error) = StanzaError::try_from(elem) { let payload = if let Ok(stanza_error) = StanzaError::try_from(elem) {
Some(MessagePayload::StanzaError(stanza_error)) Some(MessagePayload::StanzaError(stanza_error))
@ -156,6 +167,7 @@ impl<'a> TryFrom<&'a Element> for Message {
id: id, id: id,
type_: type_, type_: type_,
bodies: BTreeMap::new(), bodies: BTreeMap::new(),
subjects: subjects,
payloads: payloads, payloads: payloads,
}) })
} }
@ -183,6 +195,17 @@ impl<'a> Into<Element> for &'a Message {
.attr("to", self.to.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("id", self.id.clone())
.attr("type", self.type_.clone()) .attr("type", self.type_.clone())
.append(self.subjects.iter()
.map(|(lang, subject)| {
Element::builder("subject")
.ns(ns::JABBER_CLIENT)
.attr("xml:lang", match lang.as_ref() {
"" => None,
lang => Some(lang),
})
.append(subject.clone())
.build() })
.collect::<Vec<_>>())
.append(self.bodies.iter() .append(self.bodies.iter()
.map(|(lang, body)| { .map(|(lang, body)| {
Element::builder("body") Element::builder("body")
@ -230,6 +253,7 @@ mod tests {
id: None, id: None,
type_: MessageType::Normal, type_: MessageType::Normal,
bodies: BTreeMap::new(), bodies: BTreeMap::new(),
subjects: BTreeMap::new(),
payloads: vec!(), payloads: vec!(),
}; };
let elem2 = (&message).into(); let elem2 = (&message).into();
@ -253,12 +277,23 @@ mod tests {
id: None, id: None,
type_: MessageType::Chat, type_: MessageType::Chat,
bodies: bodies, bodies: bodies,
subjects: BTreeMap::new(),
payloads: vec!(), payloads: vec!(),
}; };
let elem2 = (&message).into(); let elem2 = (&message).into();
assert_eq!(elem, elem2); assert_eq!(elem, elem2);
} }
#[test]
fn test_subject() {
let elem: Element = "<message xmlns='jabber:client' to='coucou@example.org' type='chat'><subject>Hello world!</subject></message>".parse().unwrap();
let message = Message::try_from(&elem).unwrap();
assert_eq!(message.subjects[""], "Hello world!");
let elem2 = (&message).into();
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();