summaryrefslogtreecommitdiff
path: root/packages/backend/src/core/FanoutTimelineEndpointService.ts
diff options
context:
space:
mode:
authoranatawa12 <anatawa12@icloud.com>2025-05-01 17:56:24 +0900
committerGitHub <noreply@github.com>2025-05-01 17:56:24 +0900
commit2fcb50273d69a798c1368b05bd2de46fae2227bf (patch)
treebc25b73919b1ee62154e1ba0919d3f5534dcf32c /packages/backend/src/core/FanoutTimelineEndpointService.ts
parent[skip ci] Update CHANGELOG.md (prepend template) (diff)
downloadmisskey-2fcb50273d69a798c1368b05bd2de46fae2227bf.tar.gz
misskey-2fcb50273d69a798c1368b05bd2de46fae2227bf.tar.bz2
misskey-2fcb50273d69a798c1368b05bd2de46fae2227bf.zip
Exclude suspended users note from most timelines (#15775)
* feat: exclude notes by suspended user from FTT timeline endpoint * feat: exclude notes by suspended user from DB based timelines * chore: fix types * chore: fix types * chore: fix non-reply / renote * chore: fix non-reply / renote * test: update test * docs(changelog): 凍結されたユーザのノートが各種タイムラインで表示されないように * Exclude suspended users note from featured * fix: join user * Update CHANGELOG.md --------- Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Diffstat (limited to 'packages/backend/src/core/FanoutTimelineEndpointService.ts')
-rw-r--r--packages/backend/src/core/FanoutTimelineEndpointService.ts18
1 files changed, 18 insertions, 0 deletions
diff --git a/packages/backend/src/core/FanoutTimelineEndpointService.ts b/packages/backend/src/core/FanoutTimelineEndpointService.ts
index 1ffeb4b3a4..6253f792ed 100644
--- a/packages/backend/src/core/FanoutTimelineEndpointService.ts
+++ b/packages/backend/src/core/FanoutTimelineEndpointService.ts
@@ -36,6 +36,7 @@ type TimelineOptions = {
excludeNoFiles?: boolean;
excludeReplies?: boolean;
excludePureRenotes: boolean;
+ ignoreAuthorFromUserSuspension?: boolean;
dbFallback: (untilId: string | null, sinceId: string | null, limit: number) => Promise<MiNote[]>,
};
@@ -139,6 +140,23 @@ export class FanoutTimelineEndpointService {
};
}
+ {
+ const parentFilter = filter;
+ filter = (note) => {
+ const noteJoined = note as MiNote & {
+ renoteUser: MiUser | null;
+ replyUser: MiUser | null;
+ };
+ if (!ps.ignoreAuthorFromUserSuspension) {
+ if (note.user!.isSuspended) return false;
+ }
+ if (note.userId !== note.renoteUserId && noteJoined.renoteUser?.isSuspended) return false;
+ if (note.userId !== note.replyUserId && noteJoined.replyUser?.isSuspended) return false;
+
+ return parentFilter(note);
+ };
+ }
+
const redisTimeline: MiNote[] = [];
let readFromRedis = 0;
let lastSuccessfulRate = 1; // rateをキャッシュする?