# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1471713139 -7200
# Node ID 96e6df7123597c8712272185a7601eb8cb26045e
# Parent  f5016c8985d73025eb91565063d6d148ffebd2b1# Parent  b8c03df6e8ca59c326c66a492e04f7408f1e1d9d
Merge 0.10->trunk

diff -r f5016c8985d7 -r 96e6df712359 plugins/mod_blocklist.lua
--- a/plugins/mod_blocklist.lua	Fri Aug 19 22:49:36 2016 +0200
+++ b/plugins/mod_blocklist.lua	Sat Aug 20 19:12:19 2016 +0200
@@ -113,7 +113,7 @@
 	origin.interested_blocklist = true; -- Gets notified about changes
 	origin.send(reply);
 	return true;
-end);
+end, -1);
 
 -- Add or remove some jid(s) from the blocklist
 -- We want this to be atomic and not do a partial update
@@ -215,8 +215,8 @@
 	return true;
 end
 
-module:hook("iq-set/self/urn:xmpp:blocking:block", edit_blocklist);
-module:hook("iq-set/self/urn:xmpp:blocking:unblock", edit_blocklist);
+module:hook("iq-set/self/urn:xmpp:blocking:block", edit_blocklist, -1);
+module:hook("iq-set/self/urn:xmpp:blocking:unblock", edit_blocklist, -1);
 
 -- Cache invalidation, solved!
 module:hook_global("user-deleted", function (event)
@@ -302,6 +302,7 @@
 module:hook("presence/bare", drop_stanza, prio_in);
 module:hook("presence/full", drop_stanza, prio_in);
 
+-- FIXME See #690
 module:hook("message/bare", bounce_message, prio_in);
 module:hook("message/full", bounce_message, prio_in);
 
@@ -312,9 +313,9 @@
 module:hook("pre-message/full", bounce_outgoing, prio_out);
 module:hook("pre-message/host", bounce_outgoing, prio_out);
 
--- Note: MUST bounce these, but we don't because this would produce
--- lots of error replies due to server-generated presence.
--- FIXME some day, likely needing changes to mod_presence
+-- 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);