diff options
| author | Johann150 <johann.galle@protonmail.com> | 2022-06-27 14:48:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-27 21:48:10 +0900 |
| commit | bc3ae901cc25fed47b85a9c3b88b13aa4ac0442d (patch) | |
| tree | 10748f4ae00f3aa67023df327f4078e91a080130 /packages/backend/src/server/api/stream/channels/global-timeline.ts | |
| parent | chore(client): tweak client (diff) | |
| download | misskey-bc3ae901cc25fed47b85a9c3b88b13aa4ac0442d.tar.gz misskey-bc3ae901cc25fed47b85a9c3b88b13aa4ac0442d.tar.bz2 misskey-bc3ae901cc25fed47b85a9c3b88b13aa4ac0442d.zip | |
refactor: remove duplicate code (#8895)
Diffstat (limited to 'packages/backend/src/server/api/stream/channels/global-timeline.ts')
| -rw-r--r-- | packages/backend/src/server/api/stream/channels/global-timeline.ts | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/packages/backend/src/server/api/stream/channels/global-timeline.ts b/packages/backend/src/server/api/stream/channels/global-timeline.ts index 1c7e038ab2..5b4ae850ec 100644 --- a/packages/backend/src/server/api/stream/channels/global-timeline.ts +++ b/packages/backend/src/server/api/stream/channels/global-timeline.ts @@ -1,10 +1,9 @@ -import { isMutedUserRelated } from '@/misc/is-muted-user-related.js'; import Channel from '../channel.js'; import { fetchMeta } from '@/misc/fetch-meta.js'; import { Notes } from '@/models/index.js'; import { checkWordMute } from '@/misc/check-word-mute.js'; -import { isBlockerUserRelated } from '@/misc/is-blocker-user-related.js'; import { isInstanceMuted } from '@/misc/is-instance-muted.js'; +import { isUserRelated } from '@/misc/is-user-related.js'; import { Packed } from '@/misc/schema.js'; export default class extends Channel { @@ -55,9 +54,9 @@ export default class extends Channel { if (isInstanceMuted(note, new Set<string>(this.userProfile?.mutedInstances ?? []))) return; // 流れてきたNoteがミュートしているユーザーが関わるものだったら無視する - if (isMutedUserRelated(note, this.muting)) return; + if (isUserRelated(note, this.muting)) return; // 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する - if (isBlockerUserRelated(note, this.blocking)) return; + if (isUserRelated(note, this.blocking)) return; // 流れてきたNoteがミュートすべきNoteだったら無視する // TODO: 将来的には、単にMutedNoteテーブルにレコードがあるかどうかで判定したい(以下の理由により難しそうではある) |