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 ( 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