From 0fc36d11d705ede03e0349e467599040ec6c329c Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 29 Oct 2023 16:13:30 +0900 Subject: fix(backend): STLにGTLの投稿が混ざる問題を修正 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix #12169 --- packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'packages/backend/src/server/api') 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 { // 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'); } -- cgit v1.2.3-freya