From 80b4272c5730fbef693addea0fd90b74542aa6cf 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] fix(frontend): fix lint (#15906)

(cherry picked from commit f8b0863b8edf18dac9188a93a52c4d149eabb0e9)

* fix(frontend): attempt to fix lint

* fix lint
---
 packages/frontend/src/scripts/collapsed.ts | 36 +++++++++++++++-------
 packages/frontend/src/scripts/url.ts       |  2 +-
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/packages/frontend/src/scripts/collapsed.ts b/packages/frontend/src/scripts/collapsed.ts
index 237bd37c7..aa24c43bc 100644
--- a/packages/frontend/src/scripts/collapsed.ts
+++ b/packages/frontend/src/scripts/collapsed.ts
@@ -6,16 +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) ||
-		(note.files.length >= 5) ||
-		(urls.length >= 4)
-	);
+	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/src/scripts/url.ts b/packages/frontend/src/scripts/url.ts
index 4b9d20333..7653802a9 100644
--- a/packages/frontend/src/scripts/url.ts
+++ b/packages/frontend/src/scripts/url.ts
@@ -40,7 +40,7 @@ export function maybeMakeRelative(urlStr: string, baseStr: string): string {
 			return urlObj.pathname + urlObj.search + urlObj.hash;
 		}
 		return urlStr;
-	} catch (e) {
+	} catch {
 		return '';
 	}
 }