mirror of https://github.com/moparisthebest/xeps
Merge branch 'feature/mix-various' into premerge
This commit is contained in:
Jonas Schäfer
commit
9cc5606a41
|
|
@ -35,6 +35,12 @@
|
|||
<shortname>MIX-CORE</shortname>
|
||||
&ksmithisode;
|
||||
&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>
|
||||
<version>0.14.5</version>
|
||||
<date>2020-11-03</date>
|
||||
|
|
@ -537,7 +543,7 @@
|
|||
</section1>
|
||||
|
||||
<section1 topic='Concepts' anchor='concepts'>
|
||||
<section2 topic="Comparsion to MUC" anchor="concepts-muc-comparison">
|
||||
<section2 topic="Comparison to MUC" anchor="concepts-muc-comparison">
|
||||
<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.
|
||||
</p>
|
||||
|
|
|
|||
14
xep-0403.xml
14
xep-0403.xml
|
|
@ -38,6 +38,12 @@
|
|||
<shortname>MIX-PRESENCE</shortname>
|
||||
&ksmithisode;
|
||||
&skille;
|
||||
<revision>
|
||||
<version>0.3.2</version>
|
||||
<date>2020-12-01</date>
|
||||
<initials>gh/@mathieui</initials>
|
||||
<remark>Fix incorrect namespaces</remark>
|
||||
</revision>
|
||||
<revision>
|
||||
<version>0.3.1</version>
|
||||
<date>2018-11-03</date>
|
||||
|
|
@ -200,7 +206,7 @@
|
|||
<items node='urn:xmpp:mix:nodes:presence'>
|
||||
<item id='123456#coven@mix.shakespeare.example/UUID-x4r/2491'>
|
||||
<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>
|
||||
<nick>thirdwitch</jid>
|
||||
</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'
|
||||
to='hag99@shakespeare.example'
|
||||
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>
|
||||
<nick>thirdwitch</jid>
|
||||
</mix>
|
||||
|
|
@ -313,7 +319,7 @@ A user MAY share presence information with the channel, for one or more online c
|
|||
to='hecate@shakespeare.example'
|
||||
id='77E07BB0-55CF-4BD4-890E-3F7C0E686BBD'
|
||||
type='unavailable'>
|
||||
<mix xmlns='urn:xmpp:presence:0'>
|
||||
<mix xmlns='urn:xmpp:mix:presence:0'>
|
||||
<jid>hecate@shakespeare.example/UUID-x4r/2491</jid>
|
||||
<nick>thirdwitch</jid>
|
||||
</mix>
|
||||
|
|
@ -337,7 +343,7 @@ A user MAY share presence information with the channel, for one or more online c
|
|||
to='hecate@shakespeare.example'
|
||||
id='77E07BB0-55CF-4BD4-890E-3F7C0E686BBD'
|
||||
type='unavailable'>
|
||||
<mix xmlns='urn:xmpp:presence:0'>
|
||||
<mix xmlns='urn:xmpp:mix:presence:0'>
|
||||
<jid>hecate@shakespeare.example/UUID-x4r/2491</jid>
|
||||
<nick>thirdwitch</jid>
|
||||
</mix>
|
||||
|
|
|
|||
17
xep-0404.xml
17
xep-0404.xml
|
|
@ -37,6 +37,12 @@
|
|||
<shortname>MIX-ANON</shortname>
|
||||
&ksmithisode;
|
||||
&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>
|
||||
<version>0.3.0</version>
|
||||
<date>2018-06-06</date>
|
||||
|
|
@ -286,10 +292,12 @@ This change means that the client will not be able to determine real JID of the
|
|||
<field type='list-single' label='Preference for JID Visibility
|
||||
var='JID Visibility'>
|
||||
<option label='JID Never Shown'><value>Never</value></option>
|
||||
<option label='Default Behaviour'
|
||||
<value>default</value></option>
|
||||
<option label='Default Behaviour'>
|
||||
<value>default</value>
|
||||
</option>
|
||||
<option label='Try not to show JID'>
|
||||
<value>prefer not</value></option>
|
||||
<value>prefer not</value>
|
||||
</option>
|
||||
</field>
|
||||
<field type='list-single' label='Example Custom Preference'
|
||||
var='Custom Preference'>
|
||||
|
|
@ -308,7 +316,7 @@ This change means that the client will not be able to determine real JID of the
|
|||
from='hag66@shakespeare.example/UUID-a1j/7533'
|
||||
to='coven@mix.shakespeare.example'
|
||||
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'>
|
||||
<field var='FORM_TYPE' type='hidden'>
|
||||
<value>urn:xmpp:mix:anon:0</value>
|
||||
|
|
@ -323,6 +331,7 @@ This change means that the client will not be able to determine real JID of the
|
|||
<value>block</value>
|
||||
</field>
|
||||
</x>
|
||||
</user-preference>
|
||||
</iq>
|
||||
|
||||
<iq type='result'
|
||||
|
|
|
|||
10
xep-0408.xml
10
xep-0408.xml
|
|
@ -35,6 +35,12 @@
|
|||
<shortname>MIX-MUC</shortname>
|
||||
&ksmithisode;
|
||||
&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>
|
||||
<version>0.1.0</version>
|
||||
<date>2018-05-21</date>
|
||||
|
|
@ -87,7 +93,7 @@
|
|||
type='text'/>
|
||||
<feature var='urn:xmpp:mix:core:0'/>
|
||||
<feature var='http://jabber.org/protocol/muc'/>
|
||||
<feature var='urn:xmpp:mix:core:0#searchable'>
|
||||
<feature var='urn:xmpp:mix:core:0#searchable'/>
|
||||
</query>
|
||||
</iq>
|
||||
]]></example>
|
||||
|
|
@ -103,7 +109,7 @@
|
|||
id='lx09df27'
|
||||
to='mix.shakespeare.example'
|
||||
type='get'>
|
||||
<query xmlns='http://jabber.org/protocol/disco#info'>
|
||||
<query xmlns='http://jabber.org/protocol/disco#info'/>
|
||||
</iq>
|
||||
|
||||
<iq from='mix.shakespeare.example'
|
||||
|
|
|
|||
Loading…
Reference in New Issue