diff options
| author | Badlop <badlop@process-one.net> | 2021-01-08 20:30:15 +0100 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2021-01-13 16:49:45 +0100 |
| commit | b6d90cc55cc02e63b0087d9cad1490685e51ea34 (patch) | |
| tree | 443b376f5af65cb9226940afe30c114531b59e85 /src | |
| parent | Run "make translations" (diff) | |
Allow non-occupant non-subscribed service admin send private MUC message (#3474)
Diffstat (limited to 'src')
| -rw-r--r-- | src/mod_muc_room.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl index 9e633a60..036a0ce1 100644 --- a/src/mod_muc_room.erl +++ b/src/mod_muc_room.erl @@ -531,7 +531,8 @@ normal_state({route, ToNick, continue_delivery -> case {(StateData#state.config)#config.allow_private_messages, is_user_online(From, StateData) orelse - is_subscriber(From, StateData)} of + is_subscriber(From, StateData) orelse + is_user_allowed_message_nonparticipant(From, StateData)} of {true, true} when Type == groupchat -> ErrText = ?T("It is not allowed to send private messages " "of type \"groupchat\""), @@ -1192,7 +1193,7 @@ get_participant_data(From, StateData) -> #subscriber{nick = FromNick} -> {FromNick, none} catch _:{badkey, _} -> - {<<"">>, moderator} + {From#jid.luser, moderator} end end. |