You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by be...@apache.org on 2010/12/29 15:06:16 UTC
svn commit: r1053637 -
/mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandler.java
Author: berndf
Date: Wed Dec 29 14:06:15 2010
New Revision: 1053637
URL: http://svn.apache.org/viewvc?rev=1053637&view=rev
Log:
MUC: now finally that whole affiliation/role concept makes sense to me: becoming an Admins implies Moderator role
Modified:
mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandler.java
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandler.java?rev=1053637&r1=1053636&r2=1053637&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandler.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandler.java Wed Dec 29 14:06:15 2010
@@ -226,8 +226,10 @@ public class MUCPresenceHandler extends
if (adhocCommandsService != null && adhocCommandsService.isAdmin(newOccupantJid.getBareJID())) {
final Affiliations roomAffiliations = room.getAffiliations();
// make new occupant an Admin, but do not downgrade from Owner
+ // Admin affilitation implies Moderator role (see XEP-0045 5.1.2)
if (roomAffiliations.getAffiliation(newOccupantJid) != Affiliation.Owner) {
roomAffiliations.add(newOccupantJid, Affiliation.Admin);
+ newOccupant.setRole(Role.Moderator);
}
}