Merge with 0.9

[prosody.git] / util / pubsub.lua

diff --git a/util/pubsub.lua b/util/pubsub.lua
index 3beafab52c423f778af7e3d2729867b238834f9c..d8ae1f38fa3f2993c66ceb50e83bacba0daf3eb0 100644 (file)
--- a/util/pubsub.lua
+++ b/util/pubsub.lua
@@ -1,3 +1,5 @@
+local events = require "util.events";
+
 module("pubsub", package.seeall);
 
 local service = {};
@@ -16,6 +18,7 @@ function new(config)
                affiliations = {};
                subscriptions = {};
                nodes = {};
+               events = events.new();
        }, service_mt);
 end
 
@@ -27,17 +30,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 +47,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 +72,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 +90,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";
@@ -105,7 +107,7 @@ function service:add_subscription(node, actor, jid, options)
                if not self.config.autocreate_on_subscribe then
                        return false, "item-not-found";
                else
-                       local ok, err = self:create(node, actor);
+                       local ok, err = self:create(node, true);
                        if not ok then
                                return ok, err;
                        end
@@ -124,13 +126,14 @@ function service:add_subscription(node, actor, jid, options)
        else
                self.subscriptions[normal_jid] = { [jid] = { [node] = true } };
        end
+       self.events.fire_event("subscription-added", { node = node, jid = jid, normalized_jid = normal_jid, options = options });
        return true;
 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";
@@ -164,13 +167,26 @@ function service:remove_subscription(node, actor, jid)
                        self.subscriptions[normal_jid] = nil;
                end
        end
+       self.events.fire_event("subscription-removed", { node = node, jid = jid, normalized_jid = normal_jid });
+       return true;
+end
+
+function service:remove_all_subscriptions(actor, jid)
+       local normal_jid = self.config.normalize_jid(jid);
+       local subs = self.subscriptions[normal_jid]
+       subs = subs and subs[jid];
+       if subs then
+               for node in pairs(subs) do
+                       self:remove_subscription(node, true, jid);
+               end
+       end
        return true;
 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";
@@ -221,7 +237,7 @@ function service:publish(node, actor, id, item)
                if not self.config.autocreate_on_publish then
                        return false, "item-not-found";
                end
-               local ok, err = self:create(node, actor);
+               local ok, err = self:create(node, true);
                if not ok then
                        return ok, err;
                end
@@ -278,7 +294,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";