--- a/plugins/mod_pep.lua Sun Dec 22 20:10:20 2019 +0100
+++ b/plugins/mod_pep.lua Mon Dec 23 20:57:10 2019 +0100
@@ -91,21 +91,6 @@
return data, err;
end
function store:set(node, data)
- if data then
- -- Save the data without subscriptions
- local subscribers = {};
- for jid, sub in pairs(data.subscribers) do
- if type(sub) ~= "table" or not sub.presence then
- subscribers[jid] = sub;
- end
- end
- data = {
- name = data.name;
- config = data.config;
- affiliations = data.affiliations;
- subscribers = subscribers;
- };
- end
return node_config:set(username, node, data);
end
function store:users()
@@ -167,18 +152,23 @@
return simple_broadcast;
end
-local function on_node_creation(event)
- local service = event.service;
- local node = event.node;
- local username = service.config.pep_username;
+local function get_subscriber_filter(username)
+ return function (jids, node)
+ local broadcast_to = {};
+ for jid, opts in pairs(jids) do
+ broadcast_to[jid] = opts;
+ end
- local service_recipients = recipients[username];
- if not service_recipients then return; end
-
- for recipient, nodes in pairs(service_recipients) do
- if nodes:contains(node) then
- service:add_subscription(node, recipient, recipient, { presence = true });
+ local service_recipients = recipients[username];
+ if service_recipients then
+ local service = services[username];
+ for recipient, nodes in pairs(service_recipients) do
+ if nodes:contains(node) and service:may(node, recipient, "subscribe") then
+ broadcast_to[recipient] = true;
+ end
+ end
end
+ return broadcast_to;
end
end
@@ -203,6 +193,7 @@
nodestore = nodestore(username);
itemstore = simple_itemstore(username);
broadcaster = get_broadcaster(username);
+ subscriber_filter = get_subscriber_filter(username);
itemcheck = is_item_stanza;
get_affiliation = function (jid)
if jid_bare(jid) == user_bare then
@@ -240,11 +231,6 @@
return service;
end
-module:hook("item-added/pep-service", function (event)
- local service = event.item.service;
- module:hook_object_event(service.events, "node-created", on_node_creation);
-end);
-
function handle_pubsub_iq(event)
local origin, stanza = event.origin, event.stanza;
local service_name = origin.username;
@@ -308,12 +294,9 @@
end
local service = get_pep_service(service_name);
- for node in current - nodes do
- service:remove_subscription(node, recipient, recipient);
- end
for node in nodes - current do
- if service:add_subscription(node, recipient, recipient, { presence = true }) then
+ if service:may(node, recipient, "subscribe") then
resend_last_item(recipient, node, service);
end
end
--- a/util/pubsub.lua Sun Dec 22 20:10:20 2019 +0100
+++ b/util/pubsub.lua Mon Dec 23 20:57:10 2019 +0100
@@ -7,6 +7,7 @@
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 @@
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 @@
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 @@
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 @@
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