diff options
| author | nullobsi <me@nullob.si> | 2022-02-05 23:02:48 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-06 16:02:48 +0900 |
| commit | 3ff89fa7ecb643abf944ce966ffbf7f49000ca3f (patch) | |
| tree | d0cc19173831e4f09e085c8bd805eb70c0e2ce1e /packages/backend/src/server/api/common | |
| parent | Fix cast (#8257) (diff) | |
| download | sharkey-3ff89fa7ecb643abf944ce966ffbf7f49000ca3f.tar.gz sharkey-3ff89fa7ecb643abf944ce966ffbf7f49000ca3f.tar.bz2 sharkey-3ff89fa7ecb643abf944ce966ffbf7f49000ca3f.zip | |
feat: Option to show replies in timeline (rebase #7685) (#8202)
* Add an option for timeline replies. Credit to Emilis (puffaboo)
* update db on request
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 }) // 返信だけど自分のノートへの返信 |