From 703b34c07ca6089a81b2135fcee88197420b2aa2 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 11 Jun 2023 23:25:10 -0700
Subject: [PATCH] fix search features

---
 packages/client/src/components/MkDialog.vue       | 12 ++++--------
 packages/client/src/scripts/search.ts             | 15 +--------------
 .../client/src/widgets/server-metric/index.vue    |  8 +++++---
 3 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/packages/client/src/components/MkDialog.vue b/packages/client/src/components/MkDialog.vue
index 249bc18c5c..10300a32f0 100644
--- a/packages/client/src/components/MkDialog.vue
+++ b/packages/client/src/components/MkDialog.vue
@@ -59,21 +59,17 @@
 				v-if="input && input.type !== 'paragraph'"
 				v-model="inputValue"
 				autofocus
-				:type="
-					input.type == 'searchAdvanced'
-						? 'search'
-						: input.type || 'text'
-				"
+				:type="input.type == 'search' ? 'search' : input.type || 'text'"
 				:placeholder="input.placeholder || undefined"
 				@keydown="onInputKeydown"
 				:style="{
-					width: input.type === 'searchAdvanced' ? '300px' : null,
+					width: input.type === 'search' ? '300px' : null,
 				}"
 			>
 				<template v-if="input.type === 'password'" #prefix
 					><i class="ph-password ph-bold ph-lg"></i
 				></template>
-				<template v-if="input.type === 'searchAdvanced'" #suffix>
+				<template v-if="input.type === 'search'" #suffix>
 					<button
 						class="_buttonIcon"
 						@click.stop="openSearchFilters"
@@ -256,7 +252,7 @@ const inputEl = ref<typeof MkInput>();
 
 function done(canceled: boolean, result?) {
 	emit("done", { canceled, result });
-	modal.value?.close();
+	modal.value?.close(ev);
 }
 
 async function ok() {
diff --git a/packages/client/src/scripts/search.ts b/packages/client/src/scripts/search.ts
index 6afffb4d36..34318ab0e9 100644
--- a/packages/client/src/scripts/search.ts
+++ b/packages/client/src/scripts/search.ts
@@ -4,21 +4,8 @@ import { mainRouter } from "@/router";
 import { instance } from "@/instance";
 
 export async function search() {
-	// const searchOptions =
-	// 	"Advanced search operators\n" +
-	// 	"from:user => filter by user\n" +
-	// 	"has:image/video/audio/text/file => filter by attachment types\n" +
-	// 	"domain:domain.com => filter by domain\n" +
-	// 	"before:Date => show posts made before Date\n" +
-	// 	"after:Date => show posts made after Date\n" +
-	// 	'"text" => get posts with exact text between quotes\n' +
-	// 	"filter:following => show results only from users you follow\n" +
-	// 	"filter:followers => show results only from followers\n";
-
-	const searchFiltersAvailable = instance.searchFilters;
-
 	const { canceled, result: query } = await os.inputText({
-		type: searchFiltersAvailable ? "searchAdvanced" : "search",
+		type: instance.features.searchFilters ? "search" : "text",
 		title: i18n.ts.search,
 		placeholder: i18n.ts.searchPlaceholder,
 	});
diff --git a/packages/client/src/widgets/server-metric/index.vue b/packages/client/src/widgets/server-metric/index.vue
index 8ecdeb1965..cf84212b1e 100644
--- a/packages/client/src/widgets/server-metric/index.vue
+++ b/packages/client/src/widgets/server-metric/index.vue
@@ -39,7 +39,9 @@
 				:meta="meta"
 			/>
 			<XMeili
-				v-else-if="instance.searchFilters && widgetProps.view === 5"
+				v-else-if="
+					instance.features.searchFilters && widgetProps.view === 5
+				"
 				:connection="connection"
 				:meta="meta"
 			/>
@@ -110,8 +112,8 @@ os.api("server-info", {}).then((res) => {
 
 const toggleView = () => {
 	if (
-		(widgetProps.view === 5 && instance.searchFilters) ||
-		(widgetProps.view === 4 && !instance.searchFilters)
+		(widgetProps.view === 5 && instance.features.searchFilters) ||
+		(widgetProps.view === 4 && !instance.features.searchFilters)
 	) {
 		widgetProps.view = 0;
 	} else {