util.pubsub: Check whether node exists, when deleting

[prosody.git] / util / pubsub.lua

diff --git a/util/pubsub.lua b/util/pubsub.lua
index 17795cf1b566841be728045f339a0b18d2e19519..e1418c62d51fdccf96b4f8605789ce0378e11a9e 100644 (file)
--- a/util/pubsub.lua
+++ b/util/pubsub.lua
@@ -226,6 +226,21 @@ function service:create(node, actor)
        return ok, err;
 end
 
+function service:delete(node, actor)
+       -- Access checking
+       if not self:may(node, actor, "delete") then
+               return false, "forbidden";
+       end
+       --
+       local node_obj = self.nodes[node];
+       if not node_obj then
+               return false, "item-not-found";
+       end
+       self.nodes[node] = nil;
+       self.config.broadcaster("delete", node, node_obj.subscribers);
+       return true;
+end
+
 function service:publish(node, actor, id, item)
        -- Access checking
        if not self:may(node, actor, "publish") then
@@ -245,7 +260,7 @@ function service:publish(node, actor, id, item)
        end
        node_obj.data[id] = item;
        self.events.fire_event("item-published", { node = node, actor = actor, id = id, item = item });
-       self.config.broadcaster(node, node_obj.subscribers, item);
+       self.config.broadcaster("items", node, node_obj.subscribers, item);
        return true;
 end
 
@@ -259,19 +274,28 @@ function service:retract(node, actor, id, retract)
        if (not node_obj) or (not node_obj.data[id]) then
                return false, "item-not-found";
        end
-       if id then
-               node_obj.data[id] = nil;
-       else
-               node_obj.data = {}; -- Purge
-       end
+       node_obj.data[id] = nil;
        if retract then
-               self.config.broadcaster(node, node_obj.subscribers, retract);
+               self.config.broadcaster("items", node, node_obj.subscribers, retract);
        end
        return true
 end
 
-function service:purge(node, actor, purge)
-       return self:retract(node, actor, nil, purge);
+function service:purge(node, actor, notify)
+       -- Access checking
+       if not self:may(node, actor, "retract") then
+               return false, "forbidden";
+       end
+       --
+       local node_obj = self.nodes[node];
+       if not node_obj then
+               return false, "item-not-found";
+       end
+       node_obj.data = {}; -- Purge
+       if notify then
+               self.config.broadcaster("purge", node, node_obj.subscribers);
+       end
+       return true
 end
 
 function service:get_items(node, actor, id)
@@ -329,7 +353,7 @@ function service:get_subscriptions(node, actor, jid)
                        if node then -- Return only subscriptions to this node
                                if subscribed_nodes[node] then
                                        ret[#ret+1] = {
-                                               node = subscribed_node;
+                                               node = node;
                                                jid = jid;
                                                subscription = node_obj.subscribers[jid];
                                        };