From 59567a7ccce641ba520f7fb2829e5d017e2d2c32 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: Mon, 3 Mar 2025 17:45:04 +0900
Subject: [PATCH] =?UTF-8?q?fix(frontend):=20=E7=85=A7=E4=BC=9A=E5=87=A6?=
 =?UTF-8?q?=E7=90=86=E3=82=92=E7=B5=B1=E4=B8=80=20(#15536)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): 照会処理を統一

* fix

* doLookup -> apLookup
---
 packages/frontend/src/pages/search.note.vue |  9 +--
 packages/frontend/src/scripts/lookup.ts     | 82 +++++++++++----------
 2 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/packages/frontend/src/pages/search.note.vue b/packages/frontend/src/pages/search.note.vue
index a390e3fba..32a35f811 100644
--- a/packages/frontend/src/pages/search.note.vue
+++ b/packages/frontend/src/pages/search.note.vue
@@ -120,6 +120,7 @@ import { i18n } from '@/i18n.js';
 import { instance } from '@/instance.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
+import { apLookup } from '@/scripts/lookup.js';
 import { useRouter } from '@/router/supplier.js';
 import MkButton from '@/components/MkButton.vue';
 import MkFoldableSection from '@/components/MkFoldableSection.vue';
@@ -260,13 +261,7 @@ async function search() {
 			text: i18n.ts.lookupConfirm,
 		});
 		if (!confirm.canceled) {
-			const promise = misskeyApi('ap/show', {
-				uri: searchParams.value.query,
-			});
-
-			os.promiseDialog(promise, null, null, i18n.ts.fetchingAsApObject);
-
-			const res = await promise;
+			const res = await apLookup(searchParams.value.query);
 
 			if (res.type === 'User') {
 				router.push(`/@${res.object.username}@${res.object.host}`);
diff --git a/packages/frontend/src/scripts/lookup.ts b/packages/frontend/src/scripts/lookup.ts
index 8ee2a4b99..02f589c7c 100644
--- a/packages/frontend/src/scripts/lookup.ts
+++ b/packages/frontend/src/scripts/lookup.ts
@@ -29,45 +29,7 @@ export async function lookup(router?: Router) {
 	}
 
 	if (query.startsWith('https://')) {
-		const promise = misskeyApi('ap/show', {
-			uri: query,
-		});
-
-		os.promiseDialog(promise, null, (err) => {
-			let title = i18n.ts.somethingHappened;
-			let text = err.message + '\n' + err.id;
-
-			switch (err.id) {
-				case '974b799e-1a29-4889-b706-18d4dd93e266':
-					title = i18n.ts._remoteLookupErrors._federationNotAllowed.title;
-					text = i18n.ts._remoteLookupErrors._federationNotAllowed.description;
-					break;
-				case '1a5eab56-e47b-48c2-8d5e-217b897d70db':
-					title = i18n.ts._remoteLookupErrors._uriInvalid.title;
-					text = i18n.ts._remoteLookupErrors._uriInvalid.description;
-					break;
-				case '81b539cf-4f57-4b29-bc98-032c33c0792e':
-					title = i18n.ts._remoteLookupErrors._requestFailed.title;
-					text = i18n.ts._remoteLookupErrors._requestFailed.description;
-					break;
-				case '70193c39-54f3-4813-82f0-70a680f7495b':
-					title = i18n.ts._remoteLookupErrors._responseInvalid.title;
-					text = i18n.ts._remoteLookupErrors._responseInvalid.description;
-					break;
-				case 'dc94d745-1262-4e63-a17d-fecaa57efc82':
-					title = i18n.ts._remoteLookupErrors._noSuchObject.title;
-					text = i18n.ts._remoteLookupErrors._noSuchObject.description;
-					break;
-			}
-
-			os.alert({
-				type: 'error',
-				title,
-				text,
-			});
-		}, i18n.ts.fetchingAsApObject);
-
-		const res = await promise;
+		const res = await apLookup(query);
 
 		if (res.type === 'User') {
 			_router.push(`/@${res.object.username}@${res.object.host}`);
@@ -78,3 +40,45 @@ export async function lookup(router?: Router) {
 		return;
 	}
 }
+
+export async function apLookup(query: string) {
+	const promise = misskeyApi('ap/show', {
+		uri: query,
+	});
+
+	os.promiseDialog(promise, null, (err) => {
+		let title = i18n.ts.somethingHappened;
+		let text = err.message + '\n' + err.id;
+
+		switch (err.id) {
+			case '974b799e-1a29-4889-b706-18d4dd93e266':
+				title = i18n.ts._remoteLookupErrors._federationNotAllowed.title;
+				text = i18n.ts._remoteLookupErrors._federationNotAllowed.description;
+				break;
+			case '1a5eab56-e47b-48c2-8d5e-217b897d70db':
+				title = i18n.ts._remoteLookupErrors._uriInvalid.title;
+				text = i18n.ts._remoteLookupErrors._uriInvalid.description;
+				break;
+			case '81b539cf-4f57-4b29-bc98-032c33c0792e':
+				title = i18n.ts._remoteLookupErrors._requestFailed.title;
+				text = i18n.ts._remoteLookupErrors._requestFailed.description;
+				break;
+			case '70193c39-54f3-4813-82f0-70a680f7495b':
+				title = i18n.ts._remoteLookupErrors._responseInvalid.title;
+				text = i18n.ts._remoteLookupErrors._responseInvalid.description;
+				break;
+			case 'dc94d745-1262-4e63-a17d-fecaa57efc82':
+				title = i18n.ts._remoteLookupErrors._noSuchObject.title;
+				text = i18n.ts._remoteLookupErrors._noSuchObject.description;
+				break;
+		}
+
+		os.alert({
+			type: 'error',
+			title,
+			text,
+		});
+	}, i18n.ts.fetchingAsApObject);
+
+	return await promise;
+}