# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1523384634 -7200
# Node ID 71939a65961eb85f86c3e5d9c71f14f46047d025
# Parent  5dc8f509496cdac6a8d5f35a672ba111f0f6c639# Parent  0fd63ed1f6471b472850de6108c1c19dec80cbc7
Merge 0.10->trunk

diff -r 5dc8f509496c -r 71939a65961e plugins/mod_blocklist.lua
--- a/plugins/mod_blocklist.lua	Tue Apr 10 01:32:52 2018 +0200
+++ b/plugins/mod_blocklist.lua	Tue Apr 10 20:23:54 2018 +0200
@@ -321,12 +321,9 @@
 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);