moparisthebest
/
xeps
mirror of https://github.com/moparisthebest/xeps
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'feature/mix-various' into premerge

This commit is contained in:
Jonas Schäfer 2020-12-01 18:13:03 +01:00
parent 9c0690f9d7 c727e45ca4
commit 9cc5606a41
4 changed files with 72 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xep-0369.xml
View File

@ -35,6 +35,12 @@
<shortname>MIX-CORE</shortname> <shortname>MIX-CORE</shortname>
&ksmithisode; &ksmithisode;
&skille; &skille;
<revision>
<version>0.14.6</version>
<date>2020-12-01</date>
<initials>gh/@mathieui</initials>
<remark><p>Fix minor typo</p></remark>
</revision>
<revision> <revision>
<version>0.14.5</version> <version>0.14.5</version>
<date>2020-11-03</date> <date>2020-11-03</date>
@ -537,7 +543,7 @@
</section1> </section1>
<section1 topic='Concepts' anchor='concepts'> <section1 topic='Concepts' anchor='concepts'>
<section2 topic="Comparsion to MUC" anchor="concepts-muc-comparison"> <section2 topic="Comparison to MUC" anchor="concepts-muc-comparison">
<p> <p>
This section is written as an introduction to MIX for those with detailed knowledge of &xep0045;, to summarize key differences and some rationale for the differences. For those unfamiliar with MUC, this section should be ignored. This section is written as an introduction to MIX for those with detailed knowledge of &xep0045;, to summarize key differences and some rationale for the differences. For those unfamiliar with MUC, this section should be ignored.
</p> </p>

14
xep-0403.xml
View File

