Software / code / prosody
Changeset
10817:7c503938ce1d
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 09 May 2020 00:48:22 +0200 |
| parents | 10813:4a9ff4f61796 (current diff) 10816:b4c2c7fae7c0 (diff) |
| children | 10818:04a0aa6d7e72 |
| files | plugins/mod_csi_simple.lua plugins/mod_muc_mam.lua |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_csi_simple.lua Sat May 09 00:28:10 2020 +0200 +++ b/plugins/mod_csi_simple.lua Sat May 09 00:48:22 2020 +0200 @@ -68,6 +68,9 @@ return true; end end + if stanza:get_child(nil, "urn:xmpp:jingle-message:0") then + return true; + end return false; elseif st_name == "iq" then return true;
--- a/plugins/mod_muc_mam.lua Sat May 09 00:28:10 2020 +0200 +++ b/plugins/mod_muc_mam.lua Sat May 09 00:48:22 2020 +0200 @@ -336,7 +336,7 @@ return true; end, 1); -module:hook("muc-broadcast-messages", function (event) +module:hook("muc-broadcast-message", function (event) local room, stanza = event.room, event.stanza; -- Filter out <stanza-id> that claim to be from us @@ -446,6 +446,7 @@ if archiving_enabled(event.room) then event.reply:tag("feature", {var=xmlns_mam}):up(); end + event.reply:tag("feature", {var=xmlns_st_id}):up(); end); -- Cleanup
