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

mod_mam,mod_muc_mam: Simplify deletion when multi-user-deletion is supported

Browse source 
More code, but less of it needs to run and no extra tracking is needed.
This commit is contained in:
Kim Alvefur 2021-11-30 01:22:14 +01:00
parent 0a50cf1be4
commit 59258d47bd
2 changed files with 54 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

35
plugins/mod_mam/mod_mam.lua
View file

@ -509,20 +509,41 @@ if cleanup_after ~= "never" then
-- messages, we collect the union of sets of users from dates that fall
-- outside the cleanup range.
local last_date = require "util.cache".new(module:get_option_number("archive_cleanup_date_cache_size", 1000));
function schedule_cleanup(username, date)
date = date or datestamp();
if last_date:get(username) == date then return end
local ok = cleanup_map:set(date, username, true);
if ok then
last_date:set(username, date);
if not (archive.caps and archive.caps.wildcard_delete) then
local last_date = require "util.cache".new(module:get_option_number("archive_cleanup_date_cache_size", 1000));
function schedule_cleanup(username, date)
date = date or datestamp();
if last_date:get(username) == date then return end
local ok = cleanup_map:set(date, username, true);
if ok then
last_date:set(username, date);
end
end
end
local cleanup_time = module:measure("cleanup", "times");
local async = require "util.async";
cleanup_runner = async.runner(function ()
local cleanup_done = cleanup_time();
if archive.caps and archive.caps.wildcard_delete then
local ok, err = archive:delete(true, { ["end"] = os.time() - cleanup_after })
if ok then
local sum = tonumber(ok);
if sum then
module:log("info", "Deleted %d expired messages", sum);
else
-- driver did not tell
module:log("info", "Deleted all expired messages");
end
else
module:log("error", "Could not delete messages: %s", err);
end
cleanup_done();
return;
end
local users = {};
local cut_off = datestamp(os.time() - cleanup_after);
for date in cleanup_storage:users() do