MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055)

1 files changed, 16 insertions, 0 deletions

diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 0dfdd1aa..0040b99c 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -122,6 +122,22 @@ function room_mt:broadcast_presence(stanza, sid, code, nick)
 end
 function room_mt:broadcast_message(stanza, historic)
 	local to = stanza.attr.to;
+	local muc_jid = self.jid;
+
+	stanza:maptags(function (child)
+		if child.name == "delay" and child.attr["xmlns"] == "urn:xmpp:delay" then
+			if child.attr["from"] == muc_jid then
+				return nil;
+			end
+		end
+		if child.name == "x" and child.attr["xmlns"] == "jabber:x:delay" then
+			if child.attr["from"] == muc_jid then
+				return nil;
+			end
+		end
+		return child;
+	end)
+
 	for occupant, o_data in pairs(self._occupants) do
 		for jid in pairs(o_data.sessions) do
 			stanza.attr.to = jid;