Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-26 17:38:45 +01:00
Code Releases Activity

Rewrite mod_irc to use XML generator

Browse Source
This commit is contained in:
Evgeniy Khramtsov 2016-08-03 20:57:05 +03:00
parent 5d06c6acbf
commit a417fbf45b
6 changed files with 972 additions and 1645 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1225
src/mod_irc.erl
View File

File diff suppressed because it is too large Load Diff

1368
src/mod_irc_connection.erl
View File

File diff suppressed because it is too large Load Diff

2
src/mod_irc_mnesia.erl
View File

@ -13,7 +13,7 @@
%% API %% API
-export([init/2, get_data/3, set_data/4, import/2]). -export([init/2, get_data/3, set_data/4, import/2]).
-include("jlib.hrl"). -include("jid.hrl").
-include("mod_irc.hrl"). -include("mod_irc.hrl").
-include("logger.hrl"). -include("logger.hrl").

2
src/mod_irc_riak.erl
View File

@ -13,7 +13,7 @@
%% API %% API
-export([init/2, get_data/3, set_data/4, import/2]). -export([init/2, get_data/3, set_data/4, import/2]).
-include("jlib.hrl"). -include("jid.hrl").
-include("mod_irc.hrl"). -include("mod_irc.hrl").
%%%=================================================================== %%%===================================================================

2
src/mod_irc_sql.erl
View File

@ -15,7 +15,7 @@
%% API %% API
-export([init/2, get_data/3, set_data/4, import/1, import/2, export/1]). -export([init/2, get_data/3, set_data/4, import/1, import/2, export/1]).
-include("jlib.hrl"). -include("jid.hrl").
-include("mod_irc.hrl"). -include("mod_irc.hrl").
-include("ejabberd_sql_pt.hrl"). -include("ejabberd_sql_pt.hrl").

18
src/xmpp.erl
View File

@ -41,7 +41,7 @@
err_resource_constraint/0, err_resource_constraint/2, err_resource_constraint/0, err_resource_constraint/2,
err_service_unavailable/0, err_service_unavailable/2, err_service_unavailable/0, err_service_unavailable/2,
err_subscription_required/0, err_subscription_required/2, err_subscription_required/0, err_subscription_required/2,
err_undefined_condition/0, err_undefined_condition/2, err_undefined_condition/1, err_undefined_condition/3,
err_unexpected_request/0, err_unexpected_request/2]). err_unexpected_request/0, err_unexpected_request/2]).
%% XMPP stream errors %% XMPP stream errors
@ -567,14 +567,16 @@ err_subscription_required(Text, Lang) ->
err(auth, 'subscription-required', 407, Text, Lang). err(auth, 'subscription-required', 407, Text, Lang).
%% No error type is defined for <undefined-confition/>. %% No error type is defined for <undefined-confition/>.
%% We choose "modify" as it's used in RFC 6120 example. %% Let user provide the type.
-spec err_undefined_condition() -> error(). -spec err_undefined_condition('auth' | 'cancel' | 'continue' |
err_undefined_condition() -> 'modify' | 'wait') -> error().
err(modify, 'undefined-condition', 500). err_undefined_condition(Type) ->
err(Type, 'undefined-condition', 500).
-spec err_undefined_condition(binary(), binary() | undefined) -> error(). -spec err_undefined_condition('auth' | 'cancel' | 'continue' | 'modify' | 'wait',
err_undefined_condition(Text, Lang) -> binary(), binary() | undefined) -> error().
err(modify, 'undefined-condition', 500, Text, Lang). err_undefined_condition(Type, Text, Lang) ->
err(Type, 'undefined-condition', 500, Text, Lang).
%% RFC 6120 says error type SHOULD be "wait" or "modify". %% RFC 6120 says error type SHOULD be "wait" or "modify".
%% RFC 3920 and XEP-0082 says it SHOULD be "wait". %% RFC 3920 and XEP-0082 says it SHOULD be "wait".