enhance(frontend): ノートとユーザーの検索時に照会を行うかを選択できるように (#89)

yojo-art · Jun 20, 2024 · 39b596f · 39b596f
1 parent d6a13b2
commit 39b596f
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 22 deletions.
diff --git a/CHANGELOG_yojo.md b/CHANGELOG_yojo.md
@@ -23,6 +23,10 @@
 ### General
 - メディアプロキシurlと拡大画像urlを分割
 
+### Client
+- enhance: ノートとユーザーの検索時に照会を行うかが選択できるようになりました
+	- @foo@example.com 形式でユーザ検索した場合に照会ができるようになりました
+
 ### Server
 - remoteProxyエンドポイント設定を追加
 

diff --git a/locales/en-US.yml b/locales/en-US.yml
@@ -2854,3 +2854,8 @@ _advancedSearch:
     endDate: "Until"
   _description:
     other: "Other settings"
+
+_searchOrApShow:
+  question: "Want to search?"
+  search: "Search"
+  lookup: "Lookup"
diff --git a/locales/index.d.ts b/locales/index.d.ts
@@ -11208,6 +11208,20 @@ export interface Locale extends ILocale {
             "other": string;
         };
     };
+    "_searchOrApShow": {
+        /**
+         * 照会を行いますか？
+         */
+        "question": string;
+        /**
+         * 検索
+         */
+        "search": string;
+        /**
+         * 照会
+         */
+        "lookup": string;
+    };
 }
 declare const locales: {
     [lang: string]: Locale;

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
@@ -2987,3 +2987,8 @@ _advancedSearch:
     endDate: "まで"
   _description:
     other: "その他の設定"
+
+_searchOrApShow:
+  question: "照会を行いますか？"
+  search: "検索"
+  lookup: "照会"
diff --git a/packages/frontend/src/pages/search.note.vue b/packages/frontend/src/pages/search.note.vue
@@ -111,21 +111,30 @@ async function search() {
 	if (query == null || query === '') return;
 
 	if (query.startsWith('https://')) {
-		const promise = misskeyApi('ap/show', {
-			uri: query,
+		const { canceled } = await os.confirm({
+			type: 'question',
+			text: i18n.ts._searchOrApShow.question,
+			okText: i18n.ts._searchOrApShow.lookup,
+			cancelText: i18n.ts._searchOrApShow.search,
 		});
 
-		os.promiseDialog(promise, null, null, i18n.ts.fetchingAsApObject);
+		if (!canceled) {
+			const promise = misskeyApi('ap/show', {
+				uri: query,
+			});
 
-		const res = await promise;
+			os.promiseDialog(promise, null, null, i18n.ts.fetchingAsApObject);
 
-		if (res.type === 'User') {
-			router.push(`/@${res.object.username}@${res.object.host}`);
-		} else if (res.type === 'Note') {
-			router.push(`/notes/${res.object.id}`);
-		}
+			const res = await promise;
+
+			if (res.type === 'User') {
+				router.push(`/@${res.object.username}@${res.object.host}`);
+			} else if (res.type === 'Note') {
+				router.push(`/notes/${res.object.id}`);
+			}
 
-		return;
+			return;
+		}
 	}
 
 	if (isAdvancedSearchAvailable === true && advancedSearch.value === true) {

diff --git a/packages/frontend/src/pages/search.user.vue b/packages/frontend/src/pages/search.user.vue
@@ -42,28 +42,48 @@ const key = ref(0);
 const searchQuery = ref('');
 const searchOrigin = ref('combined');
 const userPagination = ref();
+const isApUserName = RegExp('^@[a-zA-Z0-9_.]+@[a-zA-Z0-9-_.]+[a-zA-Z]$');
 
 async function search() {
 	const query = searchQuery.value.toString().trim();
 
 	if (query == null || query === '') return;
 
-	if (query.startsWith('https://')) {
-		const promise = misskeyApi('ap/show', {
-			uri: query,
+	if (query.startsWith('https://') || isApUserName.test(query)) {
+		const { canceled } = await os.confirm({
+			type: 'question',
+			text: i18n.ts._searchOrApShow.question,
+			okText: i18n.ts._searchOrApShow.lookup,
+			cancelText: i18n.ts._searchOrApShow.search,
 		});
 
-		os.promiseDialog(promise, null, null, i18n.ts.fetchingAsApObject);
+		if (!canceled) {
+			if (isApUserName.test(query)) {
+				const querys = query.split('@');
+				const promise = misskeyApi('users/show', {
+					username: querys[1],
+					host: querys[2],
+				});
+				os.promiseDialog(promise, null, null, i18n.ts.fetchingAsApObject);
+				const res = await promise;
+				if (typeof res.error === 'undefined') {
+					router.push(`/@${res.username}@${res.host}`);
+				}
+			} else {
+				const promise = misskeyApi('ap/show', {
+					uri: query,
+				});
+				os.promiseDialog(promise, null, null, i18n.ts.fetchingAsApObject);
+				const res = await promise;
 
-		const res = await promise;
-
-		if (res.type === 'User') {
-			router.push(`/@${res.object.username}@${res.object.host}`);
-		} else if (res.type === 'Note') {
-			router.push(`/notes/${res.object.id}`);
+				if (res.type === 'User') {
+					router.push(`/@${res.object.username}@${res.object.host}`);
+				} else if (res.type === 'Note') {
+					router.push(`/notes/${res.object.id}`);
+				}
+			}
+			return;
 		}
-
-		return;
 	}
 
 	userPagination.value = {