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

parsers: update for minidom API changes

Browse source 
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2020-03-28 13:07:26 +01:00
commit 6308250c17
26 changed files with 140 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

21
xmpp-parsers/src/data_forms.rs
View file

@ -147,13 +147,12 @@ impl TryFrom<Element> for Field {
impl From<Field> for Element {
fn from(field: Field) -> Element {
Element::builder("field")
.ns(ns::DATA_FORMS)
Element::builder("field", ns::DATA_FORMS)
.attr("var", field.var)
.attr("type", field.type_)
.attr("label", field.label)
.append_all(if field.required {
Some(Element::builder("required").ns(ns::DATA_FORMS))
Some(Element::builder("required", ns::DATA_FORMS))
} else {
None
})
@ -162,7 +161,7 @@ impl From<Field> for Element {
field
.values
.into_iter()
.map(|value| Element::builder("value").ns(ns::DATA_FORMS).append(value)),
.map(|value| Element::builder("value", ns::DATA_FORMS).append(value)),
)
.append_all(field.media.iter().cloned().map(Element::from))
.build()
@ -266,26 +265,22 @@ impl TryFrom<Element> for DataForm {
impl From<DataForm> for Element {
fn from(form: DataForm) -> Element {
Element::builder("x")
.ns(ns::DATA_FORMS)
Element::builder("x", ns::DATA_FORMS)
.attr("type", form.type_)
.append_all(
form.title
.map(|title| Element::builder("title").ns(ns::DATA_FORMS).append(title)),
.map(|title| Element::builder("title", ns::DATA_FORMS).append(title)),
)
.append_all(form.instructions.map(|text| {
Element::builder("instructions")
.ns(ns::DATA_FORMS)
Element::builder("instructions", ns::DATA_FORMS)
.append(text)
}))
.append_all(form.form_type.map(|form_type| {
Element::builder("field")
.ns(ns::DATA_FORMS)
Element::builder("field", ns::DATA_FORMS)
.attr("var", "FORM_TYPE")
.attr("type", "hidden")
.append(
Element::builder("value")
.ns(ns::DATA_FORMS)
Element::builder("value", ns::DATA_FORMS)
.append(form_type),
)
}))