Get rid of "jlib.hrl" dependency in some files

diff --git a/include/mod_privacy.hrl b/include/mod_privacy.hrl
index 0d263d659b5e9c48c4bcc9d2e8386fdfb69ea8b5..dbd19a0811ec10e0cc7fe2b4ce7267c4f871ff0d 100644 (file)
--- a/include/mod_privacy.hrl
+++ b/include/mod_privacy.hrl
@@ -36,7 +36,7 @@
 
 -type listitem() :: #listitem{}.
 -type listitem_type() :: none | jid | group | subscription.
--type listitem_value() :: none | both | from | to | ljid() | binary().
+-type listitem_value() :: none | both | from | to | jid:ljid() | binary().
 -type listitem_action() :: allow | deny.
 
 -record(userlist, {name = none :: none | binary(),

diff --git a/include/mod_roster.hrl b/include/mod_roster.hrl
index b05114e3ed21c306efce753ef89aad03e4ccbb4d..8185087037a98f0c7098df567393211cb9178e0a 100644 (file)
--- a/include/mod_roster.hrl
+++ b/include/mod_roster.hrl
@@ -20,15 +20,15 @@
 
 -record(roster,
 {
-    usj = {<<>>, <<>>, {<<>>, <<>>, <<>>}} :: {binary(), binary(), ljid()} | '_',
+    usj = {<<>>, <<>>, {<<>>, <<>>, <<>>}} :: {binary(), binary(), jid:ljid()} | '_',
     us = {<<>>, <<>>}                      :: {binary(), binary()} | '_',
-    jid = {<<>>, <<>>, <<>>}               :: ljid(),
+    jid = {<<>>, <<>>, <<>>}               :: jid:ljid(),
     name = <<>>                            :: binary() | '_',
     subscription = none                    :: subscription() | '_',
     ask = none                             :: ask() | '_',
     groups = []                            :: [binary()] | '_',
     askmessage = <<"">>                    :: binary() | '_',
-    xs = []                                :: [xmlel()] | '_'
+    xs = []                                :: [fxml:xmlel()] | '_'
 }).
 
 -record(roster_version,

diff --git a/src/cyrsasl.erl b/src/cyrsasl.erl
index 46b23384e17932f162cf7f3ecd4fbe7a31e08bb2..4b0f5a26b60b07cf78c2d2b70f383db7f30abc7d 100644 (file)
--- a/src/cyrsasl.erl
+++ b/src/cyrsasl.erl
@@ -102,30 +102,6 @@ register_mechanism(Mechanism, Module, PasswordType) ->
          true
     end.
 
-%%% TODO: use callbacks
-%%-include("ejabberd.hrl").
-%%-include("jlib.hrl").
-%%check_authzid(_State, Props) ->
-%%    AuthzId = fxml:get_attr_s(authzid, Props),
-%%    case jid:from_string(AuthzId) of
-%%     error ->
-%%         {error, "invalid-authzid"};
-%%     JID ->
-%%         LUser = jid:nodeprep(fxml:get_attr_s(username, Props)),
-%%         {U, S, R} = jid:tolower(JID),
-%%         case R of
-%%             "" ->
-%%                 {error, "invalid-authzid"};
-%%             _ ->
-%%                 case {LUser, ?MYNAME} of
-%%                     {U, S} ->
-%%                         ok;
-%%                     _ ->
-%%                         {error, "invalid-authzid"}
-%%                 end
-%%         end
-%%    end.
-
 check_credentials(_State, Props) ->
     User = proplists:get_value(authzid, Props, <<>>),
     case jid:nodeprep(User) of

diff --git a/src/cyrsasl_scram.erl b/src/cyrsasl_scram.erl
index 8643a89241acacf0954f491fce2954f93a7fcab5..fdc40cd86f0960501e0884e5e64257626a657f0a 100644 (file)
--- a/src/cyrsasl_scram.erl
+++ b/src/cyrsasl_scram.erl
@@ -34,8 +34,6 @@
 -include("ejabberd.hrl").
 -include("logger.hrl").
 
--include("jlib.hrl").
-
 -behaviour(cyrsasl).
 
 -record(state,

diff --git a/src/ejabberd_auth_anonymous.erl b/src/ejabberd_auth_anonymous.erl
index 5a5b395bf8d3eb35683db9ff1103cda70c10b287..c0ad1fb213e78b03b48a7e3150c65df2e652af8b 100644 (file)
--- a/src/ejabberd_auth_anonymous.erl
+++ b/src/ejabberd_auth_anonymous.erl
@@ -50,8 +50,7 @@
 
 -include("ejabberd.hrl").
 -include("logger.hrl").
-
--include("jlib.hrl").
+-include("jid.hrl").
 
 %% Create the anonymous table if at least one virtual host has anonymous features enabled
 %% Register to login / logout events

diff --git a/src/ejabberd_oauth.erl b/src/ejabberd_oauth.erl
index 57c1baab2d819f5926fffc4190ae4486293319c0..4e9dc8d081aa63ca8a09a34b8581735f5b9b5685 100644 (file)
--- a/src/ejabberd_oauth.erl
+++ b/src/ejabberd_oauth.erl
@@ -50,7 +50,7 @@
 
 -export([oauth_issue_token/1, oauth_list_tokens/0, oauth_revoke_token/1, oauth_list_scopes/0]).
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 
 -include("ejabberd.hrl").
 -include("logger.hrl").

diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl
index ec9ef43c6e5446f8dff772ae555ccf897837ea14..bc550ef4470e0608e90c7cbe887bdf3c8abbd994 100644 (file)
--- a/src/ejabberd_sm.erl
+++ b/src/ejabberd_sm.erl
@@ -78,7 +78,6 @@
 -include("ejabberd.hrl").
 -include("logger.hrl").
 
-%%-include("jlib.hrl").
 -include("xmpp.hrl").
 
 -include("ejabberd_commands.hrl").

diff --git a/src/ejabberd_sm_mnesia.erl b/src/ejabberd_sm_mnesia.erl
index b900da315247bf3abcbda8bee67217ca5ec67121..491872aee607095b9797b796aa865501f2471153 100644 (file)
--- a/src/ejabberd_sm_mnesia.erl
+++ b/src/ejabberd_sm_mnesia.erl
@@ -26,7 +26,6 @@
 
 -include("ejabberd.hrl").
 -include("ejabberd_sm.hrl").
--include("jlib.hrl").
 -include_lib("stdlib/include/ms_transform.hrl").
 
 -record(state, {}).

diff --git a/src/ejabberd_sm_redis.erl b/src/ejabberd_sm_redis.erl
index d25f777e3928c111091c4054a747f960cb7c6633..9c78acaf7ea518e12d9393444e10a75f8f53c12b 100644 (file)
--- a/src/ejabberd_sm_redis.erl
+++ b/src/ejabberd_sm_redis.erl
@@ -19,7 +19,6 @@
 -include("ejabberd.hrl").
 -include("ejabberd_sm.hrl").
 -include("logger.hrl").
--include("jlib.hrl").
 
 %%%===================================================================
 %%% API

diff --git a/src/ejabberd_sm_sql.erl b/src/ejabberd_sm_sql.erl
index 8871bbca48bb3364817a994affa1d82ccb5780a0..28796aca08455eb5749f6ef36b590e02c3a4c3fd 100644 (file)
--- a/src/ejabberd_sm_sql.erl
+++ b/src/ejabberd_sm_sql.erl
@@ -24,7 +24,6 @@
 -include("ejabberd.hrl").
 -include("ejabberd_sm.hrl").
 -include("logger.hrl").
--include("jlib.hrl").
 -include("ejabberd_sql_pt.hrl").
 
 %%%===================================================================

diff --git a/src/ejabberd_socket.erl b/src/ejabberd_socket.erl
index aa916867a06b1d72c498f6e0ee9b73343b4f3907..7160025e707c32acdc46a8ba8ab05472be6c0d07 100644 (file)
--- a/src/ejabberd_socket.erl
+++ b/src/ejabberd_socket.erl
@@ -49,7 +49,6 @@
 
 -include("ejabberd.hrl").
 -include("logger.hrl").
--include("jlib.hrl").
 
 -type sockmod() :: ejabberd_http_bind |
                    ejabberd_http_ws |
@@ -189,7 +188,7 @@ send(SocketData, Data) ->
 %% Can only be called when in c2s StateData#state.xml_socket is true
 %% This function is used for HTTP bind
 %% sockmod=ejabberd_http_ws|ejabberd_http_bind or any custom module
--spec send_xml(socket_state(), xmlel()) -> any().
+-spec send_xml(socket_state(), fxml:xmlel()) -> any().
 
 send_xml(SocketData, Data) ->
     catch

diff --git a/src/jid.erl b/src/jid.erl
index d81cbcefddb11117910ae52e37d4e8c11a1f823c..9e8ea9d23b949db0707b2a03701b993d5db03ae1 100644 (file)
--- a/src/jid.erl
+++ b/src/jid.erl
@@ -44,6 +44,7 @@
 -include("jid.hrl").
 
 -export_type([jid/0]).
+-export_type([ljid/0]).
 
 %%%===================================================================
 %%% API

diff --git a/src/mod_announce_mnesia.erl b/src/mod_announce_mnesia.erl
index c43eb853b922564b2fa9c27edd67fd2fc713691b..b5a1f590e8d9018fc2d632584346573dc30004b2 100644 (file)
--- a/src/mod_announce_mnesia.erl
+++ b/src/mod_announce_mnesia.erl
@@ -13,7 +13,7 @@
 -export([init/2, set_motd_users/2, set_motd/2, delete_motd/1,
         get_motd/1, is_motd_user/2, set_motd_user/2, import/2]).
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 -include("mod_announce.hrl").
 -include("logger.hrl").
 

diff --git a/src/mod_announce_riak.erl b/src/mod_announce_riak.erl
index 7ced0b3ce9fabc69a1b273ff8ba024c8b8b5eef2..879eb196da5b5f6a31b5e9fdc2cdd79cec5feb8e 100644 (file)
--- a/src/mod_announce_riak.erl
+++ b/src/mod_announce_riak.erl
@@ -13,7 +13,7 @@
 -export([init/2, set_motd_users/2, set_motd/2, delete_motd/1,
         get_motd/1, is_motd_user/2, set_motd_user/2, import/2]).
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 -include("mod_announce.hrl").
 
 %%%===================================================================

diff --git a/src/mod_announce_sql.erl b/src/mod_announce_sql.erl
index 762c97ad6204ef2de83a4caf75eae592772d223e..37b4412d34a20b082d3f9d030f29bcebf10b4c05 100644 (file)
--- a/src/mod_announce_sql.erl
+++ b/src/mod_announce_sql.erl
@@ -16,7 +16,7 @@
         get_motd/1, is_motd_user/2, set_motd_user/2, import/1,
         import/2, export/1]).
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 -include("mod_announce.hrl").
 -include("ejabberd_sql_pt.hrl").
 

diff --git a/src/mod_blocking_mnesia.erl b/src/mod_blocking_mnesia.erl
index 5a4bde64c59cfbec3f190bd1259daad0b25299c4..b64202717b314a164a2aa00f52557c8d590e0585 100644 (file)
--- a/src/mod_blocking_mnesia.erl
+++ b/src/mod_blocking_mnesia.erl
@@ -14,7 +14,6 @@
 -export([process_blocklist_block/3, unblock_by_filter/3,
         process_blocklist_get/2]).
 
--include("jlib.hrl").
 -include("mod_privacy.hrl").
 
 %%%===================================================================

diff --git a/src/mod_blocking_riak.erl b/src/mod_blocking_riak.erl
index 5dd5cfa92e8b28c2a71baca0d11c3779a8eeafac..1f15591ef6a1bc0b60c7efeb52632bfbd6fa290c 100644 (file)
--- a/src/mod_blocking_riak.erl
+++ b/src/mod_blocking_riak.erl
@@ -14,7 +14,6 @@
 -export([process_blocklist_block/3, unblock_by_filter/3,
         process_blocklist_get/2]).
 
--include("jlib.hrl").
 -include("mod_privacy.hrl").
 
 %%%===================================================================

diff --git a/src/mod_blocking_sql.erl b/src/mod_blocking_sql.erl
index bffe5bd25f8734bcef943ab3fe90ddf311cfdc9b..402d6de19ca2f354e2dbbca611f9985c956da323 100644 (file)
--- a/src/mod_blocking_sql.erl
+++ b/src/mod_blocking_sql.erl
@@ -14,7 +14,6 @@
 -export([process_blocklist_block/3, unblock_by_filter/3,
         process_blocklist_get/2]).
 
--include("jlib.hrl").
 -include("mod_privacy.hrl").
 
 %%%===================================================================

diff --git a/src/mod_muc_sql.erl b/src/mod_muc_sql.erl
index ff7ec1ebb2a43d908b792758dd766324e6f659a4..3139b531690d8329b55fd3a128f94119f913f082 100644 (file)
--- a/src/mod_muc_sql.erl
+++ b/src/mod_muc_sql.erl
@@ -17,7 +17,7 @@
         can_use_nick/4, get_rooms/2, get_nick/3, set_nick/4,
         import/1, import/2, export/1]).
 
