25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-28 16:34:13 +01:00

New conversejs_options to setup additional options for Converse

This commit is contained in:
Badlop 2022-03-31 21:24:04 +02:00
parent 94186a36d0
commit 6cdb517454
2 changed files with 39 additions and 2 deletions

View File

@ -51,6 +51,7 @@ depends(_Host, _Opts) ->
[]. [].
process([], #request{method = 'GET', host = Host, raw_path = RawPath}) -> process([], #request{method = 'GET', host = Host, raw_path = RawPath}) ->
ExtraOptions = get_extra_options(Host),
DomainRaw = gen_mod:get_module_opt(Host, ?MODULE, default_domain), DomainRaw = gen_mod:get_module_opt(Host, ?MODULE, default_domain),
Domain = misc:expand_keyword(<<"@HOST@">>, DomainRaw, Host), Domain = misc:expand_keyword(<<"@HOST@">>, DomainRaw, Host),
Script = get_file_url(Host, conversejs_script, Script = get_file_url(Host, conversejs_script,
@ -66,7 +67,8 @@ process([], #request{method = 'GET', host = Host, raw_path = RawPath}) ->
{<<"registration_domain">>, Domain}, {<<"registration_domain">>, Domain},
{<<"assets_path">>, RawPath}, {<<"assets_path">>, RawPath},
{<<"i18n">>, ejabberd_option:language(Host)}, {<<"i18n">>, ejabberd_option:language(Host)},
{<<"view_mode">>, <<"fullscreen">>}], {<<"view_mode">>, <<"fullscreen">>}
| ExtraOptions],
Init2 = Init2 =
case mod_host_meta:get_url(?MODULE, websocket, any, Host) of case mod_host_meta:get_url(?MODULE, websocket, any, Host) of
undefined -> Init; undefined -> Init;
@ -159,6 +161,17 @@ content_type(Filename) ->
%% Options parsing %% Options parsing
%%---------------------------------------------------------------------- %%----------------------------------------------------------------------
get_extra_options(Host) ->
RawOpts = gen_mod:get_module_opt(Host, ?MODULE, conversejs_options),
lists:map(fun({Name, <<"true">>}) -> {Name, true};
({Name, <<"false">>}) -> {Name, false};
({<<"locked_domain">> = Name, Value}) ->
{Name, misc:expand_keyword(<<"@HOST@">>, Value, Host)};
({Name, Value}) ->
{Name, Value}
end,
RawOpts).
get_file_url(Host, Option, Filename, Default) -> get_file_url(Host, Option, Filename, Default) ->
FileRaw = case gen_mod:get_module_opt(Host, ?MODULE, Option) of FileRaw = case gen_mod:get_module_opt(Host, ?MODULE, Option) of
auto -> get_auto_file_url(Host, Filename, Default); auto -> get_auto_file_url(Host, Filename, Default);
@ -182,6 +195,8 @@ mod_opt_type(websocket_url) ->
econf:either(auto, econf:binary()); econf:either(auto, econf:binary());
mod_opt_type(conversejs_resources) -> mod_opt_type(conversejs_resources) ->
econf:either(undefined, econf:directory()); econf:either(undefined, econf:directory());
mod_opt_type(conversejs_options) ->
econf:map(econf:binary(), econf:either(econf:binary(), econf:int()));
mod_opt_type(conversejs_script) -> mod_opt_type(conversejs_script) ->
econf:binary(); econf:binary();
mod_opt_type(conversejs_css) -> mod_opt_type(conversejs_css) ->
@ -194,6 +209,7 @@ mod_options(_) ->
{websocket_url, auto}, {websocket_url, auto},
{default_domain, <<"@HOST@">>}, {default_domain, <<"@HOST@">>},
{conversejs_resources, undefined}, {conversejs_resources, undefined},
{conversejs_options, []},
{conversejs_script, auto}, {conversejs_script, auto},
{conversejs_css, auto}]. {conversejs_css, auto}].
@ -223,7 +239,14 @@ mod_doc() ->
"modules:", "modules:",
" mod_conversejs:", " mod_conversejs:",
" conversejs_resources: \"/home/ejabberd/conversejs-9.0.0/package/dist\"", " conversejs_resources: \"/home/ejabberd/conversejs-9.0.0/package/dist\"",
" websocket_url: \"ws://example.org:5280/websocket\""], " websocket_url: \"ws://example.org:5280/websocket\""
" conversejs_options:"
" auto_away: 30"
" clear_cache_on_logout: true"
" i18n: \"pt\""
" locked_domain: \"@HOST@\""
" message_archiving: always"
" theme: concord"],
opts => opts =>
[{websocket_url, [{websocket_url,
#{value => ?T("auto | WebSocketURL"), #{value => ?T("auto | WebSocketURL"),
@ -254,6 +277,13 @@ mod_doc() ->
desc => desc =>
?T("Local path to the Converse files. " ?T("Local path to the Converse files. "
"If not set, the public Converse client will be used instead.")}}, "If not set, the public Converse client will be used instead.")}},
{conversejs_options,
#{value => "{Name: Value}",
desc =>
?T("Specify additional options to be passed to Converse. "
"See https://conversejs.org/docs/html/configuration.html[Converse configuration]. "
"Only boolean, integer and string values are supported; "
"lists are not supported.")}},
{conversejs_script, {conversejs_script,
#{value => ?T("auto | URL"), #{value => ?T("auto | URL"),
desc => desc =>

View File

@ -5,6 +5,7 @@
-export([bosh_service_url/1]). -export([bosh_service_url/1]).
-export([conversejs_css/1]). -export([conversejs_css/1]).
-export([conversejs_options/1]).
-export([conversejs_resources/1]). -export([conversejs_resources/1]).
-export([conversejs_script/1]). -export([conversejs_script/1]).
-export([default_domain/1]). -export([default_domain/1]).
@ -22,6 +23,12 @@ conversejs_css(Opts) when is_map(Opts) ->
conversejs_css(Host) -> conversejs_css(Host) ->
gen_mod:get_module_opt(Host, mod_conversejs, conversejs_css). gen_mod:get_module_opt(Host, mod_conversejs, conversejs_css).
-spec conversejs_options(gen_mod:opts() | global | binary()) -> [{binary(),binary() | integer()}].
conversejs_options(Opts) when is_map(Opts) ->
gen_mod:get_opt(conversejs_options, Opts);
conversejs_options(Host) ->
gen_mod:get_module_opt(Host, mod_conversejs, conversejs_options).
-spec conversejs_resources(gen_mod:opts() | global | binary()) -> 'undefined' | binary(). -spec conversejs_resources(gen_mod:opts() | global | binary()) -> 'undefined' | binary().
conversejs_resources(Opts) when is_map(Opts) -> conversejs_resources(Opts) when is_map(Opts) ->
gen_mod:get_opt(conversejs_resources, Opts); gen_mod:get_opt(conversejs_resources, Opts);