From e1cc95d3084cefe693a1f7028848d1c8aaceacf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8A=E3=81=95=E3=82=80=E3=81=AE=E3=81=B2=E3=81=A8?=
 <46447427+samunohito@users.noreply.github.com>
Date: Mon, 13 Nov 2023 09:27:37 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=81=AE=E3=83=8E?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E3=81=AE=E3=81=BF=E8=A1=A8=E7=A4=BA=E6=99=82?=
 =?UTF-8?q?=E3=81=ABDB=E3=81=B8=E3=83=95=E3=82=A9=E3=83=BC=E3=83=AB?=
 =?UTF-8?q?=E3=83=90=E3=83=83=E3=82=AF=E3=81=99=E3=82=8B=E3=81=A8=E3=83=AA?=
 =?UTF-8?q?=E3=83=8E=E3=83=BC=E3=83=88=E3=82=92=E5=90=AB=E3=82=93=E3=81=A7?=
 =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=86=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=20(#12321)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ユーザのノートのみ表示時にDBへフォールバックするとリノートを含んでしまうのを修正

* fix CHANGELOG.md

---------

Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
---
 CHANGELOG.md                                             | 1 +
 packages/backend/src/server/api/endpoints/users/notes.ts | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57415554e..6f9e540fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 ### Server
 - Fix: トークンのないプラグインをアンインストールするときにエラーが出ないように
 - Fix: 投稿通知がオンでもダイレクト投稿はユーザーに通知されないようにされました
+- Fix: ユーザタイムラインの「ノート」選択時にリノートが混ざり込んでしまうことがある問題の修正 #12306
 
 ## 2023.11.0
 
diff --git a/packages/backend/src/server/api/endpoints/users/notes.ts b/packages/backend/src/server/api/endpoints/users/notes.ts
index 343d320f6..a43e57292 100644
--- a/packages/backend/src/server/api/endpoints/users/notes.ts
+++ b/packages/backend/src/server/api/endpoints/users/notes.ts
@@ -51,7 +51,6 @@ export const paramDef = {
 		untilId: { type: 'string', format: 'misskey:id' },
 		sinceDate: { type: 'integer' },
 		untilDate: { type: 'integer' },
-		includeMyRenotes: { type: 'boolean', default: true },
 		withFiles: { type: 'boolean', default: false },
 		excludeNsfw: { type: 'boolean', default: false },
 	},
@@ -169,7 +168,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				query.andWhere('note.fileIds != \'{}\'');
 			}
 
-			if (ps.includeMyRenotes === false) {
+			if (ps.withRenotes === false) {
 				query.andWhere(new Brackets(qb => {
 					qb.orWhere('note.userId != :userId', { userId: ps.userId });
 					qb.orWhere('note.renoteId IS NULL');