Merge branch 'feature/xep-0313' into premerge

master
Jonas Schäfer 2 years ago
commit 94ccd1f2a0

@ -28,6 +28,14 @@
</schemaloc>
&mwild;
&ksmith;
<revision>
<version>0.7.3</version>
<date>2021-03-02</date>
<initials>ssw</initials>
<remark>
<p>Add registrar section; fix another broken link to MAM-PUBSUB</p>
</remark>
</revision>
<revision>
<version>0.7.2</version>
<date>2020-09-29</date>
@ -246,7 +254,7 @@
<p>Servers MUST NOT include the &lt;stanza-id/&gt; element in messages addressed to JIDs that do not have permissions to access the archive, such as a userss outgoing messages to their contacts. However servers SHOULD include the element as a child of the forwarded message when using &xep0280;</p>
<example caption='Client receives a message that has been archived'><![CDATA[
<message to='juliet@capulet.lit/balcony'
from='romeo@montague.lit/orchard'
from='romeo@montague.lit/orchard'
type='chat'>
<body>Call me but love, and I'll be new baptized; Henceforth I never will be Romeo.</body>
<stanza-id xmlns='urn:xmpp:sid:0' by='juliet@capulet.lit' id='28482-98726-73623' />
@ -772,8 +780,11 @@
]]></example>
</section3>
<section3 topic='Pubsub archives' anchor='business-storeret-pubsub-archives'>
<p>This specification reserves the 'node' attribute of the &lt;query&gt; element for use with pubsub archives. Full details of using
this protocol to query pubsub node archives are documented in [FIXME: number to be assigned to xep-pubsub-mam].</p>
<p>
This specification reserves the 'node' attribute of the &lt;query&gt;
element for use with pubsub archives.
Its use is defined in &xep0442;.
</p>
</section3>
</section2>
<section2 topic='IDs' anchor='business-ids'>
@ -800,12 +811,12 @@
<example caption='Server responds with features'><![CDATA[
<iq type='result' id='disco1' from='juliet@capulet.lit' to='juliet@capulet.lit/balcony'>
<query xmlns='http://jabber.org/protocol/disco#info'>
...
<feature var='urn:xmpp:mam:2'/>
<feature var='urn:xmpp:mam:2#extended'/>
...
</query>
<query xmlns='http://jabber.org/protocol/disco#info'>
...
<feature var='urn:xmpp:mam:2'/>
<feature var='urn:xmpp:mam:2#extended'/>
...
</query>
</iq>
]]></example>
@ -875,6 +886,76 @@
</section1>
<section1 topic='XMPP Registrar Considerations' anchor='registrar'>
<section2 topic='Protocol Namespaces' anchor='registrar-ns'>
<p>This specification defines the following XML namespace:</p>
<ul>
<li>urn:xmpp:mam:2</li>
</ul>
<p>
Upon advancement of this specification from a status of Experimental to a
status of Draft, the &REGISTRAR; shall add the foregoing namespace to the
registry located at &DISCOFEATURES; as described in Section 4 of
&xep0053;.
</p>
<code caption='Service Discovery Features Registry Submission'><![CDATA[
<var>
<name>urn:xmpp:mam:2</name>
<desc>Support for Message Archive Management.</desc>
<doc>&xep0313;</doc>
</var>]]></code>
<p>
The &REGISTRAR; shall also add the foregoing namespace to the Jabber/XMPP
Protocol Namespaces Registry located at &NAMESPACES;.
</p>
<code caption='Jabber/XMPP Protocol Namespaces Registry Submission'><![CDATA[
<ns>
<name>urn:xmpp:mam:2</name>
<doc>&xep0313;</doc>
</ns>]]></code>
</section2>
<section2 topic='Form Types' anchor='registrar-form'>
<p>
This specification defines the following form types:
</p>
<ul>
<li>urn:xmpp:mam:2</li>
</ul>
<p>
Upon advancement of this specification from a status of Experimental to a
status of Draft, the &REGISTRAR; shall add the foregoing namespace to the
registry located at &FORMTYPES; as described in &xep0068;.
</p>
<code caption='FORM_TYPEs Registry Submission'><![CDATA[
<form_type>
<name>urn:xmpp:mam:2</name>
<doc>&xep0313;</doc>
<desc>Query for items in a message archive.</desc>
<field
var='with'
type='jid-single'
label='A JID that should appear in query results to or from attributes.'/>
<field
var='start'
type='text-single'
label='A timestamp indicating the earliest message in the query results.'/>
<field
var='end'
type='text-single'
label='A timestamp indicating the latest message in the query results.'/>
<field
var='before-id'
type='text-single'
label='A stanza ID indicating the last message in the query results.'/>
<field
var='after-id'
type='text-single'
label='A stanza ID indicating the first message in the query results.'/>
<field
var='ids'
type='text-multi'
label='A list of stanza IDs corresponding to messages that should be included in query results.'/>
</form_type>]]></code>
</section2>
</section1>
<section1 topic='Acknowledgements' anchor='acks'>

Loading…
Cancel
Save