1 files changed, 60 insertions, 18 deletions

diff --git a/plugins/mod_pubsub/mod_pubsub.lua b/plugins/mod_pubsub/mod_pubsub.lua
index ef31f326..5a590893 100644
--- a/plugins/mod_pubsub/mod_pubsub.lua
+++ b/plugins/mod_pubsub/mod_pubsub.lua
@@ -1,10 +1,9 @@
-local pubsub = require "util.pubsub";
-local st = require "util.stanza";
-local jid_bare = require "util.jid".bare;
-local usermanager = require "core.usermanager";
-local new_id = require "util.id".medium;
-local storagemanager = require "core.storagemanager";
-local xtemplate = require "util.xtemplate";
+local pubsub = require "prosody.util.pubsub";
+local st = require "prosody.util.stanza";
+local jid_bare = require "prosody.util.jid".bare;
+local new_id = require "prosody.util.id".medium;
+local storagemanager = require "prosody.core.storagemanager";
+local xtemplate = require "prosody.util.xtemplate";
 
 local xmlns_pubsub = "http://jabber.org/protocol/pubsub";
 local xmlns_pubsub_event = "http://jabber.org/protocol/pubsub#event";
@@ -13,7 +12,7 @@ local xmlns_pubsub_owner = "http://jabber.org/protocol/pubsub#owner";
 local autocreate_on_publish = module:get_option_boolean("autocreate_on_publish", false);
 local autocreate_on_subscribe = module:get_option_boolean("autocreate_on_subscribe", false);
 local pubsub_disco_name = module:get_option_string("name", "Prosody PubSub Service");
-local expose_publisher = module:get_option_boolean("expose_publisher", false)
+local service_expose_publisher = module:get_option_boolean("expose_publisher")
 
 local service;
 
@@ -40,7 +39,7 @@ end
 --   get(node_name)
 --   users(): iterator over (node_name)
 
-local max_max_items = module:get_option_number("pubsub_max_items", 256);
+local max_max_items = module:get_option_integer("pubsub_max_items", 256, 1);
 
 local function tonumber_max_items(n)
 	if n == "max" then
@@ -82,7 +81,11 @@ function simple_broadcast(kind, node, jids, item, actor, node_obj, service) --lu
 			if node_obj and node_obj.config.include_payload == false then
 				item:maptags(function () return nil; end);
 			end
-			if not expose_publisher then
+			local node_expose_publisher = service_expose_publisher;
+			if node_expose_publisher == nil and node_obj and node_obj.config.itemreply == "publisher" then
+				node_expose_publisher = true;
+			end
+			if not node_expose_publisher then
 				item.attr.publisher = nil;
 			elseif not item.attr.publisher and actor ~= true then
 				item.attr.publisher = service.config.normalize_jid(actor);
@@ -136,12 +139,22 @@ end
 
 -- Compose a textual representation of Atom payloads
 local summary_templates = module:get_option("pubsub_summary_templates", {
-	["http://www.w3.org/2005/Atom"] = "{summary|or{{author/name|and{{author/name} posted }}{title}}}";
+	["http://www.w3.org/2005/Atom"] = "{@pubsub:title|and{*{@pubsub:title}*\n\n}}{summary|or{{author/name|and{{author/name} posted }}{title}}}";
 })
 
 for pubsub_type, template in pairs(summary_templates) do
 	module:hook("pubsub-summary/"..pubsub_type, function (event)
 		local payload = event.payload;
+
+		local got_config, node_config = service:get_node_config(event.node, true);
+		if got_config then
+			payload = st.clone(payload);
+			payload.attr["xmlns:pubsub"] = xmlns_pubsub;
+			payload.attr["pubsub:node"] = event.node;
+			payload.attr["pubsub:title"] = node_config.title;
+			payload.attr["pubsub:description"] = node_config.description;
+		end
+
 		return xtemplate.render(template, payload, tostring);
 	end, -1);
 end
@@ -171,15 +184,31 @@ module:hook("host-disco-items", function (event)
 	if not ok then
 		return;
 	end
-	for node, node_obj in pairs(ret) do
-		reply:tag("item", { jid = module.host, node = node, name = node_obj.config.title }):up();
+	for node in pairs(ret) do
+		local ok, meta = service:get_node_metadata(node, stanza.attr.from);
+		if ok then
+			reply:tag("item", { jid = module.host, node = node, name = meta.title }):up();
+		end
 	end
 end);
 
-local admin_aff = module:get_option_string("default_admin_affiliation", "owner");
-local function get_affiliation(jid)
+local admin_aff = module:get_option_enum("default_admin_affiliation", "owner", "publisher", "member", "outcast", "none");
+
+module:default_permission("prosody:admin", ":service-admin");
+module:default_permission("prosody:admin", ":create-node");
+
+local function get_affiliation(jid, _, action)
 	local bare_jid = jid_bare(jid);
-	if bare_jid == module.host or usermanager.is_admin(bare_jid, module.host) then
+	if bare_jid == module.host then
+		-- The host itself (i.e. local modules) is treated as an admin.
+		-- Check this first as to avoid sendig a host JID to :may()
+		return admin_aff;
+	end
+	if action == "create" and module:may(":create-node", bare_jid) then
+		-- Only one affiliation is allowed to create nodes by default
+		return "owner";
+	end
+	if module:could(":service-admin", bare_jid) then
 		return admin_aff;
 	end
 end
@@ -192,7 +221,7 @@ function set_service(new_service)
 	service = new_service;
 	service.config.autocreate_on_publish = autocreate_on_publish;
 	service.config.autocreate_on_subscribe = autocreate_on_subscribe;
-	service.config.expose_publisher = expose_publisher;
+	service.config.expose_publisher = service_expose_publisher;
 
 	service.config.nodestore = node_store;
 	service.config.itemstore = create_simple_itemstore;
@@ -219,7 +248,7 @@ function module.load()
 	set_service(pubsub.new({
 		autocreate_on_publish = autocreate_on_publish;
 		autocreate_on_subscribe = autocreate_on_subscribe;
-		expose_publisher = expose_publisher;
+		expose_publisher = service_expose_publisher;
 
 		node_defaults = {
 			["persist_items"] = true;
@@ -230,9 +259,22 @@ function module.load()
 		broadcaster = simple_broadcast;
 		itemcheck = is_item_stanza;
 		check_node_config = check_node_config;
+		metadata_subset = {
+			"title";
+			"description";
+			"payload_type";
+			"access_model";
+			"publish_model";
+		};
 		get_affiliation = get_affiliation;
 
 		jid = module.host;
 		normalize_jid = jid_bare;
 	}));
 end
+
+local function get_service(service_jid)
+	return assert(assert(prosody.hosts[service_jid], "Unknown pubsub service").modules.pubsub, "Not a pubsub service").service;
+end
+
+module:require("commands").add_commands(get_service);