author | Kim Alvefur <zash@zash.se> |
Sun, 23 Dec 2018 02:56:10 +0100 | |
changeset 9727 | 3c6e266391a2 |
parent 9726 | 695fae2e16b2 |
child 9833 | fdc42f685557 |
permissions | -rw-r--r-- |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
1 |
local pubsub = require "util.pubsub"; |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
2 |
local jid_bare = require "util.jid".bare; |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
3 |
local jid_split = require "util.jid".split; |
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
4 |
local jid_join = require "util.jid".join; |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
5 |
local set_new = require "util.set".new; |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
6 |
local st = require "util.stanza"; |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
7 |
local calculate_hash = require "util.caps".calculate_hash; |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
8 |
local is_contact_subscribed = require "core.rostermanager".is_contact_subscribed; |
8323
fe5eaf4ed631
mod_pep_plus: Make node persistence configurable via pubsub#persist_items
Kim Alvefur <zash@zash.se>
parents:
8322
diff
changeset
|
9 |
local cache = require "util.cache"; |
8344
910d3c3f60a6
mod_pep_plus: Use feature detection from pubsub.lib
Kim Alvefur <zash@zash.se>
parents:
8342
diff
changeset
|
10 |
local set = require "util.set"; |
9727
3c6e266391a2
mod_pep: Set an 'id' on notifications
Kim Alvefur <zash@zash.se>
parents:
9726
diff
changeset
|
11 |
local new_id = require "util.id".medium; |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
12 |
|
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
13 |
local xmlns_pubsub = "http://jabber.org/protocol/pubsub"; |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
14 |
local xmlns_pubsub_event = "http://jabber.org/protocol/pubsub#event"; |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
15 |
local xmlns_pubsub_owner = "http://jabber.org/protocol/pubsub#owner"; |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
16 |
|
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
17 |
local lib_pubsub = module:require "pubsub"; |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
18 |
|
6305
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
19 |
local empty_set = set_new(); |
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
20 |
|
9116
74639d606a15
mod_pep: Add comments describing root tables used for data
Kim Alvefur <zash@zash.se>
parents:
9106
diff
changeset
|
21 |
-- username -> util.pubsub service object |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
22 |
local services = {}; |
9116
74639d606a15
mod_pep: Add comments describing root tables used for data
Kim Alvefur <zash@zash.se>
parents:
9106
diff
changeset
|
23 |
|
9145
85bc624b8685
mod_pep: Correct comment about 'recipients' table
Kim Alvefur <zash@zash.se>
parents:
9144
diff
changeset
|
24 |
-- username -> recipient -> set of nodes |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
25 |
local recipients = {}; |
9146
817f666d9037
mod_pep: Add comment about 'hash_map' table
Kim Alvefur <zash@zash.se>
parents:
9145
diff
changeset
|
26 |
|
817f666d9037
mod_pep: Add comment about 'hash_map' table
Kim Alvefur <zash@zash.se>
parents:
9145
diff
changeset
|
27 |
-- caps hash -> set of nodes |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
28 |
local hash_map = {}; |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
29 |
|
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
30 |
local host = module.host; |
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
31 |
|
8952
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
32 |
local node_config = module:open_store("pep", "map"); |
8309
202b9951b037
mod_pep_plus: Keep track of nodes, and restore them when later
Kim Alvefur <zash@zash.se>
parents:
8308
diff
changeset
|
33 |
local known_nodes = module:open_store("pep"); |
202b9951b037
mod_pep_plus: Keep track of nodes, and restore them when later
Kim Alvefur <zash@zash.se>
parents:
8308
diff
changeset
|
34 |
|
9080
aefb96a52f5f
mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen)
Matthew Wild <mwild1@gmail.com>
parents:
9077
diff
changeset
|
35 |
local max_max_items = module:get_option_number("pep_max_items", 256); |
aefb96a52f5f
mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen)
Matthew Wild <mwild1@gmail.com>
parents:
9077
diff
changeset
|
36 |
|
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
37 |
function module.save() |
9144
c1368fb756bf
mod_pep: Pass 'recipients' table across module reloads
Kim Alvefur <zash@zash.se>
parents:
9143
diff
changeset
|
38 |
return { |
c1368fb756bf
mod_pep: Pass 'recipients' table across module reloads
Kim Alvefur <zash@zash.se>
parents:
9143
diff
changeset
|
39 |
services = services; |
c1368fb756bf
mod_pep: Pass 'recipients' table across module reloads
Kim Alvefur <zash@zash.se>
parents:
9143
diff
changeset
|
40 |
recipients = recipients; |
c1368fb756bf
mod_pep: Pass 'recipients' table across module reloads
Kim Alvefur <zash@zash.se>
parents:
9143
diff
changeset
|
41 |
}; |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
42 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
43 |
|
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
44 |
function module.restore(data) |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
45 |
services = data.services; |
9144
c1368fb756bf
mod_pep: Pass 'recipients' table across module reloads
Kim Alvefur <zash@zash.se>
parents:
9143
diff
changeset
|
46 |
recipients = data.recipients; |
9541
07665733b332
mod_pep: Add all pubsub service objects to item API in order to behave across reloads
Kim Alvefur <zash@zash.se>
parents:
9208
diff
changeset
|
47 |
for username, service in pairs(services) do |
07665733b332
mod_pep: Add all pubsub service objects to item API in order to behave across reloads
Kim Alvefur <zash@zash.se>
parents:
9208
diff
changeset
|
48 |
local user_bare = jid_join(username, host); |
07665733b332
mod_pep: Add all pubsub service objects to item API in order to behave across reloads
Kim Alvefur <zash@zash.se>
parents:
9208
diff
changeset
|
49 |
module:add_item("pep-service", { service = service, jid = user_bare }); |
07665733b332
mod_pep: Add all pubsub service objects to item API in order to behave across reloads
Kim Alvefur <zash@zash.se>
parents:
9208
diff
changeset
|
50 |
end |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
51 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
52 |
|
8699
164da3186511
mod_pep_plus: Validate items here too (thanks Link Mauve)
Kim Alvefur <zash@zash.se>
parents:
8380
diff
changeset
|
53 |
function is_item_stanza(item) |
164da3186511
mod_pep_plus: Validate items here too (thanks Link Mauve)
Kim Alvefur <zash@zash.se>
parents:
8380
diff
changeset
|
54 |
return st.is_stanza(item) and item.attr.xmlns == xmlns_pubsub and item.name == "item"; |
164da3186511
mod_pep_plus: Validate items here too (thanks Link Mauve)
Kim Alvefur <zash@zash.se>
parents:
8380
diff
changeset
|
55 |
end |
164da3186511
mod_pep_plus: Validate items here too (thanks Link Mauve)
Kim Alvefur <zash@zash.se>
parents:
8380
diff
changeset
|
56 |
|
9083
1b21f8ffaec8
mod_pep: Silence warnings about unused arguments [luacheck]
Kim Alvefur <zash@zash.se>
parents:
9080
diff
changeset
|
57 |
function check_node_config(node, actor, new_config) -- luacheck: ignore 212/node 212/actor |
9080
aefb96a52f5f
mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen)
Matthew Wild <mwild1@gmail.com>
parents:
9077
diff
changeset
|
58 |
if (new_config["max_items"] or 1) > max_max_items then |
aefb96a52f5f
mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen)
Matthew Wild <mwild1@gmail.com>
parents:
9077
diff
changeset
|
59 |
return false; |
aefb96a52f5f
mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen)
Matthew Wild <mwild1@gmail.com>
parents:
9077
diff
changeset
|
60 |
end |
9106
d5a7d2697b19
mod_pep: Restrict access models to 'presence', 'whitelist' and 'open'
Kim Alvefur <zash@zash.se>
parents:
9102
diff
changeset
|
61 |
if new_config["access_model"] ~= "presence" |
d5a7d2697b19
mod_pep: Restrict access models to 'presence', 'whitelist' and 'open'
Kim Alvefur <zash@zash.se>
parents:
9102
diff
changeset
|
62 |
and new_config["access_model"] ~= "whitelist" |
d5a7d2697b19
mod_pep: Restrict access models to 'presence', 'whitelist' and 'open'
Kim Alvefur <zash@zash.se>
parents:
9102
diff
changeset
|
63 |
and new_config["access_model"] ~= "open" then |
d5a7d2697b19
mod_pep: Restrict access models to 'presence', 'whitelist' and 'open'
Kim Alvefur <zash@zash.se>
parents:
9102
diff
changeset
|
64 |
return false; |
d5a7d2697b19
mod_pep: Restrict access models to 'presence', 'whitelist' and 'open'
Kim Alvefur <zash@zash.se>
parents:
9102
diff
changeset
|
65 |
end |
9085
297a06074175
mod_pep: Return true if all node config checks passes (fixes configuration)
Kim Alvefur <zash@zash.se>
parents:
9083
diff
changeset
|
66 |
return true; |
9080
aefb96a52f5f
mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen)
Matthew Wild <mwild1@gmail.com>
parents:
9077
diff
changeset
|
67 |
end |
aefb96a52f5f
mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen)
Matthew Wild <mwild1@gmail.com>
parents:
9077
diff
changeset
|
68 |
|
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
69 |
local function subscription_presence(username, recipient) |
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
70 |
local user_bare = jid_join(username, host); |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
71 |
local recipient_bare = jid_bare(recipient); |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
72 |
if (recipient_bare == user_bare) then return true; end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
73 |
return is_contact_subscribed(username, host, recipient_bare); |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
74 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
75 |
|
8952
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
76 |
local function nodestore(username) |
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
77 |
-- luacheck: ignore 212/self |
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
78 |
local store = {}; |
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
79 |
function store:get(node) |
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
80 |
local data, err = node_config:get(username, node) |
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
81 |
if data == true then |
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
82 |
-- COMPAT Previously stored only a boolean representing 'persist_items' |
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
83 |
data = { |
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
84 |
name = node; |
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
85 |
config = {}; |
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
86 |
subscribers = {}; |
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
87 |
affiliations = {}; |
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
88 |
}; |
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
89 |
end |
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
90 |
return data, err; |
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
91 |
end |
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
92 |
function store:set(node, data) |
9032
c5e738b54d77
mod_pep_plus: Don't save subscriptions since they are normally session based and transient
Kim Alvefur <zash@zash.se>
parents:
8985
diff
changeset
|
93 |
if data then |
c5e738b54d77
mod_pep_plus: Don't save subscriptions since they are normally session based and transient
Kim Alvefur <zash@zash.se>
parents:
8985
diff
changeset
|
94 |
-- Save the data without subscriptions |
9136
2c1d68b54c91
mod_pep: Save non-presence based subscriptions to storage
Kim Alvefur <zash@zash.se>
parents:
9135
diff
changeset
|
95 |
local subscribers = {}; |
2c1d68b54c91
mod_pep: Save non-presence based subscriptions to storage
Kim Alvefur <zash@zash.se>
parents:
9135
diff
changeset
|
96 |
for jid, sub in pairs(data.subscribers) do |
2c1d68b54c91
mod_pep: Save non-presence based subscriptions to storage
Kim Alvefur <zash@zash.se>
parents:
9135
diff
changeset
|
97 |
if type(sub) ~= "table" or not sub.presence then |
2c1d68b54c91
mod_pep: Save non-presence based subscriptions to storage
Kim Alvefur <zash@zash.se>
parents:
9135
diff
changeset
|
98 |
subscribers[jid] = sub; |
2c1d68b54c91
mod_pep: Save non-presence based subscriptions to storage
Kim Alvefur <zash@zash.se>
parents:
9135
diff
changeset
|
99 |
end |
2c1d68b54c91
mod_pep: Save non-presence based subscriptions to storage
Kim Alvefur <zash@zash.se>
parents:
9135
diff
changeset
|
100 |
end |
9032
c5e738b54d77
mod_pep_plus: Don't save subscriptions since they are normally session based and transient
Kim Alvefur <zash@zash.se>
parents:
8985
diff
changeset
|
101 |
data = { |
c5e738b54d77
mod_pep_plus: Don't save subscriptions since they are normally session based and transient
Kim Alvefur <zash@zash.se>
parents:
8985
diff
changeset
|
102 |
name = data.name; |
c5e738b54d77
mod_pep_plus: Don't save subscriptions since they are normally session based and transient
Kim Alvefur <zash@zash.se>
parents:
8985
diff
changeset
|
103 |
config = data.config; |
c5e738b54d77
mod_pep_plus: Don't save subscriptions since they are normally session based and transient
Kim Alvefur <zash@zash.se>
parents:
8985
diff
changeset
|
104 |
affiliations = data.affiliations; |
9136
2c1d68b54c91
mod_pep: Save non-presence based subscriptions to storage
Kim Alvefur <zash@zash.se>
parents:
9135
diff
changeset
|
105 |
subscribers = subscribers; |
9032
c5e738b54d77
mod_pep_plus: Don't save subscriptions since they are normally session based and transient
Kim Alvefur <zash@zash.se>
parents:
8985
diff
changeset
|
106 |
}; |
c5e738b54d77
mod_pep_plus: Don't save subscriptions since they are normally session based and transient
Kim Alvefur <zash@zash.se>
parents:
8985
diff
changeset
|
107 |
end |
8952
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
108 |
return node_config:set(username, node, data); |
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
109 |
end |
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
110 |
function store:users() |
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
111 |
return pairs(known_nodes:get(username) or {}); |
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
112 |
end |
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
113 |
return store; |
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
114 |
end |
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
115 |
|
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
116 |
local function simple_itemstore(username) |
8221
2c75a5ba58fc
mod_pubsub: Pass 'user' to simple_itemstore
Kim Alvefur <zash@zash.se>
parents:
8218
diff
changeset
|
117 |
return function (config, node) |
8336
2abbb01cd756
pubsub: Distinguish internal representation of node config from XEP-0060 form (util.pubsub should be protocol-agnostic)
Kim Alvefur <zash@zash.se>
parents:
8335
diff
changeset
|
118 |
if config["persist_items"] then |
8323
fe5eaf4ed631
mod_pep_plus: Make node persistence configurable via pubsub#persist_items
Kim Alvefur <zash@zash.se>
parents:
8322
diff
changeset
|
119 |
module:log("debug", "Creating new persistent item store for user %s, node %q", username, node); |
fe5eaf4ed631
mod_pep_plus: Make node persistence configurable via pubsub#persist_items
Kim Alvefur <zash@zash.se>
parents:
8322
diff
changeset
|
120 |
local archive = module:open_store("pep_"..node, "archive"); |
fe5eaf4ed631
mod_pep_plus: Make node persistence configurable via pubsub#persist_items
Kim Alvefur <zash@zash.se>
parents:
8322
diff
changeset
|
121 |
return lib_pubsub.archive_itemstore(archive, config, username, node, false); |
fe5eaf4ed631
mod_pep_plus: Make node persistence configurable via pubsub#persist_items
Kim Alvefur <zash@zash.se>
parents:
8322
diff
changeset
|
122 |
else |
fe5eaf4ed631
mod_pep_plus: Make node persistence configurable via pubsub#persist_items
Kim Alvefur <zash@zash.se>
parents:
8322
diff
changeset
|
123 |
module:log("debug", "Creating new ephemeral item store for user %s, node %q", username, node); |
8336
2abbb01cd756
pubsub: Distinguish internal representation of node config from XEP-0060 form (util.pubsub should be protocol-agnostic)
Kim Alvefur <zash@zash.se>
parents:
8335
diff
changeset
|
124 |
return cache.new(tonumber(config["max_items"])); |
8323
fe5eaf4ed631
mod_pep_plus: Make node persistence configurable via pubsub#persist_items
Kim Alvefur <zash@zash.se>
parents:
8322
diff
changeset
|
125 |
end |
8221
2c75a5ba58fc
mod_pubsub: Pass 'user' to simple_itemstore
Kim Alvefur <zash@zash.se>
parents:
8218
diff
changeset
|
126 |
end |
8218
835bb32c36b4
mod_pep_plus: Add item persistency.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
8217
diff
changeset
|
127 |
end |
835bb32c36b4
mod_pep_plus: Add item persistency.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
8217
diff
changeset
|
128 |
|
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
129 |
local function get_broadcaster(username) |
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
130 |
local user_bare = jid_join(username, host); |
9192
8fadd3d6c8d3
mod_pep: Respect settings for which kinds of notifications to send
Kim Alvefur <zash@zash.se>
parents:
9182
diff
changeset
|
131 |
local function simple_broadcast(kind, node, jids, item, _, node_obj) |
8fadd3d6c8d3
mod_pep: Respect settings for which kinds of notifications to send
Kim Alvefur <zash@zash.se>
parents:
9182
diff
changeset
|
132 |
if node_obj then |
8fadd3d6c8d3
mod_pep: Respect settings for which kinds of notifications to send
Kim Alvefur <zash@zash.se>
parents:
9182
diff
changeset
|
133 |
if node_obj.config["notify_"..kind] == false then |
8fadd3d6c8d3
mod_pep: Respect settings for which kinds of notifications to send
Kim Alvefur <zash@zash.se>
parents:
9182
diff
changeset
|
134 |
return; |
8fadd3d6c8d3
mod_pep: Respect settings for which kinds of notifications to send
Kim Alvefur <zash@zash.se>
parents:
9182
diff
changeset
|
135 |
end |
8fadd3d6c8d3
mod_pep: Respect settings for which kinds of notifications to send
Kim Alvefur <zash@zash.se>
parents:
9182
diff
changeset
|
136 |
end |
9182
82fad995a149
util.pubsub: Pass "retract" as the type of such broadcasts
Kim Alvefur <zash@zash.se>
parents:
9163
diff
changeset
|
137 |
if kind == "retract" then |
82fad995a149
util.pubsub: Pass "retract" as the type of such broadcasts
Kim Alvefur <zash@zash.se>
parents:
9163
diff
changeset
|
138 |
kind = "items"; -- XEP-0060 signals retraction in an <items> container |
82fad995a149
util.pubsub: Pass "retract" as the type of such broadcasts
Kim Alvefur <zash@zash.se>
parents:
9163
diff
changeset
|
139 |
end |
9726
695fae2e16b2
mod_pep: Add some spacing between blocks in broadcaster to improve readability
Kim Alvefur <zash@zash.se>
parents:
9725
diff
changeset
|
140 |
|
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
141 |
if item then |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
142 |
item = st.clone(item); |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
143 |
item.attr.xmlns = nil; -- Clear the pubsub namespace |
9193
b88f537163da
mod_pep: Respect setting for whether to include payload in notifications
Kim Alvefur <zash@zash.se>
parents:
9192
diff
changeset
|
144 |
if kind == "items" then |
b88f537163da
mod_pep: Respect setting for whether to include payload in notifications
Kim Alvefur <zash@zash.se>
parents:
9192
diff
changeset
|
145 |
if node_obj and node_obj.config.include_payload == false then |
b88f537163da
mod_pep: Respect setting for whether to include payload in notifications
Kim Alvefur <zash@zash.se>
parents:
9192
diff
changeset
|
146 |
item:maptags(function () return nil; end); |
b88f537163da
mod_pep: Respect setting for whether to include payload in notifications
Kim Alvefur <zash@zash.se>
parents:
9192
diff
changeset
|
147 |
end |
b88f537163da
mod_pep: Respect setting for whether to include payload in notifications
Kim Alvefur <zash@zash.se>
parents:
9192
diff
changeset
|
148 |
end |
9725
233305015373
mod_pep: Move broadcaster code around to be more like in mod_pubsub
Kim Alvefur <zash@zash.se>
parents:
9611
diff
changeset
|
149 |
end |
233305015373
mod_pep: Move broadcaster code around to be more like in mod_pubsub
Kim Alvefur <zash@zash.se>
parents:
9611
diff
changeset
|
150 |
|
9727
3c6e266391a2
mod_pep: Set an 'id' on notifications
Kim Alvefur <zash@zash.se>
parents:
9726
diff
changeset
|
151 |
local id = new_id(); |
3c6e266391a2
mod_pep: Set an 'id' on notifications
Kim Alvefur <zash@zash.se>
parents:
9726
diff
changeset
|
152 |
local message = st.message({ from = user_bare, type = "headline", id = id }) |
9725
233305015373
mod_pep: Move broadcaster code around to be more like in mod_pubsub
Kim Alvefur <zash@zash.se>
parents:
9611
diff
changeset
|
153 |
:tag("event", { xmlns = xmlns_pubsub_event }) |
233305015373
mod_pep: Move broadcaster code around to be more like in mod_pubsub
Kim Alvefur <zash@zash.se>
parents:
9611
diff
changeset
|
154 |
:tag(kind, { node = node }); |
9726
695fae2e16b2
mod_pep: Add some spacing between blocks in broadcaster to improve readability
Kim Alvefur <zash@zash.se>
parents:
9725
diff
changeset
|
155 |
|
9725
233305015373
mod_pep: Move broadcaster code around to be more like in mod_pubsub
Kim Alvefur <zash@zash.se>
parents:
9611
diff
changeset
|
156 |
if item then |
8898
d00ea07de9a0
mod_pep_plus: Prevent nil from being added as a child on item deletion.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
8756
diff
changeset
|
157 |
message:add_child(item); |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
158 |
end |
9726
695fae2e16b2
mod_pep: Add some spacing between blocks in broadcaster to improve readability
Kim Alvefur <zash@zash.se>
parents:
9725
diff
changeset
|
159 |
|
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
160 |
for jid in pairs(jids) do |
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
161 |
module:log("debug", "Sending notification to %s from %s: %s", jid, user_bare, tostring(item)); |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
162 |
message.attr.to = jid; |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
163 |
module:send(message); |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
164 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
165 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
166 |
return simple_broadcast; |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
167 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
168 |
|
9545
b8bfcfbe5126
mod_pep: Add automatic subscriptions on node creation (fixes #1222)
Kim Alvefur <zash@zash.se>
parents:
9544
diff
changeset
|
169 |
local function on_node_creation(event) |
b8bfcfbe5126
mod_pep: Add automatic subscriptions on node creation (fixes #1222)
Kim Alvefur <zash@zash.se>
parents:
9544
diff
changeset
|
170 |
local service = event.service; |
b8bfcfbe5126
mod_pep: Add automatic subscriptions on node creation (fixes #1222)
Kim Alvefur <zash@zash.se>
parents:
9544
diff
changeset
|
171 |
local node = event.node; |
b8bfcfbe5126
mod_pep: Add automatic subscriptions on node creation (fixes #1222)
Kim Alvefur <zash@zash.se>
parents:
9544
diff
changeset
|
172 |
local username = service.config.pep_username; |
b8bfcfbe5126
mod_pep: Add automatic subscriptions on node creation (fixes #1222)
Kim Alvefur <zash@zash.se>
parents:
9544
diff
changeset
|
173 |
|
b8bfcfbe5126
mod_pep: Add automatic subscriptions on node creation (fixes #1222)
Kim Alvefur <zash@zash.se>
parents:
9544
diff
changeset
|
174 |
local service_recipients = recipients[username]; |
b8bfcfbe5126
mod_pep: Add automatic subscriptions on node creation (fixes #1222)
Kim Alvefur <zash@zash.se>
parents:
9544
diff
changeset
|
175 |
if not service_recipients then return; end |
b8bfcfbe5126
mod_pep: Add automatic subscriptions on node creation (fixes #1222)
Kim Alvefur <zash@zash.se>
parents:
9544
diff
changeset
|
176 |
|
b8bfcfbe5126
mod_pep: Add automatic subscriptions on node creation (fixes #1222)
Kim Alvefur <zash@zash.se>
parents:
9544
diff
changeset
|
177 |
for recipient, nodes in pairs(service_recipients) do |
b8bfcfbe5126
mod_pep: Add automatic subscriptions on node creation (fixes #1222)
Kim Alvefur <zash@zash.se>
parents:
9544
diff
changeset
|
178 |
if nodes:contains(node) then |
b8bfcfbe5126
mod_pep: Add automatic subscriptions on node creation (fixes #1222)
Kim Alvefur <zash@zash.se>
parents:
9544
diff
changeset
|
179 |
service:add_subscription(node, recipient, recipient, { presence = true }); |
b8bfcfbe5126
mod_pep: Add automatic subscriptions on node creation (fixes #1222)
Kim Alvefur <zash@zash.se>
parents:
9544
diff
changeset
|
180 |
end |
b8bfcfbe5126
mod_pep: Add automatic subscriptions on node creation (fixes #1222)
Kim Alvefur <zash@zash.se>
parents:
9544
diff
changeset
|
181 |
end |
b8bfcfbe5126
mod_pep: Add automatic subscriptions on node creation (fixes #1222)
Kim Alvefur <zash@zash.se>
parents:
9544
diff
changeset
|
182 |
end |
b8bfcfbe5126
mod_pep: Add automatic subscriptions on node creation (fixes #1222)
Kim Alvefur <zash@zash.se>
parents:
9544
diff
changeset
|
183 |
|
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
184 |
function get_pep_service(username) |
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
185 |
module:log("debug", "get_pep_service(%q)", username); |
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
186 |
local user_bare = jid_join(username, host); |
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
187 |
local service = services[username]; |
6435
388786af0dd2
mod_pep_plus: Add pubsub service objects to an item list
Kim Alvefur <zash@zash.se>
parents:
6305
diff
changeset
|
188 |
if service then |
388786af0dd2
mod_pep_plus: Add pubsub service objects to an item list
Kim Alvefur <zash@zash.se>
parents:
6305
diff
changeset
|
189 |
return service; |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
190 |
end |
6435
388786af0dd2
mod_pep_plus: Add pubsub service objects to an item list
Kim Alvefur <zash@zash.se>
parents:
6305
diff
changeset
|
191 |
service = pubsub.new({ |
9544
742977123168
mod_pep: Add PEP service owners username in configuration to ease identification
Kim Alvefur <zash@zash.se>
parents:
9543
diff
changeset
|
192 |
pep_username = username; |
6447
aab509a9d0ba
mod_pep_plus: Default to max one item per node (Recomended for PEP)
Kim Alvefur <zash@zash.se>
parents:
6446
diff
changeset
|
193 |
node_defaults = { |
8336
2abbb01cd756
pubsub: Distinguish internal representation of node config from XEP-0060 form (util.pubsub should be protocol-agnostic)
Kim Alvefur <zash@zash.se>
parents:
8335
diff
changeset
|
194 |
["max_items"] = 1; |
2abbb01cd756
pubsub: Distinguish internal representation of node config from XEP-0060 form (util.pubsub should be protocol-agnostic)
Kim Alvefur <zash@zash.se>
parents:
8335
diff
changeset
|
195 |
["persist_items"] = true; |
9100
ce2ba9f91c84
mod_pep: Set default access model to 'presence'
Kim Alvefur <zash@zash.se>
parents:
9085
diff
changeset
|
196 |
["access_model"] = "presence"; |
6447
aab509a9d0ba
mod_pep_plus: Default to max one item per node (Recomended for PEP)
Kim Alvefur <zash@zash.se>
parents:
6446
diff
changeset
|
197 |
}; |
aab509a9d0ba
mod_pep_plus: Default to max one item per node (Recomended for PEP)
Kim Alvefur <zash@zash.se>
parents:
6446
diff
changeset
|
198 |
|
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
199 |
autocreate_on_publish = true; |
9545
b8bfcfbe5126
mod_pep: Add automatic subscriptions on node creation (fixes #1222)
Kim Alvefur <zash@zash.se>
parents:
9544
diff
changeset
|
200 |
autocreate_on_subscribe = false; |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
201 |
|
8952
9194431b6447
mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents:
8898
diff
changeset
|
202 |
nodestore = nodestore(username); |
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
203 |
itemstore = simple_itemstore(username); |
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
204 |
broadcaster = get_broadcaster(username); |
8699
164da3186511
mod_pep_plus: Validate items here too (thanks Link Mauve)
Kim Alvefur <zash@zash.se>
parents:
8380
diff
changeset
|
205 |
itemcheck = is_item_stanza; |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
206 |
get_affiliation = function (jid) |
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
207 |
if jid_bare(jid) == user_bare then |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
208 |
return "owner"; |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
209 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
210 |
end; |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
211 |
|
9102
974b25c27f24
mod_pep: Move subscriber check into 'presence' access model callback
Kim Alvefur <zash@zash.se>
parents:
9100
diff
changeset
|
212 |
access_models = { |
974b25c27f24
mod_pep: Move subscriber check into 'presence' access model callback
Kim Alvefur <zash@zash.se>
parents:
9100
diff
changeset
|
213 |
presence = function (jid) |
974b25c27f24
mod_pep: Move subscriber check into 'presence' access model callback
Kim Alvefur <zash@zash.se>
parents:
9100
diff
changeset
|
214 |
if subscription_presence(username, jid) then |
9163
e13a1a0b0107
mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060
Matthew Wild <mwild1@gmail.com>
parents:
9161
diff
changeset
|
215 |
return "member"; |
9102
974b25c27f24
mod_pep: Move subscriber check into 'presence' access model callback
Kim Alvefur <zash@zash.se>
parents:
9100
diff
changeset
|
216 |
end |
9163
e13a1a0b0107
mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060
Matthew Wild <mwild1@gmail.com>
parents:
9161
diff
changeset
|
217 |
return "outcast"; |
9102
974b25c27f24
mod_pep: Move subscriber check into 'presence' access model callback
Kim Alvefur <zash@zash.se>
parents:
9100
diff
changeset
|
218 |
end; |
974b25c27f24
mod_pep: Move subscriber check into 'presence' access model callback
Kim Alvefur <zash@zash.se>
parents:
9100
diff
changeset
|
219 |
}; |
974b25c27f24
mod_pep: Move subscriber check into 'presence' access model callback
Kim Alvefur <zash@zash.se>
parents:
9100
diff
changeset
|
220 |
|
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
221 |
normalize_jid = jid_bare; |
9080
aefb96a52f5f
mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen)
Matthew Wild <mwild1@gmail.com>
parents:
9077
diff
changeset
|
222 |
|
aefb96a52f5f
mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen)
Matthew Wild <mwild1@gmail.com>
parents:
9077
diff
changeset
|
223 |
check_node_config = check_node_config; |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
224 |
}); |
8309
202b9951b037
mod_pep_plus: Keep track of nodes, and restore them when later
Kim Alvefur <zash@zash.se>
parents:
8308
diff
changeset
|
225 |
local nodes, err = known_nodes:get(username); |
202b9951b037
mod_pep_plus: Keep track of nodes, and restore them when later
Kim Alvefur <zash@zash.se>
parents:
8308
diff
changeset
|
226 |
if nodes then |
202b9951b037
mod_pep_plus: Keep track of nodes, and restore them when later
Kim Alvefur <zash@zash.se>
parents:
8308
diff
changeset
|
227 |
module:log("debug", "Restoring nodes for user %s", username); |
202b9951b037
mod_pep_plus: Keep track of nodes, and restore them when later
Kim Alvefur <zash@zash.se>
parents:
8308
diff
changeset
|
228 |
for node in pairs(nodes) do |
202b9951b037
mod_pep_plus: Keep track of nodes, and restore them when later
Kim Alvefur <zash@zash.se>
parents:
8308
diff
changeset
|
229 |
module:log("debug", "Restoring node %q", node); |
202b9951b037
mod_pep_plus: Keep track of nodes, and restore them when later
Kim Alvefur <zash@zash.se>
parents:
8308
diff
changeset
|
230 |
service:create(node, true); |
202b9951b037
mod_pep_plus: Keep track of nodes, and restore them when later
Kim Alvefur <zash@zash.se>
parents:
8308
diff
changeset
|
231 |
end |
202b9951b037
mod_pep_plus: Keep track of nodes, and restore them when later
Kim Alvefur <zash@zash.se>
parents:
8308
diff
changeset
|
232 |
elseif err then |
202b9951b037
mod_pep_plus: Keep track of nodes, and restore them when later
Kim Alvefur <zash@zash.se>
parents:
8308
diff
changeset
|
233 |
module:log("error", "Could not restore nodes for %s: %s", username, err); |
202b9951b037
mod_pep_plus: Keep track of nodes, and restore them when later
Kim Alvefur <zash@zash.se>
parents:
8308
diff
changeset
|
234 |
else |
202b9951b037
mod_pep_plus: Keep track of nodes, and restore them when later
Kim Alvefur <zash@zash.se>
parents:
8308
diff
changeset
|
235 |
module:log("debug", "No known nodes"); |
202b9951b037
mod_pep_plus: Keep track of nodes, and restore them when later
Kim Alvefur <zash@zash.se>
parents:
8308
diff
changeset
|
236 |
end |
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
237 |
services[username] = service; |
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
238 |
module:add_item("pep-service", { service = service, jid = user_bare }); |
6435
388786af0dd2
mod_pep_plus: Add pubsub service objects to an item list
Kim Alvefur <zash@zash.se>
parents:
6305
diff
changeset
|
239 |
return service; |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
240 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
241 |
|
9545
b8bfcfbe5126
mod_pep: Add automatic subscriptions on node creation (fixes #1222)
Kim Alvefur <zash@zash.se>
parents:
9544
diff
changeset
|
242 |
module:hook("item-added/pep-service", function (event) |
b8bfcfbe5126
mod_pep: Add automatic subscriptions on node creation (fixes #1222)
Kim Alvefur <zash@zash.se>
parents:
9544
diff
changeset
|
243 |
local service = event.item.service; |
b8bfcfbe5126
mod_pep: Add automatic subscriptions on node creation (fixes #1222)
Kim Alvefur <zash@zash.se>
parents:
9544
diff
changeset
|
244 |
module:hook_object_event(service.events, "node-created", on_node_creation); |
b8bfcfbe5126
mod_pep: Add automatic subscriptions on node creation (fixes #1222)
Kim Alvefur <zash@zash.se>
parents:
9544
diff
changeset
|
245 |
end); |
b8bfcfbe5126
mod_pep: Add automatic subscriptions on node creation (fixes #1222)
Kim Alvefur <zash@zash.se>
parents:
9544
diff
changeset
|
246 |
|
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
247 |
function handle_pubsub_iq(event) |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
248 |
local origin, stanza = event.origin, event.stanza; |
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
249 |
local service_name = origin.username; |
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
250 |
if stanza.attr.to ~= nil then |
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
251 |
service_name = jid_split(stanza.attr.to); |
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
252 |
end |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
253 |
local service = get_pep_service(service_name); |
8338
9db72349095f
mod_pep_plus: Use dispatch function from pubsub.lib
Kim Alvefur <zash@zash.se>
parents:
8336
diff
changeset
|
254 |
|
9db72349095f
mod_pep_plus: Use dispatch function from pubsub.lib
Kim Alvefur <zash@zash.se>
parents:
8336
diff
changeset
|
255 |
return lib_pubsub.handle_pubsub_iq(event, service) |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
256 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
257 |
|
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
258 |
module:hook("iq/bare/"..xmlns_pubsub..":pubsub", handle_pubsub_iq); |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
259 |
module:hook("iq/bare/"..xmlns_pubsub_owner..":pubsub", handle_pubsub_iq); |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
260 |
|
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
261 |
local function get_caps_hash_from_presence(stanza, current) |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
262 |
local t = stanza.attr.type; |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
263 |
if not t then |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
264 |
local child = stanza:get_child("c", "http://jabber.org/protocol/caps"); |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
265 |
if child then |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
266 |
local attr = child.attr; |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
267 |
if attr.hash then -- new caps |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
268 |
if attr.hash == 'sha-1' and attr.node and attr.ver then |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
269 |
return attr.ver, attr.node.."#"..attr.ver; |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
270 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
271 |
else -- legacy caps |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
272 |
if attr.node and attr.ver then |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
273 |
return attr.node.."#"..attr.ver.."#"..(attr.ext or ""), attr.node.."#"..attr.ver; |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
274 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
275 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
276 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
277 |
return; -- no or bad caps |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
278 |
elseif t == "unavailable" or t == "error" then |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
279 |
return; |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
280 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
281 |
return current; -- no caps, could mean caps optimization, so return current |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
282 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
283 |
|
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
284 |
local function resend_last_item(jid, node, service) |
8380
58cdbbe3b86a
mod_pep_plus: Broadcast only the last item (thanks lovetox)
Kim Alvefur <zash@zash.se>
parents:
8345
diff
changeset
|
285 |
local ok, id, item = service:get_last_item(node, jid); |
9208 | 286 |
if not (ok and id) then return; end |
8380
58cdbbe3b86a
mod_pep_plus: Broadcast only the last item (thanks lovetox)
Kim Alvefur <zash@zash.se>
parents:
8345
diff
changeset
|
287 |
service.config.broadcaster("items", node, { [jid] = true }, item); |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
288 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
289 |
|
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
290 |
local function update_subscriptions(recipient, service_name, nodes) |
6305
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
291 |
nodes = nodes or empty_set; |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
292 |
|
6305
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
293 |
local service_recipients = recipients[service_name]; |
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
294 |
if not service_recipients then |
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
295 |
service_recipients = {}; |
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
296 |
recipients[service_name] = service_recipients; |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
297 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
298 |
|
6305
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
299 |
local current = service_recipients[recipient]; |
9543
8cdd7fec6aa7
mod_pep: Remove use of recipients table for signaling pending disco#items
Kim Alvefur <zash@zash.se>
parents:
9541
diff
changeset
|
300 |
if not current then |
6305
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
301 |
current = empty_set; |
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
302 |
end |
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
303 |
|
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
304 |
if (current == empty_set or current:empty()) and (nodes == empty_set or nodes:empty()) then |
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
305 |
return; |
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
306 |
end |
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
307 |
|
8756
d6373a378b73
mod_pep_plus: Skip getting PEP service instance for sessions that have not touched PEP
Kim Alvefur <zash@zash.se>
parents:
8731
diff
changeset
|
308 |
local service = get_pep_service(service_name); |
6305
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
309 |
for node in current - nodes do |
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
310 |
service:remove_subscription(node, recipient, recipient); |
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
311 |
end |
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
312 |
|
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
313 |
for node in nodes - current do |
9143
415a6d26709e
mod_pep: Only resend last item on successful subscription
Kim Alvefur <zash@zash.se>
parents:
9142
diff
changeset
|
314 |
if service:add_subscription(node, recipient, recipient, { presence = true }) then |
415a6d26709e
mod_pep: Only resend last item on successful subscription
Kim Alvefur <zash@zash.se>
parents:
9142
diff
changeset
|
315 |
resend_last_item(recipient, node, service); |
415a6d26709e
mod_pep: Only resend last item on successful subscription
Kim Alvefur <zash@zash.se>
parents:
9142
diff
changeset
|
316 |
end |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
317 |
end |
6305
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
318 |
|
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
319 |
if nodes == empty_set or nodes:empty() then |
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
320 |
nodes = nil; |
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
321 |
end |
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
322 |
|
38d82f8ead25
mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents:
6264
diff
changeset
|
323 |
service_recipients[recipient] = nodes; |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
324 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
325 |
|
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
326 |
module:hook("presence/bare", function(event) |
8731
41c959c5c84b
Fix spelling throughout the codebase [codespell]
Kim Alvefur <zash@zash.se>
parents:
8699
diff
changeset
|
327 |
-- inbound presence to bare JID received |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
328 |
local origin, stanza = event.origin, event.stanza; |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
329 |
local t = stanza.attr.type; |
8306
053cf683c2c7
mod_pep_plus: Rename variable for clarity
Kim Alvefur <zash@zash.se>
parents:
8303
diff
changeset
|
330 |
local is_self = not stanza.attr.to; |
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
331 |
local username = jid_split(stanza.attr.to); |
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
332 |
local user_bare = jid_bare(stanza.attr.to); |
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
333 |
if is_self then |
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
334 |
username = origin.username; |
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
335 |
user_bare = jid_join(username, host); |
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
336 |
end |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
337 |
|
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
338 |
if not t then -- available presence |
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
339 |
if is_self or subscription_presence(username, stanza.attr.from) then |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
340 |
local recipient = stanza.attr.from; |
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
341 |
local current = recipients[username] and recipients[username][recipient]; |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
342 |
local hash, query_node = get_caps_hash_from_presence(stanza, current); |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
343 |
if current == hash or (current and current == hash_map[hash]) then return; end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
344 |
if not hash then |
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
345 |
update_subscriptions(recipient, username); |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
346 |
else |
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
347 |
recipients[username] = recipients[username] or {}; |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
348 |
if hash_map[hash] then |
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
349 |
update_subscriptions(recipient, username, hash_map[hash]); |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
350 |
else |
9543
8cdd7fec6aa7
mod_pep: Remove use of recipients table for signaling pending disco#items
Kim Alvefur <zash@zash.se>
parents:
9541
diff
changeset
|
351 |
-- COMPAT from ~= stanza.attr.to because OneTeam can't deal with missing from attribute |
8cdd7fec6aa7
mod_pep: Remove use of recipients table for signaling pending disco#items
Kim Alvefur <zash@zash.se>
parents:
9541
diff
changeset
|
352 |
origin.send( |
8cdd7fec6aa7
mod_pep: Remove use of recipients table for signaling pending disco#items
Kim Alvefur <zash@zash.se>
parents:
9541
diff
changeset
|
353 |
st.stanza("iq", {from=user_bare, to=stanza.attr.from, id="disco", type="get"}) |
8cdd7fec6aa7
mod_pep: Remove use of recipients table for signaling pending disco#items
Kim Alvefur <zash@zash.se>
parents:
9541
diff
changeset
|
354 |
:tag("query", {xmlns = "http://jabber.org/protocol/disco#info", node = query_node}) |
8cdd7fec6aa7
mod_pep: Remove use of recipients table for signaling pending disco#items
Kim Alvefur <zash@zash.se>
parents:
9541
diff
changeset
|
355 |
); |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
356 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
357 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
358 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
359 |
elseif t == "unavailable" then |
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
360 |
update_subscriptions(stanza.attr.from, username); |
8306
053cf683c2c7
mod_pep_plus: Rename variable for clarity
Kim Alvefur <zash@zash.se>
parents:
8303
diff
changeset
|
361 |
elseif not is_self and t == "unsubscribe" then |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
362 |
local from = jid_bare(stanza.attr.from); |
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
363 |
local subscriptions = recipients[username]; |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
364 |
if subscriptions then |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
365 |
for subscriber in pairs(subscriptions) do |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
366 |
if jid_bare(subscriber) == from then |
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
367 |
update_subscriptions(subscriber, username); |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
368 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
369 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
370 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
371 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
372 |
end, 10); |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
373 |
|
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
374 |
module:hook("iq-result/bare/disco", function(event) |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
375 |
local origin, stanza = event.origin, event.stanza; |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
376 |
local disco = stanza:get_child("query", "http://jabber.org/protocol/disco#info"); |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
377 |
if not disco then |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
378 |
return; |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
379 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
380 |
|
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
381 |
-- Process disco response |
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
382 |
local is_self = stanza.attr.to == nil; |
8318
967f04fe7fd4
mod_pep_plus: Add missing variable
Kim Alvefur <zash@zash.se>
parents:
8310
diff
changeset
|
383 |
local user_bare = jid_bare(stanza.attr.to); |
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
384 |
local username = jid_split(stanza.attr.to); |
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
385 |
if is_self then |
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
386 |
username = origin.username; |
8318
967f04fe7fd4
mod_pep_plus: Add missing variable
Kim Alvefur <zash@zash.se>
parents:
8310
diff
changeset
|
387 |
user_bare = jid_join(username, host); |
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
388 |
end |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
389 |
local contact = stanza.attr.from; |
9543
8cdd7fec6aa7
mod_pep: Remove use of recipients table for signaling pending disco#items
Kim Alvefur <zash@zash.se>
parents:
9541
diff
changeset
|
390 |
local ver = calculate_hash(disco.tags); -- calculate hash |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
391 |
local notify = set_new(); |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
392 |
for _, feature in pairs(disco.tags) do |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
393 |
if feature.name == "feature" and feature.attr.var then |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
394 |
local nfeature = feature.attr.var:match("^(.*)%+notify$"); |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
395 |
if nfeature then notify:add(nfeature); end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
396 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
397 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
398 |
hash_map[ver] = notify; -- update hash map |
8306
053cf683c2c7
mod_pep_plus: Rename variable for clarity
Kim Alvefur <zash@zash.se>
parents:
8303
diff
changeset
|
399 |
if is_self then |
8310
94860b5733d3
mod_pep_plus: Update subscriptions for other local users only
Kim Alvefur <zash@zash.se>
parents:
8309
diff
changeset
|
400 |
-- Optimization: Fiddle with other local users |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
401 |
for jid, item in pairs(origin.roster) do -- for all interested contacts |
8307
9f8476c77fa8
mod_pep_plus: Skip over roster metadata (version, pending) entry
Kim Alvefur <zash@zash.se>
parents:
8306
diff
changeset
|
402 |
if jid then |
8310
94860b5733d3
mod_pep_plus: Update subscriptions for other local users only
Kim Alvefur <zash@zash.se>
parents:
8309
diff
changeset
|
403 |
local contact_node, contact_host = jid_split(jid); |
9064
82dd435c942c
mod_pep_plus: Fix boolean logic precedence (thanks Link Mauve)
Kim Alvefur <zash@zash.se>
parents:
9033
diff
changeset
|
404 |
if contact_host == host and (item.subscription == "both" or item.subscription == "from") then |
8310
94860b5733d3
mod_pep_plus: Update subscriptions for other local users only
Kim Alvefur <zash@zash.se>
parents:
8309
diff
changeset
|
405 |
update_subscriptions(user_bare, contact_node, notify); |
8307
9f8476c77fa8
mod_pep_plus: Skip over roster metadata (version, pending) entry
Kim Alvefur <zash@zash.se>
parents:
8306
diff
changeset
|
406 |
end |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
407 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
408 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
409 |
end |
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
410 |
update_subscriptions(contact, username, notify); |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
411 |
end); |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
412 |
|
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
413 |
module:hook("account-disco-info-node", function(event) |
8985
4a576c39bb2f
mod_pep_plus: Use service discovery helpers from pubsub.lib
Kim Alvefur <zash@zash.se>
parents:
8952
diff
changeset
|
414 |
local stanza, origin = event.stanza, event.origin; |
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
415 |
local service_name = origin.username; |
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
416 |
if stanza.attr.to ~= nil then |
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
417 |
service_name = jid_split(stanza.attr.to); |
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
418 |
end |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
419 |
local service = get_pep_service(service_name); |
8985
4a576c39bb2f
mod_pep_plus: Use service discovery helpers from pubsub.lib
Kim Alvefur <zash@zash.se>
parents:
8952
diff
changeset
|
420 |
return lib_pubsub.handle_disco_info_node(event, service); |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
421 |
end); |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
422 |
|
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
423 |
module:hook("account-disco-info", function(event) |
8322
57e3ad11f3f6
mod_pep_plus: Advertise pubsub features in disco#info (code adapted from mod_pubsub)
Kim Alvefur <zash@zash.se>
parents:
8321
diff
changeset
|
424 |
local origin, reply = event.origin, event.reply; |
57e3ad11f3f6
mod_pep_plus: Advertise pubsub features in disco#info (code adapted from mod_pubsub)
Kim Alvefur <zash@zash.se>
parents:
8321
diff
changeset
|
425 |
|
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
426 |
reply:tag('identity', {category='pubsub', type='pep'}):up(); |
8322
57e3ad11f3f6
mod_pep_plus: Advertise pubsub features in disco#info (code adapted from mod_pubsub)
Kim Alvefur <zash@zash.se>
parents:
8321
diff
changeset
|
427 |
|
57e3ad11f3f6
mod_pep_plus: Advertise pubsub features in disco#info (code adapted from mod_pubsub)
Kim Alvefur <zash@zash.se>
parents:
8321
diff
changeset
|
428 |
local username = jid_split(reply.attr.from) or origin.username; |
57e3ad11f3f6
mod_pep_plus: Advertise pubsub features in disco#info (code adapted from mod_pubsub)
Kim Alvefur <zash@zash.se>
parents:
8321
diff
changeset
|
429 |
local service = get_pep_service(username); |
57e3ad11f3f6
mod_pep_plus: Advertise pubsub features in disco#info (code adapted from mod_pubsub)
Kim Alvefur <zash@zash.se>
parents:
8321
diff
changeset
|
430 |
|
8345
0c0990a575de
mod_pep_plus: Fix a typo.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
8344
diff
changeset
|
431 |
local supported_features = lib_pubsub.get_feature_set(service) + set.new{ |
8344
910d3c3f60a6
mod_pep_plus: Use feature detection from pubsub.lib
Kim Alvefur <zash@zash.se>
parents:
8342
diff
changeset
|
432 |
-- Features not covered by the above |
8335
e89b57d0d80a
mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods
Kim Alvefur <zash@zash.se>
parents:
8334
diff
changeset
|
433 |
"auto-subscribe", |
e89b57d0d80a
mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods
Kim Alvefur <zash@zash.se>
parents:
8334
diff
changeset
|
434 |
"filtered-notifications", |
e89b57d0d80a
mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods
Kim Alvefur <zash@zash.se>
parents:
8334
diff
changeset
|
435 |
"last-published", |
e89b57d0d80a
mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods
Kim Alvefur <zash@zash.se>
parents:
8334
diff
changeset
|
436 |
"presence-notifications", |
e89b57d0d80a
mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods
Kim Alvefur <zash@zash.se>
parents:
8334
diff
changeset
|
437 |
"presence-subscribe", |
e89b57d0d80a
mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods
Kim Alvefur <zash@zash.se>
parents:
8334
diff
changeset
|
438 |
}; |
8344
910d3c3f60a6
mod_pep_plus: Use feature detection from pubsub.lib
Kim Alvefur <zash@zash.se>
parents:
8342
diff
changeset
|
439 |
|
8345
0c0990a575de
mod_pep_plus: Fix a typo.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
8344
diff
changeset
|
440 |
for feature in supported_features do |
8335
e89b57d0d80a
mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods
Kim Alvefur <zash@zash.se>
parents:
8334
diff
changeset
|
441 |
reply:tag('feature', {var=xmlns_pubsub.."#"..feature}):up(); |
e89b57d0d80a
mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods
Kim Alvefur <zash@zash.se>
parents:
8334
diff
changeset
|
442 |
end |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
443 |
end); |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
444 |
|
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
445 |
module:hook("account-disco-items-node", function(event) |
8985
4a576c39bb2f
mod_pep_plus: Use service discovery helpers from pubsub.lib
Kim Alvefur <zash@zash.se>
parents:
8952
diff
changeset
|
446 |
local stanza, origin = event.stanza, event.origin; |
8324
73ff49a42ea8
mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)
Kim Alvefur <zash@zash.se>
parents:
8323
diff
changeset
|
447 |
local is_self = stanza.attr.to == nil; |
73ff49a42ea8
mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)
Kim Alvefur <zash@zash.se>
parents:
8323
diff
changeset
|
448 |
local username = jid_split(stanza.attr.to); |
73ff49a42ea8
mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)
Kim Alvefur <zash@zash.se>
parents:
8323
diff
changeset
|
449 |
if is_self then |
73ff49a42ea8
mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)
Kim Alvefur <zash@zash.se>
parents:
8323
diff
changeset
|
450 |
username = origin.username; |
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
451 |
end |
8324
73ff49a42ea8
mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)
Kim Alvefur <zash@zash.se>
parents:
8323
diff
changeset
|
452 |
local service = get_pep_service(username); |
8985
4a576c39bb2f
mod_pep_plus: Use service discovery helpers from pubsub.lib
Kim Alvefur <zash@zash.se>
parents:
8952
diff
changeset
|
453 |
return lib_pubsub.handle_disco_items_node(event, service); |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
454 |
end); |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
455 |
|
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
456 |
module:hook("account-disco-items", function(event) |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
457 |
local reply, stanza, origin = event.reply, event.stanza, event.origin; |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
458 |
|
8324
73ff49a42ea8
mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)
Kim Alvefur <zash@zash.se>
parents:
8323
diff
changeset
|
459 |
local is_self = stanza.attr.to == nil; |
73ff49a42ea8
mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)
Kim Alvefur <zash@zash.se>
parents:
8323
diff
changeset
|
460 |
local user_bare = jid_bare(stanza.attr.to); |
73ff49a42ea8
mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)
Kim Alvefur <zash@zash.se>
parents:
8323
diff
changeset
|
461 |
local username = jid_split(stanza.attr.to); |
73ff49a42ea8
mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)
Kim Alvefur <zash@zash.se>
parents:
8323
diff
changeset
|
462 |
if is_self then |
73ff49a42ea8
mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)
Kim Alvefur <zash@zash.se>
parents:
8323
diff
changeset
|
463 |
username = origin.username; |
73ff49a42ea8
mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)
Kim Alvefur <zash@zash.se>
parents:
8323
diff
changeset
|
464 |
user_bare = jid_join(username, host); |
8308
ec605946e597
mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents:
8307
diff
changeset
|
465 |
end |
8324
73ff49a42ea8
mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)
Kim Alvefur <zash@zash.se>
parents:
8323
diff
changeset
|
466 |
local service = get_pep_service(username); |
73ff49a42ea8
mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)
Kim Alvefur <zash@zash.se>
parents:
8323
diff
changeset
|
467 |
|
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
468 |
local ok, ret = service:get_nodes(jid_bare(stanza.attr.from)); |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
469 |
if not ok then return; end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
470 |
|
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
471 |
for node, node_obj in pairs(ret) do |
9601
17d43543f9b6
pubsub: Set pubsub#title as name attribute in disco#items (fixes #1226)
Kim Alvefur <zash@zash.se>
parents:
9545
diff
changeset
|
472 |
reply:tag("item", { jid = user_bare, node = node, name = node_obj.config.title }):up(); |
5852
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
473 |
end |
84bdac93910f
mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff
changeset
|
474 |
end); |