aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-05-09 00:55:18 +0200
committerKim Alvefur <zash@zash.se>2020-05-09 00:55:18 +0200
commit4443c44e22a58b5cd2d2f16f9748648d5bd8a7e9 (patch)
tree2e42ab3a2a2c15269732aa51e397c3360b72de3b
parent3d5273454b79de0f6c9809cce5ed91f439a91e9f (diff)
downloadprosody-4443c44e22a58b5cd2d2f16f9748648d5bd8a7e9.tar.gz
prosody-4443c44e22a58b5cd2d2f16f9748648d5bd8a7e9.zip
mod_carbons: Explicitly carbon XEP-0353: Jingle Message Initiation
-rw-r--r--doc/doap.xml2
-rw-r--r--plugins/mod_carbons.lua5
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/doap.xml b/doc/doap.xml
index fa3f8d91..0befc21c 100644
--- a/doc/doap.xml
+++ b/doc/doap.xml
@@ -512,7 +512,7 @@
<xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0353.html"/>
<xmpp:version>0.3</xmpp:version>
<xmpp:since>0.11.6</xmpp:since>
- <xmpp:note>triggers buffer flush in mod_csi_simple since 0.11.6</xmpp:note>
+ <xmpp:note>triggers buffer flush in mod_csi_simple since 0.11.6; recognised by mod_carbons since 0.12</xmpp:note>
</xmpp:SupportedXep>
</implements>
<implements>
diff --git a/plugins/mod_carbons.lua b/plugins/mod_carbons.lua
index ccd16ad5..e0f0a711 100644
--- a/plugins/mod_carbons.lua
+++ b/plugins/mod_carbons.lua
@@ -55,6 +55,11 @@ local function should_copy(stanza, c2s, user_bare) --> boolean, reason: string
return true, "bounce";
end
+ if stanza:get_child(nil, "urn:xmpp:jingle-message:0") then
+ -- XXX Experimental XEP stuck in Proposed for almost a year at the time of this comment
+ return true, "jingle call";
+ end
+
for archived in stanza:childtags("stanza-id", "urn:xmpp:sid:0") do
if archived and archived.attr.by == user_bare then
return true, "archived";