diff options
| author | Kim Alvefur <zash@zash.se> | 2017-12-29 20:50:07 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-12-29 20:50:07 +0100 |
| commit | b12d5c9bc890144ffcb16966e8489f73d82232f1 (patch) | |
| tree | f99617f5697506024e44291a1efd56e81a69f031 | |
| parent | 616e9c23ac35944b13acb4e3ceed1627440acc86 (diff) | |
| parent | f6efb7e00f49c6133e687074e045c114ff247e00 (diff) | |
| download | prosody-b12d5c9bc890144ffcb16966e8489f73d82232f1.tar.gz prosody-b12d5c9bc890144ffcb16966e8489f73d82232f1.zip | |
Merge 0.10->trunk
| -rw-r--r-- | core/rostermanager.lua | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/rostermanager.lua b/core/rostermanager.lua index f6a44028..65be0de0 100644 --- a/core/rostermanager.lua +++ b/core/rostermanager.lua @@ -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); |