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

disco: Create a mutable DiscoInfoResult at the beginning of its parsing.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-07-29 04:25:55 +01:00
parent 58760fc28d
commit 5ece20a029
1 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/disco.rs
View file

@ -99,16 +99,17 @@ impl TryFrom<Element> for DiscoInfoResult {
return Err(Error::ParseError("This is not a disco#info element.")); return Err(Error::ParseError("This is not a disco#info element."));
} }
let mut identities: Vec<Identity> = vec!(); let mut result = DiscoInfoResult {
let mut features: Vec<Feature> = vec!(); node: get_attr!(elem, "node", optional),
let mut extensions: Vec<DataForm> = vec!(); identities: vec!(),
features: vec!(),
let node = get_attr!(elem, "node", optional); extensions: vec!(),
};
for child in elem.children() { for child in elem.children() {
if child.is("feature", ns::DISCO_INFO) { if child.is("feature", ns::DISCO_INFO) {
let feature = get_attr!(child, "var", required); let feature = get_attr!(child, "var", required);
features.push(Feature { result.features.push(Feature {
var: feature, var: feature,
}); });
} else if child.is("identity", ns::DISCO_INFO) { } else if child.is("identity", ns::DISCO_INFO) {
@ -124,7 +125,7 @@ impl TryFrom<Element> for DiscoInfoResult {
let lang = get_attr!(child, "xml:lang", optional); let lang = get_attr!(child, "xml:lang", optional);
let name = get_attr!(child, "name", optional); let name = get_attr!(child, "name", optional);
identities.push(Identity { result.identities.push(Identity {
category: category, category: category,
type_: type_, type_: type_,
lang: lang, lang: lang,
@ -135,31 +136,26 @@ impl TryFrom<Element> for DiscoInfoResult {
if data_form.type_ != DataFormType::Result_ { if data_form.type_ != DataFormType::Result_ {
return Err(Error::ParseError("Data form must have a 'result' type in disco#info.")); return Err(Error::ParseError("Data form must have a 'result' type in disco#info."));
} }
match data_form.form_type { if data_form.form_type.is_none() {
Some(_) => extensions.push(data_form), return Err(Error::ParseError("Data form found without a FORM_TYPE."));
None => return Err(Error::ParseError("Data form found without a FORM_TYPE.")),
} }
result.extensions.push(data_form);
} else { } else {
return Err(Error::ParseError("Unknown element in disco#info.")); return Err(Error::ParseError("Unknown element in disco#info."));
} }
} }
if identities.is_empty() { if result.identities.is_empty() {
return Err(Error::ParseError("There must be at least one identity in disco#info.")); return Err(Error::ParseError("There must be at least one identity in disco#info."));
} }
if features.is_empty() { if result.features.is_empty() {
return Err(Error::ParseError("There must be at least one feature in disco#info.")); return Err(Error::ParseError("There must be at least one feature in disco#info."));
} }
if !features.contains(&Feature { var: ns::DISCO_INFO.to_owned() }) { if !result.features.contains(&Feature { var: ns::DISCO_INFO.to_owned() }) {
return Err(Error::ParseError("disco#info feature not present in disco#info.")); return Err(Error::ParseError("disco#info feature not present in disco#info."));
} }
Ok(DiscoInfoResult { Ok(result)
node: node,
identities: identities,
features: features,
extensions: extensions
})
} }
} }