moparisthebest/xeps
1
0
Fork 0
mirror of https://github.com/moparisthebest/xeps synced 2024-11-28 04:02:20 -05:00
Code Issues Releases Wiki Activity

Revert "XEP-0060: Add pubsub#public in Publish-Subscribe features"

Browse Source 
This reverts commit 7bc015cfea. It
was merged accidentally and prematurely.
This commit is contained in:
Jonas Schäfer 2019-08-20 18:25:44 +02:00
parent e69cfab890
commit 6a8871d045
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xep-0060.xml
View File

@ -921,7 +921,6 @@ And by opposing end them?
<section2 topic='Discover Nodes' anchor='entity-nodes'> <section2 topic='Discover Nodes' anchor='entity-nodes'>
<p>If a service implements a hierarchy of nodes (by means of <link url='#collections'>Collection Nodes</link>), it MUST also enable entities to discover the nodes in that hierarchy by means of the <strong>Service Discovery</strong> protocol, subject to the recommendations in <cite>XEP-0030</cite> regarding large result sets (for which &xep0055; or some other protocol SHOULD be used). The following examples show the use of service discovery in discovering the nodes available at a hierarchical pubsub service.</p> <p>If a service implements a hierarchy of nodes (by means of <link url='#collections'>Collection Nodes</link>), it MUST also enable entities to discover the nodes in that hierarchy by means of the <strong>Service Discovery</strong> protocol, subject to the recommendations in <cite>XEP-0030</cite> regarding large result sets (for which &xep0055; or some other protocol SHOULD be used). The following examples show the use of service discovery in discovering the nodes available at a hierarchical pubsub service.</p>
<p>Note: Node hierarchies and collection nodes are OPTIONAL. For details, refer to the <link url='#impl-semantics'>NodeID Semantics</link> and <link url='#collections'>Collection Nodes</link> sections of this document.</p> <p>Note: Node hierarchies and collection nodes are OPTIONAL. For details, refer to the <link url='#impl-semantics'>NodeID Semantics</link> and <link url='#collections'>Collection Nodes</link> sections of this document.</p>
<p>The service SHOULD return a full list of the public nodes it hosts (i.e., not return any nodes that don't contain the "http://jabber.org/protocol/pubsub#public" feature or that have the feature set to false).</p>
<p>In the first example, an entity sends a service discovery items ("disco#items") request to the root node (i.e., the service itself), which is a <link url='#collections'>Collection Node</link>:</p> <p>In the first example, an entity sends a service discovery items ("disco#items") request to the root node (i.e., the service itself), which is a <link url='#collections'>Collection Node</link>:</p>
<example caption='Entity asks service for all first-level nodes'><![CDATA[ <example caption='Entity asks service for all first-level nodes'><![CDATA[
<iq type='get' <iq type='get'
@ -1068,9 +1067,6 @@ And by opposing end them?
<field var='pubsub#contact' label='People to contact with questions' type='jid-multi'> <field var='pubsub#contact' label='People to contact with questions' type='jid-multi'>
<value>bard@shakespeare.lit</value> <value>bard@shakespeare.lit</value>
</field> </field>
<field var='pubsub#public' label='Make node publicly searchable' type='boolean'>
<value>1</value>
</field>
<field var='pubsub#access_model' label='Access model' type='list-single'> <field var='pubsub#access_model' label='Access model' type='list-single'>
<value>open</value> <value>open</value>
</field> </field>
@ -5234,12 +5230,6 @@ And by opposing end them?
<td>RECOMMENDED</td> <td>RECOMMENDED</td>
<td><link url='#auto-subscribe'>Auto-Subscribe</link></td> <td><link url='#auto-subscribe'>Auto-Subscribe</link></td>
</tr> </tr>
<tr>
<td>public</td>
<td>Public searching for a node is supported.</td>
<td>OPTIONAL</td>
<td><link url='#entity-nodes'>Discover Nodes</link></td>
</tr>
<tr> <tr>
<td>publish</td> <td>publish</td>
<td>Publishing items is supported.</td> <td>Publishing items is supported.</td>
@ -6126,11 +6116,6 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings;item=ae
<desc>Implicit presence-based subscriptions are supported.</desc> <desc>Implicit presence-based subscriptions are supported.</desc>
<doc>XEP-0060</doc> <doc>XEP-0060</doc>
</var> </var>
<var>
<name>http://jabber.org/protocol/pubsub#public</name>
<desc>Public searching for a node is supported.</desc>
<doc>XEP-0060</doc>
</var>
<var> <var>
<name>http://jabber.org/protocol/pubsub#publish</name> <name>http://jabber.org/protocol/pubsub#publish</name>
<desc>Publishing items is supported.</desc> <desc>Publishing items is supported.</desc>
@ -6953,7 +6938,6 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
<xs:enumeration value='persistent-items'/> <xs:enumeration value='persistent-items'/>
<xs:enumeration value='presence-notifications'/> <xs:enumeration value='presence-notifications'/>
<xs:enumeration value='presence-subscribe'/> <xs:enumeration value='presence-subscribe'/>
<xs:enumeration value='public'/>
<xs:enumeration value='publish'/> <xs:enumeration value='publish'/>
<xs:enumeration value='publish-options'/> <xs:enumeration value='publish-options'/>
<xs:enumeration value='publish-only-affiliation'/> <xs:enumeration value='publish-only-affiliation'/>