diff options
Diffstat (limited to '')
| -rw-r--r-- | src/mod_shared_roster.erl | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl index 9020e5d3..52828245 100644 --- a/src/mod_shared_roster.erl +++ b/src/mod_shared_roster.erl @@ -182,8 +182,8 @@ get_vcard_module(Server) -> get_rosteritem_name([], _, _) -> <<"">>; get_rosteritem_name([ModVcard], U, S) -> - From = jlib:make_jid(<<"">>, S, jlib:atom_to_binary(?MODULE)), - To = jlib:make_jid(U, S, <<"">>), + From = jid:make(<<"">>, S, jlib:atom_to_binary(?MODULE)), + To = jid:make(U, S, <<"">>), case lists:member(To#jid.lserver, ?MYHOSTS) of true -> IQ = {iq, <<"">>, get, <<"vcard-temp">>, <<"">>, @@ -246,11 +246,11 @@ process_item(RosterItem, Host) -> %% existing roster groups. [] -> mod_roster:out_subscription(UserTo, ServerTo, - jlib:make_jid(UserFrom, ServerFrom, + jid:make(UserFrom, ServerFrom, <<"">>), unsubscribe), mod_roster:in_subscription(aaaa, UserFrom, ServerFrom, - jlib:make_jid(UserTo, ServerTo, + jid:make(UserTo, ServerTo, <<"">>), unsubscribe, <<"">>), RosterItem#roster{subscription = both, ask = none}; @@ -275,8 +275,8 @@ set_new_rosteritems(UserFrom, ServerFrom, UserTo, RIFrom = build_roster_record(UserFrom, ServerFrom, UserTo, ServerTo, NameTo, GroupsFrom), set_item(UserFrom, ServerFrom, ResourceTo, RIFrom), - JIDTo = jlib:make_jid(UserTo, ServerTo, <<"">>), - JIDFrom = jlib:make_jid(UserFrom, ServerFrom, <<"">>), + JIDTo = jid:make(UserTo, ServerTo, <<"">>), + JIDFrom = jid:make(UserFrom, ServerFrom, <<"">>), RITo = build_roster_record(UserTo, ServerTo, UserFrom, ServerFrom, UserFrom, []), set_item(UserTo, ServerTo, <<"">>, RITo), @@ -305,14 +305,14 @@ set_item(User, Server, Resource, Item) -> [#xmlel{name = <<"query">>, attrs = [{<<"xmlns">>, ?NS_ROSTER}], children = [mod_roster:item_to_xml(Item)]}]}, - ejabberd_router:route(jlib:make_jid(User, Server, + ejabberd_router:route(jid:make(User, Server, Resource), - jlib:make_jid(<<"">>, Server, <<"">>), + jid:make(<<"">>, Server, <<"">>), jlib:iq_to_xml(ResIQ)). get_subscription_lists({F, T}, User, Server) -> - LUser = jlib:nodeprep(User), - LServer = jlib:nameprep(Server), + LUser = jid:nodeprep(User), + LServer = jid:nameprep(Server), US = {LUser, LServer}, DisplayedGroups = get_user_displayed_groups(US), SRUsers = lists:usort(lists:flatmap(fun (Group) -> @@ -324,10 +324,10 @@ get_subscription_lists({F, T}, User, Server) -> get_jid_info({Subscription, Groups}, User, Server, JID) -> - LUser = jlib:nodeprep(User), - LServer = jlib:nameprep(Server), + LUser = jid:nodeprep(User), + LServer = jid:nameprep(Server), US = {LUser, LServer}, - {U1, S1, _} = jlib:jid_tolower(JID), + {U1, S1, _} = jid:tolower(JID), US1 = {U1, S1}, DisplayedGroups = get_user_displayed_groups(US), SRUsers = lists:foldl(fun (Group, Acc1) -> @@ -357,7 +357,7 @@ in_subscription(Acc, User, Server, JID, Type, out_subscription(UserFrom, ServerFrom, JIDTo, unsubscribed) -> #jid{luser = UserTo, lserver = ServerTo} = JIDTo, - JIDFrom = jlib:make_jid(UserFrom, ServerFrom, <<"">>), + JIDFrom = jid:make(UserFrom, ServerFrom, <<"">>), mod_roster:out_subscription(UserTo, ServerTo, JIDFrom, unsubscribe), mod_roster:in_subscription(aaaa, UserFrom, ServerFrom, @@ -370,11 +370,11 @@ out_subscription(User, Server, JID, Type) -> process_subscription(Direction, User, Server, JID, _Type, Acc) -> - LUser = jlib:nodeprep(User), - LServer = jlib:nameprep(Server), + LUser = jid:nodeprep(User), + LServer = jid:nameprep(Server), US = {LUser, LServer}, {U1, S1, _} = - jlib:jid_tolower(jlib:jid_remove_resource(JID)), + jid:tolower(jid:remove_resource(JID)), US1 = {U1, S1}, DisplayedGroups = get_user_displayed_groups(US), SRUsers = lists:usort(lists:flatmap(fun (Group) -> @@ -657,7 +657,7 @@ get_group_explicit_users(Host, Group, odbc) -> {selected, [<<"jid">>], Rs} -> lists:map(fun ([JID]) -> {U, S, _} = - jlib:jid_tolower(jlib:string_to_jid(JID)), + jid:tolower(jid:from_string(JID)), {U, S} end, Rs); @@ -949,8 +949,8 @@ remove_user(User, Server) -> push_user_to_members(User, Server, remove). push_user_to_members(User, Server, Subscription) -> - LUser = jlib:nodeprep(User), - LServer = jlib:nameprep(Server), + LUser = jid:nodeprep(User), + LServer = jid:nameprep(Server), GroupsOpts = groups_with_opts(LServer), SpecialGroups = get_special_displayed_groups(GroupsOpts), @@ -1024,8 +1024,8 @@ push_item(User, Server, Item) -> attrs = [{<<"xmlns">>, ?NS_ROSTER}], children = [item_to_xml(Item)]}]}), lists:foreach(fun (Resource) -> - JID = jlib:make_jid(User, Server, Resource), - ejabberd_router:route(jlib:jid_remove_resource(JID), JID, Stanza) + JID = jid:make(User, Server, Resource), + ejabberd_router:route(jid:remove_resource(JID), JID, Stanza) end, ejabberd_sm:get_user_resources(User, Server)). @@ -1040,7 +1040,7 @@ push_roster_item(User, Server, ContactU, ContactS, item_to_xml(Item) -> Attrs1 = [{<<"jid">>, - jlib:jid_to_string(Item#roster.jid)}], + jid:to_string(Item#roster.jid)}], Attrs2 = case Item#roster.name of <<"">> -> Attrs1; Name -> [{<<"name">>, Name} | Attrs1] @@ -1298,7 +1298,7 @@ shared_roster_group_parse_query(Host, Group, Query) -> <<"@all@">> -> USs; <<"@online@">> -> USs; _ -> - case jlib:string_to_jid(SJID) + case jid:from_string(SJID) of JID when is_record(JID, @@ -1358,7 +1358,7 @@ get_opt(Opts, Opt, Default) -> end. us_to_list({User, Server}) -> - jlib:jid_to_string({User, Server, <<"">>}). + jid:to_string({User, Server, <<"">>}). split_grouphost(Host, Group) -> case str:tokens(Group, <<"@">>) of @@ -1368,8 +1368,8 @@ split_grouphost(Host, Group) -> broadcast_subscription(User, Server, ContactJid, Subscription) -> ejabberd_sm:route( - jlib:make_jid(<<"">>, Server, <<"">>), - jlib:make_jid(User, Server, <<"">>), + jid:make(<<"">>, Server, <<"">>), + jid:make(User, Server, <<"">>), {broadcast, {item, ContactJid, Subscription}}). @@ -1386,7 +1386,7 @@ displayed_groups_update(Members, DisplayedGroups, Subscription) -> end, Members). make_jid_s(U, S) -> - ejabberd_odbc:escape(jlib:jid_to_string(jlib:jid_tolower(jlib:make_jid(U, + ejabberd_odbc:escape(jid:to_string(jid:tolower(jid:make(U, S, <<"">>)))). @@ -1466,9 +1466,9 @@ export(_Server) -> when LServer == Host -> SGroup = ejabberd_odbc:escape(Group), SJID = ejabberd_odbc:escape( - jlib:jid_to_string( - jlib:jid_tolower( - jlib:make_jid(U, S, <<"">>)))), + jid:to_string( + jid:tolower( + jid:make(U, S, <<"">>)))), [[<<"delete from sr_user where jid='">>, SJID, <<"'and grp='">>, Group, <<"';">>], [<<"insert into sr_user(jid, grp) values ('">>, @@ -1485,7 +1485,7 @@ import(LServer) -> end}, {<<"select jid, grp from sr_user;">>, fun([SJID, Group]) -> - #jid{luser = U, lserver = S} = jlib:string_to_jid(SJID), + #jid{luser = U, lserver = S} = jid:from_string(SJID), #sr_user{us = {U, S}, group_host = {Group, LServer}} end}]. |