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

mam: Replace Strings with proper wrappers, and make queryid optional as it should be.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2018-08-02 20:05:35 +02:00
parent a70ce99d91
commit d038ddddab
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/mam.rs
View file

@ -15,14 +15,20 @@ use iq::{IqGetPayload, IqSetPayload, IqResultPayload};
use data_forms::DataForm; use data_forms::DataForm;
use rsm::Set; use rsm::Set;
use forwarding::Forwarded; use forwarding::Forwarded;
use pubsub::NodeName;
use ns; use ns;
generate_id!(
/// An identifier matching a result message to the query requesting it.
QueryId
);
generate_element!( generate_element!(
Query, "query", MAM, Query, "query", MAM,
attributes: [ attributes: [
queryid: Option<String> = "queryid" => optional, queryid: Option<QueryId> = "queryid" => optional,
node: Option<String> = "node" => optional node: Option<NodeName> = "node" => optional
], ],
children: [ children: [
form: Option<DataForm> = ("x", DATA_FORMS) => DataForm, form: Option<DataForm> = ("x", DATA_FORMS) => DataForm,
@ -38,7 +44,7 @@ generate_element!(
Result_, "result", MAM, Result_, "result", MAM,
attributes: [ attributes: [
id: String = "id" => required, id: String = "id" => required,
queryid: String = "queryid" => required, queryid: Option<QueryId> = "queryid" => optional,
], ],
children: [ children: [
forwarded: Required<Forwarded> = ("forwarded", FORWARD) => Forwarded forwarded: Required<Forwarded> = ("forwarded", FORWARD) => Forwarded