diff options
| author |   Kim Alvefur <zash@zash.se> | 2024-04-27 15:59:46 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2024-04-27 15:59:46 +0200 |
| commit | 58af0798b756f48277fdf0b204e4c8f6e78907fd (patch) | |
| tree | d9f3919161403479b800984c2ced0cc57df12d29 | |
| parent | mod_pep: Implement 'roster' (group) access_model (diff) | |
| parent | mod_admin_shell: Allow matching on host or bare JID in c2s:show (diff) | |
| download | prosody-58af0798b756f48277fdf0b204e4c8f6e78907fd.tar.xz prosody-58af0798b756f48277fdf0b204e4c8f6e78907fd.zip | |
Merge 0.12->trunk
| -rw-r--r-- | plugins/mod_blocklist.lua | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/plugins/mod_blocklist.lua b/plugins/mod_blocklist.lua index e9a103c83..6587c8b12 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); |