Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.12->trunk default tip
authorKim Alvefur <zash@zash.se>
Sat, 27 Apr 2024 15:59:46 +0200
changeset 13493 ae65f199f408
parent 13490 fdd1438d9ef7 (current diff)
parent 13492 b2b090181270 (diff)
Merge 0.12->trunk
plugins/mod_admin_shell.lua file | annotate | diff | comparison | revisions
plugins/mod_blocklist.lua file | annotate | diff | comparison | revisions 
--- 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);
prosody