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: Signal that 'persistent-items' is unsupported when disabled

Browse source 
XEP-0060 says that this the way to indicate that 'persistent-items' is
unsupported, but doesn't explicitly say if it being disabled in the node
configuration also counts as unsupported.
This commit is contained in:
Kim Alvefur 2021-07-22 19:53:21 +02:00
parent 1603e003b1
commit dfed446a5a
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/mod_pubsub/pubsub.lib.lua
View file

@ -32,6 +32,7 @@ local pubsub_errors = {
["internal-server-error"] = { "wait", "internal-server-error" };
["precondition-not-met"] = { "cancel", "conflict", nil, "precondition-not-met" };
["invalid-item"] = { "modify", "bad-request", "invalid item" };
["persistent-items-unsupported"] = { "cancel", "feature-not-implemented", nil, "persistent-items" };
};
local function pubsub_error_reply(stanza, error)
local e = pubsub_errors[error];

4
spec/util_pubsub_spec.lua
View file

@ -523,8 +523,8 @@ describe("util.pubsub", function ()
assert.spy(broadcaster).was_called();
local ok, items = service:get_items("node", true);
assert.truthy(ok);
assert.same(items, {});
assert.not_truthy(ok);
assert.equal(items, "persistent-items-unsupported");
end);
end)

7
util/pubsub.lua
View file

@ -652,13 +652,14 @@ function service:get_items(node, actor, ids) --> (true, { id, [id] = node }) or
if not node_obj then
return false, "item-not-found";
end
if not self.data[node] then
-- Disabled rather than unsupported, but close enough.
return false, "persistent-items-unsupported";
end
if type(ids) == "string" then -- COMPAT see #1305
ids = { ids };
end
local data = {};
if not self.data[node] then
return true, data;
end
if ids then
for _, key in ipairs(ids) do
local value = self.data[node]:get(key);