# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1474632104 -7200
# Node ID ad7f87bd30c812378518a3c66b09e99278a12f06
# Parent  ad40c094e7d740345a204f0b9f6081128ecda4a2
mod_carbons: Make the conditions for ignoring MUC PMs more specific (fixes #744)

diff -r ad40c094e7d7 -r ad7f87bd30c8 mod_carbons/mod_carbons.lua
--- a/mod_carbons/mod_carbons.lua	Fri Sep 23 13:20:49 2016 +0200
+++ b/mod_carbons/mod_carbons.lua	Fri Sep 23 14:01:44 2016 +0200
@@ -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.
 
@@ -74,7 +74,7 @@
 	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