Software / code / prosody
Changeset
13535:88cab98aa28c
mod_pubsub: Move precondition error wrangling out of util.pubsub
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.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 29 Oct 2024 14:56:02 +0100 |
| parents | 13534:d532176d4334 |
| children | 13536:272ea65c3087 |
| files | plugins/mod_pubsub/pubsub.lib.lua util/pubsub.lua |
| diffstat | 2 files changed, 5 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_pubsub/pubsub.lib.lua Tue Oct 29 14:10:02 2024 +0100 +++ b/plugins/mod_pubsub/pubsub.lib.lua Tue Oct 29 14:56:02 2024 +0100 @@ -34,10 +34,11 @@ ["persistent-items-unsupported"] = { "cancel", "feature-not-implemented", nil, "persistent-items" }; }); local function pubsub_error_reply(stanza, error, context) - if type(error) == "table" and type(error.pubsub_condition) == "string" then - error.extra = { namespace = xmlns_pubsub_errors; condition = error.pubsub_condition } + local err = pubsub_errors.wrap(error, context); + if error == "precondition-not-met" and type(context) == "table" and type(context.field) == "string" then + err.text = "Field does not match: " .. context.field; end - local reply = st.error_reply(stanza, pubsub_errors.wrap(error, context)); + local reply = st.error_reply(stanza, err); return reply; end _M.pubsub_error_reply = pubsub_error_reply;
--- a/util/pubsub.lua Tue Oct 29 14:10:02 2024 +0100 +++ b/util/pubsub.lua Tue Oct 29 14:56:02 2024 +0100 @@ -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 @@ -- 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
