From d2a1c356bda2773da780648b5f5d04c3ae577a49 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot
Date: Thu, 26 Mar 2020 16:56:37 +0100
Subject: [PATCH 1/7] XEP-0369: Add missing disco#info feature in examples
Better safe than sorry, many implementations blindly follow examples,
and these were violating a MUST in XEP-0030.
---
xep-0369.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/xep-0369.xml b/xep-0369.xml
index 8ab1655e..6f11582a 100644
--- a/xep-0369.xml
+++ b/xep-0369.xml
@@ -780,6 +780,7 @@
category='conference'
name='Shakespearean Chat Service'
type='mix'/>
+
@@ -840,6 +841,7 @@
category='conference'
name='A Dark Cave'
type='mix'/>
+
@@ -1299,6 +1301,7 @@
category='conference'
name='Shakespearean Chat Service'
type='mix'/>
+
From 2b8a4638110e531b6e9c3e3468e801f3497c5490 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot
Date: Thu, 26 Mar 2020 19:39:26 +0100
Subject: [PATCH 2/7] XEP-0369: Add an identity to client example, this is a
MUST in XEP-0030.
---
xep-0369.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/xep-0369.xml b/xep-0369.xml
index 6f11582a..61483299 100644
--- a/xep-0369.xml
+++ b/xep-0369.xml
@@ -977,6 +977,10 @@
to='juliet@capulet.example/UUID-e3r/9264'
type='result'>
+
From 0ebc97c13834c7fa0a4f04bfe098a0e69f664d6e Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot
Date: Thu, 26 Mar 2020 18:51:40 +0100
Subject: [PATCH 3/7] =?UTF-8?q?XEP-0369:=20Fix=20typo=20xlns=E2=86=92xmlns?=
=?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
xep-0369.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/xep-0369.xml b/xep-0369.xml
index 61483299..48d2f5cf 100644
--- a/xep-0369.xml
+++ b/xep-0369.xml
@@ -886,7 +886,7 @@
id='kl2fax27'
to='coven@mix.shakespeare.example'
type='get'>
-
+
@@ -939,7 +939,7 @@
id='kl2fax27'
to='hag66@shakespeare.example/UUID-c8y/1573'
type='result'>
-
+
-
From 5104e1a3b872f3412956e972218ede2a58fdd290 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot
Date: Thu, 26 Mar 2020 19:12:21 +0100
Subject: [PATCH 4/7] XEP-0369: Rename info node also in the text.
---
xep-0369.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xep-0369.xml b/xep-0369.xml
index 48d2f5cf..8c26c35c 100644
--- a/xep-0369.xml
+++ b/xep-0369.xml
@@ -567,7 +567,7 @@
&xep0313; (MAM) is used for all history access, with each node being individually addressable for MAM queries. This simplifies implementation compared to MUC (which had a specialized and rather limited history retrieval mechanism).
A client can achieve a 'quick resync' of a node by requesting just those changes it has not yet received, using standard MAM protocol. This solves the MUC issue of either receiving duplicate messages when rejoining a room or potentially missing messages.
- Because MAM is used for history, only those nodes that have a 'current value' need to store any items in them — e.g., 'urn:xmpp:mix:nodes:presence' and 'urn:xmpp:mix:nodes:information' would store their current values (with older values being queryable through MAM), while 'urn:xmpp:mix:nodes:messages' would store no items.
+ Because MAM is used for history, only those nodes that have a 'current value' need to store any items in them — e.g., 'urn:xmpp:mix:nodes:presence' and 'urn:xmpp:mix:nodes:info' would store their current values (with older values being queryable through MAM), while 'urn:xmpp:mix:nodes:messages' would store no items.
A user's participation in a channel outlives their client sessions. A client which is offline will not share presence within the channel, but the associated user will still be listed as an participant.
Presence is sent to participants using bare JID, whether or not the user has an online client.
Online clients MAY register presence, which is then shared with participants who have subscribed to presence.
From 85ccb1e79664c0f4a06aef45de1bec3947ff7b0c Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot
Date: Thu, 26 Mar 2020 20:16:48 +0100
Subject: [PATCH 5/7] XEP-0369: Fix a typo.
---
xep-0369.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xep-0369.xml b/xep-0369.xml
index 8c26c35c..dd05dd10 100644
--- a/xep-0369.xml
+++ b/xep-0369.xml
@@ -1103,7 +1103,7 @@
]]>
- A user MAY specify a nick when joining the channel. Channels MAY have mandatory nicks, which is default behavior. Therefore it is will generally be necessary to include a nick when joining an channel. If nick is missing on a channel where nick is mandatory, the join MUST be rejected. Other error cases are dealt with below with the nick management commands. Where a nick is specified, the join will only complete if the nick is accepted. The nick used MUST be reported back in the join result.
+ A user MAY specify a nick when joining the channel. Channels MAY have mandatory nicks, which is default behavior. Therefore it will generally be necessary to include a nick when joining an channel. If nick is missing on a channel where nick is mandatory, the join MUST be rejected. Other error cases are dealt with below with the nick management commands. Where a nick is specified, the join will only complete if the nick is accepted. The nick used MUST be reported back in the join result.
From bb05bddeab9b215ce113d7dfd2c8ad6998bbdde2 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot
Date: Fri, 27 Mar 2020 12:19:52 +0100
Subject: [PATCH 6/7] XEP-0369: Allow unsubscribing from nodes.
The element so far was only allowing a user to
subscribe to new nodes, not unsubscribe from them. The only option if
for instance one node was too floody was to leave the channel and rejoin
it with only the nodes we wanted.
---
xep-0369.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/xep-0369.xml b/xep-0369.xml
index dd05dd10..bcdcc843 100644
--- a/xep-0369.xml
+++ b/xep-0369.xml
@@ -1080,7 +1080,7 @@
- A user MAY subsequently modify subscription to nodes in a channel by sending a subscription modification request encoded as a <update-subscription/> child element of <iq/> element. The <update-subscription/> element is qualified by the 'urn:xmpp:mix:core:1' namespace. The requested nodes are encoded as <subscribe/> child elements of the <update-subscription/> element with the node name encoded as a 'node' attribute. This modification goes directly from client to the MIX channel, as this change does not impact the roster and so does not need any local action. The following example shows subscription modification.
+ A user MAY subsequently modify subscription to nodes in a channel by sending a subscription modification request encoded as a <update-subscription/> child element of <iq/> element. The <update-subscription/> element is qualified by the 'urn:xmpp:mix:core:1' namespace. The requested nodes are encoded as <subscribe/> and <unsubscribe/> child elements of the <update-subscription/> element with the node name encoded as a 'node' attribute. This modification goes directly from client to the MIX channel, as this change does not impact the roster and so does not need any local action. The following example shows subscription modification.
+
@@ -1099,6 +1100,7 @@
+
]]>
From f3592ab95d883f1e6f3488f87a14fc9fc3952969 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot
Date: Thu, 26 Mar 2020 18:52:57 +0100
Subject: [PATCH 7/7] XEP-0369: Add a revision block.
---
xep-0369.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/xep-0369.xml b/xep-0369.xml
index bcdcc843..cf7e8c40 100644
--- a/xep-0369.xml
+++ b/xep-0369.xml
@@ -35,6 +35,17 @@
MIX-CORE
&ksmithisode;
&skille;
+
+ 0.14.4
+ 2020-03-26
+ egp
+
+ - Add missing disco#info features or identities in disco#info examples.
+ - Fix typo in examples (xlns→xmlns).
+ - Rename urn:xmpp:mix:nodes:information to urn:xmpp:mix:nodes:info in the text.
+ - Add a way to unsubscribe from nodes without leaving a channel.
+
+
0.14.3
2020-03-03