Merge d07b150059 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,21 +49,14 @@ 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 }}
-        />
+        {toCappedNumber(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": "Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know",
+  "filtered_notifications_banner.pending_requests": "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

@@ -10171,25 +10171,10 @@ 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;
-    }
+    background: $ui-button-background-color;
+    color: $white;
+    border-radius: 100px;
+    padding: 2px 8px;
   }
 }
 

config/application.rb

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

config/initializers/1_hosts.rb

@@ -12,8 +12,8 @@ Rails.application.configure do
   config.x.local_domain = host
   config.x.web_domain   = web_host
   config.x.use_https    = https
-  config.x.use_s3       = ENV['S3_ENABLED'] == 'true'
-  config.x.use_swift    = ENV['SWIFT_ENABLED'] == 'true'
+  config.x.use_s3       = Rails.configuration.x.storage.s3_enabled
+  config.x.use_swift    = Rails.configuration.x.storage.swift_enabled
 
   config.x.alternate_domains = alternate_domains
 

config/initializers/paperclip.rb

@@ -35,7 +35,7 @@ Paperclip::Attachment.default_options.merge!(
   storage: :fog
 )
 
-if ENV['S3_ENABLED'] == 'true'
+if Rails.configuration.x.storage.s3_enabled
   require 'aws-sdk-s3'
 
   s3_region   = ENV.fetch('S3_REGION')   { 'us-east-1' }
@@ -115,7 +115,7 @@ if ENV['S3_ENABLED'] == 'true'
   end
 
   Paperclip::Storage::S3.prepend(Paperclip::Storage::S3Extensions)
-elsif ENV['SWIFT_ENABLED'] == 'true'
+elsif Rails.configuration.x.storage.swift_enabled
   require 'fog/openstack'
 
   Paperclip::Attachment.default_options.merge!(
@@ -139,7 +139,7 @@ elsif ENV['SWIFT_ENABLED'] == 'true'
     fog_host: ENV['SWIFT_OBJECT_URL'],
     fog_public: true
   )
-elsif ENV['AZURE_ENABLED'] == 'true'
+elsif Rails.configuration.x.storage.azure_enabled
   require 'paperclip-azure'
 
   Paperclip::Attachment.default_options.merge!(

config/storage.yml

@@ -0,0 +1,4 @@
+shared:
+  azure_enabled: <%= ENV.fetch('AZURE_ENABLED', 'false') %>
+  s3_enabled: <%= ENV.fetch('S3_ENABLED', 'false') %>
+  swift_enabled: <%= ENV.fetch('SWIFT_ENABLED', 'false') %>

spec/lib/content_security_policy_spec.rb

@@ -116,8 +116,11 @@ describe ContentSecurityPolicy do
 
     context 'when s3_enabled is configured' do
       around do |example|
-        ClimateControl.modify S3_ENABLED: 'true', S3_HOSTNAME: 'asset-host.s3.example' do
+        ClimateControl.modify S3_HOSTNAME: 'asset-host.s3.example' do
+          original = Rails.configuration.x.storage.s3_enabled
+          Rails.configuration.x.storage.s3_enabled = true
           example.run
+          Rails.configuration.x.storage.s3_enabled = original
         end
       end