Comparison

MUC: Move delayed delivery check into an event handler

comparison

equal deleted inserted replaced

-:3d3706147174
+:d546815e555e
 	end
 	return x
 end
 function room_mt:broadcast_message(stanza)
+	if module:fire_event("muc-broadcast-message", {room = self, stanza = stanza}) then
+		return true;
+	end
+	self:broadcast(stanza);
+	return true;
+end
+-- Strip delay tags claiming to be from us
+module:hook("muc-broadcast-message", function (event)
+	local stanza = event.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
 				return nil;
 			end
 		end
 		return child;
 	end)
+end);
-	if module:fire_event("muc-broadcast-message", {room = self, stanza = stanza}) then
-		return true;
-	end
-	self:broadcast(stanza);
-	return true;
-end
 -- Broadcast a stanza to all occupants in the room.
 -- optionally checks conditional called with (nick, occupant)
 function room_mt:broadcast(stanza, cond_func)
 	for nick, occupant in self:each_occupant() do