Merge 0.10->trunk

[prosody.git] / util / pubsub.lua

diff --git a/util/pubsub.lua b/util/pubsub.lua
index 0dfd196b2db22b5ef08545febaeca4b51b4b7aa0..fc67cb1fda5767b492c4e4c02180ab5cb2ff2da1 100644 (file)
--- a/util/pubsub.lua
+++ b/util/pubsub.lua
@@ -1,4 +1,5 @@
 local events = require "util.events";
+local t_remove = table.remove;
 
 module("pubsub", package.seeall);
 
@@ -18,6 +19,7 @@ function new(config)
                affiliations = {};
                subscriptions = {};
                nodes = {};
+               data = {};
                events = events.new();
        }, service_mt);
 end
@@ -212,16 +214,19 @@ function service:create(node, actor)
                return false, "conflict";
        end
 
+       self.data[node] = {};
        self.nodes[node] = {
                name = node;
                subscribers = {};
                config = {};
-               data = {};
                affiliations = {};
        };
+       setmetatable(self.nodes[node], { __index = { data = self.data[node] } }); -- COMPAT
+       self.events.fire_event("node-created", { node = node, actor = actor });
        local ok, err = self:set_affiliation(node, true, actor, "owner");
        if not ok then
                self.nodes[node] = nil;
+               self.data[node] = nil;
        end
        return ok, err;
 end
@@ -237,10 +242,23 @@ function service:delete(node, actor)
                return false, "item-not-found";
        end
        self.nodes[node] = nil;
+       self.data[node] = nil;
+       self.events.fire_event("node-deleted", { node = node, actor = actor });
        self.config.broadcaster("delete", node, node_obj.subscribers);
        return true;
 end
 
+local function remove_item_by_id(data, id)
+       if not data[id] then return end
+       data[id] = nil;
+       for i, _id in ipairs(data) do
+               if id == _id then
+                       t_remove(data, i);
+                       return i;
+               end
+       end
+end
+
 function service:publish(node, actor, id, item)
        -- Access checking
        if not self:may(node, actor, "publish") then
@@ -258,7 +276,10 @@ function service:publish(node, actor, id, item)
                end
                node_obj = self.nodes[node];
        end
-       node_obj.data[id] = item;
+       local node_data = self.data[node];
+       remove_item_by_id(node_data, id);
+       node_data[#self.data[node] + 1] = id;
+       node_data[id] = item;
        self.events.fire_event("item-published", { node = node, actor = actor, id = id, item = item });
        self.config.broadcaster("items", node, node_obj.subscribers, item);
        return true;
@@ -271,10 +292,11 @@ function service:retract(node, actor, id, retract)
        end
        --
        local node_obj = self.nodes[node];
-       if (not node_obj) or (not node_obj.data[id]) then
+       if (not node_obj) or (not self.data[node][id]) then
                return false, "item-not-found";
        end
-       node_obj.data[id] = nil;
+       self.events.fire_event("item-retracted", { node = node, actor = actor, id = id });
+       remove_item_by_id(self.data[node], id);
        if retract then
                self.config.broadcaster("items", node, node_obj.subscribers, retract);
        end
@@ -291,7 +313,8 @@ function service:purge(node, actor, notify)
        if not node_obj then
                return false, "item-not-found";
        end
-       node_obj.data = {}; -- Purge
+       self.data[node] = {}; -- Purge
+       self.events.fire_event("node-purged", { node = node, actor = actor });
        if notify then
                self.config.broadcaster("purge", node, node_obj.subscribers);
        end
@@ -309,9 +332,9 @@ function service:get_items(node, actor, id)
                return false, "item-not-found";
        end
        if id then -- Restrict results to a single specific item
-               return true, { [id] = node_obj.data[id] };
+               return true, { id, [id] = self.data[node][id] };
        else
-               return true, node_obj.data;
+               return true, self.data[node];
        end
 end