Skip to content

Commit e041b7b

Browse files
linkmauvelinkmauve
authored
XEP-0313: Fix MUC archive example
1 parent 37b33b9 commit e041b7b

File tree

1 file changed

+58
-44
lines changed

1 file changed

+58
-44
lines changed

‎xep-0313.xml

+58-44
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,18 @@
3030
</schemaloc>
3131
&mwild;
3232
&ksmith;
33+
<revision>
34+
<version>1.1.2</version>
35+
<date>2024-09-18</date>
36+
<initials>egp</initials>
37+
<remark>
38+
<ul>
39+
<li>Fix JID and affiliation of the first two witches in the MUC example.</li>
40+
<li>Fix duplicated 'id' in MUC example.</li>
41+
<li>Fix indentation in examples.</li>
42+
</ul>
43+
</remark>
44+
</revision>
3345
<revision>
3446
<version>1.1.1</version>
3547
<date>2024-02-20</date>
@@ -321,7 +333,9 @@
321333
from='[email protected]/orchard'
322334
type='chat'>
323335
<body>Call me but love, and I'll be new baptized; Henceforth I never will be Romeo.</body>
324-
<stanza-id xmlns='urn:xmpp:sid:0' by='[email protected]' id='28482-98726-73623' />
336+
<stanza-id xmlns='urn:xmpp:sid:0'
337+
by='[email protected]'
338+
id='28482-98726-73623' />
325339
</message>]]></example>
326340
<p>Note: Previous versions of this protocol did not specify any interaction with stanza-id, and clients MUST NOT interpret XEP-0359 IDs in messages as archive IDs unless the server advertises support for 'urn:xmpp:mam:2' specifically.</p>
327341
</section2>
@@ -644,9 +658,9 @@
644658
<forwarded xmlns='urn:xmpp:forward:0'>
645659
<delay xmlns='urn:xmpp:delay' stamp='2010-07-10T23:08:25Z'/>
646660
<message xmlns='jabber:client'
647-
to='[email protected]/balcony'
648-
from='[email protected]/orchard'
649-
type='chat'>
661+
to='[email protected]/balcony'
662+
from='[email protected]/orchard'
663+
type='chat'>
650664
<body>Call me but love, and I'll be new baptized; Henceforth I never will be Romeo.</body>
651665
</message>
652666
</forwarded>
@@ -658,9 +672,9 @@
658672
<forwarded xmlns='urn:xmpp:forward:0'>
659673
<delay xmlns='urn:xmpp:delay' stamp='2010-07-10T23:09:32Z'/>
660674
<message xmlns='jabber:client'
661-
to='[email protected]/orchard'
662-
from='[email protected]/balcony'
663-
type='chat' id='8a54s'>
675+
to='[email protected]/orchard'
676+
from='[email protected]/balcony'
677+
type='chat' id='8a54s'>
664678
<body>What man art thou that thus bescreen'd in night so stumblest on my counsel?</body>
665679
</message>
666680
</forwarded>
@@ -724,14 +738,14 @@
724738
<example caption='A page query using Result Set Management'><![CDATA[
725739
<iq type='set' id='q29303'>
726740
<query xmlns='urn:xmpp:mam:2'>
727-
<x xmlns='jabber:x:data' type='submit'>
728-
<field var='FORM_TYPE' type='hidden'><value>urn:xmpp:mam:2</value></field>
729-
<field var='start'><value>2010-08-07T00:00:00Z</value></field>
730-
</x>
731-
<set xmlns='http://jabber.org/protocol/rsm'>
732-
<max>10</max>
733-
<after>09af3-cc343-b409f</after>
734-
</set>
741+
<x xmlns='jabber:x:data' type='submit'>
742+
<field var='FORM_TYPE' type='hidden'><value>urn:xmpp:mam:2</value></field>
743+
<field var='start'><value>2010-08-07T00:00:00Z</value></field>
744+
</x>
745+
<set xmlns='http://jabber.org/protocol/rsm'>
746+
<max>10</max>
747+
<after>09af3-cc343-b409f</after>
748+
</set>
735749
</query>
736750
</iq>
737751
]]></example>
@@ -742,7 +756,7 @@
742756
<iq type='error' id='q29303'>
743757
<error type='cancel'>
744758
<item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
745-
</error>
759+
</error>
746760
</iq>
747761
]]></example>
748762
<p>When the results returned by the server are complete (that is: when they have not been limited by the maximum size of the result page (either as specified or enforced by the server)), the server MUST include a 'complete' attribute on the &lt;fin&gt; element, with a value of 'true'; this informs the client that it doesn't need to perform further paging to retreive the requested data. If it is not the last page of the result set, the server MUST either omit the 'complete' attribute, or give it a value of 'false'.</p>
@@ -765,14 +779,14 @@
765779
<example caption='A request for the last page in an archive'><![CDATA[
766780
<iq type='set' id='q29303'>
767781
<query xmlns='urn:xmpp:mam:2'>
768-
<x xmlns='jabber:x:data' type='submit'>
769-
<field var='FORM_TYPE' type='hidden'><value>urn:xmpp:mam:2</value></field>
770-
<field var='start'><value>2010-08-07T00:00:00Z</value></field>
771-
</x>
772-
<set xmlns='http://jabber.org/protocol/rsm'>
773-
<max>10</max>
774-
<before/>
775-
</set>
782+
<x xmlns='jabber:x:data' type='submit'>
783+
<field var='FORM_TYPE' type='hidden'><value>urn:xmpp:mam:2</value></field>
784+
<field var='start'><value>2010-08-07T00:00:00Z</value></field>
785+
</x>
786+
<set xmlns='http://jabber.org/protocol/rsm'>
787+
<max>10</max>
788+
<before/>
789+
</set>
776790
</query>
777791
</iq>
778792
]]></example>
@@ -786,15 +800,15 @@
786800
<example caption='Requesting a page that is flipped'><![CDATA[
787801
<iq type='set' id='q29309'>
788802
<query xmlns='urn:xmpp:mam:2'>
789-
<x xmlns='jabber:x:data' type='submit'>
790-
<field var='FORM_TYPE' type='hidden'><value>urn:xmpp:mam:2</value></field>
791-
<field var='start'><value>2010-08-07T00:00:00Z</value></field>
792-
</x>
793-
<set xmlns='http://jabber.org/protocol/rsm'>
794-
<max>10</max>
795-
<after>09af3-cc343-b409f</after>
796-
</set>
797-
<flip-page/>
803+
<x xmlns='jabber:x:data' type='submit'>
804+
<field var='FORM_TYPE' type='hidden'><value>urn:xmpp:mam:2</value></field>
805+
<field var='start'><value>2010-08-07T00:00:00Z</value></field>
806+
</x>
807+
<set xmlns='http://jabber.org/protocol/rsm'>
808+
<max>10</max>
809+
<after>09af3-cc343-b409f</after>
810+
</set>
811+
<flip-page/>
798812
</query>
799813
</iq>
800814
]]></example>
@@ -853,17 +867,17 @@
853867
<p>In the case of non-anonymous rooms or if the recipient of the MUC archive has the right to access the sender real JID at the time of the query, the archive message will use extended message information in an &lt;x/&gt; element qualified by the 'http://jabber.org/protocol/muc#user' namespace and containing an &lt;item/&gt; child with a 'jid' attribute specifying the occupant's full JID, as defined for non-anonymous room presence in &xep0045;. The archiving entity MUST strip any pre-existing &lt;x&gt; element from MUC messages (as MUC rooms are not required to do this).</p>
854868
<example caption='Server returns MUC messages'><![CDATA[
855869
<message id='iasd207' from='[email protected]' to='[email protected]/pda'>
856-
<result xmlns='urn:xmpp:mam:2' queryid='g27' id='34482-21985-73620'>
870+
<result xmlns='urn:xmpp:mam:2' queryid='g27' id='78527-06716-51603'>
857871
<forwarded xmlns='urn:xmpp:forward:0'>
858872
<delay xmlns='urn:xmpp:delay' stamp='2002-10-13T23:58:37Z'/>
859873
<message xmlns="jabber:client"
860-
from='[email protected]/firstwitch'
861-
id='162BEBB1-F6DB-4D9A-9BD8-CFDCC801A0B2'
862-
type='groupchat'>
874+
from='[email protected]/firstwitch'
875+
id='162BEBB1-F6DB-4D9A-9BD8-CFDCC801A0B2'
876+
type='groupchat'>
863877
<body>Thrice the brinded cat hath mew'd.</body>
864878
<x xmlns='http://jabber.org/protocol/muc#user'>
865-
<item affiliation='none'
866-
jid='witch1@shakespeare.lit'
879+
<item affiliation='owner'
880+
jid='crone1@shakespeare.lit'
867881
role='participant' />
868882
</x>
869883
</message>
@@ -876,13 +890,13 @@
876890
<forwarded xmlns='urn:xmpp:forward:0'>
877891
<delay xmlns='urn:xmpp:delay' stamp='2002-10-13T23:58:43Z'/>
878892
<message xmlns="jabber:client"
879-
from='[email protected]/secondwitch'
880-
id='90057840-30FD-4141-AA44-103EEDF218FC'
881-
type='groupchat'>
893+
from='[email protected]/secondwitch'
894+
id='90057840-30FD-4141-AA44-103EEDF218FC'
895+
type='groupchat'>
882896
<body>Thrice and once the hedge-pig whined.</body>
883897
<x xmlns='http://jabber.org/protocol/muc#user'>
884-
<item affiliation='none'
885-
jid='witch2@shakespeare.lit'
898+
<item affiliation='admin'
899+
jid='wiccarocks@shakespeare.lit'
886900
role='participant' />
887901
</x>
888902
</message>

0 commit comments

Comments
 (0)