diff options
| author | Kim Alvefur <zash@zash.se> | 2020-11-05 22:31:25 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2020-11-05 22:31:25 +0100 |
| commit | 238b2bfc1cdb65ae7d051c2f29c1427149317795 (patch) | |
| tree | 58547de6e7795740633c1b93e67c217eb621fe8f /plugins/mod_blocklist.lua | |
| parent | ce3e3808f5359f481f3ea063220ba71428b26ad5 (diff) | |
| parent | 48521ba1538f797f5bef64f5fe5f3a9fb6e68f7f (diff) | |
| download | prosody-238b2bfc1cdb65ae7d051c2f29c1427149317795.tar.gz prosody-238b2bfc1cdb65ae7d051c2f29c1427149317795.zip | |
Merge 0.11->trunk
Diffstat (limited to 'plugins/mod_blocklist.lua')
| -rw-r--r-- | plugins/mod_blocklist.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/mod_blocklist.lua b/plugins/mod_blocklist.lua index ee48ffad..dad06b62 100644 --- a/plugins/mod_blocklist.lua +++ b/plugins/mod_blocklist.lua @@ -67,7 +67,7 @@ local function migrate_privacy_list(username) if item.type == "jid" and item.action == "deny" then local jid = jid_prep(item.value); if not jid then - module:log("warn", "Invalid JID in privacy store for user '%s' not migrated: %s", username, tostring(item.value)); + module:log("warn", "Invalid JID in privacy store for user '%s' not migrated: %s", username, item.value); else migrated_data[jid] = true; end @@ -162,7 +162,7 @@ local function edit_blocklist(event) local blocklist = cache[username] or get_blocklist(username); local new_blocklist = { - -- We set the [false] key to someting as a signal not to migrate privacy lists + -- We set the [false] key to something as a signal not to migrate privacy lists [false] = blocklist[false] or { created = now; }; }; if type(blocklist[false]) == "table" then @@ -189,6 +189,7 @@ local function edit_blocklist(event) if is_blocking then for jid in pairs(send_unavailable) do + -- Check that this JID isn't already blocked, i.e. this is not a change if not blocklist[jid] then for _, session in pairs(sessions[username].sessions) do if session.presence then |