From e9ec1969b5e51260397302a01c27ff8750d24b0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 19 Jul 2023 17:47:34 -0400 Subject: [PATCH] Revert "fix: #11756, fix unique visitor stats in acp table" This reverts commit b4506897053b73a5f5cbe31cc80f8133197f882b. --- src/analytics.js | 15 ++++++--------- src/controllers/admin/dashboard.js | 3 +-- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/analytics.js b/src/analytics.js index 903a520d18..5d71d161a8 100644 --- a/src/analytics.js +++ b/src/analytics.js @@ -238,26 +238,23 @@ Analytics.getDailyStatsForSet = async function (set, day, numDays) { set = `analytics:${set}`; } + const daysArr = []; day = new Date(day); // set the date to tomorrow, because getHourlyStatsForSet steps *backwards* 24 hours to sum up the values day.setDate(day.getDate() + 1); day.setHours(0, 0, 0, 0); - async function getHourlyStats(hour) { + while (numDays > 0) { + /* eslint-disable no-await-in-loop */ const dayData = await Analytics.getHourlyStatsForSet( set, - hour, + day.getTime() - (1000 * 60 * 60 * 24 * (numDays - 1)), 24 ); - return dayData.reduce((cur, next) => cur + next); - } - const hours = []; - while (numDays > 0) { - hours.push(day.getTime() - (1000 * 60 * 60 * 24 * (numDays - 1))); + daysArr.push(dayData.reduce((cur, next) => cur + next)); numDays -= 1; } - - return await Promise.all(hours.map(getHourlyStats)); + return daysArr; }; Analytics.getUnwrittenPageviews = function () { diff --git a/src/controllers/admin/dashboard.js b/src/controllers/admin/dashboard.js index 193476f1af..ac9f4fc130 100644 --- a/src/controllers/admin/dashboard.js +++ b/src/controllers/admin/dashboard.js @@ -128,13 +128,12 @@ async function getStats() { } let results = await Promise.all([ - getStatsFromAnalytics('uniquevisitors', 'uniqueIPCount'), + getStatsForSet('ip:recent', 'uniqueIPCount'), getStatsFromAnalytics('logins', 'loginCount'), getStatsForSet('users:joindate', 'userCount'), getStatsForSet('posts:pid', 'postCount'), getStatsForSet('topics:tid', 'topicCount'), ]); - results[0].name = '[[admin/dashboard:unique-visitors]]'; results[1].name = '[[admin/dashboard:logins]]';