From 5dbc4f99545179c5535924a727913e62a8b42da4 Mon Sep 17 00:00:00 2001 From: Karim Gemayel Date: Mon, 1 Jun 2009 16:30:15 +0000 Subject: [PATCH] API renaming : jid_to_bare_jid > bare SVN Revision: 2120 --- src/ejabberd_c2s.erl | 10 +++++----- src/ejabberd_s2s.erl | 2 +- src/ejabberd_sm.erl | 2 +- src/jlib.erl | 4 ++-- src/mod_muc/mod_muc_room.erl | 2 +- src/mod_roster.erl | 4 ++-- src/mod_roster_odbc.erl | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 477aeffc0..0fdc23c36 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -838,7 +838,7 @@ session_established2(El, StateData) -> To = exmpp_stanza:get_recipient(El), ToJID = case To of undefined -> - exmpp_jid:jid_to_bare_jid(StateData#state.jid); + exmpp_jid:bare(StateData#state.jid); _ -> exmpp_jid:parse_jid(To) end, @@ -1518,28 +1518,28 @@ presence_track(From, To, Packet, StateData) -> ejabberd_hooks:run(roster_out_subscription, StateData#state.server, [StateData#state.user, StateData#state.server, To, subscribe]), - check_privacy_route(From, StateData, exmpp_jid:jid_to_bare_jid(From), + check_privacy_route(From, StateData, exmpp_jid:bare(From), To, Packet), StateData; 'subscribed' -> ejabberd_hooks:run(roster_out_subscription, StateData#state.server, [StateData#state.user, StateData#state.server, To, subscribed]), - check_privacy_route(From, StateData, exmpp_jid:jid_to_bare_jid(From), + check_privacy_route(From, StateData, exmpp_jid:bare(From), To, Packet), StateData; 'unsubscribe' -> ejabberd_hooks:run(roster_out_subscription, StateData#state.server, [StateData#state.user, StateData#state.server, To, unsubscribe]), - check_privacy_route(From, StateData, exmpp_jid:jid_to_bare_jid(From), + check_privacy_route(From, StateData, exmpp_jid:bare(From), To, Packet), StateData; 'unsubscribed' -> ejabberd_hooks:run(roster_out_subscription, StateData#state.server, [StateData#state.user, StateData#state.server, To, unsubscribed]), - check_privacy_route(From, StateData, exmpp_jid:jid_to_bare_jid(From), + check_privacy_route(From, StateData, exmpp_jid:bare(From), To, Packet), StateData; 'error' -> diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl index e21511fcb..0c68c694c 100644 --- a/src/ejabberd_s2s.erl +++ b/src/ejabberd_s2s.erl @@ -357,7 +357,7 @@ choose_pid(From, Pids) -> % Use sticky connections based on the JID of the sender (whithout % the resource to ensure that a muc room always uses the same % connection) - Pid = lists:nth(erlang:phash(exmpp_jid:jid_to_bare_jid(From), length(Pids1)), + Pid = lists:nth(erlang:phash(exmpp_jid:bare(From), length(Pids1)), Pids1), ?DEBUG("Using ejabberd_s2s_out ~p~n", [Pid]), Pid. diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl index 6cc7c20c5..7bb0cf35a 100644 --- a/src/ejabberd_sm.erl +++ b/src/ejabberd_sm.erl @@ -678,7 +678,7 @@ check_max_sessions(JID) -> %% Defaults to infinity get_max_user_sessions(JID) -> case acl:match_rule( - exmpp_jid:ldomain_as_list(JID), max_user_sessions, exmpp_jid:jid_to_bare_jid(JID)) of + exmpp_jid:ldomain_as_list(JID), max_user_sessions, exmpp_jid:bare(JID)) of Max when is_integer(Max) -> Max; infinity -> infinity; _ -> ?MAX_USER_SESSIONS diff --git a/src/jlib.erl b/src/jlib.erl index 3b1e8f914..d914bf73f 100644 --- a/src/jlib.erl +++ b/src/jlib.erl @@ -379,7 +379,7 @@ short_jid(JID) -> {exmpp_jid:node(JID), exmpp_jid:domain(JID), exmpp_jid:resource(JID)}. short_bare_jid(JID) -> - short_jid(exmpp_jid:jid_to_bare_jid(JID)). + short_jid(exmpp_jid:bare(JID)). short_prepd_jid(JID) -> {exmpp_jid:lnode(JID), @@ -387,6 +387,6 @@ short_prepd_jid(JID) -> exmpp_jid:lresource(JID)}. short_prepd_bare_jid(JID) -> - short_prepd_jid(exmpp_jid:jid_to_bare_jid(JID)). + short_prepd_jid(exmpp_jid:bare(JID)). diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl index c0f44a8fa..d16e09020 100644 --- a/src/mod_muc/mod_muc_room.erl +++ b/src/mod_muc/mod_muc_room.erl @@ -2379,7 +2379,7 @@ find_changed_items(UJID, UAffiliation, URole, UJID, UAffiliation, URole, Items, Lang, StateData, - [{exmpp_jid:jid_to_bare_jid(JID), + [{exmpp_jid:bare(JID), affiliation, SAffiliation, exmpp_xml:get_path( diff --git a/src/mod_roster.erl b/src/mod_roster.erl index 7ae405284..4afb0df88 100644 --- a/src/mod_roster.erl +++ b/src/mod_roster.erl @@ -300,14 +300,14 @@ process_item_set(From, To, #xmlel{} = El) -> {U, S, R} = OldItem#roster.jid, if IsTo -> ejabberd_router:route( - exmpp_jid:jid_to_bare_jid(From), + exmpp_jid:bare(From), exmpp_jid:make(U, S, R), exmpp_presence:unsubscribe()); true -> ok end, if IsFrom -> ejabberd_router:route( - exmpp_jid:jid_to_bare_jid(From), + exmpp_jid:bare(From), exmpp_jid:make(U, S, R), exmpp_presence:unsubscribed()); true -> ok diff --git a/src/mod_roster_odbc.erl b/src/mod_roster_odbc.erl index 590f036e4..c4ea93cf0 100644 --- a/src/mod_roster_odbc.erl +++ b/src/mod_roster_odbc.erl @@ -284,14 +284,14 @@ process_item_set(From, To, #xmlel{} = El) -> {U, S, R} = OldItem#roster.jid, if IsTo -> ejabberd_router:route( - exmpp_jid:jid_to_bare_jid(From), + exmpp_jid:bare(From), exmpp_jid:make(U, S, R), exmpp_presence:unsubscribe()); true -> ok end, if IsFrom -> ejabberd_router:route( - exmpp_jid:jid_to_bare_jid(From), + exmpp_jid:bare(From), exmpp_jid:make(U, S, R), exmpp_presence:unsubscribed()); true -> ok