Move JID related functions to jid.erl (#847)

1 files changed, 37 insertions, 37 deletions

diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl
index 772f075e..c550409f 100644
--- a/src/ejabberd_sm.erl
+++ b/src/ejabberd_sm.erl
@@ -120,7 +120,7 @@ route(From, To, Packet) ->
 open_session(SID, User, Server, Resource, Priority, Info) ->
     set_session(SID, User, Server, Resource, Priority, Info),
     check_for_sessions_to_replace(User, Server, Resource),
-    JID = jlib:make_jid(User, Server, Resource),
+    JID = jid:make(User, Server, Resource),
     ejabberd_hooks:run(sm_register_connection_hook,
 		       JID#jid.lserver, [SID, JID, Info]).
 
@@ -133,14 +133,14 @@ open_session(SID, User, Server, Resource, Info) ->
 
 close_session(SID, User, Server, Resource) ->
     Mod = get_sm_backend(),
-    LUser = jlib:nodeprep(User),
-    LServer = jlib:nameprep(Server),
-    LResource = jlib:resourceprep(Resource),
+    LUser = jid:nodeprep(User),
+    LServer = jid:nameprep(Server),
+    LResource = jid:resourceprep(Resource),
     Info = case Mod:delete_session(LUser, LServer, LResource, SID) of
 	       {ok, #session{info = I}} -> I;
 	       {error, notfound} -> []
 	   end,
-    JID = jlib:make_jid(User, Server, Resource),
+    JID = jid:make(User, Server, Resource),
     ejabberd_hooks:run(sm_remove_connection_hook,
 		       JID#jid.lserver, [SID, JID, Info]).
 
@@ -164,13 +164,13 @@ bounce_offline_message(From, To, Packet) ->
 -spec disconnect_removed_user(binary(), binary()) -> ok.
 
 disconnect_removed_user(User, Server) ->
-    ejabberd_sm:route(jlib:make_jid(<<"">>, <<"">>, <<"">>),
-		      jlib:make_jid(User, Server, <<"">>),
+    ejabberd_sm:route(jid:make(<<"">>, <<"">>, <<"">>),
+		      jid:make(User, Server, <<"">>),
                       {broadcast, {exit, <<"User removed">>}}).
 
 get_user_resources(User, Server) ->
-    LUser = jlib:nodeprep(User),
-    LServer = jlib:nameprep(Server),
+    LUser = jid:nodeprep(User),
+    LServer = jid:nameprep(Server),
     Mod = get_sm_backend(),
     Ss = Mod:get_sessions(LUser, LServer),
     [element(3, S#session.usr) || S <- clean_session_list(Ss)].
@@ -186,9 +186,9 @@ get_user_present_resources(LUser, LServer) ->
 -spec get_user_ip(binary(), binary(), binary()) -> ip().
 
 get_user_ip(User, Server, Resource) ->
-    LUser = jlib:nodeprep(User),
-    LServer = jlib:nameprep(Server),
-    LResource = jlib:resourceprep(Resource),
+    LUser = jid:nodeprep(User),
+    LServer = jid:nameprep(Server),
+    LResource = jid:resourceprep(Resource),
     Mod = get_sm_backend(),
     case Mod:get_sessions(LUser, LServer, LResource) of
 	[] ->
@@ -201,9 +201,9 @@ get_user_ip(User, Server, Resource) ->
 -spec get_user_info(binary(), binary(), binary()) -> info() | offline.
 
 get_user_info(User, Server, Resource) ->
-    LUser = jlib:nodeprep(User),
-    LServer = jlib:nameprep(Server),
-    LResource = jlib:resourceprep(Resource),
+    LUser = jid:nodeprep(User),
+    LServer = jid:nameprep(Server),
+    LResource = jid:resourceprep(Resource),
     Mod = get_sm_backend(),
     case Mod:get_sessions(LUser, LServer, LResource) of
 	[] ->
@@ -224,7 +224,7 @@ set_presence(SID, User, Server, Resource, Priority,
     set_session(SID, User, Server, Resource, Priority,
 		Info),
     ejabberd_hooks:run(set_presence_hook,
-		       jlib:nameprep(Server),
+		       jid:nameprep(Server),
 		       [User, Server, Resource, Presence]).
 
 -spec unset_presence(sid(), binary(), binary(),
@@ -235,7 +235,7 @@ unset_presence(SID, User, Server, Resource, Status,
     set_session(SID, User, Server, Resource, undefined,
 		Info),
     ejabberd_hooks:run(unset_presence_hook,
-		       jlib:nameprep(Server),
+		       jid:nameprep(Server),
 		       [User, Server, Resource, Status]).
 
 -spec close_session_unset_presence(sid(), binary(), binary(),
@@ -245,15 +245,15 @@ close_session_unset_presence(SID, User, Server,
 			     Resource, Status) ->
     close_session(SID, User, Server, Resource),
     ejabberd_hooks:run(unset_presence_hook,
-		       jlib:nameprep(Server),
+		       jid:nameprep(Server),
 		       [User, Server, Resource, Status]).
 
 -spec get_session_pid(binary(), binary(), binary()) -> none | pid().
 
 get_session_pid(User, Server, Resource) ->
-    LUser = jlib:nodeprep(User),
-    LServer = jlib:nameprep(Server),
-    LResource = jlib:resourceprep(Resource),
+    LUser = jid:nodeprep(User),
+    LServer = jid:nameprep(Server),
+    LResource = jid:resourceprep(Resource),
     Mod = get_sm_backend(),
     case Mod:get_sessions(LUser, LServer, LResource) of
 	[#session{sid = {_, Pid}}] -> Pid;
@@ -275,7 +275,7 @@ dirty_get_my_sessions_list() ->
 -spec get_vh_session_list(binary()) -> [ljid()].
 
 get_vh_session_list(Server) ->
-    LServer = jlib:nameprep(Server),
+    LServer = jid:nameprep(Server),
     Mod = get_sm_backend(),
     [S#session.usr || S <- Mod:get_sessions(LServer)].
 
@@ -288,7 +288,7 @@ get_all_pids() ->
 -spec get_vh_session_number(binary()) -> non_neg_integer().
 
 get_vh_session_number(Server) ->
-    LServer = jlib:nameprep(Server),
+    LServer = jid:nameprep(Server),
     Mod = get_sm_backend(),
     length(Mod:get_sessions(LServer)).
 
@@ -374,9 +374,9 @@ code_change(_OldVsn, State, _Extra) -> {ok, State}.
                   prio(), info()) -> ok.
 
 set_session(SID, User, Server, Resource, Priority, Info) ->
-    LUser = jlib:nodeprep(User),
-    LServer = jlib:nameprep(Server),
-    LResource = jlib:resourceprep(Resource),
+    LUser = jid:nodeprep(User),
+    LServer = jid:nameprep(Server),
+    LResource = jid:resourceprep(Resource),
     US = {LUser, LServer},
     USR = {LUser, LServer, LResource},
     Mod = get_sm_backend(),
@@ -390,12 +390,12 @@ do_route(From, To, {broadcast, _} = Packet) ->
         <<"">> ->
             lists:foreach(fun(R) ->
                                   do_route(From,
-                                           jlib:jid_replace_resource(To, R),
+                                           jid:replace_resource(To, R),
                                            Packet)
                           end,
                           get_user_resources(To#jid.user, To#jid.server));
         _ ->
-            {U, S, R} = jlib:jid_tolower(To),
+            {U, S, R} = jid:tolower(To),
 	    Mod = get_sm_backend(),
 	    case Mod:get_sessions(U, S, R) of
                 [] ->
@@ -474,7 +474,7 @@ do_route(From, To, #xmlel{} = Packet) ->
 		       PResources = get_user_present_resources(LUser, LServer),
 		       lists:foreach(fun ({_, R}) ->
 					     do_route(From,
-						      jlib:jid_replace_resource(To,
+						      jid:replace_resource(To,
 										R),
 						      Packet)
 				     end,
@@ -563,7 +563,7 @@ route_message(From, To, Packet, Type) ->
 	  when is_integer(Priority), Priority >= 0 ->
 	  lists:foreach(fun ({P, R}) when P == Priority;
 					  (P >= 0) and (Type == headline) ->
-				LResource = jlib:resourceprep(R),
+				LResource = jid:resourceprep(R),
 				Mod = get_sm_backend(),
 				case Mod:get_sessions(LUser, LServer,
 						      LResource) of
@@ -619,9 +619,9 @@ clean_session_list([S1, S2 | Rest], Res) ->
 
 %% On new session, check if some existing connections need to be replace
 check_for_sessions_to_replace(User, Server, Resource) ->
-    LUser = jlib:nodeprep(User),
-    LServer = jlib:nameprep(Server),
-    LResource = jlib:resourceprep(Resource),
+    LUser = jid:nodeprep(User),
+    LServer = jid:nameprep(Server),
+    LResource = jid:resourceprep(Resource),
     check_existing_resources(LUser, LServer, LResource),
     check_max_sessions(LUser, LServer).
 
@@ -643,9 +643,9 @@ is_existing_resource(LUser, LServer, LResource) ->
     [] /= get_resource_sessions(LUser, LServer, LResource).
 
 get_resource_sessions(User, Server, Resource) ->
-    LUser = jlib:nodeprep(User),
-    LServer = jlib:nameprep(Server),
-    LResource = jlib:resourceprep(Resource),
+    LUser = jid:nodeprep(User),
+    LServer = jid:nameprep(Server),
+    LResource = jid:resourceprep(Resource),
     Mod = get_sm_backend(),
     [S#session.sid || S <- Mod:get_sessions(LUser, LServer, LResource)].
 
@@ -663,7 +663,7 @@ check_max_sessions(LUser, LServer) ->
 %% Defaults to infinity
 get_max_user_sessions(LUser, Host) ->
     case acl:match_rule(Host, max_user_sessions,
-			jlib:make_jid(LUser, Host, <<"">>))
+			jid:make(LUser, Host, <<"">>))
 	of
       Max when is_integer(Max) -> Max;
       infinity -> infinity;