diff options
| author | Evgeny Khramtsov <xramtsov@gmail.com> | 2018-01-05 11:43:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-05 11:43:18 +0300 |
| commit | 946754536c254e5a9e0c8f2d0775576cb5ff7d5f (patch) | |
| tree | 2fdfe2b0efdfb7319081ce111d0e5a3bd1a34602 /src | |
| parent | Fix ejabberd command privacy_set (diff) | |
| parent | mod_block_strangers: Bounce an error message (diff) | |
Merge pull request #2202 from weiss/bounce-to-stranger
mod_block_strangers: Bounce an error message
Diffstat (limited to 'src')
| -rw-r--r-- | src/mod_block_strangers.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mod_block_strangers.erl b/src/mod_block_strangers.erl index b2c56f36b..afb0fbd9a 100644 --- a/src/mod_block_strangers.erl +++ b/src/mod_block_strangers.erl @@ -79,7 +79,7 @@ filter_offline_msg({_Action, #message{} = Msg} = Acc) -> deny -> {stop, {drop, Msg}} end. -check_message(#message{from = From, to = To} = Msg) -> +check_message(#message{from = From, to = To, lang = Lang} = Msg) -> LServer = To#jid.lserver, AllowLocalUsers = gen_mod:get_module_opt(LServer, ?MODULE, allow_local_users, true), @@ -95,7 +95,7 @@ check_message(#message{from = From, to = To} = Msg) -> if Log -> ?INFO_MSG("~s message from stranger ~s to ~s", - [if Drop -> "Dropping"; + [if Drop -> "Rejecting"; true -> "Allow" end, jid:encode(From), jid:encode(To)]); @@ -104,6 +104,9 @@ check_message(#message{from = From, to = To} = Msg) -> end, if Drop -> + Txt = <<"Messages from strangers are rejected">>, + Err = xmpp:err_policy_violation(Txt, Lang), + ejabberd_router:route_error(Msg, Err), deny; true -> allow |