From fb6e125917c44e40f6f4cf5934ceeca1e64b9269 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?KMY=EF=BC=88=E9=9B=AA=E3=81=82=E3=81=99=E3=81=8B=EF=BC=89?=
 <tt@kmycode.net>
Date: Tue, 26 Dec 2023 09:48:03 +0900
Subject: [PATCH] =?UTF-8?q?Change:=20#322=20`fedibird=5Fcapabilities`?=
 =?UTF-8?q?=E3=81=8B=E3=82=89`profile=5Fsearch`=E3=82=92=E5=89=8A=E9=99=A4?=
 =?UTF-8?q?=20(#387)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Change: #322 `fedibird_capabilities`から`profile_search`を削除

* v1にも追加
---
 app/helpers/kmyblue_capabilities_helper.rb       | 2 +-
 app/javascript/mastodon/features/about/index.jsx | 3 ++-
 app/serializers/rest/instance_serializer.rb      | 5 +++++
 app/serializers/rest/v1/instance_serializer.rb   | 5 +++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/helpers/kmyblue_capabilities_helper.rb b/app/helpers/kmyblue_capabilities_helper.rb
index ce29e7ff37..ef6799faeb 100644
--- a/app/helpers/kmyblue_capabilities_helper.rb
+++ b/app/helpers/kmyblue_capabilities_helper.rb
@@ -21,7 +21,7 @@ module KmyblueCapabilitiesHelper
       kmyblue_list_notification
     )
 
-    capabilities << :profile_search unless Chewy.enabled?
+    capabilities << :full_text_search if Chewy.enabled?
     if Setting.enable_emoji_reaction
       capabilities << :emoji_reaction
       capabilities << :enable_wide_emoji_reaction
diff --git a/app/javascript/mastodon/features/about/index.jsx b/app/javascript/mastodon/features/about/index.jsx
index 7603eb8ddd..5c24292442 100644
--- a/app/javascript/mastodon/features/about/index.jsx
+++ b/app/javascript/mastodon/features/about/index.jsx
@@ -160,7 +160,8 @@ class About extends PureComponent {
     const isPublicUnlistedVisibility = fedibirdCapabilities.includes('kmyblue_visibility_public_unlisted');
     const isEmojiReaction = fedibirdCapabilities.includes('emoji_reaction');
     const isLocalTimeline = !fedibirdCapabilities.includes('timeline_no_local');
-    const isFullTextSearch = !fedibirdCapabilities.includes('profile_search');
+
+    const isFullTextSearch = server.getIn(['configuration', 'search', 'enabled']);
 
     return (
       <Column bindToDocument={!multiColumn} label={intl.formatMessage(messages.title)}>
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index bda7c4ec30..565e5c2e2b 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -98,6 +98,11 @@ class REST::InstanceSerializer < ActiveModel::Serializer
       reactions: {
         max_reactions: EmojiReaction::EMOJI_REACTION_PER_ACCOUNT_LIMIT,
       },
+
+      # https://github.com/mastodon/mastodon/pull/27009
+      search: {
+        enabled: Chewy.enabled?,
+      },
     }
   end
 
diff --git a/app/serializers/rest/v1/instance_serializer.rb b/app/serializers/rest/v1/instance_serializer.rb
index d0473f5f97..29a314557a 100644
--- a/app/serializers/rest/v1/instance_serializer.rb
+++ b/app/serializers/rest/v1/instance_serializer.rb
@@ -100,6 +100,11 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer
       reactions: {
         max_reactions: EmojiReaction::EMOJI_REACTION_PER_ACCOUNT_LIMIT,
       },
+
+      # https://github.com/mastodon/mastodon/pull/27009
+      search: {
+        enabled: Chewy.enabled?,
+      },
     }
   end