1
0
mirror of https://github.com/moparisthebest/xeps synced 2024-11-23 01:32:22 -05:00

Reference latest core (core:1);

Bump namespace to pam:2;
This commit is contained in:
Steve Kille 2019-09-30 11:32:00 +01:00
parent 0a237b1b9c
commit 03b03ffd2c

View File

@ -38,6 +38,15 @@
<shortname>MIX-PAM</shortname> <shortname>MIX-PAM</shortname>
&ksmithisode; &ksmithisode;
&skille; &skille;
<revision>
<version>0.5.0</version>
<date>2019-09-30</date>
<initials>sek</initials>
<remark>
Reference latest core (core:1);
Bump namespace to pam:2;
</remark>
</revision>
<revision> <revision>
<version>0.4.1</version> <version>0.4.1</version>
<date>2019-04-30</date> <date>2019-04-30</date>
@ -153,7 +162,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa
id='77E07BB0-55CF-4BD4-890E-3F7C0E686BBD' id='77E07BB0-55CF-4BD4-890E-3F7C0E686BBD'
type='groupchat'> type='groupchat'>
<body>Harpier cries: 'tis time, 'tis time.</body> <body>Harpier cries: 'tis time, 'tis time.</body>
<mix xmlns='urn:xmpp:mix:core:0'> <mix xmlns='urn:xmpp:mix:core:1'>
<nick>thirdwitch</nick> <nick>thirdwitch</nick>
<jid>hag66@shakespeare.example</jid> <jid>hag66@shakespeare.example</jid>
</mix> </mix>
@ -172,7 +181,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa
id='77E07BB0-55CF-4BD4-890E-3F7C0E686BBD' id='77E07BB0-55CF-4BD4-890E-3F7C0E686BBD'
type='groupchat'> type='groupchat'>
<body>Harpier cries: 'tis time, 'tis time.</body> <body>Harpier cries: 'tis time, 'tis time.</body>
<mix xmlns='urn:xmpp:mix:core:0'> <mix xmlns='urn:xmpp:mix:core:1'>
<nick>thirdwitch</nick> <nick>thirdwitch</nick>
<jid>hag66@shakespeare.example</jid> <jid>hag66@shakespeare.example</jid>
</mix> </mix>
@ -183,7 +192,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa
id='77E07BB0-55CF-4BD4-890E-3F7C0E686BBD' id='77E07BB0-55CF-4BD4-890E-3F7C0E686BBD'
type='groupchat'> type='groupchat'>
<body>Harpier cries: 'tis time, 'tis time.</body> <body>Harpier cries: 'tis time, 'tis time.</body>
<mix xmlns='urn:xmpp:mix:core:0'> <mix xmlns='urn:xmpp:mix:core:1'>
<nick>thirdwitch</nick> <nick>thirdwitch</nick>
<jid>hag66@shakespeare.example</jid> <jid>hag66@shakespeare.example</jid>
</mix> </mix>
@ -201,7 +210,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa
<section2 topic="Client Determines MIX Capability of Client's Server" anchor="user-server-client-capability"> <section2 topic="Client Determines MIX Capability of Client's Server" anchor="user-server-client-capability">
<p> <p>
Servers supporting this specification MUST advertise this to clients for which they wish to support this specification. A client wishing to use MIX MUST check for this capability in the local server before using MIX, by verifying support for the client's account. The capability is represented by the 'urn:xmpp:mix:pam:1' feature. In addition to this the server MAY advertize the 'urn:xmpp:mix:pam:1#archive' feature, which shows that the local server archives MIX messages. Servers supporting this specification MUST advertise this to clients for which they wish to support this specification. A client wishing to use MIX MUST check for this capability in the local server before using MIX, by verifying support for the client's account. The capability is represented by the 'urn:xmpp:mix:pam:2' feature. In addition to this the server MAY advertize the 'urn:xmpp:mix:pam:2#archive' feature, which shows that the local server archives MIX messages.
</p> </p>
<example caption="Client Determines MIX Capability for Server Account"><![CDATA[ <example caption="Client Determines MIX Capability for Server Account"><![CDATA[
<iq from='hag66@shakespeare.example/UUID-c8y/1573' <iq from='hag66@shakespeare.example/UUID-c8y/1573'
@ -214,8 +223,8 @@ This approach enables flexible support of multiple clients for a MIX channel pa
to='hag66@shakespeare.example/UUID-c8y/1573' to='hag66@shakespeare.example/UUID-c8y/1573'
type='result'> type='result'>
<query xmlns='http://jabber.org/protocol/disco#info'> <query xmlns='http://jabber.org/protocol/disco#info'>
<feature var='urn:xmpp:mix:pam:1'/> <feature var='urn:xmpp:mix:pam:2'/>
<feature var='urn:xmpp:mix:pam:1#archive'/> <feature var='urn:xmpp:mix:pam:2#archive'/>
</query> </query>
</iq> </iq>
]]></example> ]]></example>
@ -238,7 +247,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa
<p>A user joins a channel by sending a MIX "client-join" command from one of the user's clients, which wraps the "join" command specified in &xep0369;. &xep0369; specifies how the join command works, and so this specification considers only the wrapping and client actions. <p>A user joins a channel by sending a MIX "client-join" command from one of the user's clients, which wraps the "join" command specified in &xep0369;. &xep0369; specifies how the join command works, and so this specification considers only the wrapping and client actions.
The &lt;client-join/&gt; is a child element of &lt;iq/&gt; element. The &lt;client-join/&gt; element is qualified by the 'urn:xmpp:mix:pam:1' namespace. The channel being joined is specified by a 'channel' attribute in the &lt;client-join/&gt; element, which is used by the server to correctly address the join. The &lt;join&gt; is specified in &xep0369; and is a child element of &lt;client-join/&gt;. The &lt;client-join/&gt; is a child element of &lt;iq/&gt; element. The &lt;client-join/&gt; element is qualified by the 'urn:xmpp:mix:pam:2' namespace. The channel being joined is specified by a 'channel' attribute in the &lt;client-join/&gt; element, which is used by the server to correctly address the join. The &lt;join&gt; is specified in &xep0369; and is a child element of &lt;client-join/&gt;.
</p> </p>
<example caption="Client sends request to local server to Join a MIX Channel"><![CDATA[ <example caption="Client sends request to local server to Join a MIX Channel"><![CDATA[
@ -246,8 +255,8 @@ This approach enables flexible support of multiple clients for a MIX channel pa
from='hag66@shakespeare.example/UUID-a1j/7533' from='hag66@shakespeare.example/UUID-a1j/7533'
to='hag66@shakespeare.example' to='hag66@shakespeare.example'
id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'> id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'>
<client-join xmlns='urn:xmpp:mix:pam:1' channel='coven@mix.shakespeare.example'> <client-join xmlns='urn:xmpp:mix:pam:2' channel='coven@mix.shakespeare.example'>
<join xmlns='urn:xmpp:mix:core:0'> <join xmlns='urn:xmpp:mix:core:1'>
<subscribe node='urn:xmpp:mix:nodes:messages'/> <subscribe node='urn:xmpp:mix:nodes:messages'/>
<subscribe node='urn:xmpp:mix:nodes:presence'/> <subscribe node='urn:xmpp:mix:nodes:presence'/>
<subscribe node='urn:xmpp:mix:nodes:participants'/> <subscribe node='urn:xmpp:mix:nodes:participants'/>
@ -264,7 +273,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa
from='hag66@shakespeare.example' from='hag66@shakespeare.example'
to='coven@mix.shakespeare.example' to='coven@mix.shakespeare.example'
id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'> id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'>
<join xmlns='urn:xmpp:mix:core:0'> <join xmlns='urn:xmpp:mix:core:1'>
<subscribe node='urn:xmpp:mix:nodes:messages'/> <subscribe node='urn:xmpp:mix:nodes:messages'/>
<subscribe node='urn:xmpp:mix:nodes:presence'/> <subscribe node='urn:xmpp:mix:nodes:presence'/>
<subscribe node='urn:xmpp:mix:nodes:participants'/> <subscribe node='urn:xmpp:mix:nodes:participants'/>
@ -282,7 +291,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa
from='coven@mix.shakespeare.example' from='coven@mix.shakespeare.example'
to='hag66@shakespeare.example' to='hag66@shakespeare.example'
id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'> id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'>
<join xmlns='urn:xmpp:mix:core:0' jid='123456#coven@mix.shakespeare.example'> <join xmlns='urn:xmpp:mix:core:1' jid='123456#coven@mix.shakespeare.example'>
<subscribe node='urn:xmpp:mix:nodes:messages'/> <subscribe node='urn:xmpp:mix:nodes:messages'/>
<subscribe node='urn:xmpp:mix:nodes:presence'/> <subscribe node='urn:xmpp:mix:nodes:presence'/>
<subscribe node='urn:xmpp:mix:nodes:participants'/> <subscribe node='urn:xmpp:mix:nodes:participants'/>
@ -301,8 +310,8 @@ This approach enables flexible support of multiple clients for a MIX channel pa
from='hag66@shakespeare.example' from='hag66@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'>
<client-join xmlns='urn:xmpp:mix:pam:1'> <client-join xmlns='urn:xmpp:mix:pam:2'>
<join xmlns='urn:xmpp:mix:core:0' <join xmlns='urn:xmpp:mix:core:1'
jid='123456#coven@mix.shakespeare.example'> jid='123456#coven@mix.shakespeare.example'>
<subscribe node='urn:xmpp:mix:nodes:messages'/> <subscribe node='urn:xmpp:mix:nodes:messages'/>
<subscribe node='urn:xmpp:mix:nodes:presence'/> <subscribe node='urn:xmpp:mix:nodes:presence'/>
@ -324,7 +333,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa
<section2 topic='Leaving a Channel' anchor='usecase-user-leaving'> <section2 topic='Leaving a Channel' anchor='usecase-user-leaving'>
<p>Users generally remain in a channel for an extended period of time. The process for leaving a MIX channel is specified in &xep0369;. When a user desires to leave a channel, it will issue a client-leave request to the local server. <p>Users generally remain in a channel for an extended period of time. The process for leaving a MIX channel is specified in &xep0369;. When a user desires to leave a channel, it will issue a client-leave request to the local server.
The &lt;client-leave/&gt; is a child element of &lt;iq/&gt; element. The &lt;client-leave/&gt; element is qualified by the 'urn:xmpp:mix:pam:1' namespace. The channel being left is specified by a 'channel' attribute in the &lt;client-leave/&gt; element, which is used by the server to correctly address the join. The &lt;leave&gt; is specified in &xep0369; and is a child element of &lt;client-leave/&gt;. The &lt;client-leave/&gt; is a child element of &lt;iq/&gt; element. The &lt;client-leave/&gt; element is qualified by the 'urn:xmpp:mix:pam:2' namespace. The channel being left is specified by a 'channel' attribute in the &lt;client-leave/&gt; element, which is used by the server to correctly address the join. The &lt;leave&gt; is specified in &xep0369; and is a child element of &lt;client-leave/&gt;.
This shown in the following example.</p> This shown in the following example.</p>
@ -333,9 +342,9 @@ This approach enables flexible support of multiple clients for a MIX channel pa
from='hag66@shakespeare.example/UUID-a1j/7533' from='hag66@shakespeare.example/UUID-a1j/7533'
to='hag66@shakespeare.example' to='hag66@shakespeare.example'
id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'> id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'>
<client-leave xmlns='urn:xmpp:mix:pam:1' <client-leave xmlns='urn:xmpp:mix:pam:2'
channel='coven@mix.shakespeare.example'> channel='coven@mix.shakespeare.example'>
<leave xmlns='urn:xmpp:mix:core:0'/> <leave xmlns='urn:xmpp:mix:core:1'/>
</client-leave> </client-leave>
</iq> </iq>
]]></example> ]]></example>
@ -349,7 +358,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa
from='hag66@shakespeare.example' from='hag66@shakespeare.example'
to='coven@mix.shakespeare.example' to='coven@mix.shakespeare.example'
id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'> id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'>
<leave xmlns='urn:xmpp:mix:core:0'/> <leave xmlns='urn:xmpp:mix:core:1'/>
</iq> </iq>
]]></example> ]]></example>
@ -361,7 +370,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa
from='coven@mix.shakespeare.example' from='coven@mix.shakespeare.example'
to='hag66@shakespeare.example' to='hag66@shakespeare.example'
id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'> id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'>
<leave xmlns='urn:xmpp:mix:core:0'/> <leave xmlns='urn:xmpp:mix:core:1'/>
</iq> </iq>
]]></example> ]]></example>
@ -376,8 +385,8 @@ This approach enables flexible support of multiple clients for a MIX channel pa
from='hag66@shakespeare.example' from='hag66@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'>
<client-leave xmlns='urn:xmpp:mix:pam:1'> <client-leave xmlns='urn:xmpp:mix:pam:2'>
<leave xmlns='urn:xmpp:mix:core:0'/> <leave xmlns='urn:xmpp:mix:core:1'/>
</client-leave> </client-leave>
</iq> </iq>
]]></example> ]]></example>
@ -530,7 +539,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa
<section2 topic="MAM Archive Support" anchor="usecase-mam"> <section2 topic="MAM Archive Support" anchor="usecase-mam">
<p> <p>
Archive of MIX channel messages MAY be performed by the participant's server. When this is done, the capability is advertized to MIX clients using the 'urn:xmpp:mix:pam:1#archive' feature. If archive is provided it MUST always be used, so that Archive of MIX channel messages MAY be performed by the participant's server. When this is done, the capability is advertized to MIX clients using the 'urn:xmpp:mix:pam:2#archive' feature. If archive is provided it MUST always be used, so that
where a message is sent to the participant's server and discarded because there are no active clients, it will still be archived. This means that when archiving is provided, the messages will be available in the local archive and can be picked up by clients when they come online. where a message is sent to the participant's server and discarded because there are no active clients, it will still be archived. This means that when archiving is provided, the messages will be available in the local archive and can be picked up by clients when they come online.
</p> </p>
</section2> </section2>