diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-02-26 10:07:12 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-02-26 10:07:12 +0300 |
| commit | c1439ddd5bff82292919774c224a2bf3c8f63258 (patch) | |
| tree | cc80ebe280ac56fcdfa9656f8f03a1938f53bdeb /src/mod_multicast.erl | |
| parent | Don't pass empty resource to jid:make() (diff) | |
Get rid of jid:to_string/1 and jid:from_string/1
Diffstat (limited to 'src/mod_multicast.erl')
| -rw-r--r-- | src/mod_multicast.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mod_multicast.erl b/src/mod_multicast.erl index 48a2b596..4f4f9661 100644 --- a/src/mod_multicast.erl +++ b/src/mod_multicast.erl @@ -242,7 +242,7 @@ handle_iq(Packet, State) -> ejabberd_router:route_error(Packet, Error); reply -> To = xmpp:get_to(IQ), - LServiceS = jid:to_string(To), + LServiceS = jid:encode(To), case Packet#iq.type of result -> process_iqreply_result(LServiceS, IQ); @@ -297,7 +297,7 @@ route_trusted(LServiceS, LServerS, FromJID, Delivereds = [], Dests2 = lists:map( fun(D) -> - #dest{jid_string = jid:to_string(D), + #dest{jid_string = jid:encode(D), jid_jid = D, type = bcc, full_xml = #address{type = bcc, jid = D}} end, Destinations), @@ -463,7 +463,7 @@ convert_dest_record(Addrs) -> fun(#address{jid = undefined} = Addr) -> #dest{jid_string = none, full_xml = Addr}; (#address{jid = JID, type = Type} = Addr) -> - #dest{jid_string = jid:to_string(JID), jid_jid = JID, + #dest{jid_string = jid:encode(JID), jid_jid = JID, type = Type, full_xml = Addr} end, Addrs). @@ -1120,9 +1120,9 @@ make_reply(internal_server_error, Lang, ErrText) -> make_reply(forbidden, Lang, ErrText) -> xmpp:err_forbidden(ErrText, Lang). -stj(String) -> jid:from_string(String). +stj(String) -> jid:decode(String). -jts(String) -> jid:to_string(String). +jts(String) -> jid:encode(String). depends(_Host, _Opts) -> []. |