diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2019-09-18 17:39:40 +0200 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2019-09-18 17:39:40 +0200 |
| commit | f48b4124b12b8f700c2fad9d5f6142de02b851e8 (patch) | |
| tree | b6b1344aefaa657de2eb5bbd3658d074551eaa5d | |
| parent | Apply default role after revoking admin affiliation (#3023) (diff) | |
mod_jidprep: Don't call gen_mod functions directly
| -rw-r--r-- | src/mod_jidprep.erl | 4 | ||||
| -rw-r--r-- | src/mod_jidprep_opt.erl | 13 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/mod_jidprep.erl b/src/mod_jidprep.erl index d530b5069..8b3a8c33f 100644 --- a/src/mod_jidprep.erl +++ b/src/mod_jidprep.erl @@ -93,7 +93,7 @@ disco_local_features(empty, From, To, Node, Lang) -> disco_local_features({result, []}, From, To, Node, Lang); disco_local_features({result, OtherFeatures} = Acc, From, #jid{lserver = LServer}, <<"">>, _Lang) -> - Access = gen_mod:get_module_opt(LServer, ?MODULE, access), + Access = mod_jidprep_opt:access(LServer), case acl:match_rule(LServer, Access, From) of allow -> {result, [?NS_JIDPREP_0 | OtherFeatures]}; @@ -123,7 +123,7 @@ process_iq(#iq{from = From, to = #jid{lserver = LServer}, lang = Lang, sub_els = [#jidprep{jid = #jid{luser = U, lserver = S, lresource = R} = JID}]} = IQ) -> - Access = gen_mod:get_module_opt(LServer, ?MODULE, access), + Access = mod_jidprep_opt:access(LServer), case acl:match_rule(LServer, Access, From) of allow -> case jid:make(U, S, R) of diff --git a/src/mod_jidprep_opt.erl b/src/mod_jidprep_opt.erl new file mode 100644 index 000000000..f30f70632 --- /dev/null +++ b/src/mod_jidprep_opt.erl @@ -0,0 +1,13 @@ +%% Generated automatically +%% DO NOT EDIT: run `make options` instead + +-module(mod_jidprep_opt). + +-export([access/1]). + +-spec access(gen_mod:opts() | global | binary()) -> 'local' | acl:acl(). +access(Opts) when is_map(Opts) -> + gen_mod:get_opt(access, Opts); +access(Host) -> + gen_mod:get_module_opt(Host, mod_jidprep, access). + |