From 692ce446574afd9ba8725a1df91453dd55baec61 Mon Sep 17 00:00:00 2001
From: Guus der Kinderen <guus.der.kinderen@gmail.com>
Date: Fri, 22 Dec 2023 11:23:41 +0100
Subject: [PATCH] PubSub Server Info: replace data form fields with URI

As per Flow's suggestion, replace two data form fields that hold a pub-sub service address and node with one field, that uses a URI to identify the same pub-sub node.
---
 inbox/pubsub-server-info.xml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/inbox/pubsub-server-info.xml b/inbox/pubsub-server-info.xml
index d63a0438..4b750f62 100644
--- a/inbox/pubsub-server-info.xml
+++ b/inbox/pubsub-server-info.xml
@@ -46,7 +46,7 @@
   </section1>
 <section1 topic="Discovering Support" anchor="disco">
   <p>Domains supporting the publication of Server Information data, as described in this document, MUST advertise the fact by announcing a &xep0030; feature of 'urn:xmpp:serverinfo:0'. This signifies that an administrative entity approved the publication of data, which is important for the opt-in mechanism described in <link url="#privacy">Privacy Considerations section</link> of this document.</p>
-  <p>The pub-sub service address and node in which Server Information data is advertised SHOULD be specified using a &xep0128;. These pub-sub coordinates MUST be scoped using a FORM_TYPE of "http://jabber.org/network/serverinfo" (as specified in XEP-0157) and data form fields registered for this purpose as defined in the <link url="#registrar">XMPP Registrar Considerations section</link> of this document.</p>
+  <p>The pub-sub service address and node in which Server Information data is advertised SHOULD be specified using a &xep0128;, using an URI as specified in section 12.22 of XEP-0060. These pub-sub coordinates MUST be scoped using a FORM_TYPE of "http://jabber.org/network/serverinfo" (as specified in XEP-0157) and data form field registered for this purpose as defined in the <link url="#registrar">XMPP Registrar Considerations section</link> of this document.</p>
   <p>When the 'urn:xmpp:serverinfo:0' feature but no corresponding Service Discovery Extension is advertised, the node that is used will be a first-level leaf node using the name 'serverinfo' on the first pub-sub service advertised through service discovery.</p>
   <example caption="Service Discovery information request"><![CDATA[
 <iq type='get'
@@ -68,11 +68,8 @@
       <field var='FORM_TYPE' type='hidden'>
         <value>http://jabber.org/network/serverinfo</value>
       </field>
-      <field var='serverinfo-pubsub-service'>
-        <value>pubsub.shakespeare.lit</value>
-      </field>      
       <field var='serverinfo-pubsub-node'>
-        <value>serverinfo</value>
+        <value>xmpp:pubsub.shakespeare.lit?;node=serverinfo</value>
       </field>      
     </x>
   </query>
@@ -191,14 +188,10 @@
   <desc>
     Forms advertising the coordinates of a pub-sub service and node for publication of Server Information data.
   </desc>
-  <field
-      var='serverinfo-pubsub-service'
-      type='list-multi'
-      label='The address of a pub-sub service that hosts a node on which Server Information data is published.'/>
   <field
       var='serverinfo-pubsub-node'
-      type='list-multi'
-      label='A nodeId on which Server Information data is published.'/>
+      type='text-single'
+      label='An URI (per XEP-0060 section 12.22) identifying the pub-sub node on which Server Information data is published.'/>
 </form_type>
 ]]></code>
     <p>Note that the FORM_TYPE used by &xep0157; is purposefully re-used by this XEP, to circumvent the restriction of having at most one XMPP Standards Foundation defined FORM_TYPE for a service discovery identity, as defined in &xep0128;. When a service supports both features, the data in both forms SHOULD be merged into one form.</p>