Changeset

13489:ae65f199f408

Merge 0.12->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 27 Apr 2024 15:59:46 +0200
parents 13486:fdd1438d9ef7 (current diff) 13488:b2b090181270 (diff)
children 13490:6f840763fc73
files plugins/mod_admin_shell.lua plugins/mod_blocklist.lua
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/mod_blocklist.lua	Sun Dec 03 23:19:27 2023 +0100
+++ b/plugins/mod_blocklist.lua	Sat Apr 27 15:59:46 2024 +0200
@@ -335,8 +335,13 @@
 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);