Software / code / prosody
Changeset
9772:7934e2c6b030
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 07 Jan 2019 15:02:11 +0100 |
| parents | 9766:f40b9649e929 (current diff) 9771:bf92f37de137 (diff) |
| children | 9775:b16780e7939f |
| files | |
| diffstat | 1 files changed, 17 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_csi_simple.lua Sun Jan 06 12:20:57 2019 +0100 +++ b/plugins/mod_csi_simple.lua Mon Jan 07 15:02:11 2019 +0100 @@ -63,8 +63,23 @@ if st_type == "headline" then return false; end - local body = stanza:get_child_text("body"); - return body; + if stanza:get_child("sent", "urn:xmpp:carbons:2") then + return true; + end + local forwarded = stanza:find("{urn:xmpp:carbons:2}received/{urn:xmpp:forward:0}/{jabber:client}message"); + if forwarded then + stanza = forwarded; + end + if stanza:get_child("body") then + return true; + end + if stanza:get_child("subject") then + return true; + end + if stanza:get_child("encryption", "urn:xmpp:eme:0") then + return true; + end + return false; end return true; end, -1);
