From cf3624a54fed61930355aeb58baaf75aea820e08 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed, 11 Oct 2023 12:26:07 +0900
Subject: [PATCH] =?UTF-8?q?fix(backend):=20users/notes=E3=81=A7=E3=82=BB?=
 =?UTF-8?q?=E3=83=B3=E3=82=B7=E3=83=86=E3=82=A3=E3=83=96=E3=83=81=E3=83=A3?=
 =?UTF-8?q?=E3=83=B3=E3=83=8D=E3=83=AB=E3=81=AE=E6=8A=95=E7=A8=BF=E3=81=8C?=
 =?UTF-8?q?=E5=90=AB=E3=81=BE=E3=82=8C=E3=82=8B=E5=A0=B4=E5=90=88=E3=81=8C?=
 =?UTF-8?q?=E3=81=82=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                             | 1 +
 packages/backend/src/server/api/endpoints/users/notes.ts | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb6ecb1fb0..42fd7dadba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 
 ### Server
 - Fix: フォローしているユーザーからの自分の投稿への返信がタイムラインに含まれない問題を修正
+- Fix: users/notesでセンシティブチャンネルの投稿が含まれる場合がある問題を修正
 
 ## 2023.10.0
 ### NOTE
diff --git a/packages/backend/src/server/api/endpoints/users/notes.ts b/packages/backend/src/server/api/endpoints/users/notes.ts
index dfef35986e..df0951ce74 100644
--- a/packages/backend/src/server/api/endpoints/users/notes.ts
+++ b/packages/backend/src/server/api/endpoints/users/notes.ts
@@ -150,7 +150,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoinAndSelect('reply.user', 'replyUser')
 				.leftJoinAndSelect('renote.user', 'renoteUser');
 
-			if (!ps.withChannelNotes) {
+			if (ps.withChannelNotes) {
+				if (!isSelf) query.andWhere('channel.isSensitive = false');
+			} else {
 				query.andWhere('note.channelId IS NULL');
 			}