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

util.pubsub: Add support for requesting multiple specific items (needed for #1305)

Browse source
This commit is contained in:
Kim Alvefur 2019-01-28 01:41:01 +01:00
parent d0d8bf9237
commit da56744645
2 changed files with 44 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

31
spec/util_pubsub_spec.lua
View file

@ -170,6 +170,37 @@ describe("util.pubsub", function ()
end);
describe("the thing", function ()
randomize(false); -- These tests are ordered
local service = pubsub.new();
it("creates a node with some items", function ()
assert.truthy(service:create("node", true, { max_items = 3 }));
assert.truthy(service:publish("node", true, "1", "item 1"));
assert.truthy(service:publish("node", true, "2", "item 2"));
assert.truthy(service:publish("node", true, "3", "item 3"));
end);
it("should return the requested item", function ()
local ok, ret = service:get_items("node", true, "1");
assert.truthy(ok);
assert.same({ "1", ["1"] = "item 1" }, ret);
end);
it("should return multiple requested items", function ()
local ok, ret = service:get_items("node", true, { "1", "2" });
assert.truthy(ok);
assert.same({
"1",
"2",
["1"] = "item 1",
["2"] = "item 2",
}, ret);
end);
end);
describe("node config", function ()
local service;
before_each(function ()

21
util/pubsub.lua
View file

@ -600,7 +600,7 @@ function service:purge(node, actor, notify) --> ok, err
return true
end
function service:get_items(node, actor, id) --> (true, { id, [id] = node }) or (false, err)
function service:get_items(node, actor, ids) --> (true, { id, [id] = node }) or (false, err)
-- Access checking
if not self:may(node, actor, "get_items") then
return false, "forbidden";
@ -610,20 +610,25 @@ function service:get_items(node, actor, id) --> (true, { id, [id] = node }) or (
if not node_obj then
return false, "item-not-found";
end
if id then -- Restrict results to a single specific item
local with_id = self.data[node]:get(id);
if not with_id then
return true, { };
if type(ids) == "string" then -- COMPAT see #1305
ids = { ids };
end
local data = {};
if ids then
for _, key in ipairs(ids) do
local value = self.data[node]:get(key);
if value then
data[#data+1] = key;
data[key] = value;
end
end
return true, { id, [id] = with_id };
else
local data = {}
for key, value in self.data[node]:items() do
data[#data+1] = key;
data[key] = value;
end
return true, data;
end
return true, data;
end
function service:get_last_item(node, actor) --> (true, id, node) or (false, err)