Merge pull request #1280 from edhelas/feature/pubsub-social-feed-discovery-type-format

XEP-0472: Pubsub Social Feed, cleaner pubsub#type, discovery section

xep-0472.xml

@@ -32,6 +32,17 @@
       <jid>edhelas@movim.eu</jid>
       <uri>https://edhelas.movim.eu</uri>
     </author>
+    <revision>
+      <version>0.2.0</version>
+      <date>2023-04-03</date>
+      <initials>tj</initials>
+      <remark>
+        <ul>
+          <li>Change the pubsub#type to be consistent with other XEPs</li>
+          <li>Add a Discovery section</li>
+        </ul>
+      </remark>
+    </revision>
     <revision>
       <version>0.1.1</version>
       <date>2022-12-24</date>
@@ -77,6 +88,26 @@
     </dl>
   </section1>
 
+  <section1 topic='Discovery' anchor='discovery'>
+    <p>If an entity implements Pubsub Social Feed, it MUST specify the 'urn:xmpp:pubsub-social-feed:1' feature in its service discovery information features as specified in &xep0030; and the Entity Capabilities profile specified in &xep0115;.</p>
+
+    <p>If the entity is also implementing specific profiles, it MUST expose the specific feature defined in the related Pubsub type.</p>
+
+    <example caption='The entity responds with specific features profiles'><![CDATA[
+  <iq type='result'
+      id='disco1'
+      from='juliet@capulet.lit/sabo239'
+      to='romeo@montegue.lit/30d3d8'>
+    <query xmlns='http://jabber.org/protocol/disco#info'>
+      ...
+      <feature var='urn:xmpp:pubsub-social-feed:1'/>
+      <feature var='urn:xmpp:pubsub-social-feed:gallery:1'/>
+      ...
+    </query>
+  </iq>
+  ]]></example>
+  </section1>
+
   <section1 topic='Protocol' anchor='protocol'>
     <section2 topic='Location' anchor='location'>
       <p>
@@ -308,7 +339,7 @@
     </p>
 
     <section2 topic="Base profile" anchor="profile_base">
-      <p>This profile is specified by the Pubsub type "urn:xmpp:pubsub-social-feed:0" and define a generic Pubsub Social Feed that can be hosted on any Pubsub service node or &xep0163; node.</p>
+      <p>This profile is specified by the Pubsub type "urn:xmpp:pubsub-social-feed:1" and define a generic Pubsub Social Feed that can be hosted on any Pubsub service node or &xep0163; node.</p>
       <p>Those restrictions MUST be used by all the other profiles defined bellow and in other XEPs based on Pubsub Social Feed.</p>
 
       <section3 topic="Pubsub Node Configuration" anchor="profile_base_node_config">
@@ -327,7 +358,7 @@
     </section2>
 
     <section2 topic="Gallery profile" anchor="profile_gallery">
-      <p>This profile is defined by the Pubsub type "urn:xmpp:pubsub-social-gallery:0" and can be hosted on any Pubsub service.</p>
+      <p>This profile is defined by the Pubsub type "urn:xmpp:pubsub-social-feed:gallery:1" and can be hosted on any Pubsub service.</p>
       <p>All the items published in a gallery node MUST only have at least one attached picture. This picture MUST be of type "enclosure" as specified in &rfc4287;.</p>
       <example caption="An Atom attached picture"><![CDATA[
 <link rel='enclosure' href='https://capulet.lit/upload/romeo.jpg' type='image/jpeg' title='Romeo Portrait'/>
@@ -344,7 +375,7 @@
   </section1>
 
   <section1 topic='XMPP Registrar Considerations' anchor='registrar'>
-    <p>The &REGISTRAR; is requested to issue an initial namespace of "urn:xmpp:social:0" and "urn:xmpp:gallery:0".</p>
+    <p>The &REGISTRAR; is requested to issue an initial namespace of "urn:xmpp:pubsub-social-feed:1" and "urn:xmpp:pubsub-social-feed:gallery:1".</p>
   </section1>
 
   <section1 topic='XML Schema' anchor='schema'>