diff options
| author | Kim Alvefur <zash@zash.se> | 2018-04-10 20:23:54 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2018-04-10 20:23:54 +0200 |
| commit | d38609fc4807ef55fe43bdc15b2e7bab8ecdf905 (patch) | |
| tree | 56ce87b57c881f7a5096b5f8c24b3cc4cc34fcdc | |
| parent | d1ded0b062305d31ae81bc2508f79e9af0a46734 (diff) | |
| parent | 5b56cf55da53ec450d7ff35300271144fc0e836f (diff) | |
| download | prosody-d38609fc4807ef55fe43bdc15b2e7bab8ecdf905.tar.gz prosody-d38609fc4807ef55fe43bdc15b2e7bab8ecdf905.zip | |
Merge 0.10->trunk
| -rw-r--r-- | plugins/mod_blocklist.lua | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/plugins/mod_blocklist.lua b/plugins/mod_blocklist.lua index e10ac27d..3c6708f0 100644 --- a/plugins/mod_blocklist.lua +++ b/plugins/mod_blocklist.lua @@ -321,12 +321,9 @@ module:hook("pre-message/bare", bounce_outgoing, prio_out); 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); |