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/mod_register.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/mod_register.erl')
| -rw-r--r-- | src/mod_register.erl | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/mod_register.erl b/src/mod_register.erl index 30b139bb..55ce3ff0 100644 --- a/src/mod_register.erl +++ b/src/mod_register.erl @@ -150,7 +150,7 @@ process_iq(#iq{type = set, lang = Lang, to = To, from = From, case From of #jid{luser = LUser, lserver = Server} -> ResIQ = xmpp:make_iq_result(IQ), - ejabberd_router:route(From, From, ResIQ), + ejabberd_router:route(xmpp:set_from_to(ResIQ, From, From)), ejabberd_auth:remove_user(LUser, Server), ignore; _ -> @@ -380,8 +380,9 @@ send_welcome_message(JID) -> {<<"">>, <<"">>} -> ok; {Subj, Body} -> ejabberd_router:route( - jid:make(Host), JID, - #message{subject = xmpp:mk_text(Subj), + #message{from = jid:make(Host), + to = JID, + subject = xmpp:mk_text(Subj), body = xmpp:mk_text(Body)}); _ -> ok end. @@ -406,8 +407,9 @@ send_registration_notifications(Mod, UJID, Source) -> lists:foreach( fun(JID) -> ejabberd_router:route( - jid:make(Host), JID, - #message{type = chat, + #message{from = jid:make(Host), + to = JID, + type = chat, body = xmpp:mk_text(Body)}) end, JIDs) end. |