# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1533540115 -3600
# Node ID da7a2db01d6a506c257a2807462144257b8ca86b
# Parent  dcc490f0044d277d089f24f7eeeefd6716b3c855# Parent  a69dc9c729eca2dcf360d87570a91ce2e751893c
Merge with jonasw

diff -r a69dc9c729ec -r da7a2db01d6a plugins/mod_pubsub/pubsub.lib.lua
--- a/plugins/mod_pubsub/pubsub.lib.lua	Sun Aug 05 15:52:19 2018 +0200
+++ b/plugins/mod_pubsub/pubsub.lib.lua	Mon Aug 06 08:21:55 2018 +0100
@@ -156,7 +156,7 @@
 				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 @@
 		-- 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;