1
0
mirror of https://github.com/moparisthebest/xeps synced 2024-11-22 09:12:19 -05:00

Merge commit 'refs/pull/607/head' of https://github.com/xsf/xeps into feature/xep-369

This commit is contained in:
Jonas Wielicki 2018-03-18 12:13:29 +01:00
commit 337d19fce0

View File

@ -2381,7 +2381,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa
</iq> </iq>
]]></example> ]]></example>
</section3> </section3>
<section3 topic='Controlling Channel Partipcipants' anchor='usecase-admin-participants'> <section3 topic='Controlling Channel Participants' anchor='usecase-admin-participants'>
<p> <p>
Owners and Administrators are allowed to control which users can participate in a channel by use of Allowed and Banned lists using PubSub. These operations follow &xep0060; which sets out detailed protocol use and error handling. Owners and Administrators are allowed to control which users can participate in a channel by use of Allowed and Banned lists using PubSub. These operations follow &xep0060; which sets out detailed protocol use and error handling.
Allowed and Banned lists MAY be read by PubSub get of the Banned and Allowed Nodes. This operation MAY be used by users as controlled by 'Allowed Node Subscription' and 'Banned Node Subscription' configuration node options (default Administrators). Allowed and Banned lists MAY be read by PubSub get of the Banned and Allowed Nodes. This operation MAY be used by users as controlled by 'Allowed Node Subscription' and 'Banned Node Subscription' configuration node options (default Administrators).
@ -2419,7 +2419,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa
<pubsub xmlns='http://jabber.org/protocol/pubsub'> <pubsub xmlns='http://jabber.org/protocol/pubsub'>
<publish node='urn:xmpp:mix:nodes:allowed'> <publish node='urn:xmpp:mix:nodes:allowed'>
<item id='marlow.example'/> <item id='marlow.example'/>
</items> </publish>
</pubsub> </pubsub>
</iq> </iq>
@ -2433,7 +2433,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa
<p> <p>
JIDs can be removed from the Allowed and Banned nodes by pubsub retract command. JIDs can be removed from the Allowed and Banned nodes by pubsub retract command.
</p> </p>
<example caption="Client Removes a JID to the Banned Node" ><![CDATA[ <example caption="Client Removes a JID from the Banned Node" ><![CDATA[
<iq from='hag66@shakespeare.example/UUID-a1j/7533' <iq from='hag66@shakespeare.example/UUID-a1j/7533'
id='lx09df27' id='lx09df27'
to='mix.shakespeare.example' to='mix.shakespeare.example'
@ -2441,7 +2441,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa
<pubsub xmlns='http://jabber.org/protocol/pubsub'> <pubsub xmlns='http://jabber.org/protocol/pubsub'>
<retract node='urn:xmpp:mix:nodes:banned'> <retract node='urn:xmpp:mix:nodes:banned'>
<item id='lear@shakespeare.example'/> <item id='lear@shakespeare.example'/>
</items> </retract>
</pubsub> </pubsub>
</iq> </iq>