Merge 0.11->trunk

This commit is contained in:
Kim Alvefur 2019-03-02 22:26:30 +01:00
commit 0f12a9df66

View file

@ -3,6 +3,7 @@ local array = require "util.array";
local envload = require "util.envload".envload;
local st = require "util.stanza";
local is_stanza = st.is_stanza or function (s) return getmetatable(s) == st.stanza_mt end
local new_id = require "util.id".medium;
local auto_purge_enabled = module:get_option_boolean("storage_memory_temporary", false);
local auto_purge_stores = module:get_option_set("storage_memory_temporary_stores", {});
@ -64,7 +65,7 @@ function archive_store:append(username, key, value, when, with)
end
local v = { key = key, when = when, with = with, value = value };
if not key then
key = tostring(a):match"%x+$"..tostring(v):match"%x+$";
key = new_id();
v.key = key;
end
if a[key] then