aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-04-06 22:12:45 +0200
committerKim Alvefur <zash@zash.se>2018-04-06 22:12:45 +0200
commitb9a0fc550ea5ae7434098fdbba7d4f141b83cd71 (patch)
tree69f4f9589157521bff84e76f4df6c3979f3133cf
parentbb47d9eed064a133cbfaafb0e4de1203fcd8c138 (diff)
downloadprosody-b9a0fc550ea5ae7434098fdbba7d4f141b83cd71.tar.gz
prosody-b9a0fc550ea5ae7434098fdbba7d4f141b83cd71.zip
mod_blocklist: Allow mod_presence to handle subscription stanzas before bouncing outgoing presence (fixes #575)
-rw-r--r--plugins/mod_blocklist.lua9
1 files changed, 3 insertions, 6 deletions
diff --git a/plugins/mod_blocklist.lua b/plugins/mod_blocklist.lua
index e10ac27d..3c6708f0 100644
--- a/plugins/mod_blocklist.lua
+++ b/plugins/mod_blocklist.lua
@@ -321,12 +321,9 @@ module:hook("pre-message/bare", bounce_outgoing, prio_out);
module:hook("pre-message/full", bounce_outgoing, prio_out);
module:hook("pre-message/host", bounce_outgoing, prio_out);
--- FIXME See #575 -- We MUST bounce these, but we don't because this
--- would produce lots of error replies due to server-generated presence.
--- This will likely need changes to mod_presence
-module:hook("pre-presence/bare", drop_outgoing, prio_out);
-module:hook("pre-presence/full", drop_outgoing, prio_out);
-module:hook("pre-presence/host", drop_outgoing, prio_out);
+module:hook("pre-presence/bare", bounce_outgoing, -1);
+module:hook("pre-presence/host", bounce_outgoing, -1);
+module:hook("pre-presence/full", bounce_outgoing, prio_out);
module:hook("pre-iq/bare", bounce_outgoing, prio_out);
module:hook("pre-iq/full", bounce_outgoing, prio_out);