aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-05-30 21:44:35 +0200
committerKim Alvefur <zash@zash.se>2019-05-30 21:44:35 +0200
commit8848e1ea6c2a30a487d624c01311c8d3363a0a1a (patch)
tree2fbd98b50303da8aab3c9670070b681dfdf35414
parent2661a6f5a32731100287df9564c45cbe2406e0f0 (diff)
parentcabd5216b4de1471e62f4b859b634863e6ea2512 (diff)
downloadprosody-8848e1ea6c2a30a487d624c01311c8d3363a0a1a.tar.gz
prosody-8848e1ea6c2a30a487d624c01311c8d3363a0a1a.zip
Merge 0.11->trunk
-rw-r--r--plugins/mod_pep.lua55
1 files changed, 16 insertions, 39 deletions
diff --git a/plugins/mod_pep.lua b/plugins/mod_pep.lua
index 92a09bb0..815c2e37 100644
--- a/plugins/mod_pep.lua
+++ b/plugins/mod_pep.lua
@@ -91,21 +91,6 @@ local function nodestore(username)
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()
@@ -159,7 +144,22 @@ local function get_broadcaster(username)
message:add_child(item);
end
+ local broadcast_to = {};
for jid in pairs(jids) do
+ broadcast_to[jid] = true;
+ end
+
+ 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
+
+ for jid in pairs(broadcast_to) do
module:log("debug", "Sending notification to %s from %s: %s", jid, user_bare, tostring(item));
message.attr.to = jid;
module:send(message);
@@ -168,21 +168,6 @@ local function get_broadcaster(username)
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 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 });
- end
- end
-end
-
function get_pep_service(username)
module:log("debug", "get_pep_service(%q)", username);
local user_bare = jid_join(username, host);
@@ -241,11 +226,6 @@ function get_pep_service(username)
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 +288,9 @@ local function update_subscriptions(recipient, service_name, nodes)
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