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

mod_pubsub: Move precondition error wrangling out of util.pubsub

Browse source 
Removes dependency on util.error from util.pubsub which was only used
for this one special case.

Line count reduction!

Would be even nicer if templating could be done by util.error itself.
This commit is contained in:
Kim Alvefur 2024-10-29 14:56:02 +01:00
parent 73b512d3a6
commit c175dc8265
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
util/pubsub.lua
View file

@ -1,6 +1,5 @@
local events = require "prosody.util.events";
local cache = require "prosody.util.cache";
local errors = require "prosody.util.error";
local service_mt = {};
@ -562,11 +561,7 @@ function service:publish(node, actor, id, item, requested_config) --> ok, err
-- Check that node has the requested config before we publish
local ok, field = check_preconditions(node_obj.config, requested_config);
if not ok then
local err = errors.new({
type = "cancel", condition = "conflict", text = "Field does not match: "..field;
});
err.pubsub_condition = "precondition-not-met";
return false, err;
return false, "precondition-not-met", { field = field };
end
end
if not self.config.itemcheck(item) then