aljaz/ditto
1
0
Fork 0
mirror of https://github.com/aljazceru/ditto.git synced 2026-01-26 08:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor trending tags history, make it more correct

Browse Source
This commit is contained in:
Alex Gleason
2023-07-26 17:18:21 -05:00
parent f8d46cae58
commit bc3a96eeed
4 changed files with 60 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/controllers/api/trends.ts
View File

@@ -3,6 +3,7 @@ import { Conf } from '@/config.ts';
import { z } from '@/deps.ts';
import { trends } from '@/trends.ts';
import { Time } from '@/utils.ts';
import { stripTime } from '@/utils/time.ts';
const limitSchema = z.coerce.number().catch(10).transform((value) => Math.min(Math.max(value, 0), 20));
@@ -25,11 +26,11 @@ const trendingTagsController: AppController = (c) => {
url: Conf.local(`/tags/${name}`),
history: [
{
day: String(Math.floor(now.getTime() / 1000)),
day: String(Math.floor(stripTime(now).getTime() / 1000)),
accounts: String(accounts),
uses: String(uses),
},
...getTagHistoryWithGapsFilled({
...trends.getTagHistory({
tag: name,
since: lastWeek,
until: now,
@@ -44,28 +45,4 @@ const trendingTagsController: AppController = (c) => {
})));
};
function generateDateRange(since: Date, until: Date): Date[] {
const dates = [];
const sinceDate = new Date(Date.UTC(since.getUTCFullYear(), since.getUTCMonth(), since.getUTCDate() + 1));
const untilDate = new Date(Date.UTC(until.getUTCFullYear(), until.getUTCMonth(), until.getUTCDate()));
while (sinceDate < untilDate) {
dates.push(new Date(sinceDate));
sinceDate.setUTCDate(sinceDate.getUTCDate() + 1);
}
return dates.reverse();
}
function getTagHistoryWithGapsFilled(params: Parameters<typeof trends.getTagHistory>[0]) {
const history = trends.getTagHistory(params);
const dateRange = generateDateRange(params.since, params.until);
return dateRange.map((day) => {
const data = history.find((item) => item.day.getTime() === day.getTime());
return data || { day, accounts: 0, uses: 0 };
});
}
export { trendingTagsController };