aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-04-10 20:23:54 +0200
committerKim Alvefur <zash@zash.se>2018-04-10 20:23:54 +0200
commit5d2a541a3ddabdc146615ffd1c1de8475e64fca7 (patch)
tree56ce87b57c881f7a5096b5f8c24b3cc4cc34fcdc
parent693a06e2f3094f51f11fd0fe1ee50d230be1cba6 (diff)
parentb9a0fc550ea5ae7434098fdbba7d4f141b83cd71 (diff)
downloadprosody-5d2a541a3ddabdc146615ffd1c1de8475e64fca7.tar.gz
prosody-5d2a541a3ddabdc146615ffd1c1de8475e64fca7.zip
Merge 0.10->trunk
-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);