--include("jlib.hrl").
+-include("jid.hrl").
 -include("mod_muc.hrl").
 -include("logger.hrl").
 -include("ejabberd_sql_pt.hrl").

diff --git a/src/mod_offline_mnesia.erl b/src/mod_offline_mnesia.erl
index 6a1d9e309281388dacd8ed7d97927450f1c36e39..e8db08ddf181537b8c2d07ed50ec0eabff7c5bc8 100644 (file)
--- a/src/mod_offline_mnesia.erl
+++ b/src/mod_offline_mnesia.erl
@@ -15,7 +15,7 @@
         read_message/3, remove_message/3, read_all_messages/2,
         remove_all_messages/2, count_messages/2, import/2]).
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 -include("mod_offline.hrl").
 -include("logger.hrl").
 

diff --git a/src/mod_offline_riak.erl b/src/mod_offline_riak.erl
index 217e8f8289658ce8fcae1aa2e17edda2b54c3468..647f71dfd2538de873bb1663f2f99ffbce3c62e6 100644 (file)
--- a/src/mod_offline_riak.erl
+++ b/src/mod_offline_riak.erl
@@ -15,7 +15,7 @@
         read_message/3, remove_message/3, read_all_messages/2,
         remove_all_messages/2, count_messages/2, import/2]).
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 -include("mod_offline.hrl").
 
 %%%===================================================================

