From 5b4115e21a6822a434a9bfbbd53f22b3ca961239 Mon Sep 17 00:00:00 2001
From: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 13 Sep 2025 08:33:14 +0900
Subject: refactor(frontend): フロントエンドの型エラー解消（途中まで） (#16539)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): FormLinkをボタンとして使用した際にエラーが出る問題を修正

* refactor(frontend): フロントエンドの型エラー解消

* remove unused ts-expect-error

* migrate

* remove unrelated changes

* fix lint

* more type fixes
---
 .../server/api/endpoints/admin/accounts/create.ts  | 21 ++++++++++++-----
 .../src/server/api/endpoints/users/lists/show.ts   | 27 ++++++++++++++--------
 2 files changed, 33 insertions(+), 15 deletions(-)

(limited to 'packages/backend/src/server')

diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/create.ts b/packages/backend/src/server/api/endpoints/admin/accounts/create.ts
index 06047b58a6..6606202118 100644
--- a/packages/backend/src/server/api/endpoints/admin/accounts/create.ts
+++ b/packages/backend/src/server/api/endpoints/admin/accounts/create.ts
@@ -34,13 +34,22 @@ export const meta = {
 	res: {
 		type: 'object',
 		optional: false, nullable: false,
-		ref: 'MeDetailed',
-		properties: {
-			token: {
-				type: 'string',
-				optional: false, nullable: false,
+		allOf: [
+			{
+				type: 'object',
+				ref: 'MeDetailed',
 			},
-		},
+			{
+				type: 'object',
+				optional: false, nullable: false,
+				properties: {
+					token: {
+						type: 'string',
+						optional: false, nullable: false,
+					},
+				},
+			}
+		],
 	},
 } as const;
 
diff --git a/packages/backend/src/server/api/endpoints/users/lists/show.ts b/packages/backend/src/server/api/endpoints/users/lists/show.ts
index ed5952d4c5..c6d477a92f 100644
--- a/packages/backend/src/server/api/endpoints/users/lists/show.ts
+++ b/packages/backend/src/server/api/endpoints/users/lists/show.ts
@@ -22,17 +22,26 @@ export const meta = {
 	res: {
 		type: 'object',
 		optional: false, nullable: false,
-		ref: 'UserList',
-		properties: {
-			likedCount: {
-				type: 'number',
-				optional: true, nullable: false,
+		allOf: [
+			{
+				type: 'object',
+				ref: 'UserList',
 			},
-			isLiked: {
-				type: 'boolean',
-				optional: true, nullable: false,
+			{
+				type: 'object',
+				optional: false, nullable: false,
+				properties: {
+					likedCount: {
+						type: 'number',
+						optional: true, nullable: false,
+					},
+					isLiked: {
+						type: 'boolean',
+						optional: true, nullable: false,
+					},
+				},
 			},
-		},
+		],
 	},
 
 	errors: {
-- 
cgit v1.2.3-freya