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 more generate_element! usages to derive macros

Browse source
This commit is contained in:
Jonas Schäfer 2024-06-26 13:13:02 +02:00
commit cea246a0fc
13 changed files with 200 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

37
parsers/src/pubsub/owner.rs
View file

@ -28,17 +28,18 @@ generate_element!(
]
);
generate_element!(
/// An affiliation element.
Affiliation, "affiliation", PUBSUB_OWNER,
attributes: [
/// The node this affiliation pertains to.
jid: Required<Jid> = "jid",
/// An affiliation element.
#[derive(FromXml, IntoXml, PartialEq, Debug, Clone)]
#[xml(namespace = ns::PUBSUB_OWNER, name = "affiliation")]
pub struct Affiliation {
/// The node this affiliation pertains to.
#[xml(attribute)]
jid: Jid,
/// The affiliation you currently have on this node.
affiliation: Required<AffiliationAttribute> = "affiliation",
]
);
/// The affiliation you currently have on this node.
#[xml(attribute)]
affiliation: AffiliationAttribute,
}
generate_element!(
/// Request to configure a node.
@ -84,14 +85,14 @@ pub struct Redirect {
pub uri: String,
}
generate_element!(
/// Request to delete a node.
Purge, "purge", PUBSUB_OWNER,
attributes: [
/// The node to be configured.
node: Required<NodeName> = "node",
]
);
/// Request to clear a node.
#[derive(FromXml, IntoXml, PartialEq, Debug, Clone)]
#[xml(namespace = ns::PUBSUB_OWNER, name = "purge")]
pub struct Purge {
/// The node to be cleared.
#[xml(attribute)]
pub node: NodeName,
}
generate_element!(
/// A request for current subscriptions.

26
parsers/src/pubsub/pubsub.rs
View file

@ -12,7 +12,10 @@ use crate::pubsub::{
};
use crate::Element;
use jid::Jid;
use xso::error::{Error, FromElementError};
use xso::{
error::{Error, FromElementError},
FromXml, IntoXml,
};
// TODO: a better solution would be to split this into a query and a result elements, like for
// XEP-0030.
@ -29,17 +32,18 @@ generate_element!(
]
);
generate_element!(
/// An affiliation element.
Affiliation, "affiliation", PUBSUB,
attributes: [
/// The node this affiliation pertains to.
node: Required<NodeName> = "node",
/// An affiliation element.
#[derive(FromXml, IntoXml, PartialEq, Debug, Clone)]
#[xml(namespace = ns::PUBSUB, name = "affiliation")]
pub struct Affiliation {
/// The node this affiliation pertains to.
#[xml(attribute)]
pub node: NodeName,
/// The affiliation you currently have on this node.
affiliation: Required<AffiliationAttribute> = "affiliation",
]
);
/// The affiliation you currently have on this node.
#[xml(attribute)]
pub affiliation: AffiliationAttribute,
}
generate_element!(
/// Request to configure a new node.