From 7c946570d5698f5509463371296ef88a06e7bb9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 11 Mar 2022 23:42:46 -0500 Subject: [PATCH] feat: on online users page override timeago cutoff to 24 hours --- public/src/app.js | 1 + public/src/overrides.js | 15 ++++++++++----- src/controllers/users.js | 1 + 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index 87c8d3ddfc..3542a4cb43 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -239,6 +239,7 @@ app.flags = {}; app.processPage = function () { highlightNavigationLink(); + overrides.overrideTimeagoCutoff(); $('.timeago').timeago(); utils.makeNumbersHumanReadable($('.human-readable-number')); utils.addCommasToNumbers($('.formatted-number')); diff --git a/public/src/overrides.js b/public/src/overrides.js index 123d814059..c00d3b530b 100644 --- a/public/src/overrides.js +++ b/public/src/overrides.js @@ -109,16 +109,21 @@ if (typeof window !== 'undefined') { }); }()); let timeagoFn; + overrides.overrideTimeagoCutoff = function () { + const cutoff = parseInt(ajaxify.data.timeagoCutoff || config.timeagoCutoff, 10); + if (cutoff === 0) { + $.timeago.settings.cutoff = 1; + } else if (cutoff > 0) { + $.timeago.settings.cutoff = 1000 * 60 * 60 * 24 * cutoff; + } + }; + overrides.overrideTimeago = function () { if (!timeagoFn) { timeagoFn = $.fn.timeago; } - if (parseInt(config.timeagoCutoff, 10) === 0) { - $.timeago.settings.cutoff = 1; - } else if (parseInt(config.timeagoCutoff, 10) > 0) { - $.timeago.settings.cutoff = 1000 * 60 * 60 * 24 * (parseInt(config.timeagoCutoff, 10) || 30); - } + overrides.overrideTimeagoCutoff(); $.timeago.settings.allowFuture = true; const userLang = config.userLang.replace('_', '-'); diff --git a/src/controllers/users.js b/src/controllers/users.js index 2f697c4b9c..f08e428c38 100644 --- a/src/controllers/users.js +++ b/src/controllers/users.js @@ -61,6 +61,7 @@ usersController.getOnlineUsers = async function (req, res) { } userData.anonymousUserCount = guests + hiddenCount; + userData.timeagoCutoff = 1000 * 60 * 60 * 24; await render(req, res, userData); };