diff options
| author | Kim Alvefur <zash@zash.se> | 2016-09-23 14:03:37 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-09-23 14:03:37 +0200 |
| commit | 77cb2879ff809f97da1b01a4c7c540b790e747ec (patch) | |
| tree | f2da6b74abb8052d5eee6f40b2b1057dd0d618a4 | |
| parent | cd10e4439e1c9b6209f87bb6c77e51fb2f7992fc (diff) | |
| download | prosody-77cb2879ff809f97da1b01a4c7c540b790e747ec.tar.gz prosody-77cb2879ff809f97da1b01a4c7c540b790e747ec.zip | |
mod_carbons: Make the conditions for ignoring MUC PMs more specific (fixes #744)
| -rw-r--r-- | plugins/mod_carbons.lua | 4 | ||||
| -rw-r--r-- | util/jid.lua | 2 |
2 files changed, 3 insertions, 3 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 diff --git a/util/jid.lua b/util/jid.lua index 522fb126..f402b7f4 100644 --- a/util/jid.lua +++ b/util/jid.lua @@ -46,7 +46,7 @@ end local function prepped_split(jid) local node, host, resource = split(jid); - if host then + if host and host ~= "." then if sub(host, -1, -1) == "." then -- Strip empty root label host = sub(host, 1, -2); end |