aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-09-23 14:03:37 +0200
committerKim Alvefur <zash@zash.se>2016-09-23 14:03:37 +0200
commit77cb2879ff809f97da1b01a4c7c540b790e747ec (patch)
treef2da6b74abb8052d5eee6f40b2b1057dd0d618a4 /plugins
parentcd10e4439e1c9b6209f87bb6c77e51fb2f7992fc (diff)
downloadprosody-77cb2879ff809f97da1b01a4c7c540b790e747ec.tar.gz
prosody-77cb2879ff809f97da1b01a4c7c540b790e747ec.zip
mod_carbons: Make the conditions for ignoring MUC PMs more specific (fixes #744)
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_carbons.lua4
1 files changed, 2 insertions, 2 deletions
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