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: Make the 'false' metadata field a table so we can store timestamps and other useful data

Browse source
This commit is contained in:
Kim Alvefur 2016-12-08 18:13:56 +01:00
parent 9a914445bf
commit 6280a047f6
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
plugins/mod_blocklist.lua
View file

@ -54,7 +54,7 @@ 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] = "not empty" }; 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 legacy_data and legacy_data.lists and legacy_data.default then
legacy_data = legacy_data.lists[legacy_data.default]; legacy_data = legacy_data.lists[legacy_data.default];
@ -160,18 +160,23 @@ local function edit_blocklist(event)
local blocklist = get_blocklist(username); local blocklist = get_blocklist(username);
local new_blocklist = {}; local new_blocklist = {
-- We set the [false] key to someting as a signal not to migrate privacy lists
[false] = blocklist[false] or { created = os.time(); };
};
if type(blocklist[false]) == "table" then
new_blocklist[false].modified = os.time();
end
if is_blocking or next(new) then if is_blocking or next(new) then
for jid in pairs(blocklist) do for jid in pairs(blocklist) do
new_blocklist[jid] = true; if jid then new_blocklist[jid] = true; end
end end
for jid in pairs(new) do for jid in pairs(new) do
new_blocklist[jid] = is_blocking; new_blocklist[jid] = is_blocking;
end end
-- else empty the blocklist -- else empty the blocklist
end end
new_blocklist[false] = "not empty"; -- In order to avoid doing the migration thing twice
local ok, err = set_blocklist(username, new_blocklist); local ok, err = set_blocklist(username, new_blocklist);
if ok then if ok then