mod_pubsub, util.pubsub: Support for unsubscribing

[prosody.git] / util / pubsub.lua

diff --git a/util/pubsub.lua b/util/pubsub.lua
index dc3f3432f4ace195db2a500925c35c5249c81237..4789dff95960547f648dadd12e1d5c83a4aa1046 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