Merge 5d385b7c8e into a50c8e951f

app/javascript/mastodon/api_types/notifications.ts

@@ -60,7 +60,7 @@ export interface BaseNotificationGroupJSON {
 
 interface NotificationGroupWithStatusJSON extends BaseNotificationGroupJSON {
   type: NotificationWithStatusType;
-  status: ApiStatusJSON;
+  status_id: string;
 }
 
 interface NotificationWithStatusJSON extends BaseNotificationJSON {

app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx

@@ -49,22 +49,15 @@ export const FilteredNotificationsBanner: React.FC = () => {
         <span>
           <FormattedMessage
             id='filtered_notifications_banner.pending_requests'
-            defaultMessage='Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know'
+            defaultMessage='From {count, plural, =0 {no one} one {one person} other {# people}} you may know'
             values={{ count: policy.summary.pending_requests_count }}
           />
         </span>
       </div>
 
       <div className='filtered-notifications-banner__badge'>
-        <div className='filtered-notifications-banner__badge__badge'>
         {toCappedNumber(policy.summary.pending_notifications_count)}
       </div>
-        <FormattedMessage
-          id='filtered_notifications_banner.mentions'
-          defaultMessage='{count, plural, one {mention} other {mentions}}'
-          values={{ count: policy.summary.pending_notifications_count }}
-        />
-      </div>
     </Link>
   );
 };

app/javascript/mastodon/locales/en.json

@@ -300,8 +300,7 @@
   "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
   "filter_modal.select_filter.title": "Filter this post",
   "filter_modal.title.status": "Filter a post",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentions}}",
+  "filtered_notifications_banner.pending_requests": "From {count, plural, =0 {no one} one {one person} other {# people}} you may know",
-  "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know",
   "filtered_notifications_banner.title": "Filtered notifications",
   "firehose.all": "All",
   "firehose.local": "This server",

app/javascript/mastodon/models/notification_group.ts

@@ -124,9 +124,9 @@ export function createNotificationGroupFromJSON(
     case 'mention':
     case 'poll':
     case 'update': {
-      const { status, ...groupWithoutStatus } = group;
+      const { status_id: statusId, ...groupWithoutStatus } = group;
       return {
-        statusId: status.id,
+        statusId,
         sampleAccountIds,
         ...groupWithoutStatus,
       };

app/javascript/styles/mastodon/components.scss

@@ -10170,27 +10170,12 @@ noscript {
     }
   }
 
-  &__badge {
-    display: flex;
-    align-items: center;
-    border-radius: 999px;
-    background: var(--background-border-color);
-    color: $darker-text-color;
-    padding: 4px;
-    padding-inline-end: 8px;
-    gap: 6px;
-    font-weight: 500;
-    font-size: 11px;
-    line-height: 16px;
-    word-break: keep-all;
-
   &__badge {
     background: $ui-button-background-color;
     color: $white;
     border-radius: 100px;
     padding: 2px 8px;
   }
-  }
 }
 
 .notification-request {

app/lib/admin/system_check/elasticsearch_check.rb

@@ -116,7 +116,7 @@ class Admin::SystemCheck::ElasticsearchCheck < Admin::SystemCheck::BaseCheck
   end
 
   def es_preset
-    ENV.fetch('ES_PRESET', 'single_node_cluster')
+    Rails.configuration.x.search.preset
   end
 
   def preset_matches?

config/application.rb

@@ -112,6 +112,8 @@ module Mastodon
       end
     end
 
+    config.x.search = config_for(:search)
+
     config.to_prepare do
       Doorkeeper::AuthorizationsController.layout 'modal'
       Doorkeeper::AuthorizedApplicationsController.layout 'admin'

config/initializers/chewy.rb

@@ -1,27 +1,18 @@
 # frozen_string_literal: true
 
-enabled         = ENV['ES_ENABLED'] == 'true'
+search_config = Rails.configuration.x.search
-host            = ENV.fetch('ES_HOST') { 'localhost' }
-port            = ENV.fetch('ES_PORT') { 9200 }
-user            = ENV.fetch('ES_USER', nil).presence
-password        = ENV.fetch('ES_PASS', nil).presence
-fallback_prefix = ENV.fetch('REDIS_NAMESPACE', nil).presence
-prefix          = ENV.fetch('ES_PREFIX') { fallback_prefix }
-ca_file         = ENV.fetch('ES_CA_FILE', nil).presence
-
-transport_options = { ssl: { ca_file: ca_file } } if ca_file.present?
 
 Chewy.settings = {
-  host: "#{host}:#{port}",
+  host: search_config.host,
-  prefix: prefix,
+  prefix: search_config.prefix,
-  enabled: enabled,
+  enabled: search_config.enabled,
   journal: false,
-  user: user,
+  user: search_config.user,
-  password: password,
+  password: search_config.password,
   index: {
-    number_of_replicas: ['single_node_cluster', nil].include?(ENV['ES_PRESET'].presence) ? 0 : 1,
+    number_of_replicas: search_config.preset == 'single_node_cluster' ? 0 : 1,
   },
-  transport_options: transport_options,
+  transport_options: search_config.ca_file.present? ? { ssl: { ca_file: search_config.ca_file } } : nil,
 }
 
 # We use our own async strategy even outside the request-response

config/search.yml

@@ -0,0 +1,8 @@
+shared:
+  ca_file: <%= ENV.fetch('ES_CA_FILE', nil).presence %>
+  enabled: <%= ENV.fetch('ES_ENABLED', 'false') %>
+  host: <%= ENV.fetch('ES_HOST', 'localhost') %>:<%= ENV.fetch('ES_PORT', '9200') %>
+  password: <%= ENV.fetch('ES_PASS', nil).presence %>
+  prefix: <%= ENV.fetch('ES_PREFIX') { ENV.fetch('REDIS_NAMESPACE', nil).presence } %>
+  preset: <%= ENV.fetch('ES_PRESET', 'single_node_cluster') %>
+  user: <%= ENV.fetch('ES_USER', nil).presence %>

lib/chewy/index_extensions.rb

@@ -3,8 +3,8 @@
 module Chewy
   module IndexExtensions
     def index_preset(base_options = {})
-      case ENV['ES_PRESET'].presence
+      case Rails.configuration.x.search.preset
-      when 'single_node_cluster', nil
+      when 'single_node_cluster'
         base_options.merge(number_of_replicas: 0)
       when 'small_cluster'
         base_options.merge(number_of_replicas: 1)