Mercurial > prosody-hg

comparison core/rostermanager.lua @ 10411:db2a06b9ff98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 16 Nov 2019 16:52:31 +0100
parents 42a3e3a28248
children f0e9e5bda415
comparison
equal deleted inserted replaced
10410:659b577f280c 10411:db2a06b9ff98
10 10
11 11
12 local log = require "util.logger".init("rostermanager"); 12 local log = require "util.logger".init("rostermanager");
13 13
14 local new_id = require "util.id".short; 14 local new_id = require "util.id".short;
15 local new_cache = require "util.cache".new;
15 16
16 local pairs = pairs; 17 local pairs = pairs;
17 local tostring = tostring; 18 local tostring = tostring;
18 local type = type; 19 local type = type;
19 20
109 if roster then return roster; end 110 if roster then return roster; end
110 log("debug", "load_roster: loading for new user: %s", jid); 111 log("debug", "load_roster: loading for new user: %s", jid);
111 else -- Attempt to load roster for non-loaded user 112 else -- Attempt to load roster for non-loaded user
112 log("debug", "load_roster: loading for offline user: %s", jid); 113 log("debug", "load_roster: loading for offline user: %s", jid);
113 end 114 end
115 local roster_cache = hosts[host] and hosts[host].roster_cache;
116 if not roster_cache then
117 if hosts[host] then
118 roster_cache = new_cache(1024);
119 hosts[host].roster_cache = roster_cache;
120 end
121 else
122 roster = roster_cache:get(jid);
123 if roster then
124 log("debug", "load_roster: cache hit");
125 roster_cache:set(jid, roster);
126 if user then user.roster = roster; end
127 return roster;
128 else
129 log("debug", "load_roster: cache miss, loading from storage");
130 end
131 end
114 local roster_store = storagemanager.open(host, "roster", "keyval"); 132 local roster_store = storagemanager.open(host, "roster", "keyval");
115 local data, err = roster_store:get(username); 133 local data, err = roster_store:get(username);
116 roster = data or {}; 134 roster = data or {};
117 if user then user.roster = roster; end 135 if user then user.roster = roster; end
118 local legacy_pending = roster.pending and type(roster.pending.subscription) ~= "string"; 136 local legacy_pending = roster.pending and type(roster.pending.subscription) ~= "string";
132 end 150 end
133 end 151 end
134 if not err then 152 if not err then
135 hosts[host].events.fire_event("roster-load", { username = username, host = host, roster = roster }); 153 hosts[host].events.fire_event("roster-load", { username = username, host = host, roster = roster });
136 end 154 end
155 if roster_cache and not user then
156 log("debug", "load_roster: caching loaded roster");
157 roster_cache:set(jid, roster);
158 end
137 return roster, err; 159 return roster, err;
138 end 160 end
139 161
140 function save_roster(username, host, roster, jid) 162 function save_roster(username, host, roster, jid)
141 if not um_user_exists(username, host) then 163 if not um_user_exists(username, host) then
261 return item and (item.subscription == "to" or item.subscription == "both"), err; 283 return item and (item.subscription == "to" or item.subscription == "both"), err;
262 end 284 end
263 285
264 function is_contact_pending_in(username, host, jid) 286 function is_contact_pending_in(username, host, jid)
265 local roster = load_roster(username, host); 287 local roster = load_roster(username, host);
266 return roster[false].pending[jid]; 288 return roster[false].pending[jid] ~= nil;
267 end 289 end
268 local function set_contact_pending_in(username, host, jid) 290 local function set_contact_pending_in(username, host, jid, stanza)
269 local roster = load_roster(username, host); 291 local roster = load_roster(username, host);
270 local item = roster[jid]; 292 local item = roster[jid];
271 if item and (item.subscription == "from" or item.subscription == "both") then 293 if item and (item.subscription == "from" or item.subscription == "both") then
272 return; -- false 294 return; -- false
273 end 295 end
274 roster[false].pending[jid] = true; 296 roster[false].pending[jid] = st.is_stanza(stanza) and st.preserialize(stanza) or true;
275 return save_roster(username, host, roster, jid); 297 return save_roster(username, host, roster, jid);
276 end 298 end
277 function is_contact_pending_out(username, host, jid) 299 function is_contact_pending_out(username, host, jid)
278 local roster = load_roster(username, host); 300 local roster = load_roster(username, host);
279 local item = roster[jid]; 301 local item = roster[jid];