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: port to use util.human.io.parse_duration

Browse source 
Updated by Zash, the original patch by Jonas had put the duration
parsing function in util.datetime but MattJ later did the same thing but
differently in f4d7fe919969
This commit is contained in:
Jonas Schäfer 2022-04-28 20:38:40 +02:00
parent 7dc9f9ab2a
commit 5c9c12d8d9
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/mod_mam/mod_mam.lua
View file

@ -36,7 +36,8 @@ local is_stanza = st.is_stanza;
local tostring = tostring;
local time_now = require "prosody.util.time".now;
local m_min = math.min;
local timestamp, datestamp = import("prosody.util.datetime", "datetime", "date");
local timestamp, datestamp = import( "util.datetime", "datetime", "date");
local parse_duration = require "util.human.io".parse_duration;
local default_max_items, max_max_items = 20, module:get_option_number("max_archive_query_results", 50);
local strip_tags = module:get_option_set("dont_archive_namespaces", { "http://jabber.org/protocol/chatstates" });
@ -510,15 +511,12 @@ if cleanup_after ~= "never" then
local cleanup_storage = module:open_store("archive_cleanup");
local cleanup_map = module:open_store("archive_cleanup", "map");
local day = 86400;
local multipliers = { d = day, w = day * 7, m = 31 * day, y = 365.2425 * day };
local n, m = cleanup_after:lower():match("(%d+)%s*([dwmy]?)");
if not n then
module:log("error", "Could not parse archive_expires_after string %q", cleanup_after);
local cleanup_after_seconds, parse_err = parse_duration(cleanup_after);
if parse_err ~= nil then
module:log("error", "Could not parse archive_expires_after string %q: %s", cleanup_after, parse_err);
return false;
end
cleanup_after = tonumber(n) * ( multipliers[m] or 1 );
cleanup_after = cleanup_after_seconds;
module:log("debug", "archive_expires_after = %d -- in seconds", cleanup_after);