util.stanza: Iterate on childtags instead of all childs.

[prosody.git] / util / pubsub.lua

diff --git a/util/pubsub.lua b/util/pubsub.lua
index dc3f3432f4ace195db2a500925c35c5249c81237..811f4a154c3ddbb25ef73183fc9020efcc9cf48e 100644 (file)
--- a/util/pubsub.lua
+++ b/util/pubsub.lua
@@ -17,7 +17,14 @@ function service:add_subscription(node, actor, jid)
 end
 
 function service:remove_subscription(node, actor, jid)
-       self.nodes[node].subscribers[jid] = nil;
+       local node_obj = self.nodes[node];
+       if not node_obj then
+               return false, "item-not-found";
+       end
+       if not node_obj.subscribers[jid] then
+               return false, "not-subscribed";
+       end
+       node_obj.subscribers[jid] = nil;
        return true;
 end
 
@@ -47,6 +54,18 @@ function service:publish(node, actor, id, item)
        return true;
 end
 
+function service:retract(node, actor, id, retract)
+       local node_obj = self.nodes[node];
+       if (not node_obj) or (not node_obj.data[id]) then
+               return false, "item-not-found";
+       end
+       node_obj.data[id] = nil;
+       if retract then
+               self.cb.broadcaster(node, node_obj.subscribers, retract);
+       end
+       return true
+end
+
 function service:get(node, actor, id)
        local node_obj = self.nodes[node];
        if node_obj then
@@ -58,4 +77,8 @@ function service:get(node, actor, id)
        end
 end
 
+function service:get_nodes(actor)
+       return true, self.nodes;
+end
+
 return _M;