Revert "MFMの検索エンジンをユーザー設定で変える" (#616)

yojo-art · Jan 16, 2025 · 73a9056 · 73a9056
1 parent 19a0caf
commit 73a9056
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 31 deletions.
diff --git a/locales/index.d.ts b/locales/index.d.ts
@@ -4215,10 +4215,6 @@ export interface Locale extends ILocale {
      * CWを維持する
      */
     "keepCw": string;
-    /**
-     * %sが検索語句に置き換えられます
-     */
-    "searchEngineDescription": string;
     /**
      * Pub/Subのアカウント
      */

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
@@ -1046,7 +1046,6 @@ usernameInfo: "サーバー上であなたのアカウントを一意に識別
 aiChanMode: "藍モード"
 devMode: "開発者モード"
 keepCw: "CWを維持する"
-searchEngineDescription: "%sが検索語句に置き換えられます"
 pubSub: "Pub/Subのアカウント"
 lastCommunication: "直近の通信"
 resolved: "解決済み"

diff --git a/packages/frontend/src/components/MkGoogle.vue b/packages/frontend/src/components/MkGoogle.vue
@@ -12,12 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { ref } from 'vue';
-import { url as local } from '@@/js/config.js';
 import { i18n } from '@/i18n.js';
-import { defaultStore } from '@/store.js';
-import { useRouter } from '@/router/supplier.js';
-
-const router = useRouter();
 
 const props = defineProps<{
 	q: string;
@@ -26,13 +21,9 @@ const props = defineProps<{
 const query = ref(props.q);
 
 const search = () => {
-	const searchUrl = String(defaultStore.state.searchEngine).replaceAll('%s', encodeURIComponent(query.value));
-	const url = new URL(searchUrl, local);
-	if (url.origin === local) {
-		router.push(url.toString().substring(local.length));
-	} else {
-		window.open(searchUrl, '_blank', 'noopener');
-	}
+	const sp = new URLSearchParams();
+	sp.append('q', query.value);
+	window.open(`https://www.google.com/search?${sp.toString()}`, '_blank', 'noopener');
 };
 </script>
 

diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
@@ -60,10 +60,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkSwitch v-model="disableNyaize">{{ i18n.ts.noNyaization }} <span class="_beta">CherryPick</span></MkSwitch>
 				<MkSwitch v-model="checkMultipleRenote">{{ i18n.ts.showMultipleRenoteWarning }} <span class="_beta">yojo-art</span></MkSwitch>
 			</div>
-			<MkInput v-model="searchEngine" manualSave :spellcheck="false">
-				<template #label>{{ i18n.ts.search }}<span class="_beta" style="vertical-align: middle;">yojo-art</span></template>
-				<template #caption>{{ i18n.ts.searchEngineDescription }}</template>
-			</MkInput>
 			<MkSelect v-model="serverDisconnectedBehavior">
 				<template #label>{{ i18n.ts.whenServerDisconnected }} <span class="_beta" style="vertical-align: middle;">CherryPick</span></template>
 				<option value="reload">{{ i18n.ts._serverDisconnectedBehavior.reload }}</option>
@@ -136,7 +132,6 @@ import FormSection from '@/components/form/section.vue';
 import FormLink from '@/components/form/link.vue';
 import MkLink from '@/components/MkLink.vue';
 import MkInfo from '@/components/MkInfo.vue';
-import MkInput from '@/components/MkInput.vue';
 import { defaultStore } from '@/store.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
@@ -176,7 +171,6 @@ const useAutoTranslate = computed(defaultStore.makeGetterSetter('useAutoTranslat
 const welcomeBackToast = computed(defaultStore.makeGetterSetter('welcomeBackToast'));
 const disableNyaize = computed(defaultStore.makeGetterSetter('disableNyaize'));
 const checkMultipleRenote = computed(defaultStore.makeGetterSetter('checkMultipleRenote'));
-const searchEngine = computed(defaultStore.makeGetterSetter('searchEngine'));
 
 watch(lang, () => {
 	miLocalStorage.setItem('lang', lang.value as string);

diff --git a/packages/frontend/src/pages/settings/preferences-backups.vue b/packages/frontend/src/pages/settings/preferences-backups.vue
@@ -191,10 +191,6 @@ const defaultStoreSaveKeys: (keyof typeof defaultStore['state'])[] = [
 	'showMoreButtonInNoteFooter',
 	'selectReaction',
 	// #endregion CherryPick
-	// #region yojo-art
-	'checkMultipleRenote',
-	'searchEngine',
-	// #endregion yojo-art
 ];
 const coldDeviceStorageSaveKeys: (keyof typeof ColdDeviceStorage.default)[] = [
 	'lightTheme',

diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
@@ -153,10 +153,6 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'account',
 		default: [] as string[],
 	},
-	searchEngine: {
-		where: 'account',
-		default: 'https://www.google.com/search?q=%s',
-	},
 
 	menu: {
 		where: 'deviceAccount',