usbharu
/
misskey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: split logic to multiple functions

This commit is contained in:
anatawa12 2023-11-29 21:20:21 +09:00
parent 1ac9a1227f
commit 60a752938a
No known key found for this signature in database
GPG Key ID: 9CA909848B8E4EA6
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
packages/backend/src/core/FanoutTimelineEndpointService.ts
View File

@ -35,6 +35,20 @@ export class FanoutTimelineEndpointService {
noteFilter: (note: MiNote) => boolean, noteFilter: (note: MiNote) => boolean,
dbFallback: (untilId: string | null, sinceId: string | null, limit: number) => Promise<MiNote[]>, dbFallback: (untilId: string | null, sinceId: string | null, limit: number) => Promise<MiNote[]>,
}): Promise<Packed<'Note'>[]> { }): Promise<Packed<'Note'>[]> {
return await this.noteEntityService.packMany(await this.getMiNotes(ps), ps.me);
}
@bindThis
private async getMiNotes(ps: {
untilId: string | null,
sinceId: string | null,
limit: number,
me?: { id: MiUser['id'] } | undefined | null,
useDbFallback: boolean,
redisTimelines: (string | { name: string, fallbackIfEmpty: boolean })[],
noteFilter: (note: MiNote) => boolean,
dbFallback: (untilId: string | null, sinceId: string | null, limit: number) => Promise<MiNote[]>,
}): Promise<MiNote[]> {
let noteIds: string[]; let noteIds: string[];
let shouldFallbackToDb = false; let shouldFallbackToDb = false;
@ -58,36 +72,36 @@ export class FanoutTimelineEndpointService {
shouldFallbackToDb = shouldFallbackToDb || (noteIds.length === 0); shouldFallbackToDb = shouldFallbackToDb || (noteIds.length === 0);
let redisTimeline: MiNote[] = [];
if (!shouldFallbackToDb) { if (!shouldFallbackToDb) {
const query = this.notesRepository.createQueryBuilder('note') const redisTimeline = await this.getAndFilterFromDb(noteIds, ps.noteFilter);
.where('note.id IN (:...noteIds)', { noteIds: noteIds })
.innerJoinAndSelect('note.user', 'user')
.leftJoinAndSelect('note.reply', 'reply')
.leftJoinAndSelect('note.renote', 'renote')
.leftJoinAndSelect('reply.user', 'replyUser')
.leftJoinAndSelect('renote.user', 'renoteUser')
.leftJoinAndSelect('note.channel', 'channel');
redisTimeline = await query.getMany();
redisTimeline = redisTimeline.filter(ps.noteFilter);
redisTimeline.sort((a, b) => a.id > b.id ? -1 : 1);
// TODO: 足りない分の埋め合わせ // TODO: 足りない分の埋め合わせ
if (redisTimeline.length !== 0) { if (redisTimeline.length !== 0) {
return await this.noteEntityService.packMany(redisTimeline, ps.me); return redisTimeline;
} }
} }
if (ps.useDbFallback) { // fallback to db if (ps.useDbFallback) { // fallback to db
const timeline = await ps.dbFallback(ps.untilId, ps.sinceId, ps.limit); return await ps.dbFallback(ps.untilId, ps.sinceId, ps.limit);
return await this.noteEntityService.packMany(timeline, ps.me);
} else { } else {
return []; return [];
} }
} }
private async getAndFilterFromDb(noteIds: string[], noteFilter: (note: MiNote) => boolean): Promise<MiNote[]> {
const query = this.notesRepository.createQueryBuilder('note')
.where('note.id IN (:...noteIds)', { noteIds: noteIds })
.innerJoinAndSelect('note.user', 'user')
.leftJoinAndSelect('note.reply', 'reply')
.leftJoinAndSelect('note.renote', 'renote')
.leftJoinAndSelect('reply.user', 'replyUser')
.leftJoinAndSelect('renote.user', 'renoteUser')
.leftJoinAndSelect('note.channel', 'channel');
const notes = (await query.getMany()).filter(noteFilter);
notes.sort((a, b) => a.id > b.id ? -1 : 1);
return notes;
}
} }