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

Update minidom dependency to 0.11

Browse source 
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2019-07-25 00:20:38 +02:00 • committed by Emmanuel Gil Peyrot
commit a1ae45add8
22 changed files with 236 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/data_forms.rs
View file

@ -7,7 +7,7 @@
use crate::util::error::Error;
use crate::media_element::MediaElement;
use crate::ns;
use minidom::Element;
use minidom::{Element, Node};
use std::convert::TryFrom;
generate_element!(
@ -152,13 +152,13 @@ impl From<Field> for Element {
.attr("var", field.var)
.attr("type", field.type_)
.attr("label", field.label)
.append(if field.required {
.append_all((if field.required {
Some(Element::builder("required").ns(ns::DATA_FORMS).build())
} else {
None
})
.append(field.options)
.append(
}).into_iter())
.append_all(field.options.iter().cloned().map(Element::from).map(Node::Element).into_iter())
.append_all(
field
.values
.into_iter()
@ -168,9 +168,8 @@ impl From<Field> for Element {
.append(value)
.build()
})
.collect::<Vec<_>>(),
)
.append(field.media)
.append_all(field.media.iter().cloned().map(Element::from).map(Node::Element))
.build()
}
}
@ -275,21 +274,21 @@ impl From<DataForm> for Element {
Element::builder("x")
.ns(ns::DATA_FORMS)
.attr("type", form.type_)
.append(
.append_all(
form.title
.map(|title| Element::builder("title").ns(ns::DATA_FORMS).append(title)),
)
.append(form.instructions.map(|text| {
.append_all(form.instructions.map(|text| {
Element::builder("instructions")
.ns(ns::DATA_FORMS)
.append(text)
}))
.append(if let Some(form_type) = form.form_type {
.append_all((if let Some(form_type) = form.form_type {
vec![Element::builder("field").ns(ns::DATA_FORMS).attr("var", "FORM_TYPE").attr("type", "hidden").append(Element::builder("value").ns(ns::DATA_FORMS).append(form_type).build()).build()]
} else {
vec![]
})
.append(form.fields)
}).into_iter())
.append_all(form.fields.iter().cloned().map(Element::from).map(Node::Element))
.build()
}
}