25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-20 16:15:59 +01:00

mod_block_strangers: Add feature announcement to disco-info (#4039)

This commit is contained in:
Badlop 2024-08-27 11:57:28 +02:00
parent 50948d1619
commit 74b0f64645

View File

@ -32,7 +32,8 @@
-export([start/2, stop/1, reload/3, mod_doc/0, -export([start/2, stop/1, reload/3, mod_doc/0,
depends/2, mod_opt_type/1, mod_options/1]). depends/2, mod_opt_type/1, mod_options/1]).
-export([filter_packet/1, filter_offline_msg/1, filter_subscription/2]). -export([filter_packet/1, filter_offline_msg/1, filter_subscription/2,
get_sm_features/5]).
-include_lib("xmpp/include/xmpp.hrl"). -include_lib("xmpp/include/xmpp.hrl").
-include("logger.hrl"). -include("logger.hrl").
@ -40,13 +41,17 @@
-define(SETS, gb_sets). -define(SETS, gb_sets).
-define(NS_BLOCK_STRANGERS, <<"urn:ejabberd:block-strangers">>).
-type c2s_state() :: ejabberd_c2s:state(). -type c2s_state() :: ejabberd_c2s:state().
%%%=================================================================== %%%===================================================================
%%% Callbacks and hooks %%% Callbacks and hooks
%%%=================================================================== %%%===================================================================
start(_Host, _Opts) -> start(_Host, _Opts) ->
{ok, [{hook, user_receive_packet, filter_packet, 25}, {ok, [{hook, disco_local_features, get_sm_features, 50},
{hook, disco_sm_features, get_sm_features, 50},
{hook, user_receive_packet, filter_packet, 25},
{hook, roster_in_subscription, filter_subscription, 25}, {hook, roster_in_subscription, filter_subscription, 25},
{hook, offline_message_hook, filter_offline_msg, 25}]}. {hook, offline_message_hook, filter_offline_msg, 25}]}.
@ -56,6 +61,16 @@ stop(_Host) ->
reload(_Host, _NewOpts, _OldOpts) -> reload(_Host, _NewOpts, _OldOpts) ->
ok. ok.
get_sm_features(Acc, _From, _To, <<"">>, _Lang) ->
Features = case Acc of
{result, I} -> I;
_ -> []
end,
{result, [?NS_BLOCK_STRANGERS | Features]};
get_sm_features(Acc, _From, _To, _Node, _Lang) ->
Acc.
-spec filter_packet({stanza(), c2s_state()}) -> {stanza(), c2s_state()} | -spec filter_packet({stanza(), c2s_state()}) -> {stanza(), c2s_state()} |
{stop, {drop, c2s_state()}}. {stop, {drop, c2s_state()}}.
filter_packet({#message{from = From} = Msg, State} = Acc) -> filter_packet({#message{from = From} = Msg, State} = Acc) ->