From 63cd831cf62674476f1b292680b1f966f67369c9 Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Sun, 12 Feb 2023 00:25:51 +0100
Subject: [PATCH] simplify code

---
 .../server/api/mastodon/endpoints/account.ts  | 33 ++++---------------
 1 file changed, 7 insertions(+), 26 deletions(-)

diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index fe48e4a11..4e2c93334 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -63,39 +63,20 @@ export function apiAccountMastodon(router: Router): void {
 			ctx.body = e.response.data;
 		}
 	});
-	router.get(
-		"/v1/accounts/lookup",
-		async (ctx) => {
-			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
-			const accessTokens = ctx.headers.authorization;
-			const client = getClient(BASE_URL, accessTokens);
-			try {
-				const data = await client.search((ctx.query.acct || '').toString(), "accounts", {
-					resolve: true
-				});
-				ctx.body = data.data.accounts[0];
-				if (data.data.accounts.length === 0) {
-					ctx.status = 404;
-					ctx.body = {
-						error: `Record (${ctx.query.acct}) not found`
-					}
-				}
-			} catch (e: any) {
-				console.error(e);
-				console.error(e.response.data);
-				ctx.status = 401;
-				ctx.body = e.response.data;
-			}
-		},
-	);
 	router.get<{ Params: { id: string } }>(
 		"/v1/accounts/:id",
 		async (ctx) => {
 			const BASE_URL = `${ctx.protocol}://${ctx.hostname}`;
 			const accessTokens = ctx.headers.authorization;
 			const client = getClient(BASE_URL, accessTokens);
+			let req_user = ctx.query.acct;
+			if (!req_user) {
+				req_user = ctx.params.id;
+			} else {
+				req_user = req_user.toString();
+			}
 			try {
-				const data = await client.getAccount(ctx.params.id);
+				const data = await client.getAccount(req_user);
 				ctx.body = data.data;
 			} catch (e: any) {
 				console.error(e);