diff options
| author | Kim Alvefur <zash@zash.se> | 2016-10-07 16:52:18 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-10-07 16:52:18 +0200 |
| commit | 67c41ef89e175c064eca7d7518779aefed31c187 (patch) | |
| tree | 9043fbad3e9e1ac74e957347fedc8cca0a635106 /plugins/mod_carbons.lua | |
| parent | 5ebf40bbffcbd1b50d76228307ade67863c3f586 (diff) | |
| parent | 36b9149295afd0c8b48e91c82ef0a1f8ebe7f932 (diff) | |
| download | prosody-67c41ef89e175c064eca7d7518779aefed31c187.tar.gz prosody-67c41ef89e175c064eca7d7518779aefed31c187.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_carbons.lua')
| -rw-r--r-- | plugins/mod_carbons.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_carbons.lua b/plugins/mod_carbons.lua index 9ef14713..951645f8 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 bare_jid == orig_from and stanza:get_child("x", "http://jabber.org/protocol/muc#user") then module:log("debug", "MUC PM, ignoring"); return end |