aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2024-04-27 15:59:46 +0200
committerKim Alvefur <zash@zash.se>2024-04-27 15:59:46 +0200
commit58af0798b756f48277fdf0b204e4c8f6e78907fd (patch)
treed9f3919161403479b800984c2ced0cc57df12d29 /plugins
parent83ee7e57394d381fe5a2156b3b3dadfa07c4cc57 (diff)
parentf3b1b57a70a41c97cbfe42c3d98118b2bc2c9901 (diff)
downloadprosody-master.tar.gz
prosody-master.zip
Merge 0.12->trunkHEADorigin/mastermaster
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_blocklist.lua9
1 files changed, 7 insertions, 2 deletions
diff --git a/plugins/mod_blocklist.lua b/plugins/mod_blocklist.lua
index e9a103c8..6587c8b1 100644
--- a/plugins/mod_blocklist.lua
+++ b/plugins/mod_blocklist.lua
@@ -335,8 +335,13 @@ local prio_in, prio_out = 100, 100;
module:hook("presence/bare", drop_stanza, prio_in);
module:hook("presence/full", drop_stanza, prio_in);
-module:hook("message/bare", bounce_message, prio_in);
-module:hook("message/full", bounce_message, prio_in);
+if module:get_option_boolean("bounce_blocked_messages", false) then
+ module:hook("message/bare", bounce_message, prio_in);
+ module:hook("message/full", bounce_message, prio_in);
+else
+ module:hook("message/bare", drop_stanza, prio_in);
+ module:hook("message/full", drop_stanza, prio_in);
+end
module:hook("iq/bare", bounce_iq, prio_in);
module:hook("iq/full", bounce_iq, prio_in);