Change: #322 fedibird_capabilitiesからprofile_searchを削除 (#387)

* Change: #322 `fedibird_capabilities`から`profile_search`を削除 * v1にも追加
kmycode · Dec 26, 2023 · fb6e125 · fb6e125
1 parent f3120a8
commit fb6e125
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/app/helpers/kmyblue_capabilities_helper.rb b/app/helpers/kmyblue_capabilities_helper.rb
@@ -21,7 +21,7 @@ def fedibird_capabilities
       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
@@ -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
@@ -98,6 +98,11 @@ def configuration
       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
@@ -100,6 +100,11 @@ def configuration
       reactions: {
         max_reactions: EmojiReaction::EMOJI_REACTION_PER_ACCOUNT_LIMIT,
       },
+
+      # https://github.com/mastodon/mastodon/pull/27009
+      search: {
+        enabled: Chewy.enabled?,
+      },
     }
   end