diff options
| author | Kim Alvefur <zash@zash.se> | 2019-07-08 02:44:32 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-07-08 02:44:32 +0200 |
| commit | f1406ebe53dd38003cd1fd3121946ae4924de03c (patch) | |
| tree | 6b13265c066c8c32f4ed5d44fc9ca8421d118d06 /plugins/mod_blocklist.lua | |
| parent | 5399b9b9057f8202ceb25e933d10e1825383bc99 (diff) | |
| parent | 37fc8f2a2fdaac95d7aee6e51b88514f3febef31 (diff) | |
| download | prosody-f1406ebe53dd38003cd1fd3121946ae4924de03c.tar.gz prosody-f1406ebe53dd38003cd1fd3121946ae4924de03c.zip | |
Merge 0.11->trunk
Diffstat (limited to 'plugins/mod_blocklist.lua')
| -rw-r--r-- | plugins/mod_blocklist.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/mod_blocklist.lua b/plugins/mod_blocklist.lua index ee48ffad..cf8aad80 100644 --- a/plugins/mod_blocklist.lua +++ b/plugins/mod_blocklist.lua @@ -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 |