# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1506518849 -7200
# Node ID 13dad833e821b668a42951db77095d898a775366
# Parent  3798955049e34167b49941e0233f5913296d71ad
mod_blocklist: Drop messages to existing full JIDs in order to prevent issues with MUC PMs, fixes #690

diff -r 3798955049e3 -r 13dad833e821 plugins/mod_blocklist.lua
--- a/plugins/mod_blocklist.lua	Wed Sep 27 15:21:20 2017 +0200
+++ b/plugins/mod_blocklist.lua	Wed Sep 27 15:27:29 2017 +0200
@@ -22,6 +22,7 @@
 
 local storage = module:open_store();
 local sessions = prosody.hosts[module.host].sessions;
+local full_sessions = prosody.full_sessions;
 
 -- First level cache of blocklists by username.
 -- Weak table so may randomly expire at any time.
@@ -271,8 +272,13 @@
 end
 
 local function bounce_message(event)
-	local type = event.stanza.attr.type;
+	local stanza = event.stanza;
+	local type = stanza.attr.type;
 	if type == "chat" or not type or type == "normal" then
+		if full_sessions[stanza.attr.to] then
+			-- See #690
+			return drop_stanza(event);
+		end
 		return bounce_stanza(event);
 	end
 	return drop_stanza(event); -- drop headlines, groupchats etc
@@ -305,7 +311,6 @@
 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);