Mercurial > prosody-hg
comparison plugins/mod_carbons.lua @ 10778:a62b981db0e2
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 26 Apr 2020 20:49:31 +0200 |
| parents | 658b759a1f7a 3695904d2854 |
| children | d95e083931d1 |
comparison
equal
deleted
inserted
replaced
| 10775:1641e33f1d36 | 10778:a62b981db0e2 |
|---|---|
| 67 module:log("debug", "Message tagged private, ignoring"); | 67 module:log("debug", "Message tagged private, ignoring"); |
| 68 return | 68 return |
| 69 elseif stanza:get_child("no-copy", "urn:xmpp:hints") then | 69 elseif stanza:get_child("no-copy", "urn:xmpp:hints") then |
| 70 module:log("debug", "Message has no-copy hint, ignoring"); | 70 module:log("debug", "Message has no-copy hint, ignoring"); |
| 71 return | 71 return |
| 72 elseif not c2s and bare_jid == orig_from and stanza:get_child("x", "http://jabber.org/protocol/muc#user") then | 72 elseif not c2s and bare_jid ~= orig_to and stanza:get_child("x", "http://jabber.org/protocol/muc#user") then |
| 73 module:log("debug", "MUC PM, ignoring"); | 73 module:log("debug", "MUC PM, ignoring"); |
| 74 return | 74 return |
| 75 end | 75 end |
| 76 | 76 |
| 77 local carbon; | 77 local carbon; |
