From c68d87538a8486e5c236a142e42221c70b157861 Mon Sep 17 00:00:00 2001 From: おさむのひと <46447427+samunohito@users.noreply.github.com> Date: Sun, 3 Dec 2023 10:19:37 +0900 Subject: リストタイムラインでミュートが貫通してしまう問題に対処 (#12534) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ユーザリストTL系の各種動作を修正・統一 * fix * fix CHANGELOG.md * テスト追加 --- packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'packages/backend/src/server/api/endpoints/notes') diff --git a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts index f39cac5c3e..f8f64738fe 100644 --- a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts @@ -18,6 +18,7 @@ import { QueryService } from '@/core/QueryService.js'; import { MiLocalUser } from '@/models/User.js'; import { MetaService } from '@/core/MetaService.js'; import { FanoutTimelineEndpointService } from '@/core/FanoutTimelineEndpointService.js'; +import { isInstanceMuted } from '@/misc/is-instance-muted.js'; import { ApiError } from '../../error.js'; export const meta = { @@ -124,10 +125,12 @@ export default class extends Endpoint { // eslint- userIdsWhoMeMuting, userIdsWhoMeMutingRenotes, userIdsWhoBlockingMe, + userMutedInstances, ] = await Promise.all([ this.cacheService.userMutingsCache.fetch(me.id), this.cacheService.renoteMutingsCache.fetch(me.id), this.cacheService.userBlockedCache.fetch(me.id), + this.cacheService.userProfileCache.fetch(me.id).then(p => new Set(p.mutedInstances)), ]); const timeline = await this.fanoutTimelineEndpointService.timeline({ @@ -150,6 +153,7 @@ export default class extends Endpoint { // eslint- if (ps.withRenotes === false) return false; } } + if (isInstanceMuted(note, userMutedInstances)) return false; return true; }, -- cgit v1.2.3-freya