diff options
| author | Kim Alvefur <zash@zash.se> | 2017-12-29 20:49:19 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-12-29 20:49:19 +0100 |
| commit | f6efb7e00f49c6133e687074e045c114ff247e00 (patch) | |
| tree | 0d7b74089aa23a80e48a7db72579dd733a93b703 | |
| parent | fe36378134119cf06b5290ac8021ef39ea13ebab (diff) | |
| download | prosody-f6efb7e00f49c6133e687074e045c114ff247e00.tar.gz prosody-f6efb7e00f49c6133e687074e045c114ff247e00.zip | |
rostermanager: Explicitly remove old-style 'pending' table from rosters (or it stays forever due to map stores)
| -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); |