From 41f09fa2729a6c894c49e1e746102e84e1df8134 Mon Sep 17 00:00:00 2001
From: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
Date: Tue, 29 Apr 2025 13:17:01 +0900
Subject: [PATCH 1/2] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05704b509c..2705d33fb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,7 +33,7 @@
 	(Cherry-picked from https://github.com/yojo-art/cherrypick/pull/568 and https://github.com/team-shahu/misskey/pull/38)
 - Enhance: ユーザーごとにノートの表示が高速化するように
 - Fix: システムアカウントの名前がサーバー名と同期されない問題を修正
-- Fix: 大文字を含むユーザの URL で紹介された場合に 404 エラーを返す問題 #15813
+- Fix: 大文字を含むユーザの URL で照会された場合に 404 エラーを返す問題 #15813
 - Fix: リードレプリカ設定時にレコードの追加・更新・削除を伴うクエリを発行した際はmasterノードで実行されるように調整( #10897 )
 - Fix: ファイルアップロード時の挙動を一部調整(#15895)
 

From f8b0863b8edf18dac9188a93a52c4d149eabb0e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Tue, 29 Apr 2025 15:54:57 +0900
Subject: [PATCH 2/2] fix(frontend): fix lint (#15906)

* fix(frontend): attempt to fix lint

* fix lint
---
 packages/frontend-shared/js/collapsed.ts | 37 ++++++++++++++++--------
 packages/frontend-shared/js/url.ts       |  2 +-
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/packages/frontend-shared/js/collapsed.ts b/packages/frontend-shared/js/collapsed.ts
index af1f88cb73..aa24c43bcb 100644
--- a/packages/frontend-shared/js/collapsed.ts
+++ b/packages/frontend-shared/js/collapsed.ts
@@ -6,17 +6,30 @@
 import * as Misskey from 'misskey-js';
 
 export function shouldCollapsed(note: Misskey.entities.Note, urls: string[]): boolean {
-	const collapsed = note.cw == null && (
-		(note.text != null && (
-			(note.text.includes('$[x2')) ||
-			(note.text.includes('$[x3')) ||
-			(note.text.includes('$[x4')) ||
-			(note.text.includes('$[scale')) ||
-			(note.text.split('\n').length > 9) ||
-			(note.text.length > 500) ||
-			(urls.length >= 4)
-		)) || (note.files != null && note.files.length >= 5)
-	);
+	if (note.cw != null) {
+		return false;
+	}
 
-	return collapsed;
+	if (note.text != null) {
+		if (
+			note.text.includes('$[x2') ||
+			note.text.includes('$[x3') ||
+			note.text.includes('$[x4') ||
+			note.text.includes('$[scale') ||
+			note.text.split('\n').length > 9 ||
+			note.text.length > 500
+		) {
+			return true;
+		}
+	}
+
+	if (urls.length >= 4) {
+		return true;
+	}
+
+	if (note.files != null && note.files.length >= 5) {
+		return true;
+	}
+
+	return false;
 }
diff --git a/packages/frontend-shared/js/url.ts b/packages/frontend-shared/js/url.ts
index e4f9ca513d..1f3550d951 100644
--- a/packages/frontend-shared/js/url.ts
+++ b/packages/frontend-shared/js/url.ts
@@ -39,7 +39,7 @@ export function maybeMakeRelative(urlStr: string, baseStr: string): string {
 			return urlObj.pathname + urlObj.search + urlObj.hash;
 		}
 		return urlStr;
-	} catch (e) {
+	} catch {
 		return '';
 	}
 }