From 68d2d0e4170a56e8bff3c577b53b5f58f6b5dc04 Mon Sep 17 00:00:00 2001
From: penginn-net <121443048+penginn-net@users.noreply.github.com>
Date: Sat, 19 Oct 2024 00:54:55 +0900
Subject: [PATCH 1/2] a

---
 CHANGELOG_YOJO.md                            | 14 +++++
 packages/frontend/src/pages/search.anote.vue | 57 +++++++++++++++-----
 packages/frontend/src/pages/search.vue       | 20 ++++++-
 packages/frontend/src/router/definition.ts   |  9 ++++
 4 files changed, 85 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG_YOJO.md b/CHANGELOG_YOJO.md
index a71e81c19e..fd200d94cb 100644
--- a/CHANGELOG_YOJO.md
+++ b/CHANGELOG_YOJO.md
@@ -33,6 +33,20 @@ Cherrypick 4.11.1
 - Fix: リアクションが閲覧できる状態でも見れない問題を修正 [#429](https://github.com/yojo-art/cherrypick/pull/429)
 - Enhance: チャートの連合グラフで割合を表示
 - Enhance: お気に入り登録クリップの一覧画面から登録解除できるように
+- Enhance: 高度な検索でもクエリ文字列を使えるように
+  - `/search?type=anote`
+  - `q` 通常検索と同じ
+  - `userId` 通常検索と同じ
+  - `username` 通常検索と同じ
+  - `host` 通常検索と同じ
+  - `fileAttach`添付ファイル有無 あり:`file-only`なし:`no-file`
+  - `fileSensitive`添付ファイルセンシティブ状態 あり:`includeSensitive` なし:`withOutSensitive`　センシティブのみ`sensitiveOnly`
+  - `reactions` リアクション検索ボックス
+  - `reactionsExclude` リアクション検索ボックス(除外)
+  - `excludeReply` リプライ除外 true/false
+  - `excludeCw` CW除外 true/false
+  - `excludeQuote` 引用除外 true/false
+  - `strictSearch` 表記ゆれ検索有効 true/false
 - Fix: リモートから添付されてきたクリップURLにホスト情報があると二重になる不具合を修正 [#460](https://github.com/yojo-art/cherrypick/pull/460)
 - Fix: リモートクリップ説明文がローカル仕様になってる問題の修正 [#466](https://github.com/yojo-art/cherrypick/pull/466)
 - Fix: ユーザー概要の「ファイル」の挙動を通常の添付ファイルに合わせる [#472](https://github.com/yojo-art/cherrypick/pull/472)
diff --git a/packages/frontend/src/pages/search.anote.vue b/packages/frontend/src/pages/search.anote.vue
index 955619327b..ab5617136f 100644
--- a/packages/frontend/src/pages/search.anote.vue
+++ b/packages/frontend/src/pages/search.anote.vue
@@ -103,7 +103,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
+import { ref, toRef } from 'vue';
 import type { UserDetailed } from 'cherrypick-js/entities.js';
 import MkNotes from '@/components/MkNotes.vue';
 import MkRadios from '@/components/MkRadios.vue';
@@ -122,24 +122,53 @@ import { $i } from '@/account.js';
 import { instance } from '@/instance.js';
 import { emojiPicker } from '@/scripts/emoji-picker';
 
+const props = withDefaults(defineProps<{
+		query?: string;
+		userId?: string;
+		username?: string;
+		host?: string | null;
+		fileAttach?: string;
+		fileSensitive?: string;
+		reactions?: string;
+		reactionsExclude?: string;
+		following?: string;
+		excludeReply?: boolean;
+		excludeCw?: boolean;
+		excludeQuote?: boolean;
+		strictSearch?: boolean;
+	}>(), {
+	query: '',
+	userId: undefined,
+	username: undefined,
+	host: '',
+	fileAttach: 'combined',
+	fileSensitive: 'combined',
+	reactions: '',
+	reactionsExclude: '',
+	following: 'combined',
+	excludeReply: false,
+	excludeCw: false,
+	excludeQuote: false,
+	strictSearch: false,
+});
 const router = useRouter();
 
 const key = ref(0);
-const searchQuery = ref('');
+const searchQuery = ref(toRef(props, 'query').value);
+const notePagination = ref<Paging>();
+const user = ref<UserDetailed | null>(null);
+const hostInput = ref(toRef(props, 'host').value);
 const searchOrigin = ref('combined');
-const notePagination = ref();
-const user = ref<any>(null);
 const isLocalOnly = ref(false);
-const isfileOnly = ref('combined');
-const excludeCW = ref(false);
-const excludeReply = ref(false);
-const excludeQuote = ref(false);
-const sensitiveFilter = ref('combined');
-const followingFilter = ref('combined');
-const hostInput = ref('');
-const emojiSearchQuery = ref('');
-const emojiExcludeSearchQuery = ref('');
-const strictSearch = ref(false);
+const isfileOnly = ref(toRef(props, 'fileAttach').value);
+const sensitiveFilter = ref(toRef(props, 'fileSensitive').value);
+const emojiSearchQuery = ref(toRef(props, 'reactions').value);
+const emojiExcludeSearchQuery = ref(toRef(props, 'reactionsExclude').value);
+const followingFilter = ref(toRef(props, 'following').value);
+const excludeReply = ref(toRef(props, 'excludeReply').value);
+const excludeCW = ref(toRef(props, 'excludeCw').value);
+const excludeQuote = ref(toRef(props, 'excludeQuote').value);
+const strictSearch = ref(toRef(props, 'strictSearch').value);
 const noteSearchableScope = instance.noteSearchableScope ?? 'local';
 
 function selectUser() {
diff --git a/packages/frontend/src/pages/search.vue b/packages/frontend/src/pages/search.vue
index 1f9fd757b4..2b4baec5d2 100644
--- a/packages/frontend/src/pages/search.vue
+++ b/packages/frontend/src/pages/search.vue
@@ -19,7 +19,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 		<MkSpacer v-if="tab === 'anote'" key="anote" :contentMax="800">
 			<div v-if="advanccedNotesSearchAvailable">
-				<XAnote/>
+				<XAnote v-bind="props"/>
 			</div>
 			<div v-else>
 				<MkInfo warn>{{ i18n.ts.notesAdvancedSearchNotAvailable }}</MkInfo>
@@ -50,6 +50,15 @@ const props = withDefaults(defineProps<{
 	userId?: string,
 	username?: string,
 	host?: string | null,
+	fileAttach?: string;
+	fileSensitive?: string;
+	reactions?: string;
+	reactionsExclude?: string;
+	following?: string;
+	excludeReply?: boolean;
+	excludeCw?: boolean;
+	excludeQuote?: boolean;
+	strictSearch?: boolean;
 	type?: 'note' | 'user' | 'anote' | 'event',
 	origin?: 'combined' | 'local' | 'remote',
 	// For storybook only
@@ -59,6 +68,15 @@ const props = withDefaults(defineProps<{
 	userId: undefined,
 	username: undefined,
 	host: undefined,
+	fileAttach: 'combined',
+	fileSensitive: 'combined',
+	reactions: '',
+	reactionsExclude: '',
+	following: 'combined',
+	excludeReply: false,
+	excludeCw: false,
+	excludeQuote: false,
+	strictSearch: false,
 	type: 'note',
 	origin: 'combined',
 	ignoreNotesSearchAvailable: false,
diff --git a/packages/frontend/src/router/definition.ts b/packages/frontend/src/router/definition.ts
index 17e639627c..f253f54a61 100644
--- a/packages/frontend/src/router/definition.ts
+++ b/packages/frontend/src/router/definition.ts
@@ -247,6 +247,15 @@ const routes: RouteDef[] = [{
 		userId: 'userId',
 		username: 'username',
 		host: 'host',
+		fileAttach: 'fileAttach',
+		fileSensitive: 'fileSensitive',
+		reactions: 'reactions',
+		reactionsExclude: 'reactionsExclude',
+		following: 'following',
+		excludeReply: 'excludeReply',
+		excludeCw: 'excludeCw',
+		excludeQuote: 'excludeQuote',
+		strictSearch: 'strictSearch',
 		channel: 'channel',
 		type: 'type',
 		origin: 'origin',

From 9e275a8216be1f3b144c9c34e6158c38b70f2f64 Mon Sep 17 00:00:00 2001
From: penginn-net <121443048+penginn-net@users.noreply.github.com>
Date: Sat, 19 Oct 2024 01:21:05 +0900
Subject: [PATCH 2/2] fix

---
 packages/frontend/src/pages/search.anote.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/src/pages/search.anote.vue b/packages/frontend/src/pages/search.anote.vue
index ab5617136f..0b319b2ebd 100644
--- a/packages/frontend/src/pages/search.anote.vue
+++ b/packages/frontend/src/pages/search.anote.vue
@@ -121,6 +121,7 @@ import FormSection from '@/components/form/section.vue';
 import { $i } from '@/account.js';
 import { instance } from '@/instance.js';
 import { emojiPicker } from '@/scripts/emoji-picker';
+import { Paging } from '@/components/MkPagination.vue';
 
 const props = withDefaults(defineProps<{
 		query?: string;