aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-05-09 00:48:22 +0200
committerKim Alvefur <zash@zash.se>2020-05-09 00:48:22 +0200
commit5b3710099c6ab6c855e3b672050c7a762355d82e (patch)
tree5f30078f1431496c8d5ddc30d5eb549f6a740db7
parent71d6bde69ce86526dda8b0ee7c14b3418c415a7f (diff)
parentb8779399f6ed223f9f49592edc474d33b137127d (diff)
downloadprosody-5b3710099c6ab6c855e3b672050c7a762355d82e.tar.gz
prosody-5b3710099c6ab6c855e3b672050c7a762355d82e.zip
Merge 0.11->trunk
-rw-r--r--plugins/mod_csi_simple.lua3
-rw-r--r--plugins/mod_muc_mam.lua3
2 files changed, 5 insertions, 1 deletions
diff --git a/plugins/mod_csi_simple.lua b/plugins/mod_csi_simple.lua
index bb8f757a..3bad872d 100644
--- a/plugins/mod_csi_simple.lua
+++ b/plugins/mod_csi_simple.lua
@@ -68,6 +68,9 @@ function is_important(stanza) --> boolean, reason: string
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;
diff --git a/plugins/mod_muc_mam.lua b/plugins/mod_muc_mam.lua
index a151931f..f22f20f2 100644
--- a/plugins/mod_muc_mam.lua
+++ b/plugins/mod_muc_mam.lua
@@ -336,7 +336,7 @@ module:hook("muc-get-history", function (event)
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 @@ module:hook("muc-disco#info", function(event)
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