--- 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
--- 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()
--- 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