diff options
| author | Kim Alvefur <zash@zash.se> | 2022-12-12 07:10:54 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2022-12-12 07:10:54 +0100 |
| commit | 080d7974bf0c1da8a1c0578d67c3172facc9d719 (patch) | |
| tree | 838d6904e47ab8681928b37701ff4f1c6e89184a /plugins/mod_blocklist.lua | |
| parent | baff85a52c5fda705e8b3699410c770f015d89ab (diff) | |
| parent | c916ce76ee89dca32e7e653dff1ade4732462efc (diff) | |
| download | prosody-080d7974bf0c1da8a1c0578d67c3172facc9d719.tar.gz prosody-080d7974bf0c1da8a1c0578d67c3172facc9d719.zip | |
Merge 0.12->trunk
Diffstat (limited to 'plugins/mod_blocklist.lua')
| -rw-r--r-- | plugins/mod_blocklist.lua | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/plugins/mod_blocklist.lua b/plugins/mod_blocklist.lua index dad06b62..13e98e00 100644 --- a/plugins/mod_blocklist.lua +++ b/plugins/mod_blocklist.lua @@ -54,6 +54,7 @@ local function set_blocklist(username, blocklist) end -- Migrates from the old mod_privacy storage +-- TODO mod_privacy was removed in 0.10.0, this should be phased out local function migrate_privacy_list(username) local legacy_data = module:open_store("privacy"):get(username); if not legacy_data or not legacy_data.lists or not legacy_data.default then return; end @@ -77,6 +78,13 @@ local function migrate_privacy_list(username) return migrated_data; end +if not module:get_option_boolean("migrate_legacy_blocking", true) then + migrate_privacy_list = function (username) + module:log("debug", "Migrating from mod_privacy disabled, user '%s' will start with a fresh blocklist", username); + return nil; + end +end + local function get_blocklist(username) local blocklist = cache2:get(username); if not blocklist then |