aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2023-07-21 17:23:00 +0200
committerKim Alvefur <zash@zash.se>2023-07-21 17:23:00 +0200
commit99cca59d6e53584e8e72e64af4b205f9802bec07 (patch)
tree9a73bfe95f60446e0d270ee95273070521d0de12
parent91d95d4c334ed24c4a1aaa8308c89b0b7359f99b (diff)
downloadprosody-99cca59d6e53584e8e72e64af4b205f9802bec07.tar.gz
prosody-99cca59d6e53584e8e72e64af4b205f9802bec07.zip
plugins: Handle how get_option_period returns "never"
-rw-r--r--plugins/mod_c2s.lua2
-rw-r--r--plugins/mod_http_file_share.lua2
-rw-r--r--plugins/mod_mam/mod_mam.lua4
3 files changed, 4 insertions, 4 deletions
diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index 0a4e5794..b80485f5 100644
--- a/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@ -367,7 +367,7 @@ function listener.onconnect(conn)
end
end
- if c2s_timeout then
+ if c2s_timeout < math.huge then
add_task(c2s_timeout, function ()
if session.type == "c2s_unauthed" then
(session.log or log)("debug", "Connection still not authenticated after c2s_timeout=%gs, closing it", c2s_timeout);
diff --git a/plugins/mod_http_file_share.lua b/plugins/mod_http_file_share.lua
index 08d6a90e..a1c725f8 100644
--- a/plugins/mod_http_file_share.lua
+++ b/plugins/mod_http_file_share.lua
@@ -176,7 +176,7 @@ function get_authz(slot, uploader, filename, filesize, filetype)
-- slot properties
slot = slot;
- expires = expiry >= 0 and (os.time()+expiry) or nil;
+ expires = expiry < math.huge and (os.time()+expiry) or nil;
-- file properties
filename = filename;
filesize = filesize;
diff --git a/plugins/mod_mam/mod_mam.lua b/plugins/mod_mam/mod_mam.lua
index eb796f71..d8555ec1 100644
--- a/plugins/mod_mam/mod_mam.lua
+++ b/plugins/mod_mam/mod_mam.lua
@@ -441,7 +441,7 @@ local function message_handler(event, c2s)
local time = time_now();
local ok, err = archive:append(store_user, nil, clone_for_storage, time, with);
if not ok and err == "quota-limit" then
- if type(cleanup_after) == "number" then
+ if cleanup_after ~= math.huge then
module:log("debug", "User '%s' over quota, cleaning archive", store_user);
local cleaned = archive:delete(store_user, {
["end"] = (os.time() - cleanup_after);
@@ -506,7 +506,7 @@ module:hook("message/offline/broadcast", function (event)
end
end);
-if cleanup_after ~= "never" then
+if cleanup_after ~= math.huge then
local cleanup_storage = module:open_store("archive_cleanup");
local cleanup_map = module:open_store("archive_cleanup", "map");