diff --git a/src/mod_offline_sql.erl b/src/mod_offline_sql.erl
index feefd3dd0f5b6a821e4a80e56574383268c89d96..b5033c7104d24f8c2741b79e66abca3df8282f47 100644 (file)
--- a/src/mod_offline_sql.erl
+++ b/src/mod_offline_sql.erl
@@ -18,7 +18,7 @@
         remove_all_messages/2, count_messages/2, import/1, import/2,
         export/1]).
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 -include("mod_offline.hrl").
 -include("logger.hrl").
 -include("ejabberd_sql_pt.hrl").

diff --git a/src/mod_privacy_mnesia.erl b/src/mod_privacy_mnesia.erl
index 1a9172b5a9871798c3db445e88207e96357f7f6b..4642ba58ee55676c8a10a899a099ca0a881c6d9b 100644 (file)
--- a/src/mod_privacy_mnesia.erl
+++ b/src/mod_privacy_mnesia.erl
@@ -17,7 +17,7 @@
         set_privacy_list/4, get_user_list/2, get_user_lists/2,
         remove_user/2, import/2]).
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 -include("mod_privacy.hrl").
 -include("logger.hrl").
 

diff --git a/src/mod_privacy_riak.erl b/src/mod_privacy_riak.erl
index 40e92005cec0acfbe678241da00ac4bad6286333..509ff5ebb22b72bc5680ed37cf418cb3648be870 100644 (file)
--- a/src/mod_privacy_riak.erl
+++ b/src/mod_privacy_riak.erl
@@ -19,7 +19,7 @@
 
 -export([privacy_schema/0]).
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 -include("mod_privacy.hrl").
 
 %%%===================================================================

