diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-08-17 22:01:46 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2021-08-17 22:01:46 +0900 |
| commit | df67836c1ad281d2622b52bdf7c767b2dfc0e6a5 (patch) | |
| tree | 5a2c4e5b681857d846d5fea1f4058b72e80651da /src/server/api/endpoints/notes/global-timeline.ts | |
| parent | Merge branch 'develop' (diff) | |
| parent | Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff) | |
| download | misskey-df67836c1ad281d2622b52bdf7c767b2dfc0e6a5.tar.gz misskey-df67836c1ad281d2622b52bdf7c767b2dfc0e6a5.tar.bz2 misskey-df67836c1ad281d2622b52bdf7c767b2dfc0e6a5.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/server/api/endpoints/notes/global-timeline.ts')
| -rw-r--r-- | src/server/api/endpoints/notes/global-timeline.ts | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/api/endpoints/notes/global-timeline.ts b/src/server/api/endpoints/notes/global-timeline.ts index 741c5985a3..96bfde5aa2 100644 --- a/src/server/api/endpoints/notes/global-timeline.ts +++ b/src/server/api/endpoints/notes/global-timeline.ts @@ -9,6 +9,7 @@ import { generateMutedUserQuery } from '../../common/generate-muted-user-query'; import { activeUsersChart } from '../../../../services/chart'; import { generateRepliesQuery } from '../../common/generate-replies-query'; import { generateMutedNoteQuery } from '../../common/generate-muted-note-query'; +import { generateBlockedUserQuery } from '../../common/generate-block-query'; export const meta = { tags: ['notes'], @@ -81,6 +82,7 @@ export default define(meta, async (ps, user) => { generateRepliesQuery(query, user); if (user) generateMutedUserQuery(query, user); if (user) generateMutedNoteQuery(query, user); + if (user) generateBlockedUserQuery(query, user); if (ps.withFiles) { query.andWhere('note.fileIds != \'{}\''); |