From 77cb2879ff809f97da1b01a4c7c540b790e747ec Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 23 Sep 2016 14:03:37 +0200 Subject: mod_carbons: Make the conditions for ignoring MUC PMs more specific (fixes #744) --- plugins/mod_carbons.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/mod_carbons.lua') diff --git a/plugins/mod_carbons.lua b/plugins/mod_carbons.lua index 9ef14713..71ad786d 100644 --- a/plugins/mod_carbons.lua +++ b/plugins/mod_carbons.lua @@ -1,5 +1,5 @@ -- XEP-0280: Message Carbons implementation for Prosody --- Copyright (C) 2011 Kim Alvefur +-- Copyright (C) 2011-2016 Kim Alvefur -- -- This file is MIT/X11 licensed. @@ -67,7 +67,7 @@ local function message_handler(event, c2s) elseif stanza:get_child("no-copy", "urn:xmpp:hints") then module:log("debug", "Message has no-copy hint, ignoring"); return - elseif stanza:get_child("x", "http://jabber.org/protocol/muc#user") then + elseif not c2s and orig_from ~= orig_from and stanza:get_child("x", "http://jabber.org/protocol/muc#user") then module:log("debug", "MUC PM, ignoring"); return end -- cgit v1.2.3 From 03d5fec3924e9636e22bc02025f91d3016b90486 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 23 Sep 2016 14:06:25 +0200 Subject: mod_carbons: Compare with correct variable --- plugins/mod_carbons.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/mod_carbons.lua') diff --git a/plugins/mod_carbons.lua b/plugins/mod_carbons.lua index 71ad786d..2429eefc 100644 --- a/plugins/mod_carbons.lua +++ b/plugins/mod_carbons.lua @@ -67,7 +67,7 @@ local function message_handler(event, c2s) elseif stanza:get_child("no-copy", "urn:xmpp:hints") then module:log("debug", "Message has no-copy hint, ignoring"); return - elseif not c2s and orig_from ~= orig_from and stanza:get_child("x", "http://jabber.org/protocol/muc#user") then + elseif not c2s and bare_jid ~= orig_from and stanza:get_child("x", "http://jabber.org/protocol/muc#user") then module:log("debug", "MUC PM, ignoring"); return end -- cgit v1.2.3 From c86a00dec4a0f2539b314fccd2953f68691e9263 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 23 Sep 2016 16:26:09 +0200 Subject: mod_carbons: Fix inverted logic (Thanks Ge0rg)} --- plugins/mod_carbons.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/mod_carbons.lua') diff --git a/plugins/mod_carbons.lua b/plugins/mod_carbons.lua index 2429eefc..951645f8 100644 --- a/plugins/mod_carbons.lua +++ b/plugins/mod_carbons.lua @@ -67,7 +67,7 @@ local function message_handler(event, c2s) elseif stanza:get_child("no-copy", "urn:xmpp:hints") then module:log("debug", "Message has no-copy hint, ignoring"); return - elseif not c2s and bare_jid ~= orig_from and stanza:get_child("x", "http://jabber.org/protocol/muc#user") then + elseif not c2s and bare_jid == orig_from and stanza:get_child("x", "http://jabber.org/protocol/muc#user") then module:log("debug", "MUC PM, ignoring"); return end -- cgit v1.2.3