From eefbe097c0e810bbda4108b4235b32bf0456b06f Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 19 Feb 2021 21:40:09 +0900 Subject: [PATCH] Resolve #7222 --- locales/ja-JP.yml | 1 + src/client/pages/search.vue | 1 + src/client/ui/chat/index.vue | 14 +++++++++++++- src/server/api/endpoints/notes/search.ts | 15 ++++++++++++++- 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 680e70f61e..51a82a32b9 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -704,6 +704,7 @@ editCode: "コードを編集" apply: "適用" receiveAnnouncementFromInstance: "インスタンスからのお知らせを受け取る" emailNotification: "メール通知" +inChannelSearch: "チャンネル内検索" _email: _follow: diff --git a/src/client/pages/search.vue b/src/client/pages/search.vue index ed92243cd2..5e79531b20 100644 --- a/src/client/pages/search.vue +++ b/src/client/pages/search.vue @@ -28,6 +28,7 @@ export default defineComponent({ limit: 10, params: () => ({ query: this.$route.query.q, + channelId: this.$route.query.channel, }) }, }; diff --git a/src/client/ui/chat/index.vue b/src/client/ui/chat/index.vue index 79c0d53074..44f47447a7 100644 --- a/src/client/ui/chat/index.vue +++ b/src/client/ui/chat/index.vue @@ -99,7 +99,10 @@
{{ instanceName }}
- +