mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_blocklist: Store timestamp of blocking to allow age to be determined

Browse source
This commit is contained in:
Kim Alvefur 2018-02-15 03:00:32 +01:00
parent 478a8be6b1
commit 40c1da7e93
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/mod_blocklist.lua
View file

@ -114,12 +114,14 @@ end, -1);
-- Add or remove some jid(s) from the blocklist
-- We want this to be atomic and not do a partial update
local function edit_blocklist(event)
local now = os.time();
local origin, stanza = event.origin, event.stanza;
local username = origin.username;
local action = stanza.tags[1]; -- "block" or "unblock"
local is_blocking = action.name == "block" or nil; -- nil if unblocking
local is_blocking = action.name == "block" and now or nil; -- nil if unblocking
local new = {}; -- JIDs to block depending or unblock on action
-- XEP-0191 sayeth:
-- > When the user blocks communications with the contact, the user's
-- > server MUST send unavailable presence information to the contact (but
@ -158,15 +160,15 @@ local function edit_blocklist(event)
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(); };
[false] = blocklist[false] or { created = now; };
};
if type(blocklist[false]) == "table" then
new_blocklist[false].modified = os.time();
new_blocklist[false].modified = now;
end
if is_blocking or next(new) then
for jid in pairs(blocklist) do
if jid then new_blocklist[jid] = true; end
for jid, t in pairs(blocklist) do
if jid then new_blocklist[jid] = t; end
end
for jid in pairs(new) do
new_blocklist[jid] = is_blocking;