Michcio/lost-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

server: remove dateUTC function

Browse source
This commit is contained in:
Johann150 2023-01-02 12:43:41 +01:00
parent 2a46719f31
commit d28931bf00
Signed by untrusted user: Johann150
GPG key ID: 9EE6577A2A06F8F1
2 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
packages/backend/src/prelude/time.ts
View file

@ -4,20 +4,6 @@ const dateTimeIntervals = {
'ms': 1, 'ms': 1,
}; };
export function dateUTC(time: number[]): Date {
const d = time.length === 2 ? Date.UTC(time[0], time[1])
: time.length === 3 ? Date.UTC(time[0], time[1], time[2])
: time.length === 4 ? Date.UTC(time[0], time[1], time[2], time[3])
: time.length === 5 ? Date.UTC(time[0], time[1], time[2], time[3], time[4])
: time.length === 6 ? Date.UTC(time[0], time[1], time[2], time[3], time[4], time[5])
: time.length === 7 ? Date.UTC(time[0], time[1], time[2], time[3], time[4], time[5], time[6])
: null;
if (!d) throw new Error('wrong number of arguments');
return new Date(d);
}
export function isTimeSame(a: Date, b: Date): boolean { export function isTimeSame(a: Date, b: Date): boolean {
return a.getTime() === b.getTime(); return a.getTime() === b.getTime();
} }

18
packages/backend/src/services/chart/core.ts
View file

@ -6,7 +6,7 @@
import * as nestedProperty from 'nested-property'; import * as nestedProperty from 'nested-property';
import { EntitySchema, Repository, LessThan, Between } from 'typeorm'; import { EntitySchema, Repository, LessThan, Between } from 'typeorm';
import { dateUTC, isTimeSame, isTimeBefore, subtractTime, addTime } from '@/prelude/time.js'; import { isTimeSame, isTimeBefore, subtractTime, addTime } from '@/prelude/time.js';
import { unique } from '@/prelude/array.js'; import { unique } from '@/prelude/array.js';
import { getChartInsertLock } from '@/misc/app-lock.js'; import { getChartInsertLock } from '@/misc/app-lock.js';
import { db } from '@/db/postgre.js'; import { db } from '@/db/postgre.js';
@ -282,10 +282,10 @@ export default abstract class Chart<T extends Schema> {
private async claimCurrentLog(group: string | null, span: 'hour' | 'day'): Promise<RawRecord<T>> { private async claimCurrentLog(group: string | null, span: 'hour' | 'day'): Promise<RawRecord<T>> {
const [y, m, d, h] = Chart.getCurrentDate(); const [y, m, d, h] = Chart.getCurrentDate();
const current = dateUTC( const current = new Date(Date.UTC(...(
span === 'hour' ? [y, m, d, h] : span === 'hour' ? [y, m, d, h] :
span === 'day' ? [y, m, d] : span === 'day' ? [y, m, d] :
new Error('not happen') as never); new Error('not happen') as never)));
const repository = const repository =
span === 'hour' ? this.repositoryForHour : span === 'hour' ? this.repositoryForHour :
@ -533,7 +533,7 @@ export default abstract class Chart<T extends Schema> {
} }
public async clean(): Promise<void> { public async clean(): Promise<void> {
const current = dateUTC(Chart.getCurrentDate()); const current = new Date(Date.UTC(...Chart.getCurrentDate()));
// more than 1 day and less than 3 days // more than 1 day and less than 3 days
const gt = Chart.dateToTimestamp(current) - (60 * 60 * 24 * 3); const gt = Chart.dateToTimestamp(current) - (60 * 60 * 24 * 3);
@ -571,11 +571,11 @@ export default abstract class Chart<T extends Schema> {
const [y, m, d, h, _m, _s, _ms] = cursor ? Chart.parseDate(subtractTime(addTime(cursor, 1, span), 1)) : Chart.getCurrentDate(); const [y, m, d, h, _m, _s, _ms] = cursor ? Chart.parseDate(subtractTime(addTime(cursor, 1, span), 1)) : Chart.getCurrentDate();
const [y2, m2, d2, h2] = cursor ? Chart.parseDate(addTime(cursor, 1, span)) : [] as never; const [y2, m2, d2, h2] = cursor ? Chart.parseDate(addTime(cursor, 1, span)) : [] as never;
const lt = dateUTC([y, m, d, h, _m, _s, _ms]); const lt = new Date(Date.UTC(y, m, d, h, _m, _s, _ms));
const gt = const gt =
span === 'day' ? subtractTime(cursor ? dateUTC([y2, m2, d2, 0]) : dateUTC([y, m, d, 0]), amount - 1, 'day') : span === 'day' ? subtractTime(cursor ? new Date(Date.UTC(y2, m2, d2, 0)) : new Date(Date.UTC(y, m, d, 0)), amount - 1, 'day') :
span === 'hour' ? subtractTime(cursor ? dateUTC([y2, m2, d2, h2]) : dateUTC([y, m, d, h]), amount - 1, 'hour') : span === 'hour' ? subtractTime(cursor ? new Date(Date.UTC(y2, m2, d2, h2)) : new Date(Date.UTC(y, m, d, h)), amount - 1, 'hour') :
new Error('not happen') as never; new Error('not happen') as never;
const repository = const repository =
@ -632,8 +632,8 @@ export default abstract class Chart<T extends Schema> {
for (let i = (amount - 1); i >= 0; i--) { for (let i = (amount - 1); i >= 0; i--) {
const current = const current =
span === 'hour' ? subtractTime(dateUTC([y, m, d, h]), i, 'hour') : span === 'hour' ? subtractTime(new Date(Date.UTC(y, m, d, h)), i, 'hour') :
span === 'day' ? subtractTime(dateUTC([y, m, d]), i, 'day') : span === 'day' ? subtractTime(new Date(Date.UTC(y, m, d)), i, 'day') :
new Error('not happen') as never; new Error('not happen') as never;
const log = logs.find(l => isTimeSame(new Date(l.date * 1000), current)); const log = logs.find(l => isTimeSame(new Date(l.date * 1000), current));