diff options
| author | Badlop <badlop@process-one.net> | 2019-08-13 14:55:37 +0200 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2019-08-13 14:55:37 +0200 |
| commit | 0bb14bdc0bbb80cc8eb13bddeaa7a8ca2b2e72bc (patch) | |
| tree | 6a0299855334e12d528652d4aea3fd70e12906da /src | |
| parent | When join new room with password, set pass and password_protected (#2668) (diff) | |
Revert "Affiliations other than admin and owner cannot invite to members_only rooms"
This reverts commit b010a1a0a03fb304ad018b4d42d69df93ca4c5a1.
More details in #2987
Diffstat (limited to 'src')
| -rw-r--r-- | src/mod_muc_room.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl index cf4edeca2..0dfd078a5 100644 --- a/src/mod_muc_room.erl +++ b/src/mod_muc_room.erl @@ -4410,8 +4410,7 @@ send_voice_request(From, Lang, StateData) -> ok | {error, stanza_error()}. check_invitation(From, Invitations, Lang, StateData) -> FAffiliation = get_affiliation(From, StateData), - CanInvite = ((StateData#state.config)#config.allow_user_invites - and not (StateData#state.config)#config.members_only) orelse + CanInvite = (StateData#state.config)#config.allow_user_invites orelse FAffiliation == admin orelse FAffiliation == owner, case CanInvite of true -> |