Merge remote-tracking branch 'origin/mitra' into mitra_2107

luz-sf · Nov 1, 2021 · 3321f44 · 3321f44
2 parents c96de09 + 0c2d252
commit 3321f44
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl
@@ -3139,6 +3139,12 @@ can_change_ra(owner, _FRole, admin, _TRole, affiliation,
 can_change_ra(owner, _FRole, owner, _TRole, affiliation,
  _Affiliation, _ServiceAf) ->
  check_owner;
+can_change_ra(admin, _FRole, admin,
+ _TRole, affiliation, none, none) ->
+ true; % Allow a admin that joined the room to de-member himself
+can_change_ra(member, participant, member,
+ participant, affiliation, none, none) ->
+ true; % Allow a member that joined the room to de-member himself
 can_change_ra(_FAffiliation, _FRole, _TAffiliation,
  _TRole, affiliation, _Value, _ServiceAf) ->
  false;