# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1714226386 -7200
# Node ID ae65f199f408bceeb3806ad28ad4011b8feea7d1
# Parent  fdd1438d9ef793c69d0fb66ec22eff955c1ff656# Parent  b2b090181270daf1145566c83fd4c4253dc5eb8d
Merge 0.12->trunk

diff -r fdd1438d9ef7 -r ae65f199f408 plugins/mod_admin_shell.lua
diff -r fdd1438d9ef7 -r ae65f199f408 plugins/mod_blocklist.lua
--- 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);