diff options
| author | おさむのひと <46447427+samunohito@users.noreply.github.com> | 2023-12-03 10:19:37 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-03 10:19:37 +0900 |
| commit | c68d87538a8486e5c236a142e42221c70b157861 (patch) | |
| tree | 66e8a1eb6aa5c19a5276826661b86fb46d242c74 /packages/backend/src/server/api/endpoints/notes | |
| parent | fix: withChannelNotesとwithFilesを同時に指定したときの考慮 (#12... (diff) | |
| download | misskey-c68d87538a8486e5c236a142e42221c70b157861.tar.gz misskey-c68d87538a8486e5c236a142e42221c70b157861.tar.bz2 misskey-c68d87538a8486e5c236a142e42221c70b157861.zip | |
リストタイムラインでミュートが貫通してしまう問題に対処 (#12534)
* ユーザリストTL系の各種動作を修正・統一
* fix
* fix CHANGELOG.md
* テスト追加
Diffstat (limited to 'packages/backend/src/server/api/endpoints/notes')
| -rw-r--r-- | packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts | 4 |
1 files changed, 4 insertions, 0 deletions
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<typeof meta, typeof paramDef> { // 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<typeof meta, typeof paramDef> { // eslint- if (ps.withRenotes === false) return false; } } + if (isInstanceMuted(note, userMutedInstances)) return false; return true; }, |