X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_pubsub.lua;h=841de14761b8108e070911b88096f74b8806a292;hb=62e24f323209d90f117e65f964630369cfd03165;hp=b7c04163a6552b4db887da88c367feea844a2317;hpb=bc3d372a6845e378c0fc6de664abd76301540c87;p=prosody.git

diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index b7c04163..841de147 100644
--- a/plugins/mod_pubsub.lua
+++ b/plugins/mod_pubsub.lua
@@ -9,6 +9,9 @@ local xmlns_pubsub = "http://jabber.org/protocol/pubsub";
 local xmlns_pubsub_errors = "http://jabber.org/protocol/pubsub#errors";
 local xmlns_pubsub_event = "http://jabber.org/protocol/pubsub#event";
 
+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 service;
 
 local handlers = {};
@@ -177,9 +180,39 @@ end
 
 module:hook("iq/host/http://jabber.org/protocol/pubsub:pubsub", handle_pubsub_iq);
 
-local disco_info = st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#info" })
-	:tag("identity", { category = "pubsub", type = "service" }):up()
-	:tag("feature", { var = "http://jabber.org/protocol/pubsub" }):up();
+local disco_info;
+
+local feature_map = {
+	create = { "create-nodes", autocreate_on_publish and "instant-nodes", "item-ids" };
+	retract = { "delete-items", "retract-items" };
+	publish = { "publish" };
+	get_items = { "retrieve-items" };
+};
+
+local function add_disco_features_from_service(disco, service)
+	for method, features in pairs(feature_map) do
+		if service[method] then
+			for _, feature in ipairs(features) do
+				if feature then
+					disco:tag("feature", { var = xmlns_pubsub.."#"..feature }):up();
+				end
+			end
+		end
+	end
+	for affiliation in pairs(service.config.capabilities) do
+		if affiliation ~= "none" and affiliation ~= "owner" then
+			disco:tag("feature", { var = xmlns_pubsub.."#"..affiliation.."-affiliation" }):up();
+		end
+	end
+end
+
+local function build_disco_info(service)
+	local disco_info = st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#info" })
+		:tag("identity", { category = "pubsub", type = "service" }):up()
+		:tag("feature", { var = "http://jabber.org/protocol/pubsub" }):up();
+	add_disco_features_from_service(disco_info, service);
+	return disco_info;
+end
 
 module:hook("iq-get/host/http://jabber.org/protocol/disco#info:query", function (event)
 	event.origin.send(st.reply(event.stanza):add_child(disco_info));
@@ -203,12 +236,27 @@ end);
 
 local admin_aff = module:get_option_string("default_admin_affiliation", "owner");
 local function get_affiliation(jid)
-	if usermanager.is_admin(jid, module.host) then
+	local bare_jid = jid_bare(jid);
+	if bare_jid == module.host or usermanager.is_admin(bare_jid, module.host) then
 		return admin_aff;
 	end
 end
 
-service = pubsub.new({
+function set_service(new_service)
+	service = new_service;
+	module.environment.service = service;
+	disco_info = build_disco_info(service);
+end
+
+function module.save()
+	return { service = service };
+end
+
+function module.restore(data)
+	set_service(data.service);
+end
+
+set_service(pubsub.new({
 	capabilities = {
 		none = {
 			create = false;
@@ -219,7 +267,7 @@ service = pubsub.new({
 			subscribe = true;
 			unsubscribe = true;
 			get_subscription = true;
-			--get_items = true;
+			get_items = true;
 			
 			subscribe_other = false;
 			unsubscribe_other = false;
@@ -239,7 +287,7 @@ service = pubsub.new({
 			subscribe = true;
 			unsubscribe = true;
 			get_subscription = true;
-			--get_items = true;
+			get_items = true;
 			
 			
 			subscribe_other = true;
@@ -251,25 +299,14 @@ service = pubsub.new({
 			
 			set_affiliation = true;
 		};
-		admin = { get_items = true };
 	};
 	
-	autocreate_on_publish = module:get_option_boolean("autocreate_on_publish");
-	autocreate_on_subscribe = module:get_option_boolean("autocreate_on_subscribe");
+	autocreate_on_publish = autocreate_on_publish;
+	autocreate_on_subscribe = autocreate_on_subscribe;
 	
 	broadcaster = simple_broadcast;
 	get_affiliation = get_affiliation;
 	jids_equal = function (jid1, jid2)
 		return jid_bare(jid1) == jid_bare(jid2);
 	end;
-});
-module.environment.service = service;
-
-function module.save()
-	return { service = service };
-end
-
-function module.restore(data)
-	service = data.service;
-	module.environment.service = service;
-end
+}));