Allow a subscribed owner/admin to kick participants and visitors

diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl
index fec21d2f59286f26689f2fe569c6194d23c542fe..6d92b709241337522020c44acd0fbc638f830367 100644 (file)
--- a/src/mod_muc_room.erl
+++ b/src/mod_muc_room.erl
@@ -2988,6 +2988,11 @@ can_change_ra(_FAffiliation, _FRole, _TAffiliation,
 can_change_ra(_FAffiliation, moderator, _TAffiliation,
              visitor, role, none, _ServiceAf) ->
     true;
+can_change_ra(FAffiliation, subscriber, _TAffiliation,
+             visitor, role, none, _ServiceAf)
+    when (FAffiliation == owner) or
+          (FAffiliation == admin) ->
+    true;
 can_change_ra(_FAffiliation, moderator, _TAffiliation,
              visitor, role, participant, _ServiceAf) ->
     true;
@@ -3004,6 +3009,11 @@ can_change_ra(FAffiliation, _FRole, _TAffiliation,
 can_change_ra(_FAffiliation, moderator, _TAffiliation,
              participant, role, none, _ServiceAf) ->
     true;
+can_change_ra(FAffiliation, subscriber, _TAffiliation,
+             participant, role, none, _ServiceAf)
+    when (FAffiliation == owner) or
+          (FAffiliation == admin) ->
+    true;
 can_change_ra(_FAffiliation, moderator, _TAffiliation,
              participant, role, visitor, _ServiceAf) ->
     true;