diff --git a/src/mod_privacy_sql.erl b/src/mod_privacy_sql.erl
index 66926f23680fa43e7e27ecf0a7de08b4ebb039b5..a1f743657c3c274c7c54c247c55fa5c76fb53ab3 100644 (file)
--- a/src/mod_privacy_sql.erl
+++ b/src/mod_privacy_sql.erl
@@ -28,7 +28,7 @@
         sql_get_privacy_list_id_t/2,
         sql_set_default_privacy_list/2, sql_set_privacy_list/2]).
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 -include("mod_privacy.hrl").
 -include("logger.hrl").
 -include("ejabberd_sql_pt.hrl").

diff --git a/src/mod_private_mnesia.erl b/src/mod_private_mnesia.erl
index 7a852c4f838b84389106b0e0fcdd07dd21d37225..d1bf20c857b9fe39f3c74f609b72daa633fa5a03 100644 (file)
--- a/src/mod_private_mnesia.erl
+++ b/src/mod_private_mnesia.erl
@@ -13,7 +13,7 @@
 -export([init/2, set_data/3, get_data/3, get_all_data/2, remove_user/2,
         import/2]).
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 -include("mod_private.hrl").
 -include("logger.hrl").
 

diff --git a/src/mod_private_riak.erl b/src/mod_private_riak.erl
index 11cfa477063b955d69d5fb5adac8456e7fa71d51..b05e7d725e05a8f0da15edce82a3060fd73528f1 100644 (file)
--- a/src/mod_private_riak.erl
+++ b/src/mod_private_riak.erl
@@ -14,7 +14,7 @@
 -export([init/2, set_data/3, get_data/3, get_all_data/2, remove_user/2,
         import/2]).
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 -include("mod_private.hrl").
 
 %%%===================================================================

