Changeset

8741:0fd63ed1f647

mod_blocklist: Allow mod_presence to handle subscription stanzas before bouncing outgoing presence (fixes #575)
author Kim Alvefur <zash@zash.se>
date Fri, 06 Apr 2018 22:12:45 +0200
parents 8730:de74bc49385e
children 8742:71939a65961e 8757:861a7d6c12d8
files plugins/mod_blocklist.lua
diffstat 1 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/mod_blocklist.lua	Fri Apr 06 01:42:35 2018 +0200
+++ b/plugins/mod_blocklist.lua	Fri Apr 06 22:12:45 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);