moparisthebest/xeps
1
0
Fork 0
mirror of https://github.com/moparisthebest/xeps synced 2024-11-24 10:12:19 -05:00
Code Issues Releases Wiki Activity

Prepare 8.0 after summit; Fold long lines in examples

Browse Source
This commit is contained in:
Steve Kille 2017-02-07 15:19:08 +00:00 committed by Sam Whited
parent 3aff6937fb
commit 64123f94e8
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
xep-0369.xml
View File

@ -36,6 +36,14 @@
&ksmithisode; &ksmithisode;
&skille; &skille;
&stpeter; &stpeter;
<revision>
<version>0.8</version>
<date>2017-02-XX</date>
<initials>sek</initials>
<remark><p>
Update after Brussels Summit;
</p></remark>
<revision> <revision>
<version>0.7.1</version> <version>0.7.1</version>
<date>2017-01-30</date> <date>2017-01-30</date>
@ -466,7 +474,8 @@ This approach enables flexible support of multiple clients for a MIX channel pa
<value>Witches Coven</value> <value>Witches Coven</value>
</field> </field>
<field var='Description'> <field var='Description'>
<value>A location not far from the blasted heath where the three witches meet</value> <value>A location not far from the blasted heath where
the three witches meet</value>
</field> </field>
<field var='Contact'> <field var='Contact'>
<value>greymalkin@shakespeare.lit</value> <value>greymalkin@shakespeare.lit</value>
@ -746,7 +755,8 @@ This approach enables flexible support of multiple clients for a MIX channel pa
<value>Witches Coven</value> <value>Witches Coven</value>
</field> </field>
<field var='Description'> <field var='Description'>
<value>A location not far from the blasted heath where the three witches meet</value> <value>A location not far from the blasted heath where
the three witches meet</value>
</field> </field>
<field var='Contact'> <field var='Contact'>
<value>greymalkin@shakespeare.lit</value> <value>greymalkin@shakespeare.lit</value>
@ -996,12 +1006,16 @@ the participant is not be subscribed to all nodes associated with the channel (i
<field var='FORM_TYPE' type='hidden'> <field var='FORM_TYPE' type='hidden'>
<value>urn:xmpp:mix:0</value> <value>urn:xmpp:mix:0</value>
</field> </field>
<field type='list-single' label='Preference for JID Visibility' var='JID Visibility'> <field type='list-single' label='Preference for JID Visibility'
var='JID Visibility'>
<option label='JID Never Shown'><value>Never</value></option> <option label='JID Never Shown'><value>Never</value></option>
<option label='Default Behaviour'><value>Default</value></option> <option label='Default Behaviour'>
<option label='Try not to show JID'><value>Prefer Not</value></option> <value>Default</value></option>
<option label='Try not to show JID'>
<value>Prefer Not</value></option>
</field> </field>
<field type='list-single' label='Example Custom Preference' var='Custom Preference'> <field type='list-single' label='Example Custom Preference'
var='Custom Preference'>
<option label='One Option'><value>A</value></option> <option label='One Option'><value>A</value></option>
<option label='Another Option'><value>B</value></option> <option label='Another Option'><value>B</value></option>
</field> </field>
@ -1074,7 +1088,8 @@ the participant is not be subscribed to all nodes associated with the channel (i
Deletion from the participants and presence functions as if the item (channel participant) had been deleted using the PubSub retract mechanism with notification set to true. Notification of the deletion is sent to clients subscribed to the participants PubSub nodes, as shown in the example below. Deletion from the participants and presence functions as if the item (channel participant) had been deleted using the PubSub retract mechanism with notification set to true. Notification of the deletion is sent to clients subscribed to the participants PubSub nodes, as shown in the example below.
</p> </p>
<example caption="Reporting when User Leaves a Channel"><![CDATA[ <example caption="Reporting when User Leaves a Channel"><![CDATA[
<message from='coven@mix.shakespeare.example' to='hecate@shakespeare.example' id='foo'> <message from='coven@mix.shakespeare.example'
to='hecate@shakespeare.example' id='foo'>
<event xmlns='http://jabber.org/protocol/pubsub#event'> <event xmlns='http://jabber.org/protocol/pubsub#event'>
<items node='urn:xmpp:mix:nodes:participants'> <items node='urn:xmpp:mix:nodes:participants'>
<retract id='coven+123456@mix.shakespeare.example'/> <retract id='coven+123456@mix.shakespeare.example'/>
@ -1082,7 +1097,8 @@ the participant is not be subscribed to all nodes associated with the channel (i
</event> </event>
</message> </message>
<message from='coven@mix.shakespeare.example' to='hecate@shakespeare.example' id='bar'> <message from='coven@mix.shakespeare.example'
to='hecate@shakespeare.example' id='bar'>
<event xmlns='http://jabber.org/protocol/pubsub#event'> <event xmlns='http://jabber.org/protocol/pubsub#event'>
<items node='urn:xmpp:mix:nodes:presence'> <items node='urn:xmpp:mix:nodes:presence'>
<retract id='coven+123456@mix.shakespeare.example/8765'/> <retract id='coven+123456@mix.shakespeare.example/8765'/>
@ -1219,7 +1235,8 @@ the participant is not be subscribed to all nodes associated with the channel (i
<p> <p>
A user setting status is now used as an example. Unlike in &xep0045; where coming online is a special action, coming online in MIX is implicit when presence status is set. Going offline is a achieved by setting presence status to unavailable, which removes the client full JID entry from the presence node. When a user sets a presence status, the user's server sends updated presence to the MIX channel, and the MIX service then publishes the user's availability to the "urn:xmpp:mix:nodes:presence" node. If there is not an item named by the full JID of the client with updated presence status, this item is created. If there is not an item named by the full JID of the client with updated presence status, then an item is created.</p> A user setting status is now used as an example. Unlike in &xep0045; where coming online is a special action, coming online in MIX is implicit when presence status is set. Going offline is a achieved by setting presence status to unavailable, which removes the client full JID entry from the presence node. When a user sets a presence status, the user's server sends updated presence to the MIX channel, and the MIX service then publishes the user's availability to the "urn:xmpp:mix:nodes:presence" node. If there is not an item named by the full JID of the client with updated presence status, this item is created. If there is not an item named by the full JID of the client with updated presence status, then an item is created.</p>
<example caption="User Setting Presence Status"> <example caption="User Setting Presence Status">
<![CDATA[<presence xmlns='jabber:client' from=‘hag66@shakespeare.example/pda’ to='coven@mix.shakespeare.example'> <![CDATA[<presence xmlns='jabber:client' from=‘hag66@shakespeare.example/pda’
to='coven@mix.shakespeare.example'>
<show>dnd</show> <show>dnd</show>
<status>Making a Brew</status> <status>Making a Brew</status>
</presence>]]></example> </presence>]]></example>
@ -1372,8 +1389,10 @@ the participant is not be subscribed to all nodes associated with the channel (i
<result xmlns='urn:xmpp:mam:1' queryid='f27' id='28482-98726-73623'> <result xmlns='urn:xmpp:mam:1' queryid='f27' id='28482-98726-73623'>
<forwarded xmlns='urn:xmpp:forward:0'> <forwarded xmlns='urn:xmpp:forward:0'>
<delay xmlns='urn:xmpp:delay' stamp='2010-07-10T23:08:25Z'/> <delay xmlns='urn:xmpp:delay' stamp='2010-07-10T23:08:25Z'/>
<message xmlns='jabber:client' from="hag66@shakespeare.example" to="macbeth@shakespeare.lit"> <message xmlns='jabber:client' from="hag66@shakespeare.example"
<retracted xmlns='urn:xmpp:mix:0' by='hag66@shakespeare.example' time='2010-07-10T23:08:25Z'/> to="macbeth@shakespeare.lit">
<retracted xmlns='urn:xmpp:mix:0' by='hag66@shakespeare.example'
time='2010-07-10T23:08:25Z'/>
</message> </message>
</forwarded> </forwarded>
</result> </result>
@ -1871,7 +1890,8 @@ the participant is not be subscribed to all nodes associated with the channel (i
<value>Witches Coven</value> <value>Witches Coven</value>
</field> </field>
<field var='Description'> <field var='Description'>
<value>A location not far from the blasted heath where the three witches meet</value> <value>A location not far from the blasted heath where
the three witches meet</value>
</field> </field>
<field var='Contact'> <field var='Contact'>
<value>greymalkin@shakespeare.lit</value> <value>greymalkin@shakespeare.lit</value>