diff options
Diffstat (limited to 'src/mod_irc.erl')
| -rw-r--r-- | src/mod_irc.erl | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/mod_irc.erl b/src/mod_irc.erl index 31fb31707..c3664af0f 100644 --- a/src/mod_irc.erl +++ b/src/mod_irc.erl @@ -578,7 +578,7 @@ process_irc_register(ServerHost, Host, From, _To, end. get_data(ServerHost, Host, From) -> - LServer = jlib:nameprep(ServerHost), + LServer = jid:nameprep(ServerHost), get_data(LServer, Host, From, gen_mod:db_type(LServer, ?MODULE)). @@ -604,7 +604,7 @@ get_data(LServer, Host, From, riak) -> end; get_data(LServer, Host, From, odbc) -> SJID = - ejabberd_odbc:escape(jlib:jid_to_string(jlib:jid_tolower(jlib:jid_remove_resource(From)))), + ejabberd_odbc:escape(jid:to_string(jid:tolower(jid:remove_resource(From)))), SHost = ejabberd_odbc:escape(Host), case catch ejabberd_odbc:sql_query(LServer, [<<"select data from irc_custom where jid='">>, @@ -722,12 +722,12 @@ get_form(_ServerHost, _Host, _, _, _Lang) -> {error, ?ERR_SERVICE_UNAVAILABLE}. set_data(ServerHost, Host, From, Data) -> - LServer = jlib:nameprep(ServerHost), + LServer = jid:nameprep(ServerHost), set_data(LServer, Host, From, data_to_binary(From, Data), gen_mod:db_type(LServer, ?MODULE)). set_data(_LServer, Host, From, Data, mnesia) -> - {LUser, LServer, _} = jlib:jid_tolower(From), + {LUser, LServer, _} = jid:tolower(From), US = {LUser, LServer}, F = fun () -> mnesia:write(#irc_custom{us_host = {US, Host}, @@ -735,14 +735,14 @@ set_data(_LServer, Host, From, Data, mnesia) -> end, mnesia:transaction(F); set_data(LServer, Host, From, Data, riak) -> - {LUser, LServer, _} = jlib:jid_tolower(From), + {LUser, LServer, _} = jid:tolower(From), US = {LUser, LServer}, {atomic, ejabberd_riak:put(#irc_custom{us_host = {US, Host}, data = Data}, irc_custom_schema())}; set_data(LServer, Host, From, Data, odbc) -> SJID = - ejabberd_odbc:escape(jlib:jid_to_string(jlib:jid_tolower(jlib:jid_remove_resource(From)))), + ejabberd_odbc:escape(jid:to_string(jid:tolower(jid:remove_resource(From)))), SHost = ejabberd_odbc:escape(Host), SData = ejabberd_odbc:encode_term(Data), F = fun () -> @@ -921,7 +921,7 @@ adhoc_join(From, To, <<"invite">>, attrs = [{<<"from">>, - jlib:jid_to_string(From)}], + jid:to_string(From)}], children = [#xmlel{name = @@ -952,7 +952,7 @@ adhoc_join(From, To, Lang, <<"Join the IRC channel in this Jabber ID: ~s">>), [RoomJID]))}]}]}, - ejabberd_router:route(jlib:string_to_jid(RoomJID), From, + ejabberd_router:route(jid:from_string(RoomJID), From, Invite), adhoc:produce_response(Request, #adhoc_response{status = @@ -1248,7 +1248,7 @@ data_to_binary(JID, Data) -> ?ERROR_MSG("failed to convert " "parameter ~p for user ~s", [Param, - jlib:jid_to_string(JID)]); + jid:to_string(JID)]); true -> ?ERROR_MSG("failed to convert " "parameter ~p", @@ -1295,7 +1295,7 @@ update_table() -> fun(#irc_custom{us_host = {_, H}}) -> H end, fun(#irc_custom{us_host = {{U, S}, H}, data = Data} = R) -> - JID = jlib:make_jid(U, S, <<"">>), + JID = jid:make(U, S, <<"">>), R#irc_custom{us_host = {{iolist_to_binary(U), iolist_to_binary(S)}, iolist_to_binary(H)}, @@ -1313,8 +1313,8 @@ export(_Server) -> case str:suffix(Host, IRCHost) of true -> SJID = ejabberd_odbc:escape( - jlib:jid_to_string( - jlib:make_jid(U, S, <<"">>))), + jid:to_string( + jid:make(U, S, <<"">>))), SIRCHost = ejabberd_odbc:escape(IRCHost), SData = ejabberd_odbc:encode_term(Data), [[<<"delete from irc_custom where jid='">>, SJID, @@ -1331,7 +1331,7 @@ export(_Server) -> import(_LServer) -> [{<<"select jid, host, data from irc_custom;">>, fun([SJID, IRCHost, SData]) -> - #jid{luser = U, lserver = S} = jlib:string_to_jid(SJID), + #jid{luser = U, lserver = S} = jid:from_string(SJID), Data = ejabberd_odbc:decode_term(SData), #irc_custom{us_host = {{U, S}, IRCHost}, data = Data} |