mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_storage_internal: Fix keeping old timestamp in archive map API

Browse source 
This led to a missing 'when' field on changed items, which would cause a
traceack.
This commit is contained in:
Kim Alvefur 2020-05-15 20:55:22 +02:00
parent d689f6c9a1
commit d916ce38f6
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/mod_storage_internal.lua
View file

@ -234,7 +234,7 @@ function archive:set(username, key, new_value, new_when, new_with)
if old_item.key == key then
local item = st.preserialize(st.clone(new_value));
local when = new_when or item.when or datetime.parse(item.attr.stamp);
local when = new_when or old_item.when or datetime.parse(old_item.attr.stamp);
item.key = key;
item.when = when;
item.with = new_with or old_item.with;

17
spec/core_storagemanager_spec.lua
View file

@ -445,13 +445,24 @@ describe("storagemanager", function ()
assert.falsy(archive:set("mapuser", "no-such-id", test_stanza));
local id = archive:append("mapuser", nil, test_stanza, test_time, "contact@example.com");
assert.same(test_stanza, archive:get("mapuser", id));
do
local stanza_roundtrip, when, with = archive:get("mapuser", id);
assert.same(test_stanza, stanza_roundtrip, "same stanza is returned");
assert.equal(test_time, when, "same 'when' is returned");
assert.equal("contact@example.com", with, "same 'with' is returned");
end
local replacement_stanza = st.stanza("test", { xmlns = "urn:example:foo" })
:tag("bar"):up()
:reset();
assert(archive:set("mapuser", id, replacement_stanza));
assert.same(replacement_stanza, archive:get("mapuser", id));
assert(archive:set("mapuser", id, replacement_stanza, test_time+1));
do
local replaced, when, with = archive:get("mapuser", id);
assert.same(replacement_stanza, replaced, "replaced stanza is returned");
assert.equal(test_time+1, when, "modified 'when' is returned");
assert.equal("contact@example.com", with, "original 'with' is returned");
end
end);
end);