prosody
71939a65961e

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

8742:71939a65961e

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 10 Apr 2018 20:23:54 +0200
parents 8740:5dc8f509496c (current diff) 8741:0fd63ed1f647 (diff)
children 8743:81929cfe7f86
files
diffstat 1 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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);