diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-02-16 11:00:26 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-02-16 11:10:24 +0300 |
| commit | 8b2d3084986defd6045a0c02706415e0e7ae4b3f (patch) | |
| tree | 419b64fc2d07646d221fdfa2f526e057fb34c6d2 /src/jd2ejd.erl | |
| parent | Merge branch 'master' of github.com:processone/ejabberd (diff) | |
Change routing API
Now 'From' and 'To' arguments must be omitted in functions
and structures related to routing.
The commit deprecates the following functions:
ejabberd_router:route/3 in favor of ejabberd_router:route/1
ejabberd_router:route_error/4 in favor of ejabberd_router:route_error/2
ejabberd_local:route_iq/4 in favor of ejabberd_local:route_iq/2
ejabberd_local:route_iq/5 in favor of ejabberd_local:route_iq/3
The format of {route, From, To, Packet} is changed in favor of {route, Packet}
Diffstat (limited to 'src/jd2ejd.erl')
| -rw-r--r-- | src/jd2ejd.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/jd2ejd.erl b/src/jd2ejd.erl index a1927fc69..f67e7ae17 100644 --- a/src/jd2ejd.erl +++ b/src/jd2ejd.erl @@ -156,13 +156,14 @@ process_offline(Server, To, #xmlel{children = Els}) -> lists:foreach( fun(#xmlel{} = El) -> try xmpp:decode(El, ?NS_CLIENT, [ignore_els]) of - #message{from = JID} -> + #message{from = JID} = Msg -> From = case JID of undefined -> jid:make(Server); _ -> JID end, - ejabberd_hooks:run_fold(offline_message_hook, - LServer, pass, [From, To, El]); + ejabberd_hooks:run_fold( + offline_message_hook, + LServer, pass, [xmpp:set_from_to(Msg, From, To)]); _ -> ok catch _:{xmpp_codec, Why} -> |