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

chore(backend): remove fallbackIfEmpty 

HTL will never be purged so it's no longer required
This commit is contained in:
anatawa12 2023-12-02 17:21:25 +09:00
parent c100f8c136
commit 198be6c2af
No known key found for this signature in database
GPG Key ID: 9CA909848B8E4EA6
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@ export class FanoutTimelineEndpointService {
allowPartial: boolean,
me?: { id: MiUser['id'] } | undefined | null,
useDbFallback: boolean,
redisTimelines: (string | { name: string, fallbackIfEmpty: boolean })[],
redisTimelines: string[],
noteFilter: (note: MiNote) => boolean,
dbFallback: (untilId: string | null, sinceId: string | null, limit: number) => Promise<MiNote[]>,
}): Promise<Packed<'Note'>[]> {
@ -47,7 +47,7 @@ export class FanoutTimelineEndpointService {
allowPartial: boolean,
me?: { id: MiUser['id'] } | undefined | null,
useDbFallback: boolean,
redisTimelines: (string | { name: string, fallbackIfEmpty: boolean })[],
redisTimelines: string[],
noteFilter: (note: MiNote) => boolean,
dbFallback: (untilId: string | null, sinceId: string | null, limit: number) => Promise<MiNote[]>,
}): Promise<MiNote[]> {
@ -57,18 +57,7 @@ export class FanoutTimelineEndpointService {
// 呼び出し元と以下の処理をシンプルにするためにdbFallbackを置き換える
if (!ps.useDbFallback) ps.dbFallback = () => Promise.resolve([]);
const timelines = ps.redisTimelines.map(x => typeof x === 'string' ? x : x.name);
const redisResult = await this.fanoutTimelineService.getMulti(timelines, ps.untilId, ps.sinceId);
for (let i = 0; i < ps.redisTimelines.length; i++) {
const sourceRedisConfig = ps.redisTimelines[i];
if (typeof sourceRedisConfig === 'object' && sourceRedisConfig.fallbackIfEmpty) {
if (redisResult[i].length === 0) {
shouldFallbackToDb = true;
}
}
}
const redisResult = await this.fanoutTimelineService.getMulti(ps.redisTimelines, ps.untilId, ps.sinceId);
const redisResultIds = Array.from(new Set(redisResult.flat(1)));

6
packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
View File

@ -128,18 +128,18 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
if (ps.withFiles) {
timelineConfig = [
{ name: `homeTimelineWithFiles:${me.id}`, fallbackIfEmpty: true },
`homeTimelineWithFiles:${me.id}`,
'localTimelineWithFiles',
];
} else if (ps.withReplies) {
timelineConfig = [
{ name: `homeTimeline:${me.id}`, fallbackIfEmpty: true },
`homeTimeline:${me.id}`,
'localTimeline',
'localTimelineWithReplies',
];
} else {
timelineConfig = [
{ name: `homeTimeline:${me.id}`, fallbackIfEmpty: true },
`homeTimeline:${me.id}`,
'localTimeline',
];
}