aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shchepin <alexey@process-one.net>2017-01-16 18:21:15 +0300
committerAlexey Shchepin <alexey@process-one.net>2017-01-16 18:21:36 +0300
commit5a8dea15912f5e7c2b805872a7eba1996f7aa917 (patch)
tree6affaa8a7a19e46d0404188101e9a081bc5c78d7
parentMerge branch 'new_stream' of github.com:processone/ejabberd into new_stream (diff)
Remove stub in mob_block_strangers
-rw-r--r--src/mod_block_strangers.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mod_block_strangers.erl b/src/mod_block_strangers.erl
index 947970040..bc329ea0b 100644
--- a/src/mod_block_strangers.erl
+++ b/src/mod_block_strangers.erl
@@ -53,11 +53,11 @@ stop(Host) ->
filter_packet(deny = Acc, _State, _Msg) ->
Acc;
filter_packet(Acc, State, Msg) ->
- From = Msg#message.from,
+ From = xmpp:get_from(Msg),
LFrom = jid:tolower(From),
LBFrom = jid:remove_resource(LFrom),
#{pres_a := PresA} = State,
- case false%ejabberd_router:is_my_route(From#jid.lserver)
+ case ejabberd_router:is_my_route(From#jid.lserver)
orelse (?SETS):is_element(LFrom, PresA)
orelse (?SETS):is_element(LBFrom, PresA)
orelse sets_bare_member(LBFrom, PresA) of
@@ -75,9 +75,9 @@ filter_packet(Acc, State, Msg) ->
false),
if
Log ->
- Packet = xmpp:encode(Msg, ?NS_CLIENT),
?INFO_MSG("Drop packet: ~s",
- [fxml:element_to_binary(Packet)]);
+ [fxml:element_to_binary(
+ xmpp:encode(Msg, ?NS_CLIENT))]);
true ->
ok
end,