From 2ff5ed6942b402835b48f83f2b0d2cea8f82d4ed Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Thu, 4 Jul 2024 09:59:15 +0900
Subject: [PATCH 01/24] =?UTF-8?q?refactor(frontend):=20noteSearchAvailable?=
 =?UTF-8?q?=E3=82=92accounts=E3=81=AB=E7=A7=BB=E5=8B=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/account.ts       | 3 +++
 packages/frontend/src/pages/search.vue | 5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/account.ts b/packages/frontend/src/account.ts
index f99b550a8344..3496377a46b5 100644
--- a/packages/frontend/src/account.ts
+++ b/packages/frontend/src/account.ts
@@ -14,6 +14,7 @@ import { apiUrl } from '@/config.js';
 import { waiting, popup, popupMenu, success, alert } from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { unisonReload, reloadChannel } from '@/scripts/unison-reload.js';
+import { instance } from '@/instance.js';
 
 // TODO: 他のタブと永続化されたstateを同期
 
@@ -27,6 +28,8 @@ export const $i = accountData ? reactive(JSON.parse(accountData) as Account) : n
 export const iAmModerator = $i != null && ($i.isAdmin === true || $i.isModerator === true);
 export const iAmAdmin = $i != null && $i.isAdmin;
 
+export const notesSearchAvailable = (($i == null && instance.policies.canSearchNotes) || ($i != null && $i.policies.canSearchNotes));
+
 export function signinRequired() {
 	if ($i == null) throw new Error('signin required');
 	return $i;
diff --git a/packages/frontend/src/pages/search.vue b/packages/frontend/src/pages/search.vue
index a3dcda77beb2..3faf2a1c15f6 100644
--- a/packages/frontend/src/pages/search.vue
+++ b/packages/frontend/src/pages/search.vue
@@ -28,8 +28,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 import { computed, defineAsyncComponent, ref } from 'vue';
 import { i18n } from '@/i18n.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
-import { $i } from '@/account.js';
-import { instance } from '@/instance.js';
+import { notesSearchAvailable } from '@/account.js';
 import MkInfo from '@/components/MkInfo.vue';
 import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
 
@@ -38,8 +37,6 @@ const XUser = defineAsyncComponent(() => import('./search.user.vue'));
 
 const tab = ref('note');
 
-const notesSearchAvailable = (($i == null && instance.policies.canSearchNotes) || ($i != null && $i.policies.canSearchNotes));
-
 const headerActions = computed(() => []);
 
 const headerTabs = computed(() => [{

From 678c1395c6131f5c94835476de6a48e495993980 Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Thu, 4 Jul 2024 10:04:24 +0900
Subject: [PATCH 02/24] =?UTF-8?q?feat:=20search=E3=83=9A=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=81=A7=E3=81=AE=E3=82=AF=E3=82=A8=E3=83=AA=E3=81=AE=E5=8F=97?=
 =?UTF-8?q?=E5=8F=96=E3=82=8A=E3=81=A8type=E3=81=AB=E3=82=88=E3=82=8B?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=82=BF=E3=83=96=E3=81=AE=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/search.vue     | 24 ++++++++++++++++++----
 packages/frontend/src/router/definition.ts |  3 +++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/pages/search.vue b/packages/frontend/src/pages/search.vue
index 3faf2a1c15f6..8e0863c2f5a3 100644
--- a/packages/frontend/src/pages/search.vue
+++ b/packages/frontend/src/pages/search.vue
@@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<MkHorizontalSwipe v-model:tab="tab" :tabs="headerTabs">
 		<MkSpacer v-if="tab === 'note'" key="note" :contentMax="800">
 			<div v-if="notesSearchAvailable">
-				<XNote/>
+				<XNote v-bind="props"/>
 			</div>
 			<div v-else>
 				<MkInfo warn>{{ i18n.ts.notesSearchNotAvailable }}</MkInfo>
@@ -18,24 +18,40 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</MkSpacer>
 
 		<MkSpacer v-else-if="tab === 'user'" key="user" :contentMax="800">
-			<XUser/>
+			<XUser v-bind="props"/>
 		</MkSpacer>
 	</MkHorizontalSwipe>
 </MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed, defineAsyncComponent, ref } from 'vue';
+import { computed, defineAsyncComponent, defineProps, ref, toRef } from 'vue';
 import { i18n } from '@/i18n.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { notesSearchAvailable } from '@/account.js';
 import MkInfo from '@/components/MkInfo.vue';
 import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
 
+const props = withDefaults(defineProps<{
+	query?: string,
+	userId?: string,
+	username?: string,
+	host?: string,
+	type?: 'note' | 'user',
+	origin?: 'combined' | 'local' | 'remote',
+}>(), {
+	query: '',
+	userId: undefined,
+	username: undefined,
+	host: undefined,
+	type: 'note',
+	origin: 'combined',
+});
+
 const XNote = defineAsyncComponent(() => import('./search.note.vue'));
 const XUser = defineAsyncComponent(() => import('./search.user.vue'));
 
-const tab = ref('note');
+const tab = ref(toRef(props, 'type').value);
 
 const headerActions = computed(() => []);
 
diff --git a/packages/frontend/src/router/definition.ts b/packages/frontend/src/router/definition.ts
index 12ab633af12b..ff290cf4079c 100644
--- a/packages/frontend/src/router/definition.ts
+++ b/packages/frontend/src/router/definition.ts
@@ -232,6 +232,9 @@ const routes: RouteDef[] = [{
 	component: page(() => import('@/pages/search.vue')),
 	query: {
 		q: 'query',
+		userId: 'userId',
+		username: 'username',
+		host: 'host',
 		channel: 'channel',
 		type: 'type',
 		origin: 'origin',

From aa37858991b7e0347e18b556a4dfe37163a55d3f Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Thu, 4 Jul 2024 10:07:28 +0900
Subject: [PATCH 03/24] =?UTF-8?q?user=E6=A4=9C=E7=B4=A2=E3=81=A7search?=
 =?UTF-8?q?=E3=81=AE=E8=A6=AA=E3=81=8B=E3=82=89=E5=8F=97=E3=81=91=E5=8F=96?=
 =?UTF-8?q?=E3=81=A3=E3=81=9F=E5=80=A4=E3=82=92=E5=9F=BA=E3=81=AB=E5=85=A5?=
 =?UTF-8?q?=E5=8A=9B=E5=80=A4=E3=82=92=E5=88=9D=E6=9C=9F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/search.user.vue | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/pages/search.user.vue b/packages/frontend/src/pages/search.user.vue
index b9c2704bc722..d6033d7f6a70 100644
--- a/packages/frontend/src/pages/search.user.vue
+++ b/packages/frontend/src/pages/search.user.vue
@@ -25,7 +25,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
+import { ref, toRef } from 'vue';
+import type { Endpoints } from 'misskey-js';
+import type { Paging } from '@/components/MkPagination.vue';
 import MkUserList from '@/components/MkUserList.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkRadios from '@/components/MkRadios.vue';
@@ -36,12 +38,20 @@ import MkFoldableSection from '@/components/MkFoldableSection.vue';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { useRouter } from '@/router/supplier.js';
 
+const props = withDefaults(defineProps<{
+	query?: string,
+	origin?: Endpoints['users/search']['req']['origin'],
+}>(), {
+	query: '',
+	origin: 'combined',
+});
+
 const router = useRouter();
 
 const key = ref('');
-const searchQuery = ref('');
-const searchOrigin = ref('combined');
-const userPagination = ref();
+const searchQuery = ref(toRef(props, 'query').value);
+const searchOrigin = ref(toRef(props, 'origin').value);
+const userPagination = ref<Paging>();
 
 async function search() {
 	const query = searchQuery.value.toString().trim();

From 9ccf32a3a3b70ec3b6d5f1addc2aadf805fcfb77 Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Thu, 4 Jul 2024 10:18:21 +0900
Subject: [PATCH 04/24] =?UTF-8?q?feat(frontend):=20=E3=83=8E=E3=83=BC?=
 =?UTF-8?q?=E3=83=88=E6=A4=9C=E7=B4=A2=E3=81=A7=E8=A6=AA(search)=E3=81=8B?=
 =?UTF-8?q?=E3=82=89=E3=81=AE=E6=83=85=E5=A0=B1=E3=82=92=E5=9F=BA=E3=81=AB?=
 =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC=E6=83=85=E5=A0=B1=E3=82=92?=
 =?UTF-8?q?=E5=8F=96=E5=BE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/search.note.vue | 33 +++++++++++++++++----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/packages/frontend/src/pages/search.note.vue b/packages/frontend/src/pages/search.note.vue
index d68bbaeeca2b..c2a0a8b89394 100644
--- a/packages/frontend/src/pages/search.note.vue
+++ b/packages/frontend/src/pages/search.note.vue
@@ -42,7 +42,9 @@ 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 'misskey-js/entities.js';
+import type { Paging } from '@/components/MkPagination.vue';
 import MkNotes from '@/components/MkNotes.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkButton from '@/components/MkButton.vue';
@@ -54,15 +56,36 @@ import MkFoldableSection from '@/components/MkFoldableSection.vue';
 import MkFolder from '@/components/MkFolder.vue';
 import { useRouter } from '@/router/supplier.js';
 
+const props = withDefaults(defineProps<{
+	query?: string;
+	userId?: string;
+	username?: string;
+	host?: string;
+}>(), {
+	query: '',
+	userId: undefined,
+	username: undefined,
+	host: '',
+});
+
 const router = useRouter();
 
 const key = ref(0);
-const searchQuery = ref('');
-const searchOrigin = ref('combined');
-const notePagination = ref();
-const user = ref<any>(null);
+const searchQuery = ref(toRef(props, 'query').value);
+const notePagination = ref<Paging>();
+const user = ref<UserDetailed | null>(null);
 const isLocalOnly = ref(false);
 
+if (props.userId != null) {
+	misskeyApi('users/show', { userId: props.userId }).then(_user => {
+		user.value = _user;
+	});
+} else if (props.username != null) {
+	misskeyApi('users/show', { username: props.username, host: props.host }).then(_user => {
+		user.value = _user;
+	});
+}
+
 function selectUser() {
 	os.selectUser({ includeSelf: true }).then(_user => {
 		user.value = _user;

From b4f2184c4a798235dcf323d23ef8232baf3da742 Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Thu, 4 Jul 2024 10:20:57 +0900
Subject: [PATCH 05/24] =?UTF-8?q?feat(frontend):=20=E3=83=A6=E3=83=BC?=
 =?UTF-8?q?=E3=82=B6=E3=83=BC=E3=81=AE=E3=83=8E=E3=83=BC=E3=83=88=E3=82=92?=
 =?UTF-8?q?=E6=A4=9C=E7=B4=A2=E3=81=99=E3=82=8B=E3=83=9A=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=81=AB=E9=81=B7=E7=A7=BB=E3=81=99=E3=82=8B=E3=83=9C=E3=82=BF?=
 =?UTF-8?q?=E3=83=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/index.d.ts                             |  4 ++++
 locales/ja-JP.yml                              |  1 +
 packages/frontend/src/scripts/get-user-menu.ts | 11 +++++++++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index ebd980ed8555..1cfb05ddb7ab 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -256,6 +256,10 @@ export interface Locale extends ILocale {
      * ユーザーを検索
      */
     "searchUser": string;
+    /**
+     * ユーザーのノートを検索
+     */
+    "searchThisUsersNotes": string;
     /**
      * 返信
      */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 0d89d33abeec..f80ebdf7e4ba 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -60,6 +60,7 @@ copyFileId: "ファイルIDをコピー"
 copyFolderId: "フォルダーIDをコピー"
 copyProfileUrl: "プロフィールURLをコピー"
 searchUser: "ユーザーを検索"
+searchThisUsersNotes: "ユーザーのノートを検索"
 reply: "返信"
 loadMore: "もっと見る"
 showMore: "もっと見る"
diff --git a/packages/frontend/src/scripts/get-user-menu.ts b/packages/frontend/src/scripts/get-user-menu.ts
index 3e031d232ff9..70431c851bdb 100644
--- a/packages/frontend/src/scripts/get-user-menu.ts
+++ b/packages/frontend/src/scripts/get-user-menu.ts
@@ -12,7 +12,7 @@ import { host, url } from '@/config.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { defaultStore, userActions } from '@/store.js';
-import { $i, iAmModerator } from '@/account.js';
+import { $i, iAmModerator, notesSearchAvailable } from '@/account.js';
 import { IRouter } from '@/nirax.js';
 import { antennasCache, rolesCache, userListsCache } from '@/cache.js';
 import { mainRouter } from '@/router/main.js';
@@ -158,7 +158,14 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
 		action: () => {
 			copyToClipboard(`@${user.username}@${user.host ?? host}`);
 		},
-	}, ...(iAmModerator ? [{
+	}, ...( notesSearchAvailable ? [{
+		icon: 'ti ti-search',
+		text: i18n.ts.searchThisUsersNotes,
+		action: () => {
+			router.push(`/search?username=${encodeURIComponent(user.username)}${user.host != null ? '&host=' + encodeURIComponent(user.host) : ''}`);
+		},
+	}] : [])
+	, ...(iAmModerator ? [{
 		icon: 'ti ti-user-exclamation',
 		text: i18n.ts.moderation,
 		action: () => {

From 76145e4827fe1d0a3815b30b4b62cc9f29a37f4c Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Thu, 4 Jul 2024 10:23:22 +0900
Subject: [PATCH 06/24] =?UTF-8?q?feat(frontend):=20=E3=83=8E=E3=83=BC?=
 =?UTF-8?q?=E3=83=88=E6=A4=9C=E7=B4=A2=E3=81=AB=E3=83=9B=E3=82=B9=E3=83=88?=
 =?UTF-8?q?=E5=90=8D=E6=8C=87=E5=AE=9A=E3=81=AE=E3=82=AA=E3=83=97=E3=82=B7?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E8=BF=BD=E5=8A=A0=20also=20:art:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/index.d.ts                          |  4 +
 locales/ja-JP.yml                           |  1 +
 packages/frontend/src/pages/search.note.vue | 95 +++++++++++++++++----
 3 files changed, 84 insertions(+), 16 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 1cfb05ddb7ab..30666f2d7dae 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -4464,6 +4464,10 @@ export interface Locale extends ILocale {
      * ユーザー指定
      */
     "specifyUser": string;
+    /**
+     * ホスト指定
+     */
+    "specifyHost": string;
     /**
      * プレビューできません
      */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index f80ebdf7e4ba..92df56cec583 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1112,6 +1112,7 @@ preventAiLearning: "生成AIによる学習を拒否"
 preventAiLearningDescription: "外部の文章生成AIや画像生成AIに対して、投稿したノートや画像などのコンテンツを学習の対象にしないように要求します。これはnoaiフラグをHTMLレスポンスに含めることによって実現されますが、この要求に従うかはそのAI次第であるため、学習を完全に防止するものではありません。"
 options: "オプション"
 specifyUser: "ユーザー指定"
+specifyHost: "ホスト指定"
 failedToPreviewUrl: "プレビューできません"
 update: "更新"
 rolesThatCanBeUsedThisEmojiAsReaction: "リアクションとして使えるロール"
diff --git a/packages/frontend/src/pages/search.note.vue b/packages/frontend/src/pages/search.note.vue
index c2a0a8b89394..4cc4f1b23aa1 100644
--- a/packages/frontend/src/pages/search.note.vue
+++ b/packages/frontend/src/pages/search.note.vue
@@ -9,26 +9,34 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<MkInput v-model="searchQuery" :large="true" :autofocus="true" type="search" @enter="search">
 			<template #prefix><i class="ti ti-search"></i></template>
 		</MkInput>
-		<MkFolder>
-			<template #label>{{ i18n.ts.options }}</template>
+		<MkFoldableSection :expanded="true">
+			<template #header>{{ i18n.ts.options }}</template>
 
 			<div class="_gaps_m">
-				<MkSwitch v-model="isLocalOnly">{{ i18n.ts.localOnly }}</MkSwitch>
+				<MkRadios v-model="hostSelect">
+					<template #label>{{ i18n.ts.host }}</template>
+					<option value="all" default>{{ i18n.ts.all }}</option>
+					<option value="local">{{ i18n.ts.local }}</option>
+					<option value="specified">{{ i18n.ts.specifyHost }}</option>
+				</MkRadios>
+				<MkInput v-model="hostInput" :disabled="hostSelect !== 'specified'" :large="true" type="search">
+					<template #prefix><i class="ti ti-server"></i></template>
+				</MkInput>
 
 				<MkFolder :defaultOpen="true">
 					<template #label>{{ i18n.ts.specifyUser }}</template>
-					<template v-if="user" #suffix>@{{ user.username }}</template>
+					<template v-if="user" #suffix>@{{ user.username }}{{ user.host ? `@${user.host}` : "" }}</template>
 
-					<div style="text-align: center;" class="_gaps">
-						<div v-if="user">@{{ user.username }}</div>
-						<div>
-							<MkButton v-if="user == null" primary rounded inline @click="selectUser">{{ i18n.ts.selectUser }}</MkButton>
-							<MkButton v-else danger rounded inline @click="user = null">{{ i18n.ts.remove }}</MkButton>
+					<div class="_gaps">
+						<div :class="$style.userItem">
+							<MkUserCardMini v-if="user" :class="$style.userCard" :user="user" :withChart="false"/>
+							<MkButton v-if="user == null" primary :class="$style.addUserButton" @click="selectUser"><div :class="$style.addUserButtonInner">{{ i18n.ts.selectUser }}</div></MkButton>
+							<button class="_button" :class="$style.remove" :disabled="user == null" @click="removeUser"><i class="ti ti-x"></i></button>
 						</div>
 					</div>
 				</MkFolder>
 			</div>
-		</MkFolder>
+		</MkFoldableSection>
 		<div>
 			<MkButton large primary gradate rounded style="margin: 0 auto;" @click="search">{{ i18n.ts.search }}</MkButton>
 		</div>
@@ -42,19 +50,20 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { ref, toRef } from 'vue';
+import { computed, ref, toRef, watch } from 'vue';
 import type { UserDetailed } from 'misskey-js/entities.js';
 import type { Paging } from '@/components/MkPagination.vue';
 import MkNotes from '@/components/MkNotes.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkButton from '@/components/MkButton.vue';
-import MkSwitch from '@/components/MkSwitch.vue';
 import { i18n } from '@/i18n.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import MkFoldableSection from '@/components/MkFoldableSection.vue';
 import MkFolder from '@/components/MkFolder.vue';
 import { useRouter } from '@/router/supplier.js';
+import MkUserCardMini from '@/components/MkUserCardMini.vue';
+import MkRadios from '@/components/MkRadios.vue';
 
 const props = withDefaults(defineProps<{
 	query?: string;
@@ -69,12 +78,29 @@ const props = withDefaults(defineProps<{
 });
 
 const router = useRouter();
-
 const key = ref(0);
 const searchQuery = ref(toRef(props, 'query').value);
 const notePagination = ref<Paging>();
 const user = ref<UserDetailed | null>(null);
-const isLocalOnly = ref(false);
+const hostInput = ref(toRef(props, 'host').value);
+
+const hostSelect = ref<'all' | 'local' | 'specified'>('all');
+
+const setHostSelectWithInput = (after:string|undefined, before:string|undefined) => {
+	if (before === after) return;
+	if (after === '') hostSelect.value = 'all';
+	else hostSelect.value = 'specified';
+};
+
+setHostSelectWithInput(undefined, hostInput.value);
+
+watch(hostInput, setHostSelectWithInput);
+
+const searchHost = computed(() => {
+	if (hostSelect.value === 'local') return '.';
+	if (hostSelect.value === 'specified') return hostInput.value;
+	return null;
+});
 
 if (props.userId != null) {
 	misskeyApi('users/show', { userId: props.userId }).then(_user => {
@@ -89,9 +115,15 @@ if (props.userId != null) {
 function selectUser() {
 	os.selectUser({ includeSelf: true }).then(_user => {
 		user.value = _user;
+		hostInput.value = _user.host ?? '';
 	});
 }
 
+function removeUser() {
+	user.value = null;
+	hostInput.value = '';
+}
+
 async function search() {
 	const query = searchQuery.value.toString().trim();
 
@@ -121,11 +153,42 @@ async function search() {
 		params: {
 			query: searchQuery.value,
 			userId: user.value ? user.value.id : null,
+			...(searchHost.value ? { host: searchHost.value } : {}),
 		},
 	};
 
-	if (isLocalOnly.value) notePagination.value.params.host = '.';
-
 	key.value++;
 }
 </script>
+<style lang="scss" module>
+.userItem {
+	display: flex;
+	justify-content: center;
+}
+.addUserButton {
+	padding: 16px;
+	flex-grow: 1;
+}
+.addUserButtonInner {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	min-height: 35px;
+}
+.userCard {
+	flex-grow: 1;
+}
+.remove {
+	width: 32px;
+	height: 32px;
+	align-self: center;
+
+	& > i:before {
+		color: #ff2a2a;
+	}
+
+	&:disabled {
+		opacity: 0;
+	}
+}
+</style>

From 25b2d4ccf9d471f1beb792d3fd0216a458c0ded8 Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Thu, 4 Jul 2024 10:24:26 +0900
Subject: [PATCH 07/24] =?UTF-8?q?style:=20=E3=81=9F=E3=81=A0=E7=85=A7?=
 =?UTF-8?q?=E4=BC=9A=E9=83=A8=E5=88=86=E3=82=92=E5=9B=B2=E3=81=A3=E3=81=9F?=
 =?UTF-8?q?=E3=81=A0=E3=81=91=EF=BC=88=E5=8F=AF=E8=AA=AD=E6=80=A7=E7=A2=BA?=
 =?UTF-8?q?=E4=BF=9D=E3=81=AE=E3=81=9F=E3=82=81=E3=81=AB=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/search.note.vue | 2 ++
 packages/frontend/src/pages/search.user.vue | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/packages/frontend/src/pages/search.note.vue b/packages/frontend/src/pages/search.note.vue
index 4cc4f1b23aa1..81fce68162e3 100644
--- a/packages/frontend/src/pages/search.note.vue
+++ b/packages/frontend/src/pages/search.note.vue
@@ -129,6 +129,7 @@ async function search() {
 
 	if (query == null || query === '') return;
 
+	//#region AP lookup
 	if (query.startsWith('https://')) {
 		const promise = misskeyApi('ap/show', {
 			uri: query,
@@ -146,6 +147,7 @@ async function search() {
 
 		return;
 	}
+	//#endregion
 
 	notePagination.value = {
 		endpoint: 'notes/search',
diff --git a/packages/frontend/src/pages/search.user.vue b/packages/frontend/src/pages/search.user.vue
index d6033d7f6a70..85d869d9cba7 100644
--- a/packages/frontend/src/pages/search.user.vue
+++ b/packages/frontend/src/pages/search.user.vue
@@ -58,6 +58,7 @@ async function search() {
 
 	if (query == null || query === '') return;
 
+	//#region AP lookup
 	if (query.startsWith('https://')) {
 		const promise = misskeyApi('ap/show', {
 			uri: query,
@@ -75,6 +76,7 @@ async function search() {
 
 		return;
 	}
+	//#endregion
 
 	userPagination.value = {
 		endpoint: 'users/search',

From 77bdca1c65d682242a1ec8fd307177f7c68ed508 Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Thu, 4 Jul 2024 10:27:52 +0900
Subject: [PATCH 08/24] refactor: remove unneed import defineProps and
 withDefaults are compiler micro when using `<script setup>` FYI:
 https://vuejs.org/api/sfc-script-setup.html#defineprops-defineemits:~:text=defineProps%20and%20defineEmits%20are%20compiler%20macros%20only%20usable%20inside%20%3Cscript%20setup%3E.%20They%20do%20not%20need%20to%20be%20imported%2C%20and%20are%20compiled%20away%20when%20%3Cscript%20setup%3E%20is%20processed.

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

diff --git a/packages/frontend/src/pages/search.vue b/packages/frontend/src/pages/search.vue
index 8e0863c2f5a3..12c31466f741 100644
--- a/packages/frontend/src/pages/search.vue
+++ b/packages/frontend/src/pages/search.vue
@@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { computed, defineAsyncComponent, defineProps, ref, toRef } from 'vue';
+import { computed, defineAsyncComponent, ref, toRef } from 'vue';
 import { i18n } from '@/i18n.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { notesSearchAvailable } from '@/account.js';

From 72c46586804bad156c2633db5ad48e283ca32d14 Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Thu, 4 Jul 2024 11:10:36 +0900
Subject: [PATCH 09/24] Update CHANGELOG

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a28c9ef640a..6ab84b991d32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,9 @@
 - Fix: コントロールパネルでベースロールのポリシーを編集してもUI上では変更が反映されない問題を修正 
 - Fix: アンテナの編集画面のボタンに隙間を追加
 - Fix: テーマプレビューが見れない問題を修正
+- Feat: ユーザーページから「このユーザーのノートを検索」できるように (#14128)
+- Feat: 検索ページはクエリを受け付けるようになりました (#14128)
+- Enhance: 検索ページのUI改善 (#14128)
 
 ### Server
 - チャート生成時にinstance.suspentionStateに置き換えられたinstance.isSuspendedが参照されてしまう問題を修正

From 83cc950f75b7dcf4c52fc710413d85670cec81c4 Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Thu, 4 Jul 2024 11:14:34 +0900
Subject: [PATCH 10/24] =?UTF-8?q?Fix:=20=E3=83=8E=E3=83=BC=E3=83=88?=
 =?UTF-8?q?=E6=A4=9C=E7=B4=A2=E3=81=AE=E5=88=9D=E6=9C=9F=E5=80=A4=E3=81=8C?=
 =?UTF-8?q?=E5=B8=B8=E3=81=AB=E3=83=9B=E3=82=B9=E3=83=88=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/packages/frontend/src/pages/search.note.vue b/packages/frontend/src/pages/search.note.vue
index 81fce68162e3..b7d9e20718de 100644
--- a/packages/frontend/src/pages/search.note.vue
+++ b/packages/frontend/src/pages/search.note.vue
@@ -92,7 +92,7 @@ const setHostSelectWithInput = (after:string|undefined, before:string|undefined)
 	else hostSelect.value = 'specified';
 };
 
-setHostSelectWithInput(undefined, hostInput.value);
+setHostSelectWithInput(hostInput.value, undefined);
 
 watch(hostInput, setHostSelectWithInput);
 

From 0e9d275a57bde4d790d3e8902ea3b67eeca5ccd0 Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Thu, 4 Jul 2024 11:42:02 +0900
Subject: [PATCH 11/24] =?UTF-8?q?notesSearchAvailable=E3=82=92account?=
 =?UTF-8?q?=E3=81=AB=E6=8C=81=E3=81=9F=E3=81=9B=E3=82=8B=E3=81=AE=E3=82=92?=
 =?UTF-8?q?=E3=82=84=E3=82=81=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/account.ts                   | 3 ---
 packages/frontend/src/pages/search.vue             | 2 +-
 packages/frontend/src/scripts/check-permissions.ts | 4 ++++
 packages/frontend/src/scripts/get-user-menu.ts     | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 packages/frontend/src/scripts/check-permissions.ts

diff --git a/packages/frontend/src/account.ts b/packages/frontend/src/account.ts
index 3496377a46b5..f99b550a8344 100644
--- a/packages/frontend/src/account.ts
+++ b/packages/frontend/src/account.ts
@@ -14,7 +14,6 @@ import { apiUrl } from '@/config.js';
 import { waiting, popup, popupMenu, success, alert } from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { unisonReload, reloadChannel } from '@/scripts/unison-reload.js';
-import { instance } from '@/instance.js';
 
 // TODO: 他のタブと永続化されたstateを同期
 
@@ -28,8 +27,6 @@ export const $i = accountData ? reactive(JSON.parse(accountData) as Account) : n
 export const iAmModerator = $i != null && ($i.isAdmin === true || $i.isModerator === true);
 export const iAmAdmin = $i != null && $i.isAdmin;
 
-export const notesSearchAvailable = (($i == null && instance.policies.canSearchNotes) || ($i != null && $i.policies.canSearchNotes));
-
 export function signinRequired() {
 	if ($i == null) throw new Error('signin required');
 	return $i;
diff --git a/packages/frontend/src/pages/search.vue b/packages/frontend/src/pages/search.vue
index 12c31466f741..88c3500aa21f 100644
--- a/packages/frontend/src/pages/search.vue
+++ b/packages/frontend/src/pages/search.vue
@@ -28,7 +28,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 import { computed, defineAsyncComponent, ref, toRef } from 'vue';
 import { i18n } from '@/i18n.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
-import { notesSearchAvailable } from '@/account.js';
+import { notesSearchAvailable } from '@/scripts/check-permissions.js';
 import MkInfo from '@/components/MkInfo.vue';
 import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue';
 
diff --git a/packages/frontend/src/scripts/check-permissions.ts b/packages/frontend/src/scripts/check-permissions.ts
new file mode 100644
index 000000000000..7b4574b5111b
--- /dev/null
+++ b/packages/frontend/src/scripts/check-permissions.ts
@@ -0,0 +1,4 @@
+import { instance } from '@/instance.js';
+import { $i } from '@/account.js';
+
+export const notesSearchAvailable = (($i == null && instance.policies.canSearchNotes) || ($i != null && $i.policies.canSearchNotes)) as boolean;
diff --git a/packages/frontend/src/scripts/get-user-menu.ts b/packages/frontend/src/scripts/get-user-menu.ts
index 70431c851bdb..5d7e5308a00c 100644
--- a/packages/frontend/src/scripts/get-user-menu.ts
+++ b/packages/frontend/src/scripts/get-user-menu.ts
@@ -12,7 +12,8 @@ import { host, url } from '@/config.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { defaultStore, userActions } from '@/store.js';
-import { $i, iAmModerator, notesSearchAvailable } from '@/account.js';
+import { $i, iAmModerator } from '@/account.js';
+import { notesSearchAvailable } from '@/scripts/check-permissions.js';
 import { IRouter } from '@/nirax.js';
 import { antennasCache, rolesCache, userListsCache } from '@/cache.js';
 import { mainRouter } from '@/router/main.js';

From e1b2a550db3c5ae77472f442e0d635de849522a3 Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Thu, 4 Jul 2024 11:43:34 +0900
Subject: [PATCH 12/24] SDPX-Licence-Identifier

---
 packages/frontend/src/scripts/check-permissions.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/frontend/src/scripts/check-permissions.ts b/packages/frontend/src/scripts/check-permissions.ts
index 7b4574b5111b..8b545211f7ff 100644
--- a/packages/frontend/src/scripts/check-permissions.ts
+++ b/packages/frontend/src/scripts/check-permissions.ts
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 import { instance } from '@/instance.js';
 import { $i } from '@/account.js';
 

From bc5fb65475c34dfc3653d4116122f5e2395f2fdc Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Thu, 4 Jul 2024 12:00:25 +0900
Subject: [PATCH 13/24] Fix: Vitest fails due to instance.policies being
 undefined

---
 packages/frontend/src/scripts/check-permissions.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/scripts/check-permissions.ts b/packages/frontend/src/scripts/check-permissions.ts
index 8b545211f7ff..080f8393e545 100644
--- a/packages/frontend/src/scripts/check-permissions.ts
+++ b/packages/frontend/src/scripts/check-permissions.ts
@@ -6,4 +6,10 @@
 import { instance } from '@/instance.js';
 import { $i } from '@/account.js';
 
-export const notesSearchAvailable = (($i == null && instance.policies.canSearchNotes) || ($i != null && $i.policies.canSearchNotes)) as boolean;
+export const notesSearchAvailable = (
+	// FIXME: instance.policies would be null in Vitest
+	// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+	($i == null && instance.policies != null && instance.policies.canSearchNotes) ||
+	($i != null && $i.policies.canSearchNotes) ||
+	false
+) as boolean;

From 9e0bda5805323477ea7ab85b4131e1af17e4c829 Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Thu, 4 Jul 2024 13:15:30 +0900
Subject: [PATCH 14/24] Add Storybook for search

---
 packages/frontend/.storybook/fakes.ts         |  2 +-
 packages/frontend/.storybook/generate.tsx     |  1 +
 packages/frontend/src/pages/search.note.vue   |  4 +-
 .../frontend/src/pages/search.stories.impl.ts | 75 +++++++++++++++++++
 packages/frontend/src/pages/search.vue        |  2 +-
 5 files changed, 80 insertions(+), 4 deletions(-)
 create mode 100644 packages/frontend/src/pages/search.stories.impl.ts

diff --git a/packages/frontend/.storybook/fakes.ts b/packages/frontend/.storybook/fakes.ts
index 9d789a34ff90..01f10466095f 100644
--- a/packages/frontend/.storybook/fakes.ts
+++ b/packages/frontend/.storybook/fakes.ts
@@ -154,7 +154,7 @@ export function federationInstance(): entities.FederationInstance {
 	};
 }
 
-export function userDetailed(id = 'someuserid', username = 'miskist', host = 'misskey-hub.net', name = 'Misskey User'): entities.UserDetailed {
+export function userDetailed(id = 'someuserid', username = 'miskist', host:entities.UserDetailed['host'] = 'misskey-hub.net', name:entities.UserDetailed['name'] = 'Misskey User'): entities.UserDetailed {
 	return {
 		id,
 		username,
diff --git a/packages/frontend/.storybook/generate.tsx b/packages/frontend/.storybook/generate.tsx
index 7b6c86447edc..b94dfc53e390 100644
--- a/packages/frontend/.storybook/generate.tsx
+++ b/packages/frontend/.storybook/generate.tsx
@@ -405,6 +405,7 @@ function toStories(component: string): Promise<string> {
 		glob('src/components/MkUserSetupDialog.*.vue'),
 		glob('src/components/MkInstanceCardMini.vue'),
 		glob('src/components/MkInviteCode.vue'),
+		glob('src/pages/search.vue'),
 		glob('src/pages/user/home.vue'),
 	]);
 	const components = globs.flat();
diff --git a/packages/frontend/src/pages/search.note.vue b/packages/frontend/src/pages/search.note.vue
index b7d9e20718de..03ebf8271c56 100644
--- a/packages/frontend/src/pages/search.note.vue
+++ b/packages/frontend/src/pages/search.note.vue
@@ -69,7 +69,7 @@ const props = withDefaults(defineProps<{
 	query?: string;
 	userId?: string;
 	username?: string;
-	host?: string;
+	host?: string | null;
 }>(), {
 	query: '',
 	userId: undefined,
@@ -86,7 +86,7 @@ const hostInput = ref(toRef(props, 'host').value);
 
 const hostSelect = ref<'all' | 'local' | 'specified'>('all');
 
-const setHostSelectWithInput = (after:string|undefined, before:string|undefined) => {
+const setHostSelectWithInput = (after:string|undefined|null, before:string|undefined|null) => {
 	if (before === after) return;
 	if (after === '') hostSelect.value = 'all';
 	else hostSelect.value = 'specified';
diff --git a/packages/frontend/src/pages/search.stories.impl.ts b/packages/frontend/src/pages/search.stories.impl.ts
new file mode 100644
index 000000000000..27dda2e835f1
--- /dev/null
+++ b/packages/frontend/src/pages/search.stories.impl.ts
@@ -0,0 +1,75 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { StoryObj } from '@storybook/vue3';
+import { HttpResponse, http } from 'msw';
+import search_ from './search.vue';
+import { userDetailed } from '@/../.storybook/fakes.js';
+import { commonHandlers } from '@/../.storybook/mocks.js';
+
+export const Default = {
+	render(args) {
+		return {
+			components: {
+				search_,
+			},
+			setup() {
+				return {
+					args,
+				};
+			},
+			computed: {
+				props() {
+					return {
+						...this.args,
+					};
+				},
+			},
+			template: '<search_ v-bind="props" />',
+		};
+	},
+	args: {},
+	parameters: {
+		layout: 'fullscreen',
+		msw: {
+			handlers: [
+				...commonHandlers,
+				http.post('/api/users/show', () => {
+					return HttpResponse.json(userDetailed());
+				}),
+			],
+		},
+	},
+} satisfies StoryObj<typeof search_>;
+
+export const WithUsername = {
+	...Default,
+	args: {
+		username: userDetailed().username,
+		host: userDetailed().host,
+	},
+} satisfies StoryObj<typeof search_>;
+
+const localUser = userDetailed('someuserid', 'miskist', null, 'Local Misskey User');
+
+export const WithUsernameLocal = {
+	...Default,
+
+	args: {
+		username: localUser.username,
+		host: localUser.host,
+	},
+	parameters: {
+		layout: 'fullscreen',
+		msw: {
+			handlers: [
+				...commonHandlers,
+				http.post('/api/users/show', () => {
+					return HttpResponse.json(localUser);
+				}),
+			],
+		},
+	},
+} satisfies StoryObj<typeof search_>;
diff --git a/packages/frontend/src/pages/search.vue b/packages/frontend/src/pages/search.vue
index 88c3500aa21f..43f223accc60 100644
--- a/packages/frontend/src/pages/search.vue
+++ b/packages/frontend/src/pages/search.vue
@@ -36,7 +36,7 @@ const props = withDefaults(defineProps<{
 	query?: string,
 	userId?: string,
 	username?: string,
-	host?: string,
+	host?: string | null,
 	type?: 'note' | 'user',
 	origin?: 'combined' | 'local' | 'remote',
 }>(), {

From f2859e26198a5f8551b48a8ff00d5845089149a3 Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Thu, 4 Jul 2024 13:26:06 +0900
Subject: [PATCH 15/24] =?UTF-8?q?Fix(storybook):=20=E3=83=8E=E3=83=BC?=
 =?UTF-8?q?=E3=83=88=E6=A4=9C=E7=B4=A2=E3=81=8C=E5=88=A9=E7=94=A8=E3=81=A7?=
 =?UTF-8?q?=E3=81=8D=E3=81=AA=E3=81=84=E3=81=A8=E5=87=BA=E3=81=A6=E3=81=97?=
 =?UTF-8?q?=E3=81=BE=E3=81=86=E5=95=8F=E9=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/search.stories.impl.ts | 11 ++++++++++-
 packages/frontend/src/pages/search.vue             |  5 ++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/pages/search.stories.impl.ts b/packages/frontend/src/pages/search.stories.impl.ts
index 27dda2e835f1..20b7565ac6f4 100644
--- a/packages/frontend/src/pages/search.stories.impl.ts
+++ b/packages/frontend/src/pages/search.stories.impl.ts
@@ -30,7 +30,9 @@ export const Default = {
 			template: '<search_ v-bind="props" />',
 		};
 	},
-	args: {},
+	args: {
+		ignoreNotesSearchAvailable: true,
+	},
 	parameters: {
 		layout: 'fullscreen',
 		msw: {
@@ -44,9 +46,15 @@ export const Default = {
 	},
 } satisfies StoryObj<typeof search_>;
 
+export const NoteSearchDisabled = {
+	...Default,
+	args: {},
+} satisfies StoryObj<typeof search_>;
+
 export const WithUsername = {
 	...Default,
 	args: {
+		...Default.args,
 		username: userDetailed().username,
 		host: userDetailed().host,
 	},
@@ -58,6 +66,7 @@ export const WithUsernameLocal = {
 	...Default,
 
 	args: {
+		...Default.args,
 		username: localUser.username,
 		host: localUser.host,
 	},
diff --git a/packages/frontend/src/pages/search.vue b/packages/frontend/src/pages/search.vue
index 43f223accc60..38d7548fa846 100644
--- a/packages/frontend/src/pages/search.vue
+++ b/packages/frontend/src/pages/search.vue
@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 	<MkHorizontalSwipe v-model:tab="tab" :tabs="headerTabs">
 		<MkSpacer v-if="tab === 'note'" key="note" :contentMax="800">
-			<div v-if="notesSearchAvailable">
+			<div v-if="notesSearchAvailable || ignoreNotesSearchAvailable">
 				<XNote v-bind="props"/>
 			</div>
 			<div v-else>
@@ -39,6 +39,8 @@ const props = withDefaults(defineProps<{
 	host?: string | null,
 	type?: 'note' | 'user',
 	origin?: 'combined' | 'local' | 'remote',
+	// For storybook only
+	ignoreNotesSearchAvailable?: boolean,
 }>(), {
 	query: '',
 	userId: undefined,
@@ -46,6 +48,7 @@ const props = withDefaults(defineProps<{
 	host: undefined,
 	type: 'note',
 	origin: 'combined',
+	ignoreNotesSearchAvailable: false,
 });
 
 const XNote = defineAsyncComponent(() => import('./search.note.vue'));

From 94c1a5c1b2a49df4e75181e031b8d1c9e39fd660 Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Thu, 4 Jul 2024 13:32:47 +0900
Subject: [PATCH 16/24] =?UTF-8?q?storybook=E3=81=A7=E3=83=A6=E3=83=BC?=
 =?UTF-8?q?=E3=82=B6=E3=83=BC=E9=81=B8=E6=8A=9E=E3=81=8C=E3=81=A7=E3=81=8D?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frontend/src/pages/search.stories.impl.ts | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/packages/frontend/src/pages/search.stories.impl.ts b/packages/frontend/src/pages/search.stories.impl.ts
index 20b7565ac6f4..0110a7ab8ed1 100644
--- a/packages/frontend/src/pages/search.stories.impl.ts
+++ b/packages/frontend/src/pages/search.stories.impl.ts
@@ -9,6 +9,8 @@ import search_ from './search.vue';
 import { userDetailed } from '@/../.storybook/fakes.js';
 import { commonHandlers } from '@/../.storybook/mocks.js';
 
+const localUser = userDetailed('someuserid', 'miskist', null, 'Local Misskey User');
+
 export const Default = {
 	render(args) {
 		return {
@@ -41,6 +43,9 @@ export const Default = {
 				http.post('/api/users/show', () => {
 					return HttpResponse.json(userDetailed());
 				}),
+				http.post('/api/users/search', () => {
+					return HttpResponse.json([userDetailed(), localUser]);
+				}),
 			],
 		},
 	},
@@ -51,17 +56,6 @@ export const NoteSearchDisabled = {
 	args: {},
 } satisfies StoryObj<typeof search_>;
 
-export const WithUsername = {
-	...Default,
-	args: {
-		...Default.args,
-		username: userDetailed().username,
-		host: userDetailed().host,
-	},
-} satisfies StoryObj<typeof search_>;
-
-const localUser = userDetailed('someuserid', 'miskist', null, 'Local Misskey User');
-
 export const WithUsernameLocal = {
 	...Default,
 
@@ -78,7 +72,17 @@ export const WithUsernameLocal = {
 				http.post('/api/users/show', () => {
 					return HttpResponse.json(localUser);
 				}),
+				http.post('/api/users/search', () => {
+					return HttpResponse.json([userDetailed(), localUser]);
+				}),
 			],
 		},
 	},
 } satisfies StoryObj<typeof search_>;
+
+export const WithUserType = {
+	...Default,
+	args: {
+		type: 'user',
+	},
+} satisfies StoryObj<typeof search_>;

From 3aa725219317e3af98b53de45358fff7b7706d0c Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Wed, 10 Jul 2024 20:40:51 +0900
Subject: [PATCH 17/24] =?UTF-8?q?feat:=20=E3=83=8E=E3=83=BC=E3=83=88?=
 =?UTF-8?q?=E6=A4=9C=E7=B4=A2=E3=81=A7=E8=87=AA=E5=88=86=E3=82=92=E9=81=B8?=
 =?UTF-8?q?=E6=8A=9E=E5=8F=AF=E8=83=BD=E3=81=AB=20&=20:art:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/index.d.ts                          |  4 ++++
 locales/ja-JP.yml                           |  1 +
 packages/frontend/src/pages/search.note.vue | 22 +++++++++++++++++----
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 30666f2d7dae..3ee37ff7b477 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -780,6 +780,10 @@ export interface Locale extends ILocale {
      * ホスト
      */
     "host": string;
+    /**
+     * 自分を選択
+     */
+    "selectSelf": string;
     /**
      * ユーザーを選択
      */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 92df56cec583..74d049015221 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -191,6 +191,7 @@ followConfirm: "{name}をフォローしますか？"
 proxyAccount: "プロキシアカウント"
 proxyAccountDescription: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
 host: "ホスト"
+selectSelf: "自分を選択"
 selectUser: "ユーザーを選択"
 recipient: "宛先"
 annotation: "注釈"
diff --git a/packages/frontend/src/pages/search.note.vue b/packages/frontend/src/pages/search.note.vue
index 03ebf8271c56..a1981666165c 100644
--- a/packages/frontend/src/pages/search.note.vue
+++ b/packages/frontend/src/pages/search.note.vue
@@ -30,7 +30,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<div class="_gaps">
 						<div :class="$style.userItem">
 							<MkUserCardMini v-if="user" :class="$style.userCard" :user="user" :withChart="false"/>
-							<MkButton v-if="user == null" primary :class="$style.addUserButton" @click="selectUser"><div :class="$style.addUserButtonInner">{{ i18n.ts.selectUser }}</div></MkButton>
+							<MkButton v-if="user == null && $i != null" transparent :class="$style.addMeButton" @click="selectSelf"><div :class="$style.addUserButtonInner"><span><i class="ti ti-plus"></i><i class="ti ti-user"></i></span><span>{{ i18n.ts.selectSelf }}</span></div></MkButton>
+							<MkButton v-if="user == null" transparent :class="$style.addUserButton" @click="selectUser"><div :class="$style.addUserButtonInner"><i class="ti ti-plus"></i><span>{{ i18n.ts.selectUser }}</span></div></MkButton>
 							<button class="_button" :class="$style.remove" :disabled="user == null" @click="removeUser"><i class="ti ti-x"></i></button>
 						</div>
 					</div>
@@ -64,6 +65,7 @@ import MkFolder from '@/components/MkFolder.vue';
 import { useRouter } from '@/router/supplier.js';
 import MkUserCardMini from '@/components/MkUserCardMini.vue';
 import MkRadios from '@/components/MkRadios.vue';
+import { $i } from '@/account.js';
 
 const props = withDefaults(defineProps<{
 	query?: string;
@@ -119,6 +121,11 @@ function selectUser() {
 	});
 }
 
+function selectSelf() {
+	user.value = $i as UserDetailed | null;
+	hostInput.value = null;
+}
+
 function removeUser() {
 	user.value = null;
 	hostInput.value = '';
@@ -167,15 +174,22 @@ async function search() {
 	display: flex;
 	justify-content: center;
 }
+.addMeButton {
+  border: 2px dashed var(--fgTransparent);
+	padding: 12px;
+	margin-right: 16px;
+}
 .addUserButton {
-	padding: 16px;
+  border: 2px dashed var(--fgTransparent);
+	padding: 12px;
 	flex-grow: 1;
 }
 .addUserButtonInner {
 	display: flex;
+	flex-direction: column;
 	align-items: center;
-	justify-content: center;
-	min-height: 35px;
+	justify-content: space-between;
+	min-height: 38px;
 }
 .userCard {
 	flex-grow: 1;

From 568e34af643f96083afd9b75012b60d2f0eee124 Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Thu, 18 Jul 2024 02:22:18 +0900
Subject: [PATCH 18/24] =?UTF-8?q?feat(background):=20api/meta=E3=81=A7?=
 =?UTF-8?q?=E6=A4=9C=E7=B4=A2=E5=8F=AF=E8=83=BD=E3=81=AA=E3=83=8E=E3=83=BC?=
 =?UTF-8?q?=E3=83=88=E3=81=AE=E3=82=B9=E3=82=B3=E3=83=BC=E3=83=97=E3=82=92?=
 =?UTF-8?q?=E5=8F=82=E7=85=A7=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/core/entities/MetaEntityService.ts | 1 +
 packages/backend/src/models/json-schema/meta.ts         | 6 ++++++
 packages/misskey-js/src/autogen/types.ts                | 5 +++++
 3 files changed, 12 insertions(+)

diff --git a/packages/backend/src/core/entities/MetaEntityService.ts b/packages/backend/src/core/entities/MetaEntityService.ts
index 5dfec589e12a..f23b97f077b1 100644
--- a/packages/backend/src/core/entities/MetaEntityService.ts
+++ b/packages/backend/src/core/entities/MetaEntityService.ts
@@ -113,6 +113,7 @@ export class MetaEntityService {
 
 			mediaProxy: this.config.mediaProxy,
 			enableUrlPreview: instance.urlPreviewEnabled,
+			noteSearchableScope: this.config.meilisearch == null || this.config.meilisearch.scope === 'global' ? 'global' : 'local',
 		};
 
 		return packed;
diff --git a/packages/backend/src/models/json-schema/meta.ts b/packages/backend/src/models/json-schema/meta.ts
index e7bc6356e5e3..3bcf9cac92d2 100644
--- a/packages/backend/src/models/json-schema/meta.ts
+++ b/packages/backend/src/models/json-schema/meta.ts
@@ -247,6 +247,12 @@ export const packedMetaLiteSchema = {
 			optional: false, nullable: false,
 			ref: 'RolePolicies',
 		},
+		noteSearchableScope: {
+			type: 'string',
+			enum: ['local', 'global'],
+			optional: false, nullable: false,
+			default: 'local',
+		},
 	},
 } as const;
 
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index ff731a2fa6e1..e11318792fec 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4937,6 +4937,11 @@ export type components = {
       serverRules: string[];
       themeColor: string | null;
       policies: components['schemas']['RolePolicies'];
+      /**
+       * @default local
+       * @enum {string}
+       */
+      noteSearchableScope: 'local' | 'global';
     };
     MetaDetailedOnly: {
       features?: {

From 759920c596eafdd097ed10104f5a3ba89c315d24 Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Thu, 18 Jul 2024 02:23:11 +0900
Subject: [PATCH 19/24] =?UTF-8?q?global=E3=81=AE=E3=83=8E=E3=83=BC?=
 =?UTF-8?q?=E3=83=88=E3=81=8C=E6=A4=9C=E7=B4=A2=E4=B8=8D=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E3=81=AA=E5=A0=B4=E5=90=88=E3=80=81=E6=A4=9C=E7=B4=A2=E3=82=AA?=
 =?UTF-8?q?=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkRadios.vue | 4 ++++
 packages/frontend/src/pages/search.note.vue   | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/MkRadios.vue b/packages/frontend/src/components/MkRadios.vue
index 549438f61b35..705c93f770c3 100644
--- a/packages/frontend/src/components/MkRadios.vue
+++ b/packages/frontend/src/components/MkRadios.vue
@@ -29,6 +29,9 @@ export default defineComponent({
 		// なぜかFragmentになることがあるため
 		if (options.length === 1 && options[0].props == null) options = options[0].children as VNode[];
 
+		// vnodeのうちv-if=falseなものを除外する(trueになるものはoptionなど他typeになる)
+		options = options.filter(vnode => !(typeof vnode.type === 'symbol' && vnode.type.description === 'v-cmt' && vnode.children === 'v-if'));
+
 		return () => h('div', {
 			class: 'novjtcto',
 		}, [
@@ -40,6 +43,7 @@ export default defineComponent({
 			}, options.map(option => h(MkRadio, {
 				key: option.key as string,
 				value: option.props?.value,
+				disabled: option.props?.disabled,
 				modelValue: value.value,
 				'onUpdate:modelValue': _v => value.value = _v,
 			}, () => option.children)),
diff --git a/packages/frontend/src/pages/search.note.vue b/packages/frontend/src/pages/search.note.vue
index a1981666165c..fb635654c40f 100644
--- a/packages/frontend/src/pages/search.note.vue
+++ b/packages/frontend/src/pages/search.note.vue
@@ -17,9 +17,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<template #label>{{ i18n.ts.host }}</template>
 					<option value="all" default>{{ i18n.ts.all }}</option>
 					<option value="local">{{ i18n.ts.local }}</option>
-					<option value="specified">{{ i18n.ts.specifyHost }}</option>
+					<option v-if="noteSearchableScope === 'global'" value="specified">{{ i18n.ts.specifyHost }}</option>
 				</MkRadios>
-				<MkInput v-model="hostInput" :disabled="hostSelect !== 'specified'" :large="true" type="search">
+				<MkInput v-if="noteSearchableScope === 'global'" v-model="hostInput" :disabled="hostSelect !== 'specified'" :large="true" type="search">
 					<template #prefix><i class="ti ti-server"></i></template>
 				</MkInput>
 
@@ -66,6 +66,7 @@ import { useRouter } from '@/router/supplier.js';
 import MkUserCardMini from '@/components/MkUserCardMini.vue';
 import MkRadios from '@/components/MkRadios.vue';
 import { $i } from '@/account.js';
+import { instance } from '@/instance.js';
 
 const props = withDefaults(defineProps<{
 	query?: string;
@@ -86,6 +87,8 @@ const notePagination = ref<Paging>();
 const user = ref<UserDetailed | null>(null);
 const hostInput = ref(toRef(props, 'host').value);
 
+const noteSearchableScope = instance.noteSearchableScope ?? 'local';
+
 const hostSelect = ref<'all' | 'local' | 'specified'>('all');
 
 const setHostSelectWithInput = (after:string|undefined|null, before:string|undefined|null) => {

From f6819831f7d90c3b684b0cbe622b5ace2ccd7b8e Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Thu, 18 Jul 2024 02:32:54 +0900
Subject: [PATCH 20/24] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85bd793d7a42..31d4b6dd432e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@
 - Enhance: エンドポイント`i/webhook/update`の必須項目を`webhookId`のみに
 - Enhance: エンドポイント`admin/ad/update`の必須項目を`id`のみに
 - Enhance: `default.yml`内の`url`, `db.db`, `db.user`, `db.pass`を環境変数から読み込めるように
+- Enhance: エンドポイント`api/meta`にプロパティ`noteSearchableScope`が増え、`string`値`local`または`global`を返却します
 - Fix: チャート生成時にinstance.suspensionStateに置き換えられたinstance.isSuspendedが参照されてしまう問題を修正
 - Fix: ユーザーのフィードページのMFMをHTMLに展開するように (#14006)
 - Fix: アンテナ・クリップ・リスト・ウェブフックがロールポリシーの上限より一つ多く作れてしまうのを修正 (#14036)

From 578b784e76131514e4afcf03e4e6a6c45c1c88b7 Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Thu, 18 Jul 2024 03:10:30 +0900
Subject: [PATCH 21/24] =?UTF-8?q?config.meilisearch.scope=E3=81=8Cstring[]?=
 =?UTF-8?q?=E3=82=92=E5=8F=96=E3=82=8B=E3=81=93=E3=81=A8=E3=81=8C=E3=81=82?=
 =?UTF-8?q?=E3=82=8B=E3=81=AE=E3=81=A7=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/core/entities/MetaEntityService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/core/entities/MetaEntityService.ts b/packages/backend/src/core/entities/MetaEntityService.ts
index 3395aa92a8a6..bcfd8ae41c1c 100644
--- a/packages/backend/src/core/entities/MetaEntityService.ts
+++ b/packages/backend/src/core/entities/MetaEntityService.ts
@@ -128,7 +128,7 @@ export class MetaEntityService {
 
 			mediaProxy: this.config.mediaProxy,
 			enableUrlPreview: instance.urlPreviewEnabled,
-			noteSearchableScope: this.config.meilisearch == null || this.config.meilisearch.scope === 'global' ? 'global' : 'local',
+			noteSearchableScope: this.config.meilisearch == null || this.config.meilisearch.scope === 'local' ? 'local' : 'global',
 		};
 
 		return packed;

From 1a17579e566b65bd9fb373242a3c16962e098d3f Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Thu, 18 Jul 2024 03:11:57 +0900
Subject: [PATCH 22/24] =?UTF-8?q?meilisearch=E3=82=92=E5=88=A9=E7=94=A8?=
 =?UTF-8?q?=E3=81=8B=E3=81=A4scope=E3=81=8Clocal=E3=81=AE=E5=A0=B4?=
 =?UTF-8?q?=E5=90=88=E3=80=81=E3=83=AA=E3=83=A2=E3=83=BC=E3=83=88=E3=83=A6?=
 =?UTF-8?q?=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=AE=E3=83=A1=E3=83=8B=E3=83=A5?=
 =?UTF-8?q?=E3=83=BC=E3=81=A7=E3=80=8C=E3=81=93=E3=81=AE=E3=83=A6=E3=83=BC?=
 =?UTF-8?q?=E3=82=B6=E3=83=BC=E3=81=AE=E3=83=8E=E3=83=BC=E3=83=88=E3=82=92?=
 =?UTF-8?q?=E6=A4=9C=E7=B4=A2=E3=80=8D=E3=82=92=E5=87=BA=E3=81=95=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/scripts/check-permissions.ts | 4 ++++
 packages/frontend/src/scripts/get-user-menu.ts     | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/scripts/check-permissions.ts b/packages/frontend/src/scripts/check-permissions.ts
index 080f8393e545..ed86529d5b89 100644
--- a/packages/frontend/src/scripts/check-permissions.ts
+++ b/packages/frontend/src/scripts/check-permissions.ts
@@ -13,3 +13,7 @@ export const notesSearchAvailable = (
 	($i != null && $i.policies.canSearchNotes) ||
 	false
 ) as boolean;
+
+export const canSearchNonLocalNotes = (
+	instance.noteSearchableScope === 'global'
+);
diff --git a/packages/frontend/src/scripts/get-user-menu.ts b/packages/frontend/src/scripts/get-user-menu.ts
index 2f10a494dbc1..e9e7ae771d7b 100644
--- a/packages/frontend/src/scripts/get-user-menu.ts
+++ b/packages/frontend/src/scripts/get-user-menu.ts
@@ -13,7 +13,7 @@ import * as os from '@/os.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { defaultStore, userActions } from '@/store.js';
 import { $i, iAmModerator } from '@/account.js';
-import { notesSearchAvailable } from '@/scripts/check-permissions.js';
+import { notesSearchAvailable, canSearchNonLocalNotes } from '@/scripts/check-permissions.js';
 import { IRouter } from '@/nirax.js';
 import { antennasCache, rolesCache, userListsCache } from '@/cache.js';
 import { mainRouter } from '@/router/main.js';
@@ -161,7 +161,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
 		action: () => {
 			copyToClipboard(`@${user.username}@${user.host ?? host}`);
 		},
-	}, ...( notesSearchAvailable ? [{
+	}, ...( notesSearchAvailable && (user.host == null || canSearchNonLocalNotes) ? [{
 		icon: 'ti ti-search',
 		text: i18n.ts.searchThisUsersNotes,
 		action: () => {

From 4e769e5166743eba9fd5407382300cc840197b3c Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Thu, 18 Jul 2024 03:24:08 +0900
Subject: [PATCH 23/24] =?UTF-8?q?host=E3=81=8C=E7=A9=BA=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E3=81=AE=E6=99=82=E3=81=AE=E6=8C=99=E5=8B=95=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/search.note.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/search.note.vue b/packages/frontend/src/pages/search.note.vue
index fb635654c40f..4adc5962ead8 100644
--- a/packages/frontend/src/pages/search.note.vue
+++ b/packages/frontend/src/pages/search.note.vue
@@ -112,7 +112,10 @@ if (props.userId != null) {
 		user.value = _user;
 	});
 } else if (props.username != null) {
-	misskeyApi('users/show', { username: props.username, host: props.host }).then(_user => {
+	misskeyApi('users/show', {
+		username: props.username,
+		...(props.host != null && props.host !== '') ? { host: props.host } : {},
+	}).then(_user => {
 		user.value = _user;
 	});
 }

From 7ef3bc933355781e05d56f6f74a35ffd6e964e8b Mon Sep 17 00:00:00 2001
From: taichanne30 <dev@taichan.site>
Date: Thu, 18 Jul 2024 03:29:21 +0900
Subject: [PATCH 24/24] =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=82=AB=E3=83=AB?=
 =?UTF-8?q?=E3=81=AE=E3=81=BF=E3=81=97=E3=81=8B=E3=83=8E=E3=83=BC=E3=83=88?=
 =?UTF-8?q?=E3=81=8C=E3=82=A4=E3=83=B3=E3=83=87=E3=83=83=E3=82=AF=E3=82=B9?=
 =?UTF-8?q?=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84=E5=A0=B4?=
 =?UTF-8?q?=E5=90=88=E3=80=81=E3=83=AA=E3=83=A2=E3=83=BC=E3=83=88=E3=83=A6?=
 =?UTF-8?q?=E3=83=BC=E3=82=B6=E3=83=BC=E3=82=82=E9=81=B8=E6=8A=9E=E3=81=A7?=
 =?UTF-8?q?=E3=81=8D=E3=81=AA=E3=81=8F=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/packages/frontend/src/pages/search.note.vue b/packages/frontend/src/pages/search.note.vue
index 4adc5962ead8..05dc77b94b49 100644
--- a/packages/frontend/src/pages/search.note.vue
+++ b/packages/frontend/src/pages/search.note.vue
@@ -121,7 +121,7 @@ if (props.userId != null) {
 }
 
 function selectUser() {
-	os.selectUser({ includeSelf: true }).then(_user => {
+	os.selectUser({ includeSelf: true, localOnly: instance.noteSearchableScope === 'local' }).then(_user => {
 		user.value = _user;
 		hostInput.value = _user.host ?? '';
 	});