aboutsummaryrefslogtreecommitdiffstats
path: root/util/pubsub.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-12-23 20:57:10 +0100
committerKim Alvefur <zash@zash.se>2019-12-23 20:57:10 +0100
commit7ebf9bf1bf0171f94a54a4b2887304b5c178eabf (patch)
treead03a707fa8993db9885e49929215b79a84f97e8 /util/pubsub.lua
parent6183e7a303d4fed16b368b55dcd0fddc34b20739 (diff)
parentfaa6cbefaf0982fe2c353c20ff26a8fb20fb2508 (diff)
downloadprosody-7ebf9bf1bf0171f94a54a4b2887304b5c178eabf.tar.gz
prosody-7ebf9bf1bf0171f94a54a4b2887304b5c178eabf.zip
Merge 0.11->trunk
Diffstat (limited to 'util/pubsub.lua')
-rw-r--r--util/pubsub.lua14
1 files changed, 10 insertions, 4 deletions
diff --git a/util/pubsub.lua b/util/pubsub.lua
index 8a07c669..2e9df0e7 100644
--- a/util/pubsub.lua
+++ b/util/pubsub.lua
@@ -7,6 +7,7 @@ local service_mt = {};
local default_config = {
itemstore = function (config, _) return cache.new(config["max_items"]) end;
broadcaster = function () end;
+ subscriber_filter = function (subs) return subs end;
itemcheck = function () return true; end;
get_affiliation = function () end;
normalize_jid = function (jid) return jid; end;
@@ -500,7 +501,7 @@ function service:delete(node, actor) --> ok, err
end
self.events.fire_event("node-deleted", { service = self, node = node, actor = actor });
- self.config.broadcaster("delete", node, node_obj.subscribers, nil, actor, node_obj, self);
+ self:broadcast("delete", node, node_obj.subscribers, nil, actor, node_obj);
return true;
end
@@ -568,10 +569,15 @@ function service:publish(node, actor, id, item, requested_config) --> ok, err
local event_data = { service = self, node = node, actor = actor, id = id, item = item };
self.events.fire_event("item-published/"..node, event_data);
self.events.fire_event("item-published", event_data);
- self.config.broadcaster("items", node, node_obj.subscribers, item, actor, node_obj, self);
+ self:broadcast("items", node, node_obj.subscribers, item, actor, node_obj);
return true;
end
+function service:broadcast(event, node, subscribers, item, actor, node_obj)
+ subscribers = self.config.subscriber_filter(subscribers, node, event);
+ return self.config.broadcaster(event, node, subscribers, item, actor, node_obj, self);
+end
+
function service:retract(node, actor, id, retract) --> ok, err
-- Access checking
if not self:may(node, actor, "retract") then
@@ -588,7 +594,7 @@ function service:retract(node, actor, id, retract) --> ok, err
end
self.events.fire_event("item-retracted", { service = self, node = node, actor = actor, id = id });
if retract then
- self.config.broadcaster("retract", node, node_obj.subscribers, retract, actor, node_obj, self);
+ self:broadcast("retract", node, node_obj.subscribers, retract, actor, node_obj);
end
return true
end
@@ -610,7 +616,7 @@ function service:purge(node, actor, notify) --> ok, err
end
self.events.fire_event("node-purged", { service = self, node = node, actor = actor });
if notify then
- self.config.broadcaster("purge", node, node_obj.subscribers, nil, actor, node_obj, self);
+ self:broadcast("purge", node, node_obj.subscribers, nil, actor, node_obj);
end
return true
end