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

mod_blocklist: Return early from migration if no valid privacy list data is found

Browse source
This commit is contained in:
Kim Alvefur 2016-12-05 17:22:12 +01:00
parent 6280a047f6
commit 12325f7354
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
plugins/mod_blocklist.lua
View file

@ -54,14 +54,13 @@ end
-- Migrates from the old mod_privacy storage -- Migrates from the old mod_privacy storage
local function migrate_privacy_list(username) local function migrate_privacy_list(username)
local migrated_data = { [false] = { created = os.time(); migrated = "privacy" }};
local legacy_data = module:open_store("privacy"):get(username); local legacy_data = module:open_store("privacy"):get(username);
if legacy_data and legacy_data.lists and legacy_data.default then if not legacy_data or not legacy_data.lists or not legacy_data.default then return; end
legacy_data = legacy_data.lists[legacy_data.default]; local default_list = legacy_data.lists[legacy_data.default];
legacy_data = legacy_data and legacy_data.items; if not default_list or not default_list.items then return; end
else
return migrated_data; local migrated_data = { [false] = { created = os.time(); migrated = "privacy" }};
end
if legacy_data then if legacy_data then
module:log("info", "Migrating blocklist from mod_privacy storage for user '%s'", username); module:log("info", "Migrating blocklist from mod_privacy storage for user '%s'", username);
local item, jid; local item, jid;
@ -94,6 +93,9 @@ local function get_blocklist(username)
if not blocklist then if not blocklist then
blocklist = migrate_privacy_list(username); blocklist = migrate_privacy_list(username);
end end
if not blocklist then
blocklist = { [false] = { created = os.time(); }; };
end
cache2:set(username, blocklist); cache2:set(username, blocklist);
end end
cache[username] = blocklist; cache[username] = blocklist;