Software /
code /
prosody
Changeset
7622:96e6df712359
Merge 0.10->trunk
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Sat, 20 Aug 2016 19:12:19 +0200 (2016-08-20) |
parents | 7619:f5016c8985d7 (current diff) 7621:b8c03df6e8ca (diff) |
children | 7623:a1c040a5754f |
files | |
diffstat | 1 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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);