From 8cbbb80e3f08f94f7235d40bd7ae4d4c6781011e Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Thu, 21 Aug 2025 19:10:16 +0900
Subject: [PATCH] =?UTF-8?q?fix(backend):=20`notes/mentions`=20=E3=81=A7?=
 =?UTF-8?q?=E5=A0=B4=E5=90=88=E3=81=AB=E3=82=88=E3=81=A3=E3=81=A6=E3=81=AF?=
 =?UTF-8?q?=E4=B8=A6=E3=81=B3=E9=A0=86=E3=81=8C=E6=AD=A3=E3=81=97=E3=81=8F?=
 =?UTF-8?q?=E8=BF=94=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9b250a1a7..59c3e7481b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,7 @@
 - Enhance: 全体的なパフォーマンスの向上
 - Enhance: 依存ソフトウェアの更新
 - Enhance: `clips/list` APIがページネーションに対応しました
+- Fix: `notes/mentions` で場合によっては並び順が正しく返されない問題を修正
 - Fix: SystemWebhook設定でsecretを空に出来ない問題を修正
 
 
diff --git a/packages/backend/src/server/api/endpoints/notes/mentions.ts b/packages/backend/src/server/api/endpoints/notes/mentions.ts
index 05ffdc1f97..e775bdb7fd 100644
--- a/packages/backend/src/server/api/endpoints/notes/mentions.ts
+++ b/packages/backend/src/server/api/endpoints/notes/mentions.ts
@@ -66,7 +66,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 						.orWhere(':meIdAsList <@ note.visibleUserIds');
 				}))
 				// Avoid scanning primary key index
-				.orderBy('CONCAT(note.id)', 'DESC')
+				.orderBy('CONCAT(note.id)', (ps.sinceDate || ps.sinceId) ? 'ASC' : 'DESC')
 				.innerJoinAndSelect('note.user', 'user')
 				.leftJoinAndSelect('note.reply', 'reply')
 				.leftJoinAndSelect('note.renote', 'renote')