diff --git a/src/mod_private_sql.erl b/src/mod_private_sql.erl
index 0e9d1b61e2604b9dee2243c584c4829cab0bdb5e..eb113d923837ceabd329d4eec5dc1e1707009c1a 100644 (file)
--- a/src/mod_private_sql.erl
+++ b/src/mod_private_sql.erl
@@ -14,7 +14,7 @@
 -export([init/2, set_data/3, get_data/3, get_all_data/2, remove_user/2,
         import/1, import/2, export/1]).
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 -include("mod_private.hrl").
 
 %%%===================================================================

diff --git a/src/mod_roster_mnesia.erl b/src/mod_roster_mnesia.erl
index ddfa34d686b69af167153f4c52fde70930249b47..398f105d5873ed5080625a1874a6660b2af7a595 100644 (file)
--- a/src/mod_roster_mnesia.erl
+++ b/src/mod_roster_mnesia.erl
@@ -17,7 +17,6 @@
         remove_user/2, update_roster/4, del_roster/3, transaction/2,
         read_subscription_and_groups/3, import/2]).
 
--include("jlib.hrl").
 -include("mod_roster.hrl").
 -include("logger.hrl").
 

diff --git a/src/mod_roster_riak.erl b/src/mod_roster_riak.erl
index 38e8738277753bce2d3d188d844e5ec1c5df8715..9ed5e7927b353635cae04cd0122a4078d8b184a0 100644 (file)
--- a/src/mod_roster_riak.erl
+++ b/src/mod_roster_riak.erl
@@ -18,7 +18,6 @@
         remove_user/2, update_roster/4, del_roster/3, transaction/2,
         read_subscription_and_groups/3, get_only_items/2, import/2]).
 
