From de29f8aad740317fb43ccc82afefbb8ace310d07 Mon Sep 17 00:00:00 2001 From: stpeter Date: Mon, 19 Sep 2011 14:31:49 -0600 Subject: [PATCH] 1.25rc6 --- xep-0045.xml | 53 ++++++++++++++++++++++------------------------------ 1 file changed, 22 insertions(+), 31 deletions(-) diff --git a/xep-0045.xml b/xep-0045.xml index 3c3078d8..4c421d51 100644 --- a/xep-0045.xml +++ b/xep-0045.xml @@ -47,8 +47,8 @@ &stpeter; - 1.25rc5 - in progress, last updated 2011-08-16 + 1.25rc6 + in progress, last updated 2011-09-19 psa
    @@ -62,6 +62,7 @@
  • Added 'id' attributes to most examples, especially message and presence stanzas generated by the room since IDs can be used for tracking purposes and ghost detection.
  • Added term "Occupant JID" to differentiate between the JID of a <room@service> and the JID of a <room@service/nick>.
  • Removed feature for requesting a unique room name (the client can simply use a UUID).
    • +
  • Removed any mention of fully-anonymous rooms, which are not supported by this specification.
  • Clarified many small points in the text and examples.
 @@ -531,16 +532,15 @@
-
Fully-Anonymous Room
A room in which the full JIDs or bare JIDs of occupants cannot be discovered by anyone, including room admins and room owners; such rooms are NOT RECOMMENDED or explicitly supported by MUC, but are possible using this protocol if a service implementation offers the appropriate configuration options; contrast with Non-Anonymous Room and Semi-Anonymous Room.
Hidden Room
A room that cannot be found by any user through normal means such as searching and service discovery; antonym: Public Room.
Members-Only Room
A room that a user cannot enter without being on the member list; antonym: Open Room.
Moderated Room
A room in which only those with "voice" are allowed to send messages to all occupants; antonym: Unmoderated Room.
 -
Non-Anonymous Room
A room in which an occupant's full JID is exposed to all other occupants, although the occupant can choose any desired room nickname; contrast with Semi-Anonymous Room and Fully-Anonymous Room.
 +
Non-Anonymous Room
A room in which an occupant's full JID is exposed to all other occupants, although the occupant can choose any desired room nickname; contrast with Semi-Anonymous Room.
Open Room
A room that anyone is allowed to enter without being on the member list; antonym: Members-Only Room.
Password-Protected Room
A room that a user cannot enter without first providing the correct password; antonym: Unsecured Room.
Persistent Room
A room that is not destroyed if the last occupant exits; antonym: Temporary Room.
Public Room
A room that can be found by any user through normal means such as searching and service discovery; antonym: Hidden Room.
 -
Semi-Anonymous Room
A room in which an occupant's full JID can be discovered by room admins only; contrast with Fully-Anonymous Room and Non-Anonymous Room.
 +
Semi-Anonymous Room
A room in which an occupant's full JID can be discovered by room admins only; contrast with Non-Anonymous Room.
Temporary Room
A room that is destroyed if the last occupant exits; antonym: Persistent Room.
Unmoderated Room
A room in which any occupant is allowed to send messages to all occupants; antonym: Moderated Room.
Unsecured Room
A room that anyone is allowed to enter without first providing the correct password; antonym: Password-Protected Room.
 @@ -2489,7 +2489,7 @@ ]]> -

The service then SHOULD forward the request to the room moderator(s) as described in the Approving Voice Requests section of this document.

+

The service then proceeds as described in the Approving Voice Requests section of this document.

@@ -2634,7 +2634,7 @@ @@ -2646,7 +2646,7 @@

The service MUST remove the kicked occupant by sending a presence stanza of type "unavailable" to each kicked occupant, including status code 307 in the extended presence information, optionally along with the reason (if provided) and the bare JID of the user who initiated the kick.

@@ -2661,7 +2661,7 @@

The inclusion of the status code assists clients in presenting their own notification messages (e.g., information appropriate to the user's locality). The optional inclusion of the reason and actor enable the kicked user to understand why he or she was kicked, and by whom if the kicked occupant would like to discuss the matter. Some commentors have complained that this opens room owners and administrators up to potential abuse; unfortunately, with great power comes great responsibility.

After removing the kicked occupant(s), the service MUST then inform the moderator of success:

@@ -2669,7 +2669,7 @@

After informing the moderator, the service MUST then inform all of the remaining occupants that the kicked occupant is no longer in the room by sending presence stanzas of type "unavailable" from the individual's roomnick (&ROOMJID;) to all the remaining occupants (just as it does when occupants exit the room of their own volition), including the status code and optionally the reason and actor.

@@ -2883,7 +2883,7 @@ -

As noted in the Requesting Voice section of this document, when a service receives a request for voice from an occupant it SHOULD forward that request to the room moderator(s). To do so, the service sends a &MESSAGE; stanza to the room moderator(s), where the &MESSAGE; stanza contains a data form asking for approval or denial of the request, as shown below.

+

As noted in the Requesting Voice section of this document, an occupant requests voice by sending a voice request data form to the service. The service then SHOULD use that voice request data form as the basis for a voice approval data form that it generates and sends to the room moderator(s). The voice approval data form is contained in a &MESSAGE; stanza, as shown below.

The service MUST add that bare JID to the ban list, MUST remove the outcast's nickname from the list of registered nicknames, and MUST inform the admin or owner of success:

@@ -2999,7 +2999,7 @@

The service MUST also remove any banned users who are in the room by sending a presence stanza of type "unavailable" to each banned occupant, including status code 301 in the extended presence information, optionally along with the reason (if provided) and the bare JID of the user who initiated the ban.

@@ -3016,7 +3016,7 @@ @@ -3047,7 +3047,7 @@ @@ -3056,7 +3056,7 @@ ]]>

The service MUST then return the list of banned users to the admin; each item MUST include the 'affiliation' and 'jid' attributes but SHOULD NOT include the 'nick' and 'role' attributes:

@@ -3072,7 +3072,7 @@ @@ -3088,7 +3088,7 @@ ]]>

After updating the ban list, the service MUST inform the admin of success:

@@ -3235,7 +3235,7 @@

In the context of a members-only room, the member list is essentially a "whitelist" of people who are allowed to enter the room. Anyone who is not a member is effectively banned from entering the room, even if their affiliation is not "outcast".

-

In the context of an open room, the member list is simply a list of users (bare JID and reserved nick) who are registered with the room. Such users cacan appear in a room roster, have their room nickname reserved, be returned in search results or FAQ queries, and the like.

+

In the context of an open room, the member list is simply a list of users (bare JID and reserved nick) who are registered with the room. Such users can appear in a room roster, have their room nickname reserved, be returned in search results or FAQ queries, and the like.

It is RECOMMENDED that only room admins have the privilege to modify the member list in members-only rooms. To do so, the admin first requests the member list by querying the room for all users with an affiliation of "member":

If room logging is now disabled, status code 171.
  • If the room is now non-anonymous, status code 172.
  • If the room is now semi-anonymous, status code 173.
    • -
  • If the room is now fully-anonymous, status code 174.

    • For any other configuration change, the room SHOULD send status code 104 so that interested occupants can retrieve the updated room configuration if desired.

    @@ -5207,14 +5206,6 @@ Inform occupants that the room is now semi-anonymous - - 174 - message - Configuration change - - Inform occupants that the room is now fully-anonymous (unused) - - 201 presence