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

parsers: port data_forms to use derive macros

Browse source
This commit is contained in:
Jonas Schäfer 2025-04-05 13:46:03 +02:00
commit 134255d1de
10 changed files with 176 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

12
parsers/src/server_info.rs
View file

@ -36,11 +36,14 @@ impl TryFrom<DataForm> for ServerInfo {
if form.type_ != DataFormType::Result_ {
return Err(Error::Other("Wrong type of form."));
}
if form.form_type != Some(String::from(ns::SERVER_INFO)) {
if form.form_type() != Some(ns::SERVER_INFO) {
return Err(Error::Other("Wrong FORM_TYPE for form."));
}
let mut server_info = ServerInfo::default();
for field in form.fields {
if field.var.as_deref().unwrap_or("") == "FORM_TYPE" {
continue;
}
if field.type_ != FieldType::ListMulti {
return Err(Error::Other("Field is not of the required type."));
}
@ -67,9 +70,8 @@ impl TryFrom<DataForm> for ServerInfo {
impl From<ServerInfo> for DataForm {
fn from(server_info: ServerInfo) -> DataForm {
DataForm {
let mut form = DataForm {
type_: DataFormType::Result_,
form_type: Some(String::from(ns::SERVER_INFO)),
title: None,
instructions: None,
fields: vec![
@ -80,7 +82,9 @@ impl From<ServerInfo> for DataForm {
generate_address_field("security-addresses", server_info.security),
generate_address_field("support-addresses", server_info.support),
],
}
};
form.set_form_type(ns::SERVER_INFO.to_owned());
form
}
}