X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fpubsub.lua;h=69e79acc2894d52ab45c90f91f516768d0c7c86b;hb=e0ff05b0a50b767960b60561018da50d5416211e;hp=3beafab52c423f778af7e3d2729867b238834f9c;hpb=898fc1ff90e3c6244bbe8e88b5c533cde30bb588;p=prosody.git

diff --git a/util/pubsub.lua b/util/pubsub.lua
index 3beafab5..69e79acc 100644
--- a/util/pubsub.lua
+++ b/util/pubsub.lua
@@ -27,17 +27,14 @@ end
 function service:may(node, actor, action)
 	if actor == true then return true; end
 	
-	
 	local node_obj = self.nodes[node];
 	local node_aff = node_obj and node_obj.affiliations[actor];
 	local service_aff = self.affiliations[actor]
 	                 or self.config.get_affiliation(actor, node, action)
 	                 or "none";
 	
+	-- Check if node allows/forbids it
 	local node_capabilities = node_obj and node_obj.capabilities;
-	local service_capabilities = self.config.capabilities;
-	
-	-- Check if node allows/forbids it	
 	if node_capabilities then
 		local caps = node_capabilities[node_aff or service_aff];
 		if caps then
@@ -47,7 +44,9 @@ function service:may(node, actor, action)
 			end
 		end
 	end
+	
 	-- Check service-wide capabilities instead
+	local service_capabilities = self.config.capabilities;
 	local caps = service_capabilities[node_aff or service_aff];
 	if caps then
 		local can = caps[action];
@@ -70,14 +69,14 @@ function service:set_affiliation(node, actor, jid, affiliation)
 		return false, "item-not-found";
 	end
 	node_obj.affiliations[jid] = affiliation;
-	local _, jid_sub = self:get_subscription(node, nil, jid);
+	local _, jid_sub = self:get_subscription(node, true, jid);
 	if not jid_sub and not self:may(node, jid, "be_unsubscribed") then
-		local ok, err = self:add_subscription(node, nil, jid);
+		local ok, err = self:add_subscription(node, true, jid);
 		if not ok then
 			return ok, err;
 		end
 	elseif jid_sub and not self:may(node, jid, "be_subscribed") then
-		local ok, err = self:add_subscription(node, nil, jid);
+		local ok, err = self:add_subscription(node, true, jid);
 		if not ok then
 			return ok, err;
 		end
@@ -88,7 +87,7 @@ end
 function service:add_subscription(node, actor, jid, options)
 	-- Access checking
 	local cap;
-	if jid == actor or self:jids_equal(actor, jid) then
+	if actor == true or jid == actor or self:jids_equal(actor, jid) then
 		cap = "subscribe";
 	else
 		cap = "subscribe_other";
@@ -130,7 +129,7 @@ end
 function service:remove_subscription(node, actor, jid)
 	-- Access checking
 	local cap;
-	if jid == actor or self:jids_equal(actor, jid) then
+	if actor == true or jid == actor or self:jids_equal(actor, jid) then
 		cap = "unsubscribe";
 	else
 		cap = "unsubscribe_other";
@@ -170,7 +169,7 @@ end
 function service:get_subscription(node, actor, jid)
 	-- Access checking
 	local cap;
-	if jid == actor or self:jids_equal(actor, jid) then
+	if actor == true or jid == actor or self:jids_equal(actor, jid) then
 		cap = "get_subscription";
 	else
 		cap = "get_subscription_other";
@@ -278,7 +277,7 @@ end
 function service:get_subscriptions(node, actor, jid)
 	-- Access checking
 	local cap;
-	if jid == actor or self:jids_equal(actor, jid) then
+	if actor == true or jid == actor or self:jids_equal(actor, jid) then
 		cap = "get_subscriptions";
 	else
 		cap = "get_subscriptions_other";