pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

message: Remove extra clones, and simplify Into<Element>.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-24 21:40:11 +01:00
parent 8182213666
commit 453a3635fd
1 changed files with 31 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
src/message.rs
View file

@ -97,7 +97,7 @@ impl Into<Element> for MessagePayload {
MessagePayload::StanzaId(stanza_id) => stanza_id.into(),
MessagePayload::MamResult(result) => result.into(),
MessagePayload::Unknown(elem) => elem.clone(),
MessagePayload::Unknown(elem) => elem,
}
}
}
@ -221,39 +221,36 @@ impl TryFrom<Element> for Message {
impl Into<Element> for Message {
fn into(self) -> Element {
let mut stanza = Element::builder("message")
.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())
.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()
.map(|(lang, body)| {
Element::builder("body")
.ns(ns::JABBER_CLIENT)
.attr("xml:lang", match lang.as_ref() {
"" => None,
lang => Some(lang),
})
.append(body.clone())
.build() })
.collect::<Vec<_>>())
.build();
for child in self.payloads.clone() {
stanza.append_child(child);
}
stanza
Element::builder("message")
.ns(ns::JABBER_CLIENT)
.attr("from", self.from.and_then(|value| Some(String::from(value))))
.attr("to", self.to.and_then(|value| Some(String::from(value))))
.attr("id", self.id)
.attr("type", self.type_)
.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)
.build() })
.collect::<Vec<_>>())
.append(self.bodies.iter()
.map(|(lang, body)| {
Element::builder("body")
.ns(ns::JABBER_CLIENT)
.attr("xml:lang", match lang.as_ref() {
"" => None,
lang => Some(lang),
})
.append(body)
.build() })
.collect::<Vec<_>>())
.append(self.payloads)
.build()
}
}