summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-10-29 16:13:30 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-10-29 16:13:30 +0900
commit0fc36d11d705ede03e0349e467599040ec6c329c (patch)
treec9c992145f2a49c0ebb9656055f1a0e5f7ed472e /packages/backend/src/server/api
parentlint fixes (diff)
downloadsharkey-0fc36d11d705ede03e0349e467599040ec6c329c.tar.gz
sharkey-0fc36d11d705ede03e0349e467599040ec6c329c.tar.bz2
sharkey-0fc36d11d705ede03e0349e467599040ec6c329c.zip
fix(backend): STLにGTLの投稿が混ざる問題を修正
Fix #12169
Diffstat (limited to 'packages/backend/src/server/api')
-rw-r--r--packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts5
1 files changed, 4 insertions, 1 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 4eeec563d7..7f9d728976 100644
--- a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
@@ -237,7 +237,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
if (followingChannels.length > 0) {
const followingChannelIds = followingChannels.map(x => x.followeeId);
- query.andWhere('note.channelId IN (:...followingChannelIds) OR note.channelId IS NULL', { followingChannelIds });
+ query.andWhere(new Brackets(qb => {
+ qb.where('note.channelId IN (:...followingChannelIds)', { followingChannelIds });
+ qb.andWhere('note.channelId IS NULL');
+ }));
} else {
query.andWhere('note.channelId IS NULL');
}