summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/endpoints
diff options
context:
space:
mode:
authoranatawa12 <anatawa12@icloud.com>2023-10-19 19:34:52 +0900
committerGitHub <noreply@github.com>2023-10-19 19:34:52 +0900
commit991fa054a6844e16b22cb8e89d78af04a8df078e (patch)
tree2dc0d422c360a76b5cbc0397387249ef96a16f8e /packages/backend/src/server/api/endpoints
parentUserLite.nameにnullが入りうるのを型で明示 (#12073) (diff)
downloadsharkey-991fa054a6844e16b22cb8e89d78af04a8df078e.tar.gz
sharkey-991fa054a6844e16b22cb8e89d78af04a8df078e.tar.bz2
sharkey-991fa054a6844e16b22cb8e89d78af04a8df078e.zip
chore: STLのdb fallbackでwithRepliesがtrueのときにすべてのリプライを除外しないように (#12075)
MiFollowingを見るのは実装コストが高いため現状実装していない Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'packages/backend/src/server/api/endpoints')
-rw-r--r--packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts20
1 files changed, 11 insertions, 9 deletions
diff --git a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
index f8a7a6a8b7..cbab13f30d 100644
--- a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
@@ -182,15 +182,17 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
.leftJoinAndSelect('reply.user', 'replyUser')
.leftJoinAndSelect('renote.user', 'renoteUser');
- query.andWhere(new Brackets(qb => {
- qb
- .where('note.replyId IS NULL') // 返信ではない
- .orWhere(new Brackets(qb => {
- qb // 返信だけど投稿者自身への返信
- .where('note.replyId IS NOT NULL')
- .andWhere('note.replyUserId = note.userId');
- }));
- }));
+ if (!ps.withReplies) {
+ query.andWhere(new Brackets(qb => {
+ qb
+ .where('note.replyId IS NULL') // 返信ではない
+ .orWhere(new Brackets(qb => {
+ qb // 返信だけど投稿者自身への返信
+ .where('note.replyId IS NOT NULL')
+ .andWhere('note.replyUserId = note.userId');
+ }));
+ }));
+ }
this.queryService.generateVisibilityQuery(query, me);
this.queryService.generateMutedUserQuery(query, me);