aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_pubsub/pubsub.lib.lua16
1 files changed, 13 insertions, 3 deletions
diff --git a/plugins/mod_pubsub/pubsub.lib.lua b/plugins/mod_pubsub/pubsub.lib.lua
index adee989f..e6c6fd6f 100644
--- a/plugins/mod_pubsub/pubsub.lib.lua
+++ b/plugins/mod_pubsub/pubsub.lib.lua
@@ -156,7 +156,7 @@ local function config_from_xep0060(config, strict)
config_value = tonumber(config_value);
end
ret[mapped_name] = config_value;
- elseif strict then
+ elseif strict and config_field ~= "FORM_TYPE" then
return nil, "unknown-field", config_field;
end
end
@@ -552,8 +552,18 @@ function handlers.set_publish(origin, stanza, publish, service)
-- Ensure that the node configuration matches the values in publish-options
local publish_options_form = publish_options:get_child("x", "jabber:x:data");
local required_config = config_from_xep0060(node_config_form:data(publish_options_form), true);
- local node_config = service:get_node_config(node, stanza.attr.from);
- if not check_preconditions(node_config, required_config) then
+ local node_accessible, node_config = service:get_node_config(node, stanza.attr.from);
+ if node_accessible == false and service.config.autocreate_on_publish then
+ module:log("debug", "creating node %s with publish-options", node)
+ -- we need to create the node here so that it is configured
+ -- correctly
+ local created, err = service:create(node, stanza.attr.from, required_config)
+ if not created then
+ local reply = pubsub_error_reply(stanza, err);
+ origin.send(reply);
+ return true;
+ end
+ elseif not check_preconditions(node_config, required_config) then
local reply = pubsub_error_reply(stanza, "precondition-not-met");
origin.send(reply);
return true;