# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1513900925 -3600
# Node ID 3d37061471748840eb06c9cecdab7d6f61c4c8e3
# Parent  f024cb5acc25e8e217cc627ccfb33014df069557# Parent  867679b0fb032970bab2e57390cbdd55319e9a03
Merge 0.10->trunk

diff -r f024cb5acc25 -r 3d3706147174 plugins/mod_saslauth.lua
--- a/plugins/mod_saslauth.lua	Thu Dec 21 12:22:46 2017 -0500
+++ b/plugins/mod_saslauth.lua	Fri Dec 22 01:02:05 2017 +0100
@@ -263,6 +263,7 @@
 			elseif not origin.secure and insecure_mechanisms:contains(mechanism) then
 				log("debug", "Not offering mechanism %s on insecure connection", mechanism);
 			else
+				log("debug", "Offering mechanism %s", mechanism);
 				mechanisms:tag("mechanism"):text(mechanism):up();
 			end
 		end
diff -r f024cb5acc25 -r 3d3706147174 plugins/mod_storage_sql.lua
--- a/plugins/mod_storage_sql.lua	Thu Dec 21 12:22:46 2017 -0500
+++ b/plugins/mod_storage_sql.lua	Fri Dec 22 01:02:05 2017 +0100
@@ -480,7 +480,7 @@
 		Column { name="type", type="TEXT", nullable=false };
 		Column { name="value", type="MEDIUMTEXT", nullable=false };
 		Index { name="prosodyarchive_index", unique = true, "host", "user", "store", "key" };
-		Index { name="prosodyarchive_with", "host", "user", "store", "with" };
+		Index { name="prosodyarchive_with_when", "host", "user", "store", "with", "when" };
 		Index { name="prosodyarchive_when", "host", "user", "store", "when" };
 	};
 	engine:transaction(function()
diff -r f024cb5acc25 -r 3d3706147174 plugins/muc/muc.lib.lua
--- a/plugins/muc/muc.lib.lua	Thu Dec 21 12:22:46 2017 -0500
+++ b/plugins/muc/muc.lib.lua	Fri Dec 22 01:02:05 2017 +0100
@@ -164,6 +164,23 @@
 end
 
 function room_mt:broadcast_message(stanza)
+	local to = stanza.attr.to;
+	local room_jid = self.jid;
+
+	stanza:maptags(function (child)
+		if child.name == "delay" and child.attr["xmlns"] == "urn:xmpp:delay" then
+			if child.attr["from"] == room_jid then
+				return nil;
+			end
+		end
+		if child.name == "x" and child.attr["xmlns"] == "jabber:x:delay" then
+			if child.attr["from"] == room_jid then
+				return nil;
+			end
+		end
+		return child;
+	end)
+
 	if module:fire_event("muc-broadcast-message", {room = self, stanza = stanza}) then
 		return true;
 	end