From f600d2227719a7efc700c6bbbc9f5daa796ed1a8 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Fri, 15 Dec 2023 19:37:09 +0100 Subject: [PATCH 1/2] XEP-0313: Fix MUC archive example MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It had duplicated ids, and the JIDs of the witches weren’t consistent with their definition in XEP-0045. --- xep-0313.xml | 102 +++++++++++++++++++++++++++++---------------------- 1 file changed, 58 insertions(+), 44 deletions(-) diff --git a/xep-0313.xml b/xep-0313.xml index f247e68b2..910bda9aa 100644 --- a/xep-0313.xml +++ b/xep-0313.xml @@ -30,6 +30,18 @@ &mwild; &ksmith; + + 1.1.1 + 2023-12-15 + egp + +
    +
  • Fix JID and affilitation of the first two witches in the MUC example.
    • +
  • Fix duplicated 'id' in MUC example.
    • +
  • Fix indentation in examples.
    • +
+ + 1.1.0 2023-03-09 @@ -313,7 +325,9 @@ from='romeo@montague.lit/orchard' type='chat'> Call me but love, and I'll be new baptized; Henceforth I never will be Romeo. - + ]]>

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.

@@ -636,9 +650,9 @@ + to='juliet@capulet.lit/balcony' + from='romeo@montague.lit/orchard' + type='chat'> Call me but love, and I'll be new baptized; Henceforth I never will be Romeo. @@ -650,9 +664,9 @@ + to='romeo@montague.lit/orchard' + from='juliet@capulet.lit/balcony' + type='chat' id='8a54s'> What man art thou that thus bescreen'd in night so stumblest on my counsel? @@ -716,14 +730,14 @@ - - urn:xmpp:mam:2 - 2010-08-07T00:00:00Z - - - 10 - 09af3-cc343-b409f - + + urn:xmpp:mam:2 + 2010-08-07T00:00:00Z + + + 10 + 09af3-cc343-b409f + ]]> @@ -734,7 +748,7 @@ - + ]]>

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 <fin> 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'.

@@ -757,14 +771,14 @@ - - urn:xmpp:mam:2 - 2010-08-07T00:00:00Z - - - 10 - - + + urn:xmpp:mam:2 + 2010-08-07T00:00:00Z + + + 10 + + ]]> @@ -778,15 +792,15 @@ - - urn:xmpp:mam:2 - 2010-08-07T00:00:00Z - - - 10 - 09af3-cc343-b409f - - + + urn:xmpp:mam:2 + 2010-08-07T00:00:00Z + + + 10 + 09af3-cc343-b409f + + ]]> @@ -845,17 +859,17 @@

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 <x/> element qualified by the 'http://jabber.org/protocol/muc#user' namespace and containing an <item/> 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 <x> element from MUC messages (as MUC rooms are not required to do this).

- + + from='coven@chat.shakespeare.lit/firstwitch' + id='162BEBB1-F6DB-4D9A-9BD8-CFDCC801A0B2' + type='groupchat'> Thrice the brinded cat hath mew'd. - @@ -868,13 +882,13 @@ + from='coven@chat.shakespeare.lit/secondwitch' + id='90057840-30FD-4141-AA44-103EEDF218FC' + type='groupchat'> Thrice and once the hedge-pig whined. - From 17a5d238eafcd0a3e2158fa0e12be1a2367fc146 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 18 Sep 2024 10:01:13 +0200 Subject: [PATCH 2/2] Update xep-0313.xml Co-authored-by: Dan Caseley --- xep-0313.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xep-0313.xml b/xep-0313.xml index 910bda9aa..8343ca4e8 100644 --- a/xep-0313.xml +++ b/xep-0313.xml @@ -36,7 +36,7 @@ egp
    -
  • Fix JID and affilitation of the first two witches in the MUC example.
    • +
  • Fix JID and affiliation of the first two witches in the MUC example.
  • Fix duplicated 'id' in MUC example.
  • Fix indentation in examples.