From b2a133124bf73c1979f103e122f05260756d3596 Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Tue, 17 Oct 2023 21:21:36 +0900
Subject: [PATCH] =?UTF-8?q?fix(backend):=20=E3=83=A6=E3=83=BC=E3=82=B6?=
 =?UTF-8?q?=E3=83=BC=E3=81=AE=E3=83=8E=E3=83=BC=E3=83=88=E5=8F=96=E5=BE=97?=
 =?UTF-8?q?=E3=81=A7DB=E3=81=ABfallback=E3=81=97=E3=81=9F=E9=9A=9B?=
 =?UTF-8?q?=E3=81=AB=E3=83=81=E3=83=A3=E3=83=B3=E3=83=8D=E3=83=AB=E3=83=8E?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E3=81=AE=E3=81=BF=E3=81=AB=E3=81=AA=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/server/api/endpoints/users/notes.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/endpoints/users/notes.ts b/packages/backend/src/server/api/endpoints/users/notes.ts
index 4f3d61ce07..2e9eb0dd86 100644
--- a/packages/backend/src/server/api/endpoints/users/notes.ts
+++ b/packages/backend/src/server/api/endpoints/users/notes.ts
@@ -151,7 +151,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoinAndSelect('renote.user', 'renoteUser');
 
 			if (ps.withChannelNotes) {
-				if (!isSelf) query.andWhere('channel.isSensitive = false');
+				if (!isSelf) query.andWhere(new Brackets(qb => {
+					qb.orWhere('note.channelId IS NULL');
+					qb.orWhere('channel.isSensitive = false');
+				}));
 			} else {
 				query.andWhere('note.channelId IS NULL');
 			}