From a11816e5ec39a887e9e182e6eb3a9a5fbfba019d Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <daisho7308+f@gmail.com>
Date: Fri, 2 Feb 2024 10:39:09 +0900
Subject: [PATCH] =?UTF-8?q?enhance(ServerFinder):=20=E5=A4=A7=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E5=B0=8F=E6=96=87=E5=AD=97=E3=83=BB=E5=8D=8A=E8=A7=92?=
 =?UTF-8?q?=E3=82=AB=E3=83=8A=E3=81=AE=E3=83=8E=E3=83=BC=E3=83=9E=E3=83=A9?=
 =?UTF-8?q?=E3=82=A4=E3=82=BA=E3=82=92=E8=BF=BD=E5=8A=A0=20Fix=20#116?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/js/misc/index.ts       | 34 +++++++++++++++++++++++++++++++++-
 components/servers/Finder.vue | 18 ++++++++++++++----
 pages/servers/index.vue       |  2 +-
 3 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/assets/js/misc/index.ts b/assets/js/misc/index.ts
index bc2dce00..25fd517a 100644
--- a/assets/js/misc/index.ts
+++ b/assets/js/misc/index.ts
@@ -108,4 +108,36 @@ export function copyText(val: string) {
 	document.body.removeChild(tmp);
 
 	return result;
-}
\ No newline at end of file
+}
+
+/**
+ * Converts half-width Katakana characters to full-width Katakana characters.
+ * @param str - The string to convert.
+ * @returns The converted string with full-width Katakana characters.
+ */
+export function kanaHalfToFull(str: string): string {
+    const kanaMap: Record<string, string> = {
+        'ｶﾞ': 'ガ', 'ｷﾞ': 'ギ', 'ｸﾞ': 'グ', 'ｹﾞ': 'ゲ', 'ｺﾞ': 'ゴ',
+        'ｻﾞ': 'ザ', 'ｼﾞ': 'ジ', 'ｽﾞ': 'ズ', 'ｾﾞ': 'ゼ', 'ｿﾞ': 'ゾ',
+        'ﾀﾞ': 'ダ', 'ﾁﾞ': 'ヂ', 'ﾂﾞ': 'ヅ', 'ﾃﾞ': 'デ', 'ﾄﾞ': 'ド',
+        'ﾊﾞ': 'バ', 'ﾋﾞ': 'ビ', 'ﾌﾞ': 'ブ', 'ﾍﾞ': 'ベ', 'ﾎﾞ': 'ボ',
+        'ﾊﾟ': 'パ', 'ﾋﾟ': 'ピ', 'ﾌﾟ': 'プ', 'ﾍﾟ': 'ペ', 'ﾎﾟ': 'ポ',
+        'ｳﾞ': 'ヴ', 'ﾜﾞ': 'ヷ', 'ｦﾞ': 'ヺ',
+        'ｱ': 'ア', 'ｲ': 'イ', 'ｳ': 'ウ', 'ｴ': 'エ', 'ｵ': 'オ',
+        'ｶ': 'カ', 'ｷ': 'キ', 'ｸ': 'ク', 'ｹ': 'ケ', 'ｺ': 'コ',
+        'ｻ': 'サ', 'ｼ': 'シ', 'ｽ': 'ス', 'ｾ': 'セ', 'ｿ': 'ソ',
+        'ﾀ': 'タ', 'ﾁ': 'チ', 'ﾂ': 'ツ', 'ﾃ': 'テ', 'ﾄ': 'ト',
+        'ﾅ': 'ナ', 'ﾆ': 'ニ', 'ﾇ': 'ヌ', 'ﾈ': 'ネ', 'ﾉ': 'ノ',
+        'ﾊ': 'ハ', 'ﾋ': 'ヒ', 'ﾌ': 'フ', 'ﾍ': 'ヘ', 'ﾎ': 'ホ',
+        'ﾏ': 'マ', 'ﾐ': 'ミ', 'ﾑ': 'ム', 'ﾒ': 'メ', 'ﾓ': 'モ',
+        'ﾔ': 'ヤ', 'ﾕ': 'ユ', 'ﾖ': 'ヨ',
+        'ﾗ': 'ラ', 'ﾘ': 'リ', 'ﾙ': 'ル', 'ﾚ': 'レ', 'ﾛ': 'ロ',
+        'ﾜ': 'ワ', 'ｦ': 'ヲ', 'ﾝ': 'ン',
+        'ｧ': 'ァ', 'ｨ': 'ィ', 'ｩ': 'ゥ', 'ｪ': 'ェ', 'ｫ': 'ォ',
+        'ｯ': 'ッ', 'ｬ': 'ャ', 'ｭ': 'ュ', 'ｮ': 'ョ',
+        '｡': '。', '､': '、', 'ｰ': 'ー', '｢': '「', '｣': '」', '･': '・'
+    };
+
+    var reg = new RegExp('(' + Object.keys(kanaMap).join('|') + ')', 'g');
+    return str.replace(reg, (m) => kanaMap[m]).replace(/ﾞ/g, '゛').replace(/ﾟ/g, '゜');
+};
diff --git a/components/servers/Finder.vue b/components/servers/Finder.vue
index 2f44c413..77e04c7d 100644
--- a/components/servers/Finder.vue
+++ b/components/servers/Finder.vue
@@ -18,7 +18,7 @@
                         <XIco class="w-7 h-7" />
                     </button>
                 </div>