@ -38,6 +38,12 @@
<shortname>MIX-PRESENCE</shortname> <shortname>MIX-PRESENCE</shortname>
&ksmithisode; &ksmithisode;
&skille; &skille;
<revision>
<version>0.3.2</version>
<date>2020-12-01</date>
<initials>gh/@mathieui</initials>
<remark>Fix incorrect namespaces</remark>
</revision>
<revision> <revision>
<version>0.3.1</version> <version>0.3.1</version>
<date>2018-11-03</date> <date>2018-11-03</date>
@ -200,7 +206,7 @@
<items node='urn:xmpp:mix:nodes:presence'> <items node='urn:xmpp:mix:nodes:presence'>
<item id='123456#coven@mix.shakespeare.example/UUID-x4r/2491'> <item id='123456#coven@mix.shakespeare.example/UUID-x4r/2491'>
<presence xmlns='jabber:client'> <presence xmlns='jabber:client'>
<mix xmlns='urn:xmpp:presence:0'> <mix xmlns='urn:xmpp:mix:presence:0'>
<jid>hecate@shakespeare.example/UUID-x4r/2491</jid> <jid>hecate@shakespeare.example/UUID-x4r/2491</jid>
<nick>thirdwitch</jid> <nick>thirdwitch</jid>
</mix> </mix>
@ -265,7 +271,7 @@ A user MAY share presence information with the channel, for one or more online c
<![CDATA[<presence from='123435#coven@mix.shakespeare.example/UUID-a1j/7533' <![CDATA[<presence from='123435#coven@mix.shakespeare.example/UUID-a1j/7533'
to='hag99@shakespeare.example' to='hag99@shakespeare.example'
id='77E07BB0-55CF-4BD4-890E-3F7C0E686BBD'> id='77E07BB0-55CF-4BD4-890E-3F7C0E686BBD'>
<mix xmlns='urn:xmpp:presence:0'> <mix xmlns='urn:xmpp:mix:presence:0'>
<jid>hecate@shakespeare.example/UUID-x4r/2491</jid> <jid>hecate@shakespeare.example/UUID-x4r/2491</jid>
<nick>thirdwitch</jid> <nick>thirdwitch</jid>
</mix> </mix>
@ -313,7 +319,7 @@ A user MAY share presence information with the channel, for one or more online c
to='hecate@shakespeare.example' to='hecate@shakespeare.example'
id='77E07BB0-55CF-4BD4-890E-3F7C0E686BBD' id='77E07BB0-55CF-4BD4-890E-3F7C0E686BBD'
type='unavailable'> type='unavailable'>
<mix xmlns='urn:xmpp:presence:0'> <mix xmlns='urn:xmpp:mix:presence:0'>
<jid>hecate@shakespeare.example/UUID-x4r/2491</jid> <jid>hecate@shakespeare.example/UUID-x4r/2491</jid>
<nick>thirdwitch</jid> <nick>thirdwitch</jid>
</mix> </mix>
@ -337,7 +343,7 @@ A user MAY share presence information with the channel, for one or more online c
to='hecate@shakespeare.example' to='hecate@shakespeare.example'
id='77E07BB0-55CF-4BD4-890E-3F7C0E686BBD' id='77E07BB0-55CF-4BD4-890E-3F7C0E686BBD'
type='unavailable'> type='unavailable'>
<mix xmlns='urn:xmpp:presence:0'> <mix xmlns='urn:xmpp:mix:presence:0'>
<jid>hecate@shakespeare.example/UUID-x4r/2491</jid> <jid>hecate@shakespeare.example/UUID-x4r/2491</jid>
<nick>thirdwitch</jid> <nick>thirdwitch</jid>
</mix> </mix>

85
xep-0404.xml
View File

@ -37,6 +37,12 @@
<shortname>MIX-ANON</shortname> <shortname>MIX-ANON</shortname>
&ksmithisode; &ksmithisode;
&skille; &skille;
<revision>
<version>0.3.1</version>
<date>2020-12-01</date>
<initials>gh/@mathieui</initials>
<remark>Various XML example cleanup and fixes</remark>
</revision>
<revision> <revision>
<version>0.3.0</version> <version>0.3.0</version>
<date>2018-06-06</date> <date>2018-06-06</date>
@ -278,21 +284,23 @@ This change means that the client will not be able to determine real JID of the
from='coven@mix.shakespeare.example' from='coven@mix.shakespeare.example'
to='hag66@shakespeare.example/UUID-a1j/7533' to='hag66@shakespeare.example/UUID-a1j/7533'
id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'> id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'>
<user-preference xmlns='urn:xmpp:mix:anon:0'> <user-preference xmlns='urn:xmpp:mix:anon:0'>
<x xmlns='jabber:x:data' type='form'> <x xmlns='jabber:x:data' type='form'>
<field var='FORM_TYPE' type='hidden'> <field var='FORM_TYPE' type='hidden'>
<value>urn:xmpp:mix:anon:0</value> <value>urn:xmpp:mix:anon:0</value>
</field> </field>
<field type='list-single' label='Preference for JID Visibility <field type='list-single' label='Preference for JID Visibility
var='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' <option label='Default Behaviour'>
<value>default</value></option> <value>default</value>
<option label='Try not to show JID'> </option>
<value>prefer not</value></option> <option label='Try not to show JID'>
</field> <value>prefer not</value>
<field type='list-single' label='Example Custom Preference' </option>
var='Custom Preference'> </field>
<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>
@ -308,41 +316,42 @@ This change means that the client will not be able to determine real JID of the
from='hag66@shakespeare.example/UUID-a1j/7533' from='hag66@shakespeare.example/UUID-a1j/7533'
to='coven@mix.shakespeare.example' to='coven@mix.shakespeare.example'
id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'> id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'>
<user-preference xmlns='urn:xmpp:mix:anon:0'/> <user-preference xmlns='urn:xmpp:mix:anon:0'>
<x xmlns='jabber:x:data' type='submit'> <x xmlns='jabber:x:data' type='submit'>
<field var='FORM_TYPE' type='hidden'> <field var='FORM_TYPE' type='hidden'>
<value>urn:xmpp:mix:anon:0</value> <value>urn:xmpp:mix:anon:0</value>
</field> </field>
<field var='JID Visibility'> <field var='JID Visibility'>
<value>never</value> <value>never</value>
</field> </field>
<field var='Private Messages'> <field var='Private Messages'>
<value>allow</value> <value>allow</value>
</field> </field>
<field var='vCard'> <field var='vCard'>
<value>block</value> <value>block</value>
</field> </field>
</x> </x>
</user-preference>
</iq> </iq>
<iq type='result' <iq type='result'
from='coven@mix.shakespeare.example' from='coven@mix.shakespeare.example'
to='hag66@shakespeare.example/UUID-a1j/7533' to='hag66@shakespeare.example/UUID-a1j/7533'
id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'> id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'>
<user-preference xmlns='urn:xmpp:mix:anon:0'> <user-preference xmlns='urn:xmpp:mix:anon:0'>
<x xmlns='jabber:x:data' type='result'> <x xmlns='jabber:x:data' type='result'>
<field var='FORM_TYPE' type='hidden'> <field var='FORM_TYPE' type='hidden'>
<value>urn:xmpp:mix:anon:0</value> <value>urn:xmpp:mix:anon:0</value>
</field> </field>
<field var='JID Visibility'> <field var='JID Visibility'>
<value>never</value> <value>never</value>
</field> </field>
<field var='Private Messages'> <field var='Private Messages'>
<value>allow</value> <value>allow</value>
</field> </field>
<field var='vCard'> <field var='vCard'>
<value>block</value> <value>block</value>
</field> </field>
</x> </x>
</user-preference> </user-preference>
</iq> </iq>

10
xep-0408.xml
View File

@ -35,6 +35,12 @@
<shortname>MIX-MUC</shortname> <shortname>MIX-MUC</shortname>
&ksmithisode; &ksmithisode;
&skille; &skille;
<revision>
<version>0.1.1</version>
<date>2020-12-01</date>
<initials>gh/@mathieui</initials>
<remark>Fix minor XML formatting issues</remark>
</revision>
<revision> <revision>
<version>0.1.0</version> <version>0.1.0</version>
<date>2018-05-21</date> <date>2018-05-21</date>
@ -87,7 +93,7 @@
type='text'/> type='text'/>
<feature var='urn:xmpp:mix:core:0'/> <feature var='urn:xmpp:mix:core:0'/>
<feature var='http://jabber.org/protocol/muc'/> <feature var='http://jabber.org/protocol/muc'/>
<feature var='urn:xmpp:mix:core:0#searchable'> <feature var='urn:xmpp:mix:core:0#searchable'/>
</query> </query>
</iq> </iq>
]]></example> ]]></example>
@ -103,7 +109,7 @@
id='lx09df27' id='lx09df27'
to='mix.shakespeare.example' to='mix.shakespeare.example'
type='get'> type='get'>
<query xmlns='http://jabber.org/protocol/disco#info'> <query xmlns='http://jabber.org/protocol/disco#info'/>
</iq> </iq>
<iq from='mix.shakespeare.example' <iq from='mix.shakespeare.example'