Software / code / prosody
Changeset
7771:2b288dab781a
mod_blocklist: Make the 'false' metadata field a table so we can store timestamps and other useful data
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 08 Dec 2016 18:13:56 +0100 |
| parents | 7770:f0024972489e |
| children | 7772:752697d68fda |
| files | plugins/mod_blocklist.lua |
| diffstat | 1 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_blocklist.lua Wed Dec 07 11:50:53 2016 +0100 +++ b/plugins/mod_blocklist.lua Thu Dec 08 18:13:56 2016 +0100 @@ -54,7 +54,7 @@ -- Migrates from the old mod_privacy storage 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); if legacy_data and legacy_data.lists and legacy_data.default then legacy_data = legacy_data.lists[legacy_data.default]; @@ -160,18 +160,23 @@ 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 for jid in pairs(blocklist) do - new_blocklist[jid] = true; + if jid then new_blocklist[jid] = true; end end for jid in pairs(new) do new_blocklist[jid] = is_blocking; end -- else empty the blocklist end - new_blocklist[false] = "not empty"; -- In order to avoid doing the migration thing twice local ok, err = set_blocklist(username, new_blocklist); if ok then
