# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1588978102 -7200
# Node ID 7c503938ce1dba76ca3e838472704a74b0a7c9b2
# Parent  4a9ff4f617965dae37c83d7027c58cb5ebfc8eb0# Parent  b4c2c7fae7c05cae18330e1d00eb4c2225ebea61
Merge 0.11->trunk

diff -r 4a9ff4f61796 -r 7c503938ce1d plugins/mod_csi_simple.lua
--- 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;
diff -r 4a9ff4f61796 -r 7c503938ce1d plugins/mod_muc_mam.lua
--- 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