diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2022-02-09 14:50:38 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2022-02-09 14:50:38 +0900 |
| commit | 5f985ee832eed61e31ceb51eaa1c51810ad6de39 (patch) | |
| tree | 60cd65d92e377ea0a0f0d2bc3b767f8f26196310 /packages/backend/src/server/api/common | |
| parent | Merge branch 'develop' (diff) | |
| parent | 12.104.0 (diff) | |
| download | misskey-5f985ee832eed61e31ceb51eaa1c51810ad6de39.tar.gz misskey-5f985ee832eed61e31ceb51eaa1c51810ad6de39.tar.bz2 misskey-5f985ee832eed61e31ceb51eaa1c51810ad6de39.zip | |
Merge branch 'develop'
Diffstat (limited to 'packages/backend/src/server/api/common')
| -rw-r--r-- | packages/backend/src/server/api/common/generate-replies-query.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/backend/src/server/api/common/generate-replies-query.ts b/packages/backend/src/server/api/common/generate-replies-query.ts index fbc41b2c25..249064d589 100644 --- a/packages/backend/src/server/api/common/generate-replies-query.ts +++ b/packages/backend/src/server/api/common/generate-replies-query.ts @@ -1,7 +1,7 @@ import { User } from '@/models/entities/user'; import { Brackets, SelectQueryBuilder } from 'typeorm'; -export function generateRepliesQuery(q: SelectQueryBuilder<any>, me?: { id: User['id'] } | null) { +export function generateRepliesQuery(q: SelectQueryBuilder<any>, me?: Pick<User, 'id' | 'showTimelineReplies'> | null) { if (me == null) { q.andWhere(new Brackets(qb => { qb .where(`note.replyId IS NULL`) // 返信ではない @@ -10,7 +10,7 @@ export function generateRepliesQuery(q: SelectQueryBuilder<any>, me?: { id: User .andWhere('note.replyUserId = note.userId'); })); })); - } else { + } else if(!me.showTimelineReplies) { q.andWhere(new Brackets(qb => { qb .where(`note.replyId IS NULL`) // 返信ではない .orWhere('note.replyUserId = :meId', { meId: me.id }) // 返信だけど自分のノートへの返信 |