Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00
Code Releases Activity

Do not redefine records

Browse Source
This commit is contained in:
Evgeniy Khramtsov 2016-01-15 15:34:48 +03:00
parent 1d452c98c1
commit a83c5a8f3a
4 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mod_configure.erl
View File

@ -41,14 +41,11 @@
-include("logger.hrl"). -include("logger.hrl").
-include("jlib.hrl"). -include("jlib.hrl").
-include("ejabberd_sm.hrl").
-include("adhoc.hrl"). -include("adhoc.hrl").
-define(T(Lang, Text), translate:translate(Lang, Text)). -define(T(Lang, Text), translate:translate(Lang, Text)).
%% Copied from ejabberd_sm.erl
-record(session, {sid, usr, us, priority, info}).
start(Host, _Opts) -> start(Host, _Opts) ->
ejabberd_hooks:add(disco_local_items, Host, ?MODULE, ejabberd_hooks:add(disco_local_items, Host, ?MODULE,
get_local_items, 50), get_local_items, 50),

14
src/mod_muc.erl
View File

@ -58,19 +58,7 @@
-include("logger.hrl"). -include("logger.hrl").
-include("jlib.hrl"). -include("jlib.hrl").
-include("mod_muc.hrl").
-record(muc_room, {name_host = {<<"">>, <<"">>} :: {binary(), binary()} |
{'_', binary()},
opts = [] :: list() | '_'}).
-record(muc_online_room,
{name_host = {<<"">>, <<"">>} :: {binary(), binary()} | '$1' |
{'_', binary()} | '_',
pid = self() :: pid() | '$2' | '_' | '$1'}).
-record(muc_registered,
{us_host = {{<<"">>, <<"">>}, <<"">>} :: {{binary(), binary()}, binary()} | '$1',
nick = <<"">> :: binary()}).
-record(state, -record(state,
{host = <<"">> :: binary(), {host = <<"">> :: binary(),

4
src/mod_muc_admin.erl
View File

@ -26,13 +26,11 @@
-include("logger.hrl"). -include("logger.hrl").
-include("jlib.hrl"). -include("jlib.hrl").
-include("mod_muc_room.hrl"). -include("mod_muc_room.hrl").
-include("mod_muc.hrl").
-include("ejabberd_http.hrl"). -include("ejabberd_http.hrl").
-include("ejabberd_web_admin.hrl"). -include("ejabberd_web_admin.hrl").
-include("ejabberd_commands.hrl"). -include("ejabberd_commands.hrl").
%% Copied from mod_muc/mod_muc.erl
-record(muc_online_room, {name_host, pid}).
%%---------------------------- %%----------------------------
%% gen_mod %% gen_mod
%%---------------------------- %%----------------------------

6
src/mod_muc_log.erl
View File

@ -47,13 +47,9 @@
-include("logger.hrl"). -include("logger.hrl").
-include("jlib.hrl"). -include("jlib.hrl").
-include("mod_muc.hrl").
-include("mod_muc_room.hrl"). -include("mod_muc_room.hrl").
%% Copied from mod_muc/mod_muc.erl
-record(muc_online_room, {name_host = {<<>>, <<>>} :: {binary(), binary()},
pid = self() :: pid()}).
-define(T(Text), translate:translate(Lang, Text)). -define(T(Text), translate:translate(Lang, Text)).
-define(PROCNAME, ejabberd_mod_muc_log). -define(PROCNAME, ejabberd_mod_muc_log).
-record(room, {jid, title, subject, subject_author, config}). -record(room, {jid, title, subject, subject_author, config}).