Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

createdAtではなくidで絞り込むように (#71)

Browse source
This commit is contained in:
RyotaK 2023-03-11 19:38:15 +09:00 committed by GitHub
parent 8d1b05d69c
commit 8249819a6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/backend/src/misc/id/aid.ts
View file

@ -6,7 +6,7 @@ import * as crypto from 'node:crypto';
const TIME2000 = 946684800000;
let counter = crypto.randomBytes(2).readUInt16LE(0);
function getTime(time: number): string {
export function getTimeId(time: number): string {
time = time - TIME2000;
if (time < 0) time = 0;
@ -21,5 +21,5 @@ export function genAid(date: Date): string {
const t = date.getTime();
if (isNaN(t)) throw 'Failed to create AID: Invalid Date';
counter++;
return getTime(t) + getNoise();
return getTimeId(t) + getNoise();
}

4
packages/backend/src/server/api/endpoints/notes/timeline.ts
View file

@ -6,6 +6,7 @@ import { QueryService } from '@/core/QueryService.js';
import ActiveUsersChart from '@/core/chart/charts/active-users.js';
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
import { DI } from '@/di-symbols.js';
import { getTimeId } from '@/misc/id/aid.js';
export const meta = {
tags: ['notes'],
@ -63,10 +64,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
.where('following.followerId = :followerId', { followerId: me.id })
.getMany();
const minId = getTimeId(new Date(Date.now() - (1000 * 60 * 60 * 24 * 30)).getTime()) + '00'; // 30日前まで
//#region Construct query
const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'),
ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
.andWhere('note.createdAt > :minDate', { minDate: new Date(Date.now() - (1000 * 60 * 60 * 24 * 30)) }) // 30日前まで
.andWhere('note.id > :minId', { minId })
.innerJoinAndSelect('note.user', 'user')
.leftJoinAndSelect('user.avatar', 'avatar')
.leftJoinAndSelect('user.banner', 'banner')