aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2020-04-15 13:13:10 +0200
committerBadlop <badlop@process-one.net>2020-06-24 13:17:04 +0200
commit61926a44be8d646e874c2bc2bdb6ba8855d7f418 (patch)
treec8254205b5a70fadc1356fef627e5ca937da846f /src
parentejabberd_logger: Avoid excessive stat calls (diff)
Subscriber should not send message to moderated room (#3222)
Diffstat (limited to 'src')
-rw-r--r--src/mod_muc_room.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl
index 03faa6a06..f7ebf7f27 100644
--- a/src/mod_muc_room.erl
+++ b/src/mod_muc_room.erl
@@ -935,7 +935,8 @@ process_groupchat_message(#message{from = From, lang = Lang} = Packet, StateData
of
true ->
{FromNick, Role} = get_participant_data(From, StateData),
- if (Role == moderator) or (Role == participant) or IsSubscriber or
+ if (Role == moderator) or (Role == participant) or
+ (IsSubscriber andalso ((StateData#state.config)#config.members_by_default == true)) or
((StateData#state.config)#config.moderated == false) ->
Subject = check_subject(Packet),
{NewStateData1, IsAllowed} = case Subject of