Annotate

plugins/mod_pep.lua @ 13572:d9965707f7dc

mod_smacks: Prevent traceback on attempting to resume destroyed session This shouldn't be possible, but seems to happen anyway after net.server somehow calling the close handler twice, which also should not happen.
author Kim Alvefur <zash@zash.se>
date Tue, 19 Nov 2024 00:53:01 +0100
parent 13486:fdd1438d9ef7
child 13586:c8a387912a33
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12977
74b9e05af71e plugins: Prefix module imports with prosody namespace
Kim Alvefur <zash@zash.se>
parents: 12962
diff changeset
1 local pubsub = require "prosody.util.pubsub";
74b9e05af71e plugins: Prefix module imports with prosody namespace
Kim Alvefur <zash@zash.se>
parents: 12962
diff changeset
2 local jid_bare = require "prosody.util.jid".bare;
74b9e05af71e plugins: Prefix module imports with prosody namespace
Kim Alvefur <zash@zash.se>
parents: 12962
diff changeset
3 local jid_split = require "prosody.util.jid".split;
74b9e05af71e plugins: Prefix module imports with prosody namespace
Kim Alvefur <zash@zash.se>
parents: 12962
diff changeset
4 local jid_join = require "prosody.util.jid".join;
74b9e05af71e plugins: Prefix module imports with prosody namespace
Kim Alvefur <zash@zash.se>
parents: 12962
diff changeset
5 local set_new = require "prosody.util.set".new;
74b9e05af71e plugins: Prefix module imports with prosody namespace
Kim Alvefur <zash@zash.se>
parents: 12962
diff changeset
6 local st = require "prosody.util.stanza";
74b9e05af71e plugins: Prefix module imports with prosody namespace
Kim Alvefur <zash@zash.se>
parents: 12962
diff changeset
7 local calculate_hash = require "prosody.util.caps".calculate_hash;
13486
fdd1438d9ef7 mod_pep: Implement 'roster' (group) access_model
Kim Alvefur <zash@zash.se>
parents: 13213
diff changeset
8 local rostermanager = require "prosody.core.rostermanager";
12977
74b9e05af71e plugins: Prefix module imports with prosody namespace
Kim Alvefur <zash@zash.se>
parents: 12962
diff changeset
9 local cache = require "prosody.util.cache";
74b9e05af71e plugins: Prefix module imports with prosody namespace
Kim Alvefur <zash@zash.se>
parents: 12962
diff changeset
10 local set = require "prosody.util.set";
74b9e05af71e plugins: Prefix module imports with prosody namespace
Kim Alvefur <zash@zash.se>
parents: 12962
diff changeset
11 local new_id = require "prosody.util.id".medium;
74b9e05af71e plugins: Prefix module imports with prosody namespace
Kim Alvefur <zash@zash.se>
parents: 12962
diff changeset
12 local storagemanager = require "prosody.core.storagemanager";
74b9e05af71e plugins: Prefix module imports with prosody namespace
Kim Alvefur <zash@zash.se>
parents: 12962
diff changeset
13 local usermanager = require "prosody.core.usermanager";
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
14
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
15 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
16 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
17 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
18
13486
fdd1438d9ef7 mod_pep: Implement 'roster' (group) access_model
Kim Alvefur <zash@zash.se>
parents: 13213
diff changeset
19 local is_contact_subscribed = rostermanager.is_contact_subscribed;
fdd1438d9ef7 mod_pep: Implement 'roster' (group) access_model
Kim Alvefur <zash@zash.se>
parents: 13213
diff changeset
20
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
21 local lib_pubsub = module:require "pubsub";
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
22
6305
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents: 6264
diff changeset
23 local empty_set = set_new();
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents: 6264
diff changeset
24
12086
1dc00ca6ee9d mod_pep: Limit possible growth of number of pubsub services
Kim Alvefur <zash@zash.se>
parents: 12085
diff changeset
25 -- username -> object passed to module:add_items()
1dc00ca6ee9d mod_pep: Limit possible growth of number of pubsub services
Kim Alvefur <zash@zash.se>
parents: 12085
diff changeset
26 local pep_service_items = {};
1dc00ca6ee9d mod_pep: Limit possible growth of number of pubsub services
Kim Alvefur <zash@zash.se>
parents: 12085
diff changeset
27
1dc00ca6ee9d mod_pep: Limit possible growth of number of pubsub services
Kim Alvefur <zash@zash.se>
parents: 12085
diff changeset
28 -- size of caches with full pubsub service objects
13213
50324f66ca2a plugins: Use integer config API with interval specification where sensible
Kim Alvefur <zash@zash.se>
parents: 12977
diff changeset
29 local service_cache_size = module:get_option_integer("pep_service_cache_size", 1000, 1);
12086
1dc00ca6ee9d mod_pep: Limit possible growth of number of pubsub services
Kim Alvefur <zash@zash.se>
parents: 12085
diff changeset
30
9113
74639d606a15 mod_pep: Add comments describing root tables used for data
Kim Alvefur <zash@zash.se>
parents: 9103
diff changeset
31 -- username -> util.pubsub service object
12086
1dc00ca6ee9d mod_pep: Limit possible growth of number of pubsub services
Kim Alvefur <zash@zash.se>
parents: 12085
diff changeset
32 local services = cache.new(service_cache_size, function (username, _)
1dc00ca6ee9d mod_pep: Limit possible growth of number of pubsub services
Kim Alvefur <zash@zash.se>
parents: 12085
diff changeset
33 local item = pep_service_items[username];
1dc00ca6ee9d mod_pep: Limit possible growth of number of pubsub services
Kim Alvefur <zash@zash.se>
parents: 12085
diff changeset
34 pep_service_items[username] = nil;
1dc00ca6ee9d mod_pep: Limit possible growth of number of pubsub services
Kim Alvefur <zash@zash.se>
parents: 12085
diff changeset
35 if item then
1dc00ca6ee9d mod_pep: Limit possible growth of number of pubsub services
Kim Alvefur <zash@zash.se>
parents: 12085
diff changeset
36 module:remove_item("pep-service", item);
1dc00ca6ee9d mod_pep: Limit possible growth of number of pubsub services
Kim Alvefur <zash@zash.se>
parents: 12085
diff changeset
37 end
1dc00ca6ee9d mod_pep: Limit possible growth of number of pubsub services
Kim Alvefur <zash@zash.se>
parents: 12085
diff changeset
38 end):table();
9113
74639d606a15 mod_pep: Add comments describing root tables used for data
Kim Alvefur <zash@zash.se>
parents: 9103
diff changeset
39
12087
19f67d44ec37 mod_pep: Limit possible growth of node subscription info
Kim Alvefur <zash@zash.se>
parents: 12086
diff changeset
40 -- size of caches with smaller objects
13213
50324f66ca2a plugins: Use integer config API with interval specification where sensible
Kim Alvefur <zash@zash.se>
parents: 12977
diff changeset
41 local info_cache_size = module:get_option_integer("pep_info_cache_size", 10000, 1);
12087
19f67d44ec37 mod_pep: Limit possible growth of node subscription info
Kim Alvefur <zash@zash.se>
parents: 12086
diff changeset
42
9142
85bc624b8685 mod_pep: Correct comment about 'recipients' table
Kim Alvefur <zash@zash.se>
parents: 9141
diff changeset
43 -- username -> recipient -> set of nodes
12087
19f67d44ec37 mod_pep: Limit possible growth of node subscription info
Kim Alvefur <zash@zash.se>
parents: 12086
diff changeset
44 local recipients = cache.new(info_cache_size):table();
9143
817f666d9037 mod_pep: Add comment about 'hash_map' table
Kim Alvefur <zash@zash.se>
parents: 9142
diff changeset
45
817f666d9037 mod_pep: Add comment about 'hash_map' table
Kim Alvefur <zash@zash.se>
parents: 9142
diff changeset
46 -- caps hash -> set of nodes
12087
19f67d44ec37 mod_pep: Limit possible growth of node subscription info
Kim Alvefur <zash@zash.se>
parents: 12086
diff changeset
47 local hash_map = cache.new(info_cache_size):table();
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
48
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
49 local host = module.host;
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
50
8949
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
51 local node_config = module:open_store("pep", "map");
8306
202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later
Kim Alvefur <zash@zash.se>
parents: 8305
diff changeset
52 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: 8305
diff changeset
53
13213
50324f66ca2a plugins: Use integer config API with interval specification where sensible
Kim Alvefur <zash@zash.se>
parents: 12977
diff changeset
54 local max_max_items = module:get_option_number("pep_max_items", 256, 0);
9077
aefb96a52f5f mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen)
Matthew Wild <mwild1@gmail.com>
parents: 9074
diff changeset
55
11631
6641ca266d94 mod_pubsub,mod_pep: Support "max" as 'pubsub#max_items'
Kim Alvefur <zash@zash.se>
parents: 11567
diff changeset
56 local function tonumber_max_items(n)
6641ca266d94 mod_pubsub,mod_pep: Support "max" as 'pubsub#max_items'
Kim Alvefur <zash@zash.se>
parents: 11567
diff changeset
57 if n == "max" then
6641ca266d94 mod_pubsub,mod_pep: Support "max" as 'pubsub#max_items'
Kim Alvefur <zash@zash.se>
parents: 11567
diff changeset
58 return max_max_items;
6641ca266d94 mod_pubsub,mod_pep: Support "max" as 'pubsub#max_items'
Kim Alvefur <zash@zash.se>
parents: 11567
diff changeset
59 end
6641ca266d94 mod_pubsub,mod_pep: Support "max" as 'pubsub#max_items'
Kim Alvefur <zash@zash.se>
parents: 11567
diff changeset
60 return tonumber(n);
6641ca266d94 mod_pubsub,mod_pep: Support "max" as 'pubsub#max_items'
Kim Alvefur <zash@zash.se>
parents: 11567
diff changeset
61 end
6641ca266d94 mod_pubsub,mod_pep: Support "max" as 'pubsub#max_items'
Kim Alvefur <zash@zash.se>
parents: 11567
diff changeset
62
11856
14a679588b7b mod_pubsub,mod_pep: Advertise maximum number of items via XEP-0122
Kim Alvefur <zash@zash.se>
parents: 11854
diff changeset
63 for _, field in ipairs(lib_pubsub.node_config_form) do
14a679588b7b mod_pubsub,mod_pep: Advertise maximum number of items via XEP-0122
Kim Alvefur <zash@zash.se>
parents: 11854
diff changeset
64 if field.var == "pubsub#max_items" then
14a679588b7b mod_pubsub,mod_pep: Advertise maximum number of items via XEP-0122
Kim Alvefur <zash@zash.se>
parents: 11854
diff changeset
65 field.range_max = max_max_items;
14a679588b7b mod_pubsub,mod_pep: Advertise maximum number of items via XEP-0122
Kim Alvefur <zash@zash.se>
parents: 11854
diff changeset
66 break;
14a679588b7b mod_pubsub,mod_pep: Advertise maximum number of items via XEP-0122
Kim Alvefur <zash@zash.se>
parents: 11854
diff changeset
67 end
14a679588b7b mod_pubsub,mod_pep: Advertise maximum number of items via XEP-0122
Kim Alvefur <zash@zash.se>
parents: 11854
diff changeset
68 end
14a679588b7b mod_pubsub,mod_pep: Advertise maximum number of items via XEP-0122
Kim Alvefur <zash@zash.se>
parents: 11854
diff changeset
69
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
70 function module.save()
9141
c1368fb756bf mod_pep: Pass 'recipients' table across module reloads
Kim Alvefur <zash@zash.se>
parents: 9140
diff changeset
71 return {
c1368fb756bf mod_pep: Pass 'recipients' table across module reloads
Kim Alvefur <zash@zash.se>
parents: 9140
diff changeset
72 recipients = recipients;
c1368fb756bf mod_pep: Pass 'recipients' table across module reloads
Kim Alvefur <zash@zash.se>
parents: 9140
diff changeset
73 };
5852
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
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
76 function module.restore(data)
9141
c1368fb756bf mod_pep: Pass 'recipients' table across module reloads
Kim Alvefur <zash@zash.se>
parents: 9140
diff changeset
77 recipients = data.recipients;
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
78 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
79
8696
164da3186511 mod_pep_plus: Validate items here too (thanks Link Mauve)
Kim Alvefur <zash@zash.se>
parents: 8377
diff changeset
80 function is_item_stanza(item)
10672
657e61531b33 mod_pubsub, mod_pep: Ensure correct number of children of <item/> (fixes #1496)
Kim Alvefur <zash@zash.se>
parents: 10520
diff changeset
81 return st.is_stanza(item) and item.attr.xmlns == xmlns_pubsub and item.name == "item" and #item.tags == 1;
8696
164da3186511 mod_pep_plus: Validate items here too (thanks Link Mauve)
Kim Alvefur <zash@zash.se>
parents: 8377
diff changeset
82 end
164da3186511 mod_pep_plus: Validate items here too (thanks Link Mauve)
Kim Alvefur <zash@zash.se>
parents: 8377
diff changeset
83
9080
1b21f8ffaec8 mod_pep: Silence warnings about unused arguments [luacheck]
Kim Alvefur <zash@zash.se>
parents: 9077
diff changeset
84 function check_node_config(node, actor, new_config) -- luacheck: ignore 212/node 212/actor
11631
6641ca266d94 mod_pubsub,mod_pep: Support "max" as 'pubsub#max_items'
Kim Alvefur <zash@zash.se>
parents: 11567
diff changeset
85 if (tonumber_max_items(new_config["max_items"]) or 1) > max_max_items then
9077
aefb96a52f5f mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen)
Matthew Wild <mwild1@gmail.com>
parents: 9074
diff changeset
86 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: 9074
diff changeset
87 end
9103
d5a7d2697b19 mod_pep: Restrict access models to 'presence', 'whitelist' and 'open'
Kim Alvefur <zash@zash.se>
parents: 9099
diff changeset
88 if new_config["access_model"] ~= "presence"
13486
fdd1438d9ef7 mod_pep: Implement 'roster' (group) access_model
Kim Alvefur <zash@zash.se>
parents: 13213
diff changeset
89 and new_config["access_model"] ~= "roster"
9103
d5a7d2697b19 mod_pep: Restrict access models to 'presence', 'whitelist' and 'open'
Kim Alvefur <zash@zash.se>
parents: 9099
diff changeset
90 and new_config["access_model"] ~= "whitelist"
d5a7d2697b19 mod_pep: Restrict access models to 'presence', 'whitelist' and 'open'
Kim Alvefur <zash@zash.se>
parents: 9099
diff changeset
91 and new_config["access_model"] ~= "open" then
d5a7d2697b19 mod_pep: Restrict access models to 'presence', 'whitelist' and 'open'
Kim Alvefur <zash@zash.se>
parents: 9099
diff changeset
92 return false;
d5a7d2697b19 mod_pep: Restrict access models to 'presence', 'whitelist' and 'open'
Kim Alvefur <zash@zash.se>
parents: 9099
diff changeset
93 end
9082
297a06074175 mod_pep: Return true if all node config checks passes (fixes configuration)
Kim Alvefur <zash@zash.se>
parents: 9080
diff changeset
94 return true;
9077
aefb96a52f5f mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen)
Matthew Wild <mwild1@gmail.com>
parents: 9074
diff changeset
95 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: 9074
diff changeset
96
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
97 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: 8304
diff changeset
98 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
99 local recipient_bare = jid_bare(recipient);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
100 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
101 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
102 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
103
8949
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
104 local function nodestore(username)
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
105 -- luacheck: ignore 212/self
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
106 local store = {};
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
107 function store:get(node)
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
108 local data, err = node_config:get(username, node)
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
109 if data == true then
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
110 -- COMPAT Previously stored only a boolean representing 'persist_items'
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
111 data = {
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
112 name = node;
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
113 config = {};
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
114 subscribers = {};
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
115 affiliations = {};
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
116 };
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
117 end
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
118 return data, err;
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
119 end
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
120 function store:set(node, data)
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
121 return node_config:set(username, node, data);
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
122 end
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
123 function store:users()
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
124 return pairs(known_nodes:get(username) or {});
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
125 end
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
126 return store;
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
127 end
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
128
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
129 local function simple_itemstore(username)
9827
fd8aaab6669c mod_pep: Simplify configuration for node data (fixes #1320)
Kim Alvefur <zash@zash.se>
parents: 9597
diff changeset
130 local driver = storagemanager.get_driver(module.host, "pep_data");
8218
2c75a5ba58fc mod_pubsub: Pass 'user' to simple_itemstore
Kim Alvefur <zash@zash.se>
parents: 8215
diff changeset
131 return function (config, node)
11631
6641ca266d94 mod_pubsub,mod_pep: Support "max" as 'pubsub#max_items'
Kim Alvefur <zash@zash.se>
parents: 11567
diff changeset
132 local max_items = tonumber_max_items(config["max_items"]);
11722
bc2d3f110a39 mod_pep: Remove use of RLU cache when persist_items was set to false
Kim Alvefur <zash@zash.se>
parents: 11631
diff changeset
133 module:log("debug", "Creating new persistent item store for user %s, node %q", username, node);
bc2d3f110a39 mod_pep: Remove use of RLU cache when persist_items was set to false
Kim Alvefur <zash@zash.se>
parents: 11631
diff changeset
134 local archive = driver:open("pep_"..node, "archive");
bc2d3f110a39 mod_pep: Remove use of RLU cache when persist_items was set to false
Kim Alvefur <zash@zash.se>
parents: 11631
diff changeset
135 return lib_pubsub.archive_itemstore(archive, max_items, username, node, false);
8218
2c75a5ba58fc mod_pubsub: Pass 'user' to simple_itemstore
Kim Alvefur <zash@zash.se>
parents: 8215
diff changeset
136 end
8215
835bb32c36b4 mod_pep_plus: Add item persistency.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents: 8214
diff changeset
137 end
835bb32c36b4 mod_pep_plus: Add item persistency.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents: 8214
diff changeset
138
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
139 local function get_broadcaster(username)
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
140 local user_bare = jid_join(username, host);
9189
8fadd3d6c8d3 mod_pep: Respect settings for which kinds of notifications to send
Kim Alvefur <zash@zash.se>
parents: 9179
diff changeset
141 local function simple_broadcast(kind, node, jids, item, _, node_obj)
12960
31b22cc221b5 mod_pubsub, mod_pep: Support per-node configurable inclusion of publisher
Matthew Wild <mwild1@gmail.com>
parents: 12260
diff changeset
142 local expose_publisher;
9189
8fadd3d6c8d3 mod_pep: Respect settings for which kinds of notifications to send
Kim Alvefur <zash@zash.se>
parents: 9179
diff changeset
143 if node_obj then
8fadd3d6c8d3 mod_pep: Respect settings for which kinds of notifications to send
Kim Alvefur <zash@zash.se>
parents: 9179
diff changeset
144 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: 9179
diff changeset
145 return;
8fadd3d6c8d3 mod_pep: Respect settings for which kinds of notifications to send
Kim Alvefur <zash@zash.se>
parents: 9179
diff changeset
146 end
12960
31b22cc221b5 mod_pubsub, mod_pep: Support per-node configurable inclusion of publisher
Matthew Wild <mwild1@gmail.com>
parents: 12260
diff changeset
147 if node_obj.config.itemreply == "publisher" then
31b22cc221b5 mod_pubsub, mod_pep: Support per-node configurable inclusion of publisher
Matthew Wild <mwild1@gmail.com>
parents: 12260
diff changeset
148 expose_publisher = true;
31b22cc221b5 mod_pubsub, mod_pep: Support per-node configurable inclusion of publisher
Matthew Wild <mwild1@gmail.com>
parents: 12260
diff changeset
149 end
9189
8fadd3d6c8d3 mod_pep: Respect settings for which kinds of notifications to send
Kim Alvefur <zash@zash.se>
parents: 9179
diff changeset
150 end
9179
82fad995a149 util.pubsub: Pass "retract" as the type of such broadcasts
Kim Alvefur <zash@zash.se>
parents: 9160
diff changeset
151 if kind == "retract" then
82fad995a149 util.pubsub: Pass "retract" as the type of such broadcasts
Kim Alvefur <zash@zash.se>
parents: 9160
diff changeset
152 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: 9160
diff changeset
153 end
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
154 if item then
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
155 item = st.clone(item);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
156 item.attr.xmlns = nil; -- Clear the pubsub namespace
9190
b88f537163da mod_pep: Respect setting for whether to include payload in notifications
Kim Alvefur <zash@zash.se>
parents: 9189
diff changeset
157 if kind == "items" then
b88f537163da mod_pep: Respect setting for whether to include payload in notifications
Kim Alvefur <zash@zash.se>
parents: 9189
diff changeset
158 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: 9189
diff changeset
159 item:maptags(function () return nil; end);
b88f537163da mod_pep: Respect setting for whether to include payload in notifications
Kim Alvefur <zash@zash.se>
parents: 9189
diff changeset
160 end
12960
31b22cc221b5 mod_pubsub, mod_pep: Support per-node configurable inclusion of publisher
Matthew Wild <mwild1@gmail.com>
parents: 12260
diff changeset
161 if not expose_publisher then
31b22cc221b5 mod_pubsub, mod_pep: Support per-node configurable inclusion of publisher
Matthew Wild <mwild1@gmail.com>
parents: 12260
diff changeset
162 item.attr.publisher = nil;
31b22cc221b5 mod_pubsub, mod_pep: Support per-node configurable inclusion of publisher
Matthew Wild <mwild1@gmail.com>
parents: 12260
diff changeset
163 end
9190
b88f537163da mod_pep: Respect setting for whether to include payload in notifications
Kim Alvefur <zash@zash.se>
parents: 9189
diff changeset
164 end
9721
233305015373 mod_pep: Move broadcaster code around to be more like in mod_pubsub
Kim Alvefur <zash@zash.se>
parents: 9607
diff changeset
165 end
233305015373 mod_pep: Move broadcaster code around to be more like in mod_pubsub
Kim Alvefur <zash@zash.se>
parents: 9607
diff changeset
166
9723
3c6e266391a2 mod_pep: Set an 'id' on notifications
Kim Alvefur <zash@zash.se>
parents: 9722
diff changeset
167 local id = new_id();
3c6e266391a2 mod_pep: Set an 'id' on notifications
Kim Alvefur <zash@zash.se>
parents: 9722
diff changeset
168 local message = st.message({ from = user_bare, type = "headline", id = id })
9721
233305015373 mod_pep: Move broadcaster code around to be more like in mod_pubsub
Kim Alvefur <zash@zash.se>
parents: 9607
diff changeset
169 :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: 9607
diff changeset
170 :tag(kind, { node = node });
9722
695fae2e16b2 mod_pep: Add some spacing between blocks in broadcaster to improve readability
Kim Alvefur <zash@zash.se>
parents: 9721
diff changeset
171
9721
233305015373 mod_pep: Move broadcaster code around to be more like in mod_pubsub
Kim Alvefur <zash@zash.se>
parents: 9607
diff changeset
172 if item then
8895
d00ea07de9a0 mod_pep_plus: Prevent nil from being added as a child on item deletion.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents: 8753
diff changeset
173 message:add_child(item);
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
174 end
10036
045209b41b3a mod_pep: Handle presence based subscription outside of util.pubsub (fixes #1372)
Kim Alvefur <zash@zash.se>
parents: 9827
diff changeset
175
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
176 for jid in pairs(jids) do
10047
177a8b92204b mod_pep: Log node name instead of payload
Kim Alvefur <zash@zash.se>
parents: 10046
diff changeset
177 module:log("debug", "Sending notification to %s from %s for node %s", jid, user_bare, node);
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
178 message.attr.to = jid;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
179 module:send(message);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
180 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
181 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
182 return simple_broadcast;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
183 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
184
10520
225fade2ab4d mod_pep: Handle presence subscriptions in filter (fixes #1372)
Kim Alvefur <zash@zash.se>
parents: 10045
diff changeset
185 local function get_subscriber_filter(username)
225fade2ab4d mod_pep: Handle presence subscriptions in filter (fixes #1372)
Kim Alvefur <zash@zash.se>
parents: 10045
diff changeset
186 return function (jids, node)
225fade2ab4d mod_pep: Handle presence subscriptions in filter (fixes #1372)
Kim Alvefur <zash@zash.se>
parents: 10045
diff changeset
187 local broadcast_to = {};
225fade2ab4d mod_pep: Handle presence subscriptions in filter (fixes #1372)
Kim Alvefur <zash@zash.se>
parents: 10045
diff changeset
188 for jid, opts in pairs(jids) do
225fade2ab4d mod_pep: Handle presence subscriptions in filter (fixes #1372)
Kim Alvefur <zash@zash.se>
parents: 10045
diff changeset
189 broadcast_to[jid] = opts;
225fade2ab4d mod_pep: Handle presence subscriptions in filter (fixes #1372)
Kim Alvefur <zash@zash.se>
parents: 10045
diff changeset
190 end
10045
6714578cfd6e mod_pep: Revert 045209b41b3a, caused a regression
Kim Alvefur <zash@zash.se>
parents: 10036
diff changeset
191
10520
225fade2ab4d mod_pep: Handle presence subscriptions in filter (fixes #1372)
Kim Alvefur <zash@zash.se>
parents: 10045
diff changeset
192 local service_recipients = recipients[username];
225fade2ab4d mod_pep: Handle presence subscriptions in filter (fixes #1372)
Kim Alvefur <zash@zash.se>
parents: 10045
diff changeset
193 if service_recipients then
225fade2ab4d mod_pep: Handle presence subscriptions in filter (fixes #1372)
Kim Alvefur <zash@zash.se>
parents: 10045
diff changeset
194 local service = services[username];
225fade2ab4d mod_pep: Handle presence subscriptions in filter (fixes #1372)
Kim Alvefur <zash@zash.se>
parents: 10045
diff changeset
195 for recipient, nodes in pairs(service_recipients) do
225fade2ab4d mod_pep: Handle presence subscriptions in filter (fixes #1372)
Kim Alvefur <zash@zash.se>
parents: 10045
diff changeset
196 if nodes:contains(node) and service:may(node, recipient, "subscribe") then
225fade2ab4d mod_pep: Handle presence subscriptions in filter (fixes #1372)
Kim Alvefur <zash@zash.se>
parents: 10045
diff changeset
197 broadcast_to[recipient] = true;
225fade2ab4d mod_pep: Handle presence subscriptions in filter (fixes #1372)
Kim Alvefur <zash@zash.se>
parents: 10045
diff changeset
198 end
225fade2ab4d mod_pep: Handle presence subscriptions in filter (fixes #1372)
Kim Alvefur <zash@zash.se>
parents: 10045
diff changeset
199 end
10045
6714578cfd6e mod_pep: Revert 045209b41b3a, caused a regression
Kim Alvefur <zash@zash.se>
parents: 10036
diff changeset
200 end
10520
225fade2ab4d mod_pep: Handle presence subscriptions in filter (fixes #1372)
Kim Alvefur <zash@zash.se>
parents: 10045
diff changeset
201 return broadcast_to;
10045
6714578cfd6e mod_pep: Revert 045209b41b3a, caused a regression
Kim Alvefur <zash@zash.se>
parents: 10036
diff changeset
202 end
6714578cfd6e mod_pep: Revert 045209b41b3a, caused a regression
Kim Alvefur <zash@zash.se>
parents: 10036
diff changeset
203 end
9542
b8bfcfbe5126 mod_pep: Add automatic subscriptions on node creation (fixes #1222)
Kim Alvefur <zash@zash.se>
parents: 9541
diff changeset
204
12249
5173f8a761a0 mod_pep: Clarify purpose of fallback service
Kim Alvefur <zash@zash.se>
parents: 12248
diff changeset
205 -- Read-only service with no nodes where nobody is allowed anything to act as a
12260
e729c994e7c7 mod_pep: Fix typo in comment [codespell]
Kim Alvefur <zash@zash.se>
parents: 12249
diff changeset
206 -- fallback for interactions with non-existent users
12088
e5028f6eb599 mod_pep: Prevent creation of services for non-existent users
Kim Alvefur <zash@zash.se>
parents: 12087
diff changeset
207 local nobody_service = pubsub.new({
12248
4dbca0858f0b mod_pep: Correct initialization of fallback service
Kim Alvefur <zash@zash.se>
parents: 12153
diff changeset
208 node_defaults = {
4dbca0858f0b mod_pep: Correct initialization of fallback service
Kim Alvefur <zash@zash.se>
parents: 12153
diff changeset
209 ["max_items"] = 1;
4dbca0858f0b mod_pep: Correct initialization of fallback service
Kim Alvefur <zash@zash.se>
parents: 12153
diff changeset
210 ["persist_items"] = false;
4dbca0858f0b mod_pep: Correct initialization of fallback service
Kim Alvefur <zash@zash.se>
parents: 12153
diff changeset
211 ["access_model"] = "presence";
4dbca0858f0b mod_pep: Correct initialization of fallback service
Kim Alvefur <zash@zash.se>
parents: 12153
diff changeset
212 ["send_last_published_item"] = "on_sub_and_presence";
4dbca0858f0b mod_pep: Correct initialization of fallback service
Kim Alvefur <zash@zash.se>
parents: 12153
diff changeset
213 };
12249
5173f8a761a0 mod_pep: Clarify purpose of fallback service
Kim Alvefur <zash@zash.se>
parents: 12248
diff changeset
214 autocreate_on_publish = false;
5173f8a761a0 mod_pep: Clarify purpose of fallback service
Kim Alvefur <zash@zash.se>
parents: 12248
diff changeset
215 autocreate_on_subscribe = false;
5173f8a761a0 mod_pep: Clarify purpose of fallback service
Kim Alvefur <zash@zash.se>
parents: 12248
diff changeset
216 get_affiliation = function ()
5173f8a761a0 mod_pep: Clarify purpose of fallback service
Kim Alvefur <zash@zash.se>
parents: 12248
diff changeset
217 return "outcast";
5173f8a761a0 mod_pep: Clarify purpose of fallback service
Kim Alvefur <zash@zash.se>
parents: 12248
diff changeset
218 end;
12088
e5028f6eb599 mod_pep: Prevent creation of services for non-existent users
Kim Alvefur <zash@zash.se>
parents: 12087
diff changeset
219 });
e5028f6eb599 mod_pep: Prevent creation of services for non-existent users
Kim Alvefur <zash@zash.se>
parents: 12087
diff changeset
220
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
221 function get_pep_service(username)
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
222 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: 8304
diff changeset
223 local service = services[username];
6432
388786af0dd2 mod_pep_plus: Add pubsub service objects to an item list
Kim Alvefur <zash@zash.se>
parents: 6305
diff changeset
224 if service then
388786af0dd2 mod_pep_plus: Add pubsub service objects to an item list
Kim Alvefur <zash@zash.se>
parents: 6305
diff changeset
225 return service;
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
226 end
12088
e5028f6eb599 mod_pep: Prevent creation of services for non-existent users
Kim Alvefur <zash@zash.se>
parents: 12087
diff changeset
227 if not usermanager.user_exists(username, host) then
e5028f6eb599 mod_pep: Prevent creation of services for non-existent users
Kim Alvefur <zash@zash.se>
parents: 12087
diff changeset
228 return nobody_service;
e5028f6eb599 mod_pep: Prevent creation of services for non-existent users
Kim Alvefur <zash@zash.se>
parents: 12087
diff changeset
229 end
10066
216ae100c04a mod_pep: Only log when creating new pubsub services
Kim Alvefur <zash@zash.se>
parents: 10047
diff changeset
230 module:log("debug", "Creating pubsub service for user %q", username);
6432
388786af0dd2 mod_pep_plus: Add pubsub service objects to an item list
Kim Alvefur <zash@zash.se>
parents: 6305
diff changeset
231 service = pubsub.new({
9541
742977123168 mod_pep: Add PEP service owners username in configuration to ease identification
Kim Alvefur <zash@zash.se>
parents: 9540
diff changeset
232 pep_username = username;
6444
aab509a9d0ba mod_pep_plus: Default to max one item per node (Recomended for PEP)
Kim Alvefur <zash@zash.se>
parents: 6443
diff changeset
233 node_defaults = {
8333
2abbb01cd756 pubsub: Distinguish internal representation of node config from XEP-0060 form (util.pubsub should be protocol-agnostic)
Kim Alvefur <zash@zash.se>
parents: 8332
diff changeset
234 ["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: 8332
diff changeset
235 ["persist_items"] = true;
9097
ce2ba9f91c84 mod_pep: Set default access model to 'presence'
Kim Alvefur <zash@zash.se>
parents: 9082
diff changeset
236 ["access_model"] = "presence";
11854
b605cbd5f13b mod_pubsub,mod_pep: Implement 'send_last_published_item' option #1436
Kim Alvefur <zash@zash.se>
parents: 11724
diff changeset
237 ["send_last_published_item"] = "on_sub_and_presence";
6444
aab509a9d0ba mod_pep_plus: Default to max one item per node (Recomended for PEP)
Kim Alvefur <zash@zash.se>
parents: 6443
diff changeset
238 };
12153
26af75c20163 util.pubsub: Fix item store resize to "max"
Kim Alvefur <zash@zash.se>
parents: 12091
diff changeset
239 max_items = max_max_items;
6444
aab509a9d0ba mod_pep_plus: Default to max one item per node (Recomended for PEP)
Kim Alvefur <zash@zash.se>
parents: 6443
diff changeset
240
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
241 autocreate_on_publish = true;
9542
b8bfcfbe5126 mod_pep: Add automatic subscriptions on node creation (fixes #1222)
Kim Alvefur <zash@zash.se>
parents: 9541
diff changeset
242 autocreate_on_subscribe = false;
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
243
8949
9194431b6447 mod_pep_plus: Support persistence of node configuration
Kim Alvefur <zash@zash.se>
parents: 8895
diff changeset
244 nodestore = nodestore(username);
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
245 itemstore = simple_itemstore(username);
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
246 broadcaster = get_broadcaster(username);
10520
225fade2ab4d mod_pep: Handle presence subscriptions in filter (fixes #1372)
Kim Alvefur <zash@zash.se>
parents: 10045
diff changeset
247 subscriber_filter = get_subscriber_filter(username);
8696
164da3186511 mod_pep_plus: Validate items here too (thanks Link Mauve)
Kim Alvefur <zash@zash.se>
parents: 8377
diff changeset
248 itemcheck = is_item_stanza;
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
249 get_affiliation = function (jid)
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
250 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
251 return "owner";
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
252 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
253 end;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
254
9099
974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback
Kim Alvefur <zash@zash.se>
parents: 9097
diff changeset
255 access_models = {
974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback
Kim Alvefur <zash@zash.se>
parents: 9097
diff changeset
256 presence = function (jid)
974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback
Kim Alvefur <zash@zash.se>
parents: 9097
diff changeset
257 if subscription_presence(username, jid) then
9160
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: 9158
diff changeset
258 return "member";
9099
974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback
Kim Alvefur <zash@zash.se>
parents: 9097
diff changeset
259 end
9160
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: 9158
diff changeset
260 return "outcast";
9099
974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback
Kim Alvefur <zash@zash.se>
parents: 9097
diff changeset
261 end;
13486
fdd1438d9ef7 mod_pep: Implement 'roster' (group) access_model
Kim Alvefur <zash@zash.se>
parents: 13213
diff changeset
262 roster = function (jid, node)
fdd1438d9ef7 mod_pep: Implement 'roster' (group) access_model
Kim Alvefur <zash@zash.se>
parents: 13213
diff changeset
263 jid = jid_bare(jid);
fdd1438d9ef7 mod_pep: Implement 'roster' (group) access_model
Kim Alvefur <zash@zash.se>
parents: 13213
diff changeset
264 local allowed_groups = set_new(node.config.roster_groups_allowed);
fdd1438d9ef7 mod_pep: Implement 'roster' (group) access_model
Kim Alvefur <zash@zash.se>
parents: 13213
diff changeset
265 local roster = rostermanager.load_roster(username, host);
fdd1438d9ef7 mod_pep: Implement 'roster' (group) access_model
Kim Alvefur <zash@zash.se>
parents: 13213
diff changeset
266 if not roster[jid] then
fdd1438d9ef7 mod_pep: Implement 'roster' (group) access_model
Kim Alvefur <zash@zash.se>
parents: 13213
diff changeset
267 return "outcast";
fdd1438d9ef7 mod_pep: Implement 'roster' (group) access_model
Kim Alvefur <zash@zash.se>
parents: 13213
diff changeset
268 end
fdd1438d9ef7 mod_pep: Implement 'roster' (group) access_model
Kim Alvefur <zash@zash.se>
parents: 13213
diff changeset
269 for group in pairs(roster[jid].groups) do
fdd1438d9ef7 mod_pep: Implement 'roster' (group) access_model
Kim Alvefur <zash@zash.se>
parents: 13213
diff changeset
270 if allowed_groups:contains(group) then
fdd1438d9ef7 mod_pep: Implement 'roster' (group) access_model
Kim Alvefur <zash@zash.se>
parents: 13213
diff changeset
271 return "member";
fdd1438d9ef7 mod_pep: Implement 'roster' (group) access_model
Kim Alvefur <zash@zash.se>
parents: 13213
diff changeset
272 end
fdd1438d9ef7 mod_pep: Implement 'roster' (group) access_model
Kim Alvefur <zash@zash.se>
parents: 13213
diff changeset
273 end
fdd1438d9ef7 mod_pep: Implement 'roster' (group) access_model
Kim Alvefur <zash@zash.se>
parents: 13213
diff changeset
274 return "outcast";
fdd1438d9ef7 mod_pep: Implement 'roster' (group) access_model
Kim Alvefur <zash@zash.se>
parents: 13213
diff changeset
275 end;
9099
974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback
Kim Alvefur <zash@zash.se>
parents: 9097
diff changeset
276 };
974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback
Kim Alvefur <zash@zash.se>
parents: 9097
diff changeset
277
12022
eedd3eff0768 mod_pep: Set correct jid attr on node disco items
Kim Alvefur <zash@zash.se>
parents: 11856
diff changeset
278 jid = user_bare;
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
279 normalize_jid = jid_bare;
9077
aefb96a52f5f mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen)
Matthew Wild <mwild1@gmail.com>
parents: 9074
diff changeset
280
aefb96a52f5f mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen)
Matthew Wild <mwild1@gmail.com>
parents: 9074
diff changeset
281 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
282 });
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
283 services[username] = service;
12086
1dc00ca6ee9d mod_pep: Limit possible growth of number of pubsub services
Kim Alvefur <zash@zash.se>
parents: 12085
diff changeset
284 local item = { service = service, jid = user_bare }
1dc00ca6ee9d mod_pep: Limit possible growth of number of pubsub services
Kim Alvefur <zash@zash.se>
parents: 12085
diff changeset
285 pep_service_items[username] = item;
1dc00ca6ee9d mod_pep: Limit possible growth of number of pubsub services
Kim Alvefur <zash@zash.se>
parents: 12085
diff changeset
286 module:add_item("pep-service", item);
6432
388786af0dd2 mod_pep_plus: Add pubsub service objects to an item list
Kim Alvefur <zash@zash.se>
parents: 6305
diff changeset
287 return service;
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 function handle_pubsub_iq(event)
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
291 local origin, stanza = event.origin, event.stanza;
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
292 local service_name = origin.username;
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
293 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: 8304
diff changeset
294 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: 8304
diff changeset
295 end
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
296 local service = get_pep_service(service_name);
8335
9db72349095f mod_pep_plus: Use dispatch function from pubsub.lib
Kim Alvefur <zash@zash.se>
parents: 8333
diff changeset
297
9db72349095f mod_pep_plus: Use dispatch function from pubsub.lib
Kim Alvefur <zash@zash.se>
parents: 8333
diff changeset
298 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
299 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
300
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
301 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
302 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
303
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
304
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
305 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
306 local t = stanza.attr.type;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
307 if not t then
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
308 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
309 if child then
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
310 local attr = child.attr;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
311 if attr.hash then -- new caps
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
312 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
313 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
314 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
315 else -- legacy caps
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
316 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
317 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
318 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
319 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
320 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
321 return; -- no or bad caps
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
322 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
323 return;
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 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
326 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
327
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
328 local function resend_last_item(jid, node, service)
11854
b605cbd5f13b mod_pubsub,mod_pep: Implement 'send_last_published_item' option #1436
Kim Alvefur <zash@zash.se>
parents: 11724
diff changeset
329 local ok, config = service:get_node_config(node, true);
b605cbd5f13b mod_pubsub,mod_pep: Implement 'send_last_published_item' option #1436
Kim Alvefur <zash@zash.se>
parents: 11724
diff changeset
330 if ok and config.send_last_published_item ~= "on_sub_and_presence" then return end
8377
58cdbbe3b86a mod_pep_plus: Broadcast only the last item (thanks lovetox)
Kim Alvefur <zash@zash.se>
parents: 8342
diff changeset
331 local ok, id, item = service:get_last_item(node, jid);
9205
2e710b618440 mod_pep: Simplify code
Matthew Wild <mwild1@gmail.com>
parents: 9197
diff changeset
332 if not (ok and id) then return; end
12962
1b179d14a1dd mod_pep: Pass node/service objects to broadcaster when resending last item
Matthew Wild <mwild1@gmail.com>
parents: 12960
diff changeset
333 service.config.broadcaster("items", node, { [jid] = true }, item, true, service.nodes[node], service);
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
334 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
335
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
336 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
337 nodes = nodes or empty_set;
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
338
6305
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents: 6264
diff changeset
339 local service_recipients = recipients[service_name];
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents: 6264
diff changeset
340 if not service_recipients then
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents: 6264
diff changeset
341 service_recipients = {};
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents: 6264
diff changeset
342 recipients[service_name] = service_recipients;
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
343 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
344
6305
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents: 6264
diff changeset
345 local current = service_recipients[recipient];
9540
8cdd7fec6aa7 mod_pep: Remove use of recipients table for signaling pending disco#items
Kim Alvefur <zash@zash.se>
parents: 9538
diff changeset
346 if not current then
6305
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents: 6264
diff changeset
347 current = empty_set;
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents: 6264
diff changeset
348 end
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents: 6264
diff changeset
349
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents: 6264
diff changeset
350 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
351 return;
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents: 6264
diff changeset
352 end
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents: 6264
diff changeset
353
8753
d6373a378b73 mod_pep_plus: Skip getting PEP service instance for sessions that have not touched PEP
Kim Alvefur <zash@zash.se>
parents: 8728
diff changeset
354 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
355
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents: 6264
diff changeset
356 for node in nodes - current do
10520
225fade2ab4d mod_pep: Handle presence subscriptions in filter (fixes #1372)
Kim Alvefur <zash@zash.se>
parents: 10045
diff changeset
357 if service:may(node, recipient, "subscribe") then
9140
415a6d26709e mod_pep: Only resend last item on successful subscription
Kim Alvefur <zash@zash.se>
parents: 9139
diff changeset
358 resend_last_item(recipient, node, service);
415a6d26709e mod_pep: Only resend last item on successful subscription
Kim Alvefur <zash@zash.se>
parents: 9139
diff changeset
359 end
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
360 end
6305
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents: 6264
diff changeset
361
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents: 6264
diff changeset
362 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
363 nodes = nil;
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents: 6264
diff changeset
364 end
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents: 6264
diff changeset
365
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions
Kim Alvefur <zash@zash.se>
parents: 6264
diff changeset
366 service_recipients[recipient] = nodes;
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
367 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
368
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
369 module:hook("presence/bare", function(event)
8728
41c959c5c84b Fix spelling throughout the codebase [codespell]
Kim Alvefur <zash@zash.se>
parents: 8696
diff changeset
370 -- 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
371 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
372 local t = stanza.attr.type;
8303
053cf683c2c7 mod_pep_plus: Rename variable for clarity
Kim Alvefur <zash@zash.se>
parents: 8300
diff changeset
373 local is_self = not stanza.attr.to;
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
374 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: 8304
diff changeset
375 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: 8304
diff changeset
376 if is_self then
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
377 username = origin.username;
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
378 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: 8304
diff changeset
379 end
5852
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 if not t then -- available presence
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
382 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
383 local recipient = stanza.attr.from;
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
384 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
385 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
386 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
387 if not hash then
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
388 update_subscriptions(recipient, username);
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
389 else
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
390 recipients[username] = recipients[username] or {};
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
391 if hash_map[hash] then
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
392 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
393 else
9540
8cdd7fec6aa7 mod_pep: Remove use of recipients table for signaling pending disco#items
Kim Alvefur <zash@zash.se>
parents: 9538
diff changeset
394 -- 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: 9538
diff changeset
395 origin.send(
8cdd7fec6aa7 mod_pep: Remove use of recipients table for signaling pending disco#items
Kim Alvefur <zash@zash.se>
parents: 9538
diff changeset
396 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: 9538
diff changeset
397 :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: 9538
diff changeset
398 );
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
399 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
400 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
401 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
402 elseif t == "unavailable" then
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
403 update_subscriptions(stanza.attr.from, username);
8303
053cf683c2c7 mod_pep_plus: Rename variable for clarity
Kim Alvefur <zash@zash.se>
parents: 8300
diff changeset
404 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
405 local from = jid_bare(stanza.attr.from);
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
406 local subscriptions = recipients[username];
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
407 if subscriptions then
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
408 for subscriber in pairs(subscriptions) do
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
409 if jid_bare(subscriber) == from then
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
410 update_subscriptions(subscriber, username);
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 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
413 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
414 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
415 end, 10);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
416
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
417 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
418 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
419 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
420 if not disco then
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
421 return;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
422 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
423
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
424 -- Process disco response
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
425 local is_self = stanza.attr.to == nil;
8315
967f04fe7fd4 mod_pep_plus: Add missing variable
Kim Alvefur <zash@zash.se>
parents: 8307
diff changeset
426 local user_bare = jid_bare(stanza.attr.to);
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
427 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: 8304
diff changeset
428 if is_self then
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
429 username = origin.username;
8315
967f04fe7fd4 mod_pep_plus: Add missing variable
Kim Alvefur <zash@zash.se>
parents: 8307
diff changeset
430 user_bare = jid_join(username, host);
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
431 end
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
432 local contact = stanza.attr.from;
9540
8cdd7fec6aa7 mod_pep: Remove use of recipients table for signaling pending disco#items
Kim Alvefur <zash@zash.se>
parents: 9538
diff changeset
433 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
434 local notify = set_new();
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
435 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
436 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
437 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
438 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
439 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
440 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
441 hash_map[ver] = notify; -- update hash map
8303
053cf683c2c7 mod_pep_plus: Rename variable for clarity
Kim Alvefur <zash@zash.se>
parents: 8300
diff changeset
442 if is_self then
8307
94860b5733d3 mod_pep_plus: Update subscriptions for other local users only
Kim Alvefur <zash@zash.se>
parents: 8306
diff changeset
443 -- 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
444 for jid, item in pairs(origin.roster) do -- for all interested contacts
8304
9f8476c77fa8 mod_pep_plus: Skip over roster metadata (version, pending) entry
Kim Alvefur <zash@zash.se>
parents: 8303
diff changeset
445 if jid then
8307
94860b5733d3 mod_pep_plus: Update subscriptions for other local users only
Kim Alvefur <zash@zash.se>
parents: 8306
diff changeset
446 local contact_node, contact_host = jid_split(jid);
9061
82dd435c942c mod_pep_plus: Fix boolean logic precedence (thanks Link Mauve)
Kim Alvefur <zash@zash.se>
parents: 9030
diff changeset
447 if contact_host == host and (item.subscription == "both" or item.subscription == "from") then
8307
94860b5733d3 mod_pep_plus: Update subscriptions for other local users only
Kim Alvefur <zash@zash.se>
parents: 8306
diff changeset
448 update_subscriptions(user_bare, contact_node, notify);
8304
9f8476c77fa8 mod_pep_plus: Skip over roster metadata (version, pending) entry
Kim Alvefur <zash@zash.se>
parents: 8303
diff changeset
449 end
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
450 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
451 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
452 end
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
453 update_subscriptions(contact, username, notify);
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-info-node", function(event)
8982
4a576c39bb2f mod_pep_plus: Use service discovery helpers from pubsub.lib
Kim Alvefur <zash@zash.se>
parents: 8949
diff changeset
457 local stanza, origin = event.stanza, event.origin;
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
458 local service_name = origin.username;
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
459 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: 8304
diff changeset
460 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: 8304
diff changeset
461 end
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
462 local service = get_pep_service(service_name);
8982
4a576c39bb2f mod_pep_plus: Use service discovery helpers from pubsub.lib
Kim Alvefur <zash@zash.se>
parents: 8949
diff changeset
463 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
464 end);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
465
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
466 module:hook("account-disco-info", function(event)
8319
57e3ad11f3f6 mod_pep_plus: Advertise pubsub features in disco#info (code adapted from mod_pubsub)
Kim Alvefur <zash@zash.se>
parents: 8318
diff changeset
467 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: 8318
diff changeset
468
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
469 reply:tag('identity', {category='pubsub', type='pep'}):up();
8319
57e3ad11f3f6 mod_pep_plus: Advertise pubsub features in disco#info (code adapted from mod_pubsub)
Kim Alvefur <zash@zash.se>
parents: 8318
diff changeset
470
57e3ad11f3f6 mod_pep_plus: Advertise pubsub features in disco#info (code adapted from mod_pubsub)
Kim Alvefur <zash@zash.se>
parents: 8318
diff changeset
471 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: 8318
diff changeset
472 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: 8318
diff changeset
473
8342
0c0990a575de mod_pep_plus: Fix a typo.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents: 8341
diff changeset
474 local supported_features = lib_pubsub.get_feature_set(service) + set.new{
8341
910d3c3f60a6 mod_pep_plus: Use feature detection from pubsub.lib
Kim Alvefur <zash@zash.se>
parents: 8339
diff changeset
475 -- Features not covered by the above
8332
e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods
Kim Alvefur <zash@zash.se>
parents: 8331
diff changeset
476 "auto-subscribe",
e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods
Kim Alvefur <zash@zash.se>
parents: 8331
diff changeset
477 "filtered-notifications",
e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods
Kim Alvefur <zash@zash.se>
parents: 8331
diff changeset
478 "last-published",
e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods
Kim Alvefur <zash@zash.se>
parents: 8331
diff changeset
479 "presence-notifications",
e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods
Kim Alvefur <zash@zash.se>
parents: 8331
diff changeset
480 "presence-subscribe",
e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods
Kim Alvefur <zash@zash.se>
parents: 8331
diff changeset
481 };
8341
910d3c3f60a6 mod_pep_plus: Use feature detection from pubsub.lib
Kim Alvefur <zash@zash.se>
parents: 8339
diff changeset
482
11376
774811e2c6ab mod_pep: Advertise base pubsub feature (fixes #1632)
Kim Alvefur <zash@zash.se>
parents: 10672
diff changeset
483 reply:tag('feature', {var=xmlns_pubsub}):up();
8342
0c0990a575de mod_pep_plus: Fix a typo.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents: 8341
diff changeset
484 for feature in supported_features do
8332
e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods
Kim Alvefur <zash@zash.se>
parents: 8331
diff changeset
485 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: 8331
diff changeset
486 end
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
487 end);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
488
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
489 module:hook("account-disco-items-node", function(event)
8982
4a576c39bb2f mod_pep_plus: Use service discovery helpers from pubsub.lib
Kim Alvefur <zash@zash.se>
parents: 8949
diff changeset
490 local stanza, origin = event.stanza, event.origin;
8321
73ff49a42ea8 mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)
Kim Alvefur <zash@zash.se>
parents: 8320
diff changeset
491 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: 8320
diff changeset
492 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: 8320
diff changeset
493 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: 8320
diff changeset
494 username = origin.username;
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
495 end
8321
73ff49a42ea8 mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)
Kim Alvefur <zash@zash.se>
parents: 8320
diff changeset
496 local service = get_pep_service(username);
8982
4a576c39bb2f mod_pep_plus: Use service discovery helpers from pubsub.lib
Kim Alvefur <zash@zash.se>
parents: 8949
diff changeset
497 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
498 end);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
499
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
500 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
501 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
502
8321
73ff49a42ea8 mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)
Kim Alvefur <zash@zash.se>
parents: 8320
diff changeset
503 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: 8320
diff changeset
504 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: 8320
diff changeset
505 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: 8320
diff changeset
506 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: 8320
diff changeset
507 username = origin.username;
73ff49a42ea8 mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)
Kim Alvefur <zash@zash.se>
parents: 8320
diff changeset
508 user_bare = jid_join(username, host);
8305
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references
Kim Alvefur <zash@zash.se>
parents: 8304
diff changeset
509 end
8321
73ff49a42ea8 mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)
Kim Alvefur <zash@zash.se>
parents: 8320
diff changeset
510 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: 8320
diff changeset
511
5852
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
512 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
513 if not ok then return; end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
514
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
515 for node, node_obj in pairs(ret) do
9597
17d43543f9b6 pubsub: Set pubsub#title as name attribute in disco#items (fixes #1226)
Kim Alvefur <zash@zash.se>
parents: 9542
diff changeset
516 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
517 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module
Florian Zeitz <florob@babelmonkeys.de>
parents:
diff changeset
518 end);
12089
76b4e3f12b53 mod_pep: Wipe pubsub service on user deletion
Kim Alvefur <zash@zash.se>
parents: 12088
diff changeset
519
76b4e3f12b53 mod_pep: Wipe pubsub service on user deletion
Kim Alvefur <zash@zash.se>
parents: 12088
diff changeset
520 module:hook_global("user-deleted", function(event)
76b4e3f12b53 mod_pep: Wipe pubsub service on user deletion
Kim Alvefur <zash@zash.se>
parents: 12088
diff changeset
521 if event.host ~= host then return end
76b4e3f12b53 mod_pep: Wipe pubsub service on user deletion
Kim Alvefur <zash@zash.se>
parents: 12088
diff changeset
522 local username = event.username;
76b4e3f12b53 mod_pep: Wipe pubsub service on user deletion
Kim Alvefur <zash@zash.se>
parents: 12088
diff changeset
523 local service = services[username];
76b4e3f12b53 mod_pep: Wipe pubsub service on user deletion
Kim Alvefur <zash@zash.se>
parents: 12088
diff changeset
524 if not service then return end
76b4e3f12b53 mod_pep: Wipe pubsub service on user deletion
Kim Alvefur <zash@zash.se>
parents: 12088
diff changeset
525 for node in pairs(service.nodes) do service:delete(node, true); end
76b4e3f12b53 mod_pep: Wipe pubsub service on user deletion
Kim Alvefur <zash@zash.se>
parents: 12088
diff changeset
526
76b4e3f12b53 mod_pep: Wipe pubsub service on user deletion
Kim Alvefur <zash@zash.se>
parents: 12088
diff changeset
527 local item = pep_service_items[username];
76b4e3f12b53 mod_pep: Wipe pubsub service on user deletion
Kim Alvefur <zash@zash.se>
parents: 12088
diff changeset
528 pep_service_items[username] = nil;
76b4e3f12b53 mod_pep: Wipe pubsub service on user deletion
Kim Alvefur <zash@zash.se>
parents: 12088
diff changeset
529 if item then module:remove_item("pep-service", item); end
76b4e3f12b53 mod_pep: Wipe pubsub service on user deletion
Kim Alvefur <zash@zash.se>
parents: 12088
diff changeset
530
76b4e3f12b53 mod_pep: Wipe pubsub service on user deletion
Kim Alvefur <zash@zash.se>
parents: 12088
diff changeset
531 recipients[username] = nil;
76b4e3f12b53 mod_pep: Wipe pubsub service on user deletion
Kim Alvefur <zash@zash.se>
parents: 12088
diff changeset
532 end);
76b4e3f12b53 mod_pep: Wipe pubsub service on user deletion
Kim Alvefur <zash@zash.se>
parents: 12088
diff changeset
533