From f4c0273dccd6b2d68281802576d85ba65372d3e9 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Fri, 15 Dec 2023 17:39:47 +0100 Subject: [PATCH 1/3] XEP-0227: Fix indentation in examples --- xep-0227.xml | 102 +++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/xep-0227.xml b/xep-0227.xml index 95959c8a7..ac4b50361 100644 --- a/xep-0227.xml +++ b/xep-0227.xml @@ -234,16 +234,16 @@ - Neither, fair saint, if either thee dislike. - - Offline Storage - - + from='romeo@montague.net/orchard' + to='juliet@capulet.com/balcony' + type='chat'> + Neither, fair saint, if either thee dislike. + + Offline Storage + + @@ -260,9 +260,9 @@ - - Hamlet - + + Hamlet + @@ -403,15 +403,15 @@ + name='The Play's the Thing' + autojoin='true'> Romeo + name='The Orchard' + autojoin='1'> Romeo @@ -438,27 +438,27 @@ - - - - Call me but love, and I'll be new baptized; Henceforth I never will be Romeo. - - - - - - - - What man art thou that thus bescreen'd in night so stumblest on my counsel? - - - + + + + Call me but love, and I'll be new baptized; Henceforth I never will be Romeo. + + + + + + + + What man art thou that thus bescreen'd in night so stumblest on my counsel? + + + @@ -506,8 +506,8 @@ name='juliet'> + name='Romeo' + subscription='both'> Friends @@ -516,14 +516,14 @@ + from='romeo@montague.net/orchard' + to='juliet@capulet.com/balcony' + type='chat'> Neither, fair saint, if either thee dislike. - Offline Storage + from='capulet.com' + stamp='1469-07-21T00:32:29Z'> + Offline Storage @@ -588,8 +588,8 @@ - - + + @@ -598,8 +598,8 @@ - - + + @@ -609,7 +609,7 @@ - + From 8cc38708b141df8cf3c2d6093df47fbe597ca1b2 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Fri, 15 Dec 2023 19:34:53 +0100 Subject: [PATCH 2/3] XEP-0227: Add support for MUC export --- xep-0227.xml | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 141 insertions(+), 1 deletion(-) diff --git a/xep-0227.xml b/xep-0227.xml index ac4b50361..16425607d 100644 --- a/xep-0227.xml +++ b/xep-0227.xml @@ -16,8 +16,11 @@ Council XMPP IM + XEP-0004 + XEP-0045 XEP-0049 XEP-0054 + XEP-0068 @@ -94,12 +97,16 @@

  • All user data is stored, but no server configuration data.

    User data has similar form throughout the XMPP world, but server configuration is implementation-specific. Therefore this specification does not attempt to transfer any aspects of the server configuration from one server to another.

    -

    Furthermore, the contents of MUC, Pubsub and other services are out of scope for this specification.

    +

    Furthermore, the contents of Pubsub and other services are out of scope for this specification.

  • Multiple virtual hosts are supported.

    Many server implementations can serve several hostnames in a single server instance. Thus this specification allows storing data from several virtual hosts.

    • +
  • +

    &xep0045; rooms are supported.

    +

    Many servers offer a service for storing persistent rooms. This specification allows them to be defined in any virtual host, but some server software might apply additional restrictions.

    +
    • @@ -466,6 +473,129 @@ ]]> + + +

    A server MAY host a &xep0045; service, in which case it SHOULD be included in an export.

    +

    This specification defines the <room/> element, with currently four extension points:

    +
      +
    • The <x/> element, qualified by the 'http://jabber.org/protocol/muc#user' namespace, contains the affiliations of this room.
      • +
    • The <query/> element, qualified by the 'http://jabber.org/protocol/muc#owner' namespace, contains the configuration of this room, in a data form (see &xep0004;) qualified by the 'http://jabber.org/protocol/muc#roomconfig' FORM_TYPE (see &xep0068;).
      • +
    • The <archive/> element, qualified by the 'urn:xmpp:pie:0#mam' namespace, contains the archives of this room, as defined in the previous section.
      • +
    • The <vCard/> element, qualified by the 'vcard-temp' namespace, contains exclusively the avatar of this room and its Content-Type, as defined in a previous section.
      • +
    + + + + + + + + + + + + + http://jabber.org/protocol/muc#roomconfig + + + A Dark Cave + + + The place for all good witches! + + + 0 + + + 1 + + + 0 + + + anyone + + + 10 + + + 0 + + + 0 + + + 0 + + + 0 + + + 1 + + + cauldronburn + + + moderators + + + 50 + + + wiccarocks@shakespeare.lit + crone1@shakespeare.lit + + + + + + + + + Thrice the brinded cat hath mew'd. + + + + + + + + + + + Thrice and once the hedge-pig whined. + + + + + + + + + + image/png + + Base64-encoded-avatar-file-here! + + + + + + +]]> +     @@ -589,6 +719,7 @@ + @@ -614,6 +745,15 @@     + + + + + + + + + ]]> From db303941fbfcf3ac287a4480121756e420166c9c Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Fri, 15 Dec 2023 19:35:20 +0100 Subject: [PATCH 3/3] XEP-0227: Release version 1.2.0! --- xep-0227.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/xep-0227.xml b/xep-0227.xml index 16425607d..6443db809 100644 --- a/xep-0227.xml +++ b/xep-0227.xml @@ -41,6 +41,15 @@ waqas@jaim.at &mwild; + + 1.2.0 + 2023-12-15 + egp +
      +
    • Reformat examples to fix indentation.
      • +
    • Add MUC support, with configuration, affiliations, MAM and vCard-temp support.
      • +
    +     1.1 2021-06-02