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

util.pubsub: Apply defaults metatable before config check (thanks pep.)

Browse source 
Makes it so that the callback sees the default if it’s not in the form,
which makes it easier to validate.
This commit is contained in:
Kim Alvefur 2018-08-05 15:17:00 +02:00
parent 9c75dbe8a8
commit 2b8327099a
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
util/pubsub.lua
View file

@ -565,6 +565,8 @@ function service:set_node_config(node, actor, new_config)
return false, "item-not-found"; return false, "item-not-found";
end end
setmetatable(new_config, {__index=self.node_defaults})
if self.config.check_node_config then if self.config.check_node_config then
local ok = self.config.check_node_config(node, actor, new_config); local ok = self.config.check_node_config(node, actor, new_config);
if not ok then if not ok then
@ -573,7 +575,7 @@ function service:set_node_config(node, actor, new_config)
end end
local old_config = node_obj.config; local old_config = node_obj.config;
node_obj.config = setmetatable(new_config, {__index=self.node_defaults}); node_obj.config = new_config;
if self.config.nodestore then if self.config.nodestore then
local ok, err = save_node_to_store(self, node_obj); local ok, err = save_node_to_store(self, node_obj);