yetangitu/ejabberd
1
0
Fork 0
mirror of https://github.com/processone/ejabberd synced 2025-10-03 17:59:31 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'processone/pr/1086'

Browse source 
* processone/pr/1086:
  Return error when blocking message to offline user
This commit is contained in:
Holger Weiss 2016-05-02 21:08:06 +02:00
commit 6da07d78b5
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/ejabberd_sm.erl
View file

@ -602,15 +602,12 @@ route_message(From, To, Packet, Type) ->
case Type of case Type of
headline -> ok; headline -> ok;
_ -> _ ->
case ejabberd_auth:is_user_exists(LUser, LServer) of case ejabberd_auth:is_user_exists(LUser, LServer) andalso
is_privacy_allow(From, To, Packet) of
true -> true ->
case is_privacy_allow(From, To, Packet) of ejabberd_hooks:run(offline_message_hook, LServer,
true -> [From, To, Packet]);
ejabberd_hooks:run(offline_message_hook, LServer, false ->
[From, To, Packet]);
false -> ok
end;
_ ->
Err = jlib:make_error_reply(Packet, Err = jlib:make_error_reply(Packet,
?ERR_SERVICE_UNAVAILABLE), ?ERR_SERVICE_UNAVAILABLE),
ejabberd_router:route(To, From, Err) ejabberd_router:route(To, From, Err)