mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.10->trunk

Browse source
This commit is contained in:
Kim Alvefur 2017-12-29 20:50:07 +01:00
commit 7026ec9006
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/rostermanager.lua
View file

@ -112,7 +112,15 @@ local function load_roster(username, host)
local data, err = roster_store:get(username);
roster = data or {};
if user then user.roster = roster; end
local legacy_pending = roster.pending and type(roster.pending.subscription) ~= "string";
roster_metadata(roster, err);
if legacy_pending then
-- Due to map store use, we need to manually delete this entry
log("debug", "Removing legacy 'pending' entry");
if not save_roster(username, host, roster, "pending") then
log("warn", "Could not remove legacy 'pendig' entry");
end
end
if roster[jid] then
roster[jid] = nil;
log("debug", "Roster for %s had a self-contact, removing", jid);