util.debug: Remove 'white' from boundary style (leave at default colour)

[prosody.git] / util / pubsub.lua

diff --git a/util/pubsub.lua b/util/pubsub.lua
index 69e79acc2894d52ab45c90f91f516768d0c7c86b..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
 
@@ -104,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
@@ -123,6 +126,7 @@ 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
 
@@ -163,6 +167,19 @@ 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
 
@@ -220,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