-                <form @submit.prevent="() => { f_query = f_query_partial }">
+                <form @submit.prevent="applyQuery">
                     <label class="form-label" for="query">{{ $t('_servers._search.query') }}</label>
                     <div class="input-group">
                         <input class="form-control" type="search" autocomplete="off" id="query" v-model="f_query_partial" />
@@ -129,7 +129,7 @@
 
 <script setup lang="ts">
 import type { InstanceInfo, InstanceItem, InstancesStatsObj } from '@/types/instances-info';
-import { resolveObjPath } from '@/assets/js/misc';
+import { resolveObjPath, kanaHalfToFull } from '@/assets/js/misc';
 import langs from '@/assets/data/lang';
 
 import SearchIco from 'bi/search.svg';
@@ -232,10 +232,10 @@ const filteredInstances = computed<InstanceItem[]>(() => {
     }
 
     if (f_query.value) {
-        instances = instances.filter((instance) => instance.name.includes(f_query.value) || instance.description?.includes(f_query.value));
+        instances = instances.filter((instance) => normalizeString(instance.name).includes(f_query.value) || normalizeString(instance?.description ?? '').includes(f_query.value));
     }
     if (f_langs.value) {
-        instances = instances.filter((instance) => instance.langs.includes(f_langs.value));
+        instances = instances.filter((instance) => instance.langs.includes(f_langs.value ?? ''));
     }
     if (f_registerAcceptance.value) {
         instances = instances.filter((instance) => {
@@ -279,6 +279,16 @@ const filteredInstances = computed<InstanceItem[]>(() => {
 function switchOrder() {
     f_order.value = f_order.value === 'asc' ? 'desc' : 'asc';
 }
+
+function normalizeString(str: string) {
+    // アルファベットは小文字に、半角カタカナは全角ひらがなに、全角カタカナは全角ひらがなに変換
+    const _res = kanaHalfToFull(str.toLowerCase()).replace(/[ァ-ン]/g, (s) => String.fromCharCode(s.charCodeAt(0) - 0x60));
+    return _res;
+}
+
+function applyQuery() {
+    f_query.value = normalizeString(f_query_partial.value);
+}
 </script>
 
 <style scoped>
diff --git a/pages/servers/index.vue b/pages/servers/index.vue
index 409af0fa..f4d4d00f 100644
--- a/pages/servers/index.vue
+++ b/pages/servers/index.vue
@@ -56,7 +56,7 @@ const route = useRoute();
 
 const instancesStats = ref<InstancesStatsObj>();
 
-function setServerStats(val: InstancesStatsObj) {
+function setServerStats(val?: InstancesStatsObj) {
     instancesStats.value = val;
 }