--include("jlib.hrl").
 -include("mod_roster.hrl").
 
 %%%===================================================================

diff --git a/src/mod_roster_sql.erl b/src/mod_roster_sql.erl
index 61f59a99098d475cdd856d81dd41d954ee303705..4d97aead084ad60f246a163b7cb6b07326f538ee 100644 (file)
--- a/src/mod_roster_sql.erl
+++ b/src/mod_roster_sql.erl
@@ -20,7 +20,6 @@
         read_subscription_and_groups/3, get_only_items/2,
         import/1, import/2, export/1]).
 
--include("jlib.hrl").
 -include("mod_roster.hrl").
 -include("ejabberd_sql_pt.hrl").
 

diff --git a/src/mod_vcard_mnesia.erl b/src/mod_vcard_mnesia.erl
index 781a135c8d5fff07cde63b9ea6f6e125a64aa1b6..67abed09b67d154b549d34069c051b078e016ac0 100644 (file)
--- a/src/mod_vcard_mnesia.erl
+++ b/src/mod_vcard_mnesia.erl
@@ -14,7 +14,7 @@
 -export([init/2, import/2, get_vcard/2, set_vcard/4, search/4, remove_user/2]).
 
 -include("ejabberd.hrl").
--include("jlib.hrl").
+-include("xmpp.hrl").
 -include("mod_vcard.hrl").
 -include("logger.hrl").
 

diff --git a/src/mod_vcard_riak.erl b/src/mod_vcard_riak.erl
index 386347387fa416c17769450d2c8405354e021c41..397008a798f1471d340935a73417f2e202fd6e8c 100644 (file)
--- a/src/mod_vcard_riak.erl
+++ b/src/mod_vcard_riak.erl
@@ -14,7 +14,7 @@
 -export([init/2, get_vcard/2, set_vcard/4, search/4, remove_user/2,
         import/2]).
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 -include("mod_vcard.hrl").
 
 %%%===================================================================

diff --git a/src/mod_vcard_sql.erl b/src/mod_vcard_sql.erl
index b8234bf9c699d2938890e0e8d224e1fd609db2c4..f448d07762314b9b3ff1b8e7798f90dc2225d3c1 100644 (file)
--- a/src/mod_vcard_sql.erl
+++ b/src/mod_vcard_sql.erl
@@ -16,7 +16,7 @@
 -export([init/2, get_vcard/2, set_vcard/4, search/4, remove_user/2,
         import/1, import/2, export/1]).
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 -include("mod_vcard.hrl").
 -include("logger.hrl").
 -include("ejabberd_sql_pt.hrl").

diff --git a/src/prosody2ejabberd.erl b/src/prosody2ejabberd.erl
index 204cfec2f3b980ba273fc6253cd4f302316252dc..d5eca5ecbc857cc35abf54d27afc167222288853 100644 (file)
--- a/src/prosody2ejabberd.erl
+++ b/src/prosody2ejabberd.erl
@@ -12,7 +12,7 @@
 -export([from_dir/1]).
 
 -include("ejabberd.hrl").
--include("jlib.hrl").
+-include("xmpp.hrl").
 -include("logger.hrl").
 -include("mod_roster.hrl").
 -include("mod_offline.hrl").