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

Merge branch 'master' of athena.jabber.org:xmpp

This commit is contained in:
stpeter 2012-01-10 12:27:48 -07:00
commit f2f9eefbe3

View File

@ -43,7 +43,7 @@ Appropriate action - alert user, attempt to rejoin MUC, whatever.
</section1>
<section1 topic='Discovery' anchor='discovery'>
<p>MUC Rooms supporting this should have a disco feature of "urn:xmpp:mfr" in caps.</p>
<p>MUC Rooms supporting this should have a disco feature of "urn:xmpp:presence-session:0" in caps.</p>
<p>To avoid extra roundtrips for discovery, clients may speculatively send elements when initially joining a MUC, and treat the absense of appropriate elements in the responses to indicate a lack of support.</p>
</section1>
@ -55,7 +55,7 @@ Appropriate action - alert user, attempt to rejoin MUC, whatever.
from='romeo@montague.lit/lane'
to='orchard@chat.capulet.lit/Romeo'>
<x xmlns='http://jabber.org/protocol/muc'/>
<presence-session xmlns="urn:xmpp:pressence-session:0"/>
<presence-session xmlns="urn:xmpp:presence-session:0"/>
</presence>
]]></example>
<p>If a client has indicated that it's using MUC Fast Reconnect on its session, the MUC service MUST annotate the presence stanzas it sends with elements containing a presence-session element with namespace "urn:xmpp:presence-session:0", a "session" attribute and an "id" attribute, described below.</p>
@ -66,7 +66,7 @@ Appropriate action - alert user, attempt to rejoin MUC, whatever.
<x xmlns='http://jabber.org/protocol/muc#user'>
<item affiliation='owner' role='moderator'/>
</x>
<presence-session xmlns="urn:xmpp:pressence-session:0" session="u8e8t2thu" id="893oehh"/>
<presence-session xmlns="urn:xmpp:presence-session:0" session="u8e8t2thu" id="893oehh"/>
</presence>
]]></example>
<p>Attributes:</p>
@ -82,7 +82,7 @@ Appropriate action - alert user, attempt to rejoin MUC, whatever.
from='romeo@montague.lit/lane'
to='orchard@chat.capulet.lit/Romeo'>
<x xmlns='http://jabber.org/protocol/muc'/>
<presence-session-resume xmlns="urn:xmpp:pressence-session:0" session="u8e8t2thu" id="893oehh"/>
<presence-session-resume xmlns="urn:xmpp:presence-session:0" session="u8e8t2thu" id="893oehh"/>
</presence>
]]></example>
<p>When the MUC room receives a room fast rejoin request, it must either first send an 'unavailable' presence from the room's bare JID, followed by a normal full join, as above, or instead of sending the full presence list for all occupants, only send those stanzas needed to get from the state represented by the client-provided session and id to the current state. All the presence stanzas (apart from the unavailable one used to reset state before a clean join) MUST contain the presence-session element as described above.</p>