diff --git a/.eslintrc.js b/.eslintrc.js
index 8bc6e0895..206faa1c7 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -81,6 +81,15 @@ module.exports = {
       { property: 'substring', message: 'Use .slice instead of .substring.' },
       { property: 'substr', message: 'Use .slice instead of .substr.' },
     ],
+    'no-restricted-syntax': [
+      'error',
+      {
+        // eslint-disable-next-line no-restricted-syntax
+        selector: 'Literal[value=/•/], JSXText[value=/•/]',
+        // eslint-disable-next-line no-restricted-syntax
+        message: "Use '·' (middle dot) instead of '•' (bullet)",
+      },
+    ],
     'no-self-assign': 'off',
     'no-unused-expressions': 'error',
     'no-unused-vars': 'off',
@@ -293,6 +302,7 @@ module.exports = {
         '.*rc.js',
         'ide-helper.js',
         'config/webpack/**/*',
+        'config/formatjs-formatter.js',
       ],
 
       env: {
diff --git a/.github/renovate.json5 b/.github/renovate.json5
new file mode 100644
index 000000000..1ae40d416
--- /dev/null
+++ b/.github/renovate.json5
@@ -0,0 +1,114 @@
+{
+  $schema: 'https://docs.renovatebot.com/renovate-schema.json',
+  extends: [
+    'config:base',
+    ':dependencyDashboard',
+    ':labels(dependencies)',
+    ':maintainLockFilesMonthly', // update non-direct dependencies monthly
+    ':prConcurrentLimit10', // only 10 open PRs at the same time
+  ],
+  stabilityDays: 3, // Wait 3 days after the package has been published before upgrading it
+  // packageRules order is important, they are applied from top to bottom and are merged,
+  // so for example grouping rules needs to be at the bottom
+  packageRules: [
+    {
+      // Ignore major version bumps for these node packages
+      matchManagers: ['npm'],
+      matchPackageNames: [
+        '@rails/ujs', // Needs to match the major Rails version
+        'tesseract.js', // Requires code changes
+        'react-hotkeys', // Requires code changes
+
+        // Requires Webpacker upgrade or replacement
+        '@types/webpack',
+        'babel-loader',
+        'compression-webpack-plugin',
+        'css-loader',
+        'imports-loader',
+        'mini-css-extract-plugin',
+        'postcss-loader',
+        'sass-loader',
+        'terser-webpack-plugin',
+        'webpack',
+        'webpack-assets-manifest',
+        'webpack-bundle-analyzer',
+        'webpack-dev-server',
+        'webpack-cli',
+
+        // react-router: Requires manual upgrade
+        'history',
+        'react-router-dom',
+      ],
+      matchUpdateTypes: ['major'],
+      enabled: false,
+    },
+    {
+      // Ignore major version bumps for these Ruby packages
+      matchManagers: ['bundler'],
+      matchPackageNames: [
+        'sprockets', // Requires manual upgrade https://github.com/rails/sprockets/blob/master/UPGRADING.md#guide-to-upgrading-from-sprockets-3x-to-4x
+        'strong_migrations', // Requires manual upgrade
+        'sidekiq', // Requires manual upgrade
+        'sidekiq-unique-jobs', // Requires manual upgrades and sync with Sidekiq version
+        'redis', // Requires manual upgrade and sync with Sidekiq version
+        'fog-openstack', // TODO: was ignored in https://github.com/mastodon/mastodon/pull/13964
+
+        // Needs major Rails version bump
+        'rack',
+        'rails',
+        'rails-i18n',
+      ],
+      matchUpdateTypes: ['major'],
+      enabled: false,
+    },
+    {
+      // Update Github Actions and Docker images weekly
+      matchManagers: ['github-actions', 'dockerfile', 'docker-compose'],
+      extends: ['schedule:weekly'],
+    },
+    {
+      // Ignore major & minor bumps for the ruby image, this needs to be synced with .ruby-version
+      matchManagers: ['dockerfile'],
+      matchPackageNames: ['moritzheiber/ruby-jemalloc'],
+      matchUpdateTypes: ['minor', 'major'],
+      enabled: false,
+    },
+    {
+      // Ignore major bump for the node image, this needs to be synced with .nvmrc
+      matchManagers: ['dockerfile'],
+      matchPackageNames: ['node'],
+      matchUpdateTypes: ['major'],
+      enabled: false,
+    },
+    {
+      // Ignore major postgres bumps in the docker-compose file, as those break dev environments
+      matchManagers: ['docker-compose'],
+      matchPackageNames: ['postgres'],
+      matchUpdateTypes: ['major'],
+      enabled: false,
+    },
+    {
+      // Update devDependencies every week, with one grouped PR
+      matchDepTypes: 'devDependencies',
+      matchUpdateTypes: ['patch', 'minor'],
+      excludePackageNames: [
+        'typescript', // Typescript has many changes in minor versions, needs to be checked every time
+      ],
+      groupName: 'devDependencies (non-major)',
+      extends: ['schedule:weekly'],
+    },
+    {
+      // Update @types/* packages every week, with one grouped PR
+      matchPackagePrefixes: '@types/',
+      matchUpdateTypes: ['patch', 'minor'],
+      groupName: 'DefinitelyTyped types (non-major)',
+      extends: ['schedule:weekly'],
+      addLabels: ['typescript'],
+    },
+    // Add labels depending on package manager
+    { matchManagers: ['npm', 'nvm'], addLabels: ['javascript'] },
+    { matchManagers: ['bundler', 'ruby-version'], addLabels: ['ruby'] },
+    { matchManagers: ['docker-compose', 'dockerfile'], addLabels: ['docker'] },
+    { matchManagers: ['github-actions'], addLabels: ['github_actions'] },
+  ],
+}
diff --git a/.github/workflows/check-i18n.yml b/.github/workflows/check-i18n.yml
index e282e2ab7..b67c503e9 100644
--- a/.github/workflows/check-i18n.yml
+++ b/.github/workflows/check-i18n.yml
@@ -41,8 +41,7 @@ jobs:
 
       - name: Check for missing strings in English JSON
         run: |
-          yarn build:development
-          yarn manage:translations en
+          yarn i18n:extract --throws
           git diff --exit-code
 
       - name: Check locale file normalization
diff --git a/.github/workflows/lint-css.yml b/.github/workflows/lint-css.yml
index e13d227bd..4d3c2ce5a 100644
--- a/.github/workflows/lint-css.yml
+++ b/.github/workflows/lint-css.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches-ignore:
       - 'dependabot/**'
+      - 'renovate/**'
     paths:
       - 'package.json'
       - 'yarn.lock'
@@ -48,4 +49,4 @@ jobs:
       - run: echo "::add-matcher::.github/stylelint-matcher.json"
 
       - name: Stylelint
-        run: yarn test:lint:sass
+        run: yarn lint:sass
diff --git a/.github/workflows/lint-haml.yml b/.github/workflows/lint-haml.yml
index 2ddbca781..56d817123 100644
--- a/.github/workflows/lint-haml.yml
+++ b/.github/workflows/lint-haml.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches-ignore:
       - 'dependabot/**'
+      - 'renovate/**'
     paths:
       - '.github/workflows/haml-lint-problem-matcher.json'
       - '.github/workflows/lint-haml.yml'
diff --git a/.github/workflows/lint-js.yml b/.github/workflows/lint-js.yml
index 7700e4851..1f0cfd1e7 100644
--- a/.github/workflows/lint-js.yml
+++ b/.github/workflows/lint-js.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches-ignore:
       - 'dependabot/**'
+      - 'renovate/**'
     paths:
       - 'package.json'
       - 'yarn.lock'
@@ -48,7 +49,7 @@ jobs:
         run: yarn --frozen-lockfile
 
       - name: ESLint
-        run: yarn test:lint:js --max-warnings 0
+        run: yarn lint:js --max-warnings 0
 
       - name: Typecheck
-        run: yarn test:typecheck
+        run: yarn typecheck
diff --git a/.github/workflows/lint-json.yml b/.github/workflows/lint-json.yml
index 98f101ad9..8712d8bd8 100644
--- a/.github/workflows/lint-json.yml
+++ b/.github/workflows/lint-json.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches-ignore:
       - 'dependabot/**'
+      - 'renovate/**'
     paths:
       - 'package.json'
       - 'yarn.lock'
@@ -40,4 +41,4 @@ jobs:
         run: yarn --frozen-lockfile
 
       - name: Prettier
-        run: yarn prettier --check "**/*.json"
+        run: yarn lint:json
diff --git a/.github/workflows/lint-md.yml b/.github/workflows/lint-md.yml
index 6f76dd60c..d19a0470d 100644
--- a/.github/workflows/lint-md.yml
+++ b/.github/workflows/lint-md.yml
@@ -3,8 +3,10 @@ on:
   push:
     branches-ignore:
       - 'dependabot/**'
+      - 'renovate/**'
     paths:
       - '.github/workflows/lint-md.yml'
+      - '.nvmrc'
       - '.prettier*'
       - '**/*.md'
       - '!AUTHORS.md'
@@ -14,6 +16,7 @@ on:
   pull_request:
     paths:
       - '.github/workflows/lint-md.yml'
+      - '.nvmrc'
       - '.prettier*'
       - '**/*.md'
       - '!AUTHORS.md'
@@ -32,9 +35,10 @@ jobs:
         uses: actions/setup-node@v3
         with:
           cache: yarn
+          node-version-file: '.nvmrc'
 
       - name: Install all yarn packages
         run: yarn --frozen-lockfile
 
       - name: Prettier
-        run: yarn prettier --check "**/*.md"
+        run: yarn lint:md
diff --git a/.github/workflows/lint-ruby.yml b/.github/workflows/lint-ruby.yml
index de54fe9ae..0395c8639 100644
--- a/.github/workflows/lint-ruby.yml
+++ b/.github/workflows/lint-ruby.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches-ignore:
       - 'dependabot/**'
+      - 'renovate/**'
     paths:
       - 'Gemfile*'
       - '.rubocop*.yml'
diff --git a/.github/workflows/lint-yml.yml b/.github/workflows/lint-yml.yml
index 6f79babcf..295e9610b 100644
--- a/.github/workflows/lint-yml.yml
+++ b/.github/workflows/lint-yml.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches-ignore:
       - 'dependabot/**'
+      - 'renovate/**'
     paths:
       - 'package.json'
       - 'yarn.lock'
@@ -42,4 +43,4 @@ jobs:
         run: yarn --frozen-lockfile
 
       - name: Prettier
-        run: yarn prettier --check "**/*.{yml,yaml}"
+        run: yarn lint:yml
diff --git a/.github/workflows/rebase-needed.yml b/.github/workflows/rebase-needed.yml
index 6a8035210..131a62a57 100644
--- a/.github/workflows/rebase-needed.yml
+++ b/.github/workflows/rebase-needed.yml
@@ -4,10 +4,12 @@ on:
   push:
     branches-ignore:
       - 'dependabot/**'
+      - 'renovate/**'
       - 'l10n_main'
   pull_request_target:
     branches-ignore:
       - 'dependabot/**'
+      - 'renovate/**'
       - 'l10n_main'
     types: [synchronize]
 
diff --git a/.github/workflows/test-js.yml b/.github/workflows/test-js.yml
index 1c4958550..3306105f9 100644
--- a/.github/workflows/test-js.yml
+++ b/.github/workflows/test-js.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches-ignore:
       - 'dependabot/**'
+      - 'renovate/**'
     paths:
       - 'package.json'
       - 'yarn.lock'
@@ -44,4 +45,4 @@ jobs:
         run: yarn --frozen-lockfile
 
       - name: Jest testing
-        run: yarn test:jest --reporters github-actions summary
+        run: yarn jest --reporters github-actions summary
diff --git a/.github/workflows/test-migrations-one-step.yml b/.github/workflows/test-migrations-one-step.yml
index 212b2cfe7..a91fd819a 100644
--- a/.github/workflows/test-migrations-one-step.yml
+++ b/.github/workflows/test-migrations-one-step.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches-ignore:
       - 'dependabot/**'
+      - 'renovate/**'
   pull_request:
 
 jobs:
diff --git a/.github/workflows/test-migrations-two-step.yml b/.github/workflows/test-migrations-two-step.yml
index 310153929..50266fb8a 100644
--- a/.github/workflows/test-migrations-two-step.yml
+++ b/.github/workflows/test-migrations-two-step.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches-ignore:
       - 'dependabot/**'
+      - 'renovate/**'
   pull_request:
 
 jobs:
diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index f284745ea..07cb1d41f 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches-ignore:
       - 'dependabot/**'
+      - 'renovate/**'
   pull_request:
 
 env:
diff --git a/.haml-lint.yml b/.haml-lint.yml
index 12ca46342..d1ed30b26 100644
--- a/.haml-lint.yml
+++ b/.haml-lint.yml
@@ -4,6 +4,11 @@ exclude:
   - 'vendor/**/*'
   - lib/templates/haml/scaffold/_form.html.haml
 
+require:
+  - ./lib/linter/haml_middle_dot.rb
+
 linters:
   AltText:
     enabled: true
+  MiddleDot:
+    enabled: true
diff --git a/.prettierignore b/.prettierignore
index af0411e9c..27b6d5458 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -61,7 +61,7 @@ docker-compose.override.yml
 /app/javascript/mastodon/features/emoji/emoji_map.json
 
 # Ignore locale files
-/app/javascript/mastodon/locales
+/app/javascript/mastodon/locales/*.json
 /config/locales
 
 # Ignore vendored CSS reset
diff --git a/.rubocop.yml b/.rubocop.yml
index 813cb1c01..deb9c37de 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -11,6 +11,7 @@ require:
   - rubocop-rspec
   - rubocop-performance
   - rubocop-capybara
+  - ./lib/linter/rubocop_middle_dot
 
 AllCops:
   TargetRubyVersion: 3.0 # Set to minimum supported version of CI
@@ -205,3 +206,6 @@ Style/TrailingCommaInArrayLiteral:
 # https://docs.rubocop.org/rubocop/cops_style.html#styletrailingcommainhashliteral
 Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: 'comma'
+
+Style/MiddleDot:
+  Enabled: true
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 082ff3219..7cbad5c75 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -243,79 +243,6 @@ RSpec/AnyInstance:
     - 'spec/workers/activitypub/delivery_worker_spec.rb'
     - 'spec/workers/web/push_notification_worker_spec.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: SkipBlocks, EnforcedStyle.
-# SupportedStyles: described_class, explicit
-RSpec/DescribedClass:
-  Exclude:
-    - 'spec/controllers/concerns/cache_concern_spec.rb'
-    - 'spec/controllers/concerns/challengable_concern_spec.rb'
-    - 'spec/lib/entity_cache_spec.rb'
-    - 'spec/lib/extractor_spec.rb'
-    - 'spec/lib/feed_manager_spec.rb'
-    - 'spec/lib/hash_object_spec.rb'
-    - 'spec/lib/ostatus/tag_manager_spec.rb'
-    - 'spec/lib/request_spec.rb'
-    - 'spec/lib/tag_manager_spec.rb'
-    - 'spec/lib/webfinger_resource_spec.rb'
-    - 'spec/mailers/notification_mailer_spec.rb'
-    - 'spec/mailers/user_mailer_spec.rb'
-    - 'spec/models/account_conversation_spec.rb'
-    - 'spec/models/account_domain_block_spec.rb'
-    - 'spec/models/account_migration_spec.rb'
-    - 'spec/models/account_spec.rb'
-    - 'spec/models/block_spec.rb'
-    - 'spec/models/domain_block_spec.rb'
-    - 'spec/models/email_domain_block_spec.rb'
-    - 'spec/models/export_spec.rb'
-    - 'spec/models/favourite_spec.rb'
-    - 'spec/models/follow_spec.rb'
-    - 'spec/models/identity_spec.rb'
-    - 'spec/models/import_spec.rb'
-    - 'spec/models/media_attachment_spec.rb'
-    - 'spec/models/notification_spec.rb'
-    - 'spec/models/relationship_filter_spec.rb'
-    - 'spec/models/report_filter_spec.rb'
-    - 'spec/models/session_activation_spec.rb'
-    - 'spec/models/setting_spec.rb'
-    - 'spec/models/site_upload_spec.rb'
-    - 'spec/models/status_pin_spec.rb'
-    - 'spec/models/status_spec.rb'
-    - 'spec/models/user_spec.rb'
-    - 'spec/policies/account_moderation_note_policy_spec.rb'
-    - 'spec/presenters/account_relationships_presenter_spec.rb'
-    - 'spec/presenters/status_relationships_presenter_spec.rb'
-    - 'spec/serializers/activitypub/note_serializer_spec.rb'
-    - 'spec/serializers/activitypub/update_poll_serializer_spec.rb'
-    - 'spec/serializers/rest/account_serializer_spec.rb'
-    - 'spec/services/activitypub/fetch_remote_account_service_spec.rb'
-    - 'spec/services/activitypub/fetch_remote_actor_service_spec.rb'
-    - 'spec/services/activitypub/fetch_remote_key_service_spec.rb'
-    - 'spec/services/after_block_domain_from_account_service_spec.rb'
-    - 'spec/services/authorize_follow_service_spec.rb'
-    - 'spec/services/batched_remove_status_service_spec.rb'
-    - 'spec/services/block_domain_service_spec.rb'
-    - 'spec/services/block_service_spec.rb'
-    - 'spec/services/bootstrap_timeline_service_spec.rb'
-    - 'spec/services/clear_domain_media_service_spec.rb'
-    - 'spec/services/favourite_service_spec.rb'
-    - 'spec/services/follow_service_spec.rb'
-    - 'spec/services/import_service_spec.rb'
-    - 'spec/services/post_status_service_spec.rb'
-    - 'spec/services/precompute_feed_service_spec.rb'
-    - 'spec/services/process_mentions_service_spec.rb'
-    - 'spec/services/purge_domain_service_spec.rb'
-    - 'spec/services/reblog_service_spec.rb'
-    - 'spec/services/reject_follow_service_spec.rb'
-    - 'spec/services/remove_from_followers_service_spec.rb'
-    - 'spec/services/remove_status_service_spec.rb'
-    - 'spec/services/unallow_domain_service_spec.rb'
-    - 'spec/services/unblock_service_spec.rb'
-    - 'spec/services/unfollow_service_spec.rb'
-    - 'spec/services/unmute_service_spec.rb'
-    - 'spec/services/update_account_service_spec.rb'
-    - 'spec/validators/note_length_validator_spec.rb'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 RSpec/EmptyExampleGroup:
   Exclude:
@@ -472,30 +399,6 @@ RSpec/MessageSpies:
     - 'spec/spec_helper.rb'
     - 'spec/validators/status_length_validator_spec.rb'
 
-RSpec/MissingExampleGroupArgument:
-  Exclude:
-    - 'spec/controllers/accounts_controller_spec.rb'
-    - 'spec/controllers/activitypub/collections_controller_spec.rb'
-    - 'spec/controllers/admin/statuses_controller_spec.rb'
-    - 'spec/controllers/admin/users/roles_controller_spec.rb'
-    - 'spec/controllers/api/v1/accounts_controller_spec.rb'
-    - 'spec/controllers/api/v1/admin/account_actions_controller_spec.rb'
-    - 'spec/controllers/api/v1/admin/domain_allows_controller_spec.rb'
-    - 'spec/controllers/api/v1/statuses_controller_spec.rb'
-    - 'spec/controllers/auth/registrations_controller_spec.rb'
-    - 'spec/features/log_in_spec.rb'
-    - 'spec/lib/activitypub/activity/undo_spec.rb'
-    - 'spec/lib/status_reach_finder_spec.rb'
-    - 'spec/models/account_spec.rb'
-    - 'spec/models/email_domain_block_spec.rb'
-    - 'spec/models/trends/statuses_spec.rb'
-    - 'spec/models/trends/tags_spec.rb'
-    - 'spec/models/user_role_spec.rb'
-    - 'spec/models/user_spec.rb'
-    - 'spec/services/fetch_link_card_service_spec.rb'
-    - 'spec/services/notify_service_spec.rb'
-    - 'spec/services/process_mentions_service_spec.rb'
-
 RSpec/MultipleExpectations:
   Max: 19
 
@@ -1345,11 +1248,6 @@ Style/GlobalStdStream:
     - 'config/environments/development.rb'
     - 'config/environments/production.rb'
 
-# Configuration parameters: AllowedVariables.
-Style/GlobalVars:
-  Exclude:
-    - 'config/initializers/statsd.rb'
-
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
 Style/GuardClause:
@@ -1490,7 +1388,6 @@ Style/RedundantConstantBase:
   Exclude:
     - 'config/environments/production.rb'
     - 'config/initializers/sidekiq.rb'
-    - 'config/initializers/statsd.rb'
     - 'config/locales/sr-Latn.rb'
     - 'config/locales/sr.rb'
 
@@ -1504,52 +1401,6 @@ Style/RedundantFetchBlock:
     - 'config/initializers/paperclip.rb'
     - 'config/puma.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantRegexpCharacterClass:
-  Exclude:
-    - 'app/lib/link_details_extractor.rb'
-    - 'app/lib/tag_manager.rb'
-    - 'app/models/domain_allow.rb'
-    - 'app/models/domain_block.rb'
-    - 'app/services/fetch_oembed_service.rb'
-    - 'config/initializers/rack_attack.rb'
-    - 'lib/tasks/emojis.rake'
-    - 'lib/tasks/mastodon.rake'
-
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantRegexpEscape:
-  Exclude:
-    - 'app/lib/webfinger_resource.rb'
-    - 'app/models/account.rb'
-    - 'app/models/tag.rb'
-    - 'app/services/fetch_link_card_service.rb'
-    - 'config/initializers/twitter_regex.rb'
-    - 'lib/paperclip/color_extractor.rb'
-    - 'lib/tasks/mastodon.rake'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
-# SupportedStyles: slashes, percent_r, mixed
-Style/RegexpLiteral:
-  Exclude:
-    - 'app/lib/link_details_extractor.rb'
-    - 'app/lib/plain_text_formatter.rb'
-    - 'app/lib/tag_manager.rb'
-    - 'app/lib/text_formatter.rb'
-    - 'app/models/account.rb'
-    - 'app/models/domain_allow.rb'
-    - 'app/models/domain_block.rb'
-    - 'app/models/site_upload.rb'
-    - 'app/models/tag.rb'
-    - 'app/services/backup_service.rb'
-    - 'app/services/fetch_oembed_service.rb'
-    - 'app/services/search_service.rb'
-    - 'config/initializers/rack_attack.rb'
-    - 'config/initializers/twitter_regex.rb'
-    - 'config/routes.rb'
-    - 'lib/mastodon/premailer_webpack_strategy.rb'
-    - 'lib/tasks/mastodon.rake'
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
 # AllowedMethods: present?, blank?, presence, try, try!
diff --git a/Gemfile b/Gemfile
index 51308c24d..84f210f48 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ ruby '>= 3.0.0'
 
 gem 'pkg-config', '~> 1.5'
 
-gem 'puma', '~> 6.2'
+gem 'puma', '~> 6.3'
 gem 'rails', '~> 6.1.7'
 gem 'sprockets', '~> 3.7.2'
 gem 'thor', '~> 1.2'
@@ -17,10 +17,10 @@ gem 'makara', '~> 0.5'
 gem 'pghero'
 gem 'dotenv-rails', '~> 2.8'
 
-gem 'aws-sdk-s3', '~> 1.122', require: false
+gem 'aws-sdk-s3', '~> 1.123', require: false
 gem 'fog-core', '<= 2.4.0'
 gem 'fog-openstack', '~> 0.3', require: false
-gem 'kt-paperclip', '~> 7.1', github: 'kreeti/kt-paperclip', ref: '11abf222dc31bff71160a1d138b445214f434b2b'
+gem 'kt-paperclip', '~> 7.2'
 gem 'blurhash', '~> 0.1'
 
 gem 'active_model_serializers', '~> 0.10'
@@ -60,7 +60,6 @@ gem 'kaminari', '~> 1.2'
 gem 'link_header', '~> 0.0'
 gem 'mime-types', '~> 3.4.1', require: 'mime/types/columnar'
 gem 'nokogiri', '~> 1.15'
-gem 'nsa', '~> 0.2'
 gem 'oj', '~> 3.14'
 gem 'ox', '~> 2.14'
 gem 'parslet'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0e40ce2c0..c4fa1822e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,18 +7,6 @@ GIT
       hkdf (~> 0.2)
       jwt (~> 2.0)
 
-GIT
-  remote: https://github.com/kreeti/kt-paperclip.git
-  revision: 11abf222dc31bff71160a1d138b445214f434b2b
-  ref: 11abf222dc31bff71160a1d138b445214f434b2b
-  specs:
-    kt-paperclip (7.1.1)
-      activemodel (>= 4.2.0)
-      activesupport (>= 4.2.0)
-      marcel (~> 1.0.1)
-      mime-types
-      terrapin (~> 0.6.0)
-
 GIT
   remote: https://github.com/mastodon/rails-settings-cached.git
   revision: 86328ef0bd04ce21cc0504ff5e334591e8c2ccab
@@ -109,17 +97,17 @@ GEM
     attr_required (1.0.1)
     awrence (1.2.1)
     aws-eventstream (1.2.0)
-    aws-partitions (1.761.0)
-    aws-sdk-core (3.172.0)
+    aws-partitions (1.772.0)
+    aws-sdk-core (3.174.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.64.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-kms (1.65.0)
+      aws-sdk-core (~> 3, >= 3.174.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.122.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-s3 (1.123.0)
+      aws-sdk-core (~> 3, >= 3.174.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sigv4 (1.5.2)
@@ -380,6 +368,12 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
+    kt-paperclip (7.2.0)
+      activemodel (>= 4.2.0)
+      activesupport (>= 4.2.0)
+      marcel (~> 1.0.1)
+      mime-types
+      terrapin (~> 0.6.0)
     launchy (2.5.2)
       addressable (~> 2.8)
     letter_opener (1.8.1)
@@ -442,11 +436,6 @@ GEM
     nokogiri (1.15.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nsa (0.2.8)
-      activesupport (>= 4.2, < 7)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      sidekiq (>= 3.5)
-      statsd-ruby (~> 1.4, >= 1.4.0)
     oj (3.14.3)
     omniauth (1.9.2)
       hashie (>= 3.4.6)
@@ -501,7 +490,7 @@ GEM
       premailer (~> 1.7, >= 1.7.9)
     private_address_check (0.5.0)
     public_suffix (5.0.1)
-    puma (6.2.2)
+    puma (6.3.0)
       nio4r (~> 2.0)
     pundit (2.3.0)
       activesupport (>= 3.0.0)
@@ -544,8 +533,9 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 7)
@@ -588,7 +578,7 @@ GEM
     rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (6.0.2)
+    rspec-rails (6.0.3)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -648,7 +638,7 @@ GEM
       redis (>= 4.5.0, < 5)
     sidekiq-bulk (0.2.0)
       sidekiq
-    sidekiq-scheduler (5.0.2)
+    sidekiq-scheduler (5.0.3)
       rufus-scheduler (~> 3.2)
       sidekiq (>= 6, < 8)
       tilt (>= 1.4.0)
@@ -681,7 +671,6 @@ GEM
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     stackprof (0.2.25)
-    statsd-ruby (1.5.0)
     stoplight (3.0.1)
       redlock (~> 1.0)
     strong_migrations (0.8.0)
@@ -770,7 +759,7 @@ DEPENDENCIES
   active_model_serializers (~> 0.10)
   addressable (~> 2.8)
   annotate (~> 3.2)
-  aws-sdk-s3 (~> 1.122)
+  aws-sdk-s3 (~> 1.123)
   better_errors (~> 2.9)
   binding_of_caller (~> 1.0)
   blurhash (~> 0.1)
@@ -818,7 +807,7 @@ DEPENDENCIES
   json-ld-preloaded (~> 3.2)
   json-schema (~> 4.0)
   kaminari (~> 1.2)
-  kt-paperclip (~> 7.1)!
+  kt-paperclip (~> 7.2)
   letter_opener (~> 1.8)
   letter_opener_web (~> 2.0)
   link_header (~> 0.0)
@@ -830,7 +819,6 @@ DEPENDENCIES
   net-http (~> 0.3.2)
   net-ldap (~> 0.18)
   nokogiri (~> 1.15)
-  nsa (~> 0.2)
   oj (~> 3.14)
   omniauth (~> 1.9)
   omniauth-cas (~> 2.0)
@@ -846,7 +834,7 @@ DEPENDENCIES
   premailer-rails
   private_address_check (~> 0.5)
   public_suffix (~> 5.0)
-  puma (~> 6.2)
+  puma (~> 6.3)
   pundit (~> 2.3)
   rack (~> 2.2.7)
   rack-attack (~> 6.6)
@@ -896,7 +884,7 @@ DEPENDENCIES
   xorcist (~> 1.1)
 
 RUBY VERSION
-   ruby 3.2.1p31
+   ruby 3.2.2p53
 
 BUNDLED WITH
-   2.4.6
+   2.4.13
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index 099512248..3a6df662e 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -14,15 +14,5 @@ module Admin
       @pending_tags_count    = Tag.pending_review.count
       @pending_appeals_count = Appeal.pending.count
     end
-
-    private
-
-    def redis_info
-      @redis_info ||= if redis.is_a?(Redis::Namespace)
-                        redis.redis.info
-                      else
-                        redis.info
-                      end
-    end
   end
 end
diff --git a/app/controllers/admin/domain_blocks_controller.rb b/app/controllers/admin/domain_blocks_controller.rb
index 081550b76..b9691c5a3 100644
--- a/app/controllers/admin/domain_blocks_controller.rb
+++ b/app/controllers/admin/domain_blocks_controller.rb
@@ -31,31 +31,41 @@ module Admin
       @domain_block = DomainBlock.new(resource_params)
       existing_domain_block = resource_params[:domain].present? ? DomainBlock.rule_for(resource_params[:domain]) : nil
 
+      # Disallow accidentally downgrading a domain block
       if existing_domain_block.present? && !@domain_block.stricter_than?(existing_domain_block)
         @domain_block.save
         flash.now[:alert] = I18n.t('admin.domain_blocks.existing_domain_block_html', name: existing_domain_block.domain, unblock_url: admin_domain_block_path(existing_domain_block)).html_safe
         @domain_block.errors.delete(:domain)
-        render :new
-      else
-        if existing_domain_block.present?
-          @domain_block = existing_domain_block
-          @domain_block.update(resource_params)
-        end
+        return render :new
+      end
 
-        if @domain_block.save
-          DomainBlockWorker.perform_async(@domain_block.id)
-          log_action :create, @domain_block
-          redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.created_msg')
-        else
-          render :new
-        end
+      # Allow transparently upgrading a domain block
+      if existing_domain_block.present?
+        @domain_block = existing_domain_block
+        @domain_block.assign_attributes(resource_params)
+      end
+
+      # Require explicit confirmation when suspending
+      return render :confirm_suspension if requires_confirmation?
+
+      if @domain_block.save
+        DomainBlockWorker.perform_async(@domain_block.id)
+        log_action :create, @domain_block
+        redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.created_msg')
+      else
+        render :new
       end
     end
 
     def update
       authorize :domain_block, :update?
 
-      if @domain_block.update(update_params)
+      @domain_block.assign_attributes(update_params)
+
+      # Require explicit confirmation when suspending
+      return render :confirm_suspension if requires_confirmation?
+
+      if @domain_block.save
         DomainBlockWorker.perform_async(@domain_block.id, @domain_block.severity_previously_changed?)
         log_action :update, @domain_block
         redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.created_msg')
@@ -92,5 +102,9 @@ module Admin
     def action_from_button
       'save' if params[:save]
     end
+
+    def requires_confirmation?
+      @domain_block.valid? && (@domain_block.new_record? || @domain_block.severity_changed?) && @domain_block.severity.to_s == 'suspend' && !params[:confirm]
+    end
   end
 end
diff --git a/app/controllers/admin/webhooks_controller.rb b/app/controllers/admin/webhooks_controller.rb
index 1ed3fd18a..01d9ba8ce 100644
--- a/app/controllers/admin/webhooks_controller.rb
+++ b/app/controllers/admin/webhooks_controller.rb
@@ -71,7 +71,7 @@ module Admin
     end
 
     def resource_params
-      params.require(:webhook).permit(:url, events: [])
+      params.require(:webhook).permit(:url, :template, events: [])
     end
   end
 end
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index 8af4242ba..ddb94d5ca 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -90,7 +90,7 @@ class Api::V1::AccountsController < Api::BaseController
   end
 
   def account_params
-    params.permit(:username, :email, :password, :agreement, :locale, :reason)
+    params.permit(:username, :email, :password, :agreement, :locale, :reason, :time_zone)
   end
 
   def check_enabled_registrations
diff --git a/app/controllers/api/v1/conversations_controller.rb b/app/controllers/api/v1/conversations_controller.rb
index 9034e8a2f..c55500f76 100644
--- a/app/controllers/api/v1/conversations_controller.rb
+++ b/app/controllers/api/v1/conversations_controller.rb
@@ -11,7 +11,7 @@ class Api::V1::ConversationsController < Api::BaseController
 
   def index
     @conversations = paginated_conversations
-    render json: @conversations, each_serializer: REST::ConversationSerializer
+    render json: @conversations, each_serializer: REST::ConversationSerializer, relationships: StatusRelationshipsPresenter.new(@conversations.map(&:last_status), current_user&.account_id)
   end
 
   def read
@@ -32,7 +32,20 @@ class Api::V1::ConversationsController < Api::BaseController
 
   def paginated_conversations
     AccountConversation.where(account: current_account)
-                       .to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
+                       .includes(
+                         account: :account_stat,
+                         last_status: [
+                           :media_attachments,
+                           :preview_cards,
+                           :status_stat,
+                           :tags,
+                           {
+                             active_mentions: [account: :account_stat],
+                             account: :account_stat,
+                           },
+                         ]
+                       )
+                       .to_a_paginated_by_id(limit_param(LIMIT), **params_slice(:max_id, :since_id, :min_id))
   end
 
   def insert_pagination_headers
diff --git a/app/controllers/api/v1/lists_controller.rb b/app/controllers/api/v1/lists_controller.rb
index 843ca2ec2..4bbbed267 100644
--- a/app/controllers/api/v1/lists_controller.rb
+++ b/app/controllers/api/v1/lists_controller.rb
@@ -42,6 +42,6 @@ class Api::V1::ListsController < Api::BaseController
   end
 
   def list_params
-    params.permit(:title, :replies_policy)
+    params.permit(:title, :replies_policy, :exclusive)
   end
 end
diff --git a/app/controllers/backups_controller.rb b/app/controllers/backups_controller.rb
index 5891da6f6..205df48d4 100644
--- a/app/controllers/backups_controller.rb
+++ b/app/controllers/backups_controller.rb
@@ -11,15 +11,15 @@ class BackupsController < ApplicationController
   def download
     case Paperclip::Attachment.default_options[:storage]
     when :s3
-      redirect_to @backup.dump.expiring_url(10)
+      redirect_to @backup.dump.expiring_url(10), allow_other_host: true
     when :fog
       if Paperclip::Attachment.default_options.dig(:fog_credentials, :openstack_temp_url_key).present?
-        redirect_to @backup.dump.expiring_url(Time.now.utc + 10)
+        redirect_to @backup.dump.expiring_url(Time.now.utc + 10), allow_other_host: true
       else
-        redirect_to full_asset_url(@backup.dump.url)
+        redirect_to full_asset_url(@backup.dump.url), allow_other_host: true
       end
     when :filesystem
-      redirect_to full_asset_url(@backup.dump.url)
+      redirect_to full_asset_url(@backup.dump.url), allow_other_host: true
     end
   end
 
diff --git a/app/controllers/settings/imports_controller.rb b/app/controllers/settings/imports_controller.rb
index bdbf8796f..983caf22f 100644
--- a/app/controllers/settings/imports_controller.rb
+++ b/app/controllers/settings/imports_controller.rb
@@ -12,6 +12,7 @@ class Settings::ImportsController < Settings::BaseController
     muting: 'muted_accounts_failures.csv',
     domain_blocking: 'blocked_domains_failures.csv',
     bookmarks: 'bookmarks_failures.csv',
+    lists: 'lists_failures.csv',
   }.freeze
 
   TYPE_TO_HEADERS_MAP = {
@@ -20,6 +21,7 @@ class Settings::ImportsController < Settings::BaseController
     muting: ['Account address', 'Hide notifications'],
     domain_blocking: false,
     bookmarks: false,
+    lists: false,
   }.freeze
 
   def index
@@ -49,6 +51,8 @@ class Settings::ImportsController < Settings::BaseController
               csv << [row.data['domain']]
             when :bookmarks
               csv << [row.data['uri']]
+            when :lists
+              csv << [row.data['list_name'], row.data['acct']]
             end
           end
         end
diff --git a/app/controllers/settings/preferences/base_controller.rb b/app/controllers/settings/preferences/base_controller.rb
index faf778a7e..c1f8b4989 100644
--- a/app/controllers/settings/preferences/base_controller.rb
+++ b/app/controllers/settings/preferences/base_controller.rb
@@ -19,6 +19,6 @@ class Settings::Preferences::BaseController < Settings::BaseController
   end
 
   def user_params
-    params.require(:user).permit(:locale, chosen_languages: [], settings_attributes: UserSettings.keys)
+    params.require(:user).permit(:locale, :time_zone, chosen_languages: [], settings_attributes: UserSettings.keys)
   end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 014e3a3f9..3148756b7 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -170,11 +170,11 @@ module ApplicationHelper
   end
 
   def storage_host
-    URI::HTTPS.build(host: storage_host_name).to_s
+    "https://#{storage_host_var}"
   end
 
   def storage_host?
-    storage_host_name.present?
+    storage_host_var.present?
   end
 
   def quote_wrap(text, line_width: 80, break_sequence: "\n")
@@ -235,7 +235,7 @@ module ApplicationHelper
 
   private
 
-  def storage_host_name
+  def storage_host_var
     ENV.fetch('S3_ALIAS_HOST', nil) || ENV.fetch('S3_CLOUDFRONT_HOST', nil)
   end
 end
diff --git a/app/helpers/react_component_helper.rb b/app/helpers/react_component_helper.rb
index fc08de13d..ce616e830 100644
--- a/app/helpers/react_component_helper.rb
+++ b/app/helpers/react_component_helper.rb
@@ -11,7 +11,7 @@ module ReactComponentHelper
   end
 
   def react_admin_component(name, props = {})
-    data = { 'admin-component': name.to_s.camelcase, props: Oj.dump({ locale: I18n.locale }.merge(props)) }
+    data = { 'admin-component': name.to_s.camelcase, props: Oj.dump(props) }
     div_tag_with_data(data)
   end
 
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index 3d5592867..ae89cec78 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -5,10 +5,6 @@ module SettingsHelper
     LanguagesHelper::SUPPORTED_LOCALES.keys
   end
 
-  def hash_to_object(hash)
-    HashObject.new(hash)
-  end
-
   def session_device_icon(session)
     device = session.detection.device
 
diff --git a/app/javascript/flavours/glitch/actions/importer/normalizer.js b/app/javascript/flavours/glitch/actions/importer/normalizer.js
index f0d47f95e..540e6cba7 100644
--- a/app/javascript/flavours/glitch/actions/importer/normalizer.js
+++ b/app/javascript/flavours/glitch/actions/importer/normalizer.js
@@ -6,7 +6,7 @@ import { unescapeHTML } from 'flavours/glitch/utils/html';
 
 const domParser = new DOMParser();
 
-const makeEmojiMap = record => record.emojis.reduce((obj, emoji) => {
+const makeEmojiMap = emojis => emojis.reduce((obj, emoji) => {
   obj[`:${emoji.shortcode}:`] = emoji;
   return obj;
 }, {});
@@ -20,7 +20,7 @@ export function searchTextFromRawStatus (status) {
 export function normalizeAccount(account) {
   account = { ...account };
 
-  const emojiMap = makeEmojiMap(account);
+  const emojiMap = makeEmojiMap(account.emojis);
   const displayName = account.display_name.trim().length === 0 ? account.username : account.display_name;
 
   account.display_name_html = emojify(escapeTextContentForBrowser(displayName), emojiMap);
@@ -78,7 +78,7 @@ export function normalizeStatus(status, normalOldStatus, settings) {
   } else {
     const spoilerText   = normalStatus.spoiler_text || '';
     const searchContent = ([spoilerText, status.content].concat((status.poll && status.poll.options) ? status.poll.options.map(option => option.title) : [])).concat(status.media_attachments.map(att => att.description)).join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
-    const emojiMap      = makeEmojiMap(normalStatus);
+    const emojiMap      = makeEmojiMap(normalStatus.emojis);
 
     normalStatus.search_index = domParser.parseFromString(searchContent, 'text/html').documentElement.textContent;
     normalStatus.contentHtml  = emojify(normalStatus.content, emojiMap);
@@ -89,22 +89,48 @@ export function normalizeStatus(status, normalOldStatus, settings) {
   return normalStatus;
 }
 
+export function normalizeStatusTranslation(translation, status) {
+  const emojiMap = makeEmojiMap(status.get('emojis').toJS());
+
+  const normalTranslation = {
+    detected_source_language: translation.detected_source_language,
+    language: translation.language,
+    provider: translation.provider,
+    contentHtml: emojify(translation.content, emojiMap),
+    spoilerHtml: emojify(escapeTextContentForBrowser(translation.spoiler_text), emojiMap),
+    spoiler_text: translation.spoiler_text,
+  };
+
+  return normalTranslation;
+}
+
 export function normalizePoll(poll) {
   const normalPoll = { ...poll };
-  const emojiMap = makeEmojiMap(normalPoll);
+  const emojiMap = makeEmojiMap(poll.emojis);
 
   normalPoll.options = poll.options.map((option, index) => ({
     ...option,
     voted: poll.own_votes && poll.own_votes.includes(index),
-    title_emojified: emojify(escapeTextContentForBrowser(option.title), emojiMap),
+    titleHtml: emojify(escapeTextContentForBrowser(option.title), emojiMap),
   }));
 
   return normalPoll;
 }
 
+export function normalizePollOptionTranslation(translation, poll) {
+  const emojiMap = makeEmojiMap(poll.get('emojis').toJS());
+
+  const normalTranslation = {
+    ...translation,
+    titleHtml: emojify(escapeTextContentForBrowser(translation.title), emojiMap),
+  };
+
+  return normalTranslation;
+}
+
 export function normalizeAnnouncement(announcement) {
   const normalAnnouncement = { ...announcement };
-  const emojiMap = makeEmojiMap(normalAnnouncement);
+  const emojiMap = makeEmojiMap(normalAnnouncement.emojis);
 
   normalAnnouncement.contentHtml = emojify(normalAnnouncement.content, emojiMap);
 
diff --git a/app/javascript/flavours/glitch/actions/lists.js b/app/javascript/flavours/glitch/actions/lists.js
index 2faa54b95..b0789cd42 100644
--- a/app/javascript/flavours/glitch/actions/lists.js
+++ b/app/javascript/flavours/glitch/actions/lists.js
@@ -151,10 +151,10 @@ export const createListFail = error => ({
   error,
 });
 
-export const updateList = (id, title, shouldReset, replies_policy) => (dispatch, getState) => {
+export const updateList = (id, title, shouldReset, isExclusive, replies_policy) => (dispatch, getState) => {
   dispatch(updateListRequest(id));
 
-  api(getState).put(`/api/v1/lists/${id}`, { title, replies_policy }).then(({ data }) => {
+  api(getState).put(`/api/v1/lists/${id}`, { title, replies_policy, exclusive: typeof isExclusive === 'undefined' ? undefined : !!isExclusive }).then(({ data }) => {
     dispatch(updateListSuccess(data));
 
     if (shouldReset) {
diff --git a/app/javascript/flavours/glitch/actions/notifications.js b/app/javascript/flavours/glitch/actions/notifications.js
index c201d6bde..f370905de 100644
--- a/app/javascript/flavours/glitch/actions/notifications.js
+++ b/app/javascript/flavours/glitch/actions/notifications.js
@@ -1,4 +1,4 @@
-import IntlMessageFormat from 'intl-messageformat';
+import { IntlMessageFormat } from 'intl-messageformat';
 import { defineMessages } from 'react-intl';
 
 import { List as ImmutableList } from 'immutable';
diff --git a/app/javascript/flavours/glitch/actions/statuses.js b/app/javascript/flavours/glitch/actions/statuses.js
index 9bc9bf387..5bdd31c34 100644
--- a/app/javascript/flavours/glitch/actions/statuses.js
+++ b/app/javascript/flavours/glitch/actions/statuses.js
@@ -344,7 +344,8 @@ export const translateStatusFail = (id, error) => ({
   error,
 });
 
-export const undoStatusTranslation = id => ({
+export const undoStatusTranslation = (id, pollId) => ({
   type: STATUS_TRANSLATE_UNDO,
   id,
+  pollId,
 });
diff --git a/app/javascript/flavours/glitch/actions/streaming.js b/app/javascript/flavours/glitch/actions/streaming.js
index e16a7409e..f1c44d2e2 100644
--- a/app/javascript/flavours/glitch/actions/streaming.js
+++ b/app/javascript/flavours/glitch/actions/streaming.js
@@ -1,6 +1,6 @@
 // @ts-check
 
-import { getLocale } from 'mastodon/locales';
+import { getLocale } from 'flavours/glitch/locales';
 
 import { connectStream } from '../stream';
 
@@ -25,8 +25,6 @@ import {
   fillListTimelineGaps,
 } from './timelines';
 
-const { messages } = getLocale();
-
 /**
  * @param {number} max
  * @returns {number}
@@ -44,8 +42,10 @@ const randomUpTo = max =>
  * @param {function(object): boolean} [options.accept]
  * @returns {function(): void}
  */
-export const connectTimelineStream = (timelineId, channelName, params = {}, options = {}) =>
-  connectStream(channelName, params, (dispatch, getState) => {
+export const connectTimelineStream = (timelineId, channelName, params = {}, options = {}) => {
+  const { messages } = getLocale();
+
+  return connectStream(channelName, params, (dispatch, getState) => {
     const locale = getState().getIn(['meta', 'locale']);
 
     // @ts-expect-error
@@ -122,6 +122,7 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
       },
     };
   });
+};
 
 /**
  * @param {Function} dispatch
diff --git a/app/javascript/flavours/glitch/components/admin/ImpactReport.jsx b/app/javascript/flavours/glitch/components/admin/ImpactReport.jsx
new file mode 100644
index 000000000..9ec1460fc
--- /dev/null
+++ b/app/javascript/flavours/glitch/components/admin/ImpactReport.jsx
@@ -0,0 +1,91 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import { FormattedNumber, FormattedMessage } from 'react-intl';
+
+import classNames from 'classnames';
+
+import api from 'flavours/glitch/api';
+import { Skeleton } from 'flavours/glitch/components/skeleton';
+
+export default class ImpactReport extends PureComponent {
+
+  static propTypes = {
+    domain: PropTypes.string.isRequired,
+  };
+
+  state = {
+    loading: true,
+    data: null,
+  };
+
+  componentDidMount () {
+    const { domain } = this.props;
+
+    const params = {
+      domain: domain,
+      include_subdomains: true,
+    };
+
+    api().post('/api/v1/admin/measures', {
+      keys: ['instance_accounts', 'instance_follows', 'instance_followers'],
+      start_at: null,
+      end_at: null,
+      instance_accounts: params,
+      instance_follows: params,
+      instance_followers: params,
+    }).then(res => {
+      this.setState({
+        loading: false,
+        data: res.data,
+      });
+    }).catch(err => {
+      console.error(err);
+    });
+  }
+
+  render () {
+    const { loading, data } = this.state;
+
+    return (
+      <div className='dimension'>
+        <h4><FormattedMessage id='admin.impact_report.title' defaultMessage='Impact summary' /></h4>
+
+        <table>
+          <tbody>
+            <tr className='dimension__item'>
+              <td className='dimension__item__key'>
+                <FormattedMessage id='admin.impact_report.instance_accounts' defaultMessage='Accounts profiles this would delete' />
+              </td>
+
+              <td className='dimension__item__value'>
+                {loading ? <Skeleton width={60} /> : <FormattedNumber value={data[0].total} />}
+              </td>
+            </tr>
+
+            <tr className={classNames('dimension__item', { negative: !loading && data[1].total > 0 })}>
+              <td className='dimension__item__key'>
+                <FormattedMessage id='admin.impact_report.instance_follows' defaultMessage='Followers their users would lose' />
+              </td>
+
+              <td className='dimension__item__value'>
+                {loading ? <Skeleton width={60} /> : <FormattedNumber value={data[1].total} />}
+              </td>
+            </tr>
+
+            <tr className={classNames('dimension__item', { negative: !loading && data[2].total > 0 })}>
+              <td className='dimension__item__key'>
+                <FormattedMessage id='admin.impact_report.instance_followers' defaultMessage='Followers our users would lose' />
+              </td>
+
+              <td className='dimension__item__value'>
+                {loading ? <Skeleton width={60} /> : <FormattedNumber value={data[2].total} />}
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/flavours/glitch/components/domain.tsx b/app/javascript/flavours/glitch/components/domain.tsx
index d61e4074e..50c5c256e 100644
--- a/app/javascript/flavours/glitch/components/domain.tsx
+++ b/app/javascript/flavours/glitch/components/domain.tsx
@@ -1,8 +1,7 @@
 import { useCallback } from 'react';
 import * as React from 'react';
 
-import type { InjectedIntl } from 'react-intl';
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 
 import { IconButton } from './icon_button';
 
@@ -16,9 +15,11 @@ const messages = defineMessages({
 interface Props {
   domain: string;
   onUnblockDomain: (domain: string) => void;
-  intl: InjectedIntl;
 }
-const _Domain: React.FC<Props> = ({ domain, onUnblockDomain, intl }) => {
+
+export const Domain: React.FC<Props> = ({ domain, onUnblockDomain }) => {
+  const intl = useIntl();
+
   const handleDomainUnblock = useCallback(() => {
     onUnblockDomain(domain);
   }, [domain, onUnblockDomain]);
@@ -42,5 +43,3 @@ const _Domain: React.FC<Props> = ({ domain, onUnblockDomain, intl }) => {
     </div>
   );
 };
-
-export const Domain = injectIntl(_Domain);
diff --git a/app/javascript/flavours/glitch/components/dropdown_menu.jsx b/app/javascript/flavours/glitch/components/dropdown_menu.jsx
index 03bf6e685..5294244ec 100644
--- a/app/javascript/flavours/glitch/components/dropdown_menu.jsx
+++ b/app/javascript/flavours/glitch/components/dropdown_menu.jsx
@@ -121,10 +121,10 @@ class DropdownMenu extends PureComponent {
       return <li key={`sep-${i}`} className='dropdown-menu__separator' />;
     }
 
-    const { text, href = '#', target = '_blank', method } = option;
+    const { text, href = '#', target = '_blank', method, dangerous } = option;
 
     return (
-      <li className='dropdown-menu__item' key={`${text}-${i}`}>
+      <li className={classNames('dropdown-menu__item', { 'dropdown-menu__item--dangerous': dangerous })} key={`${text}-${i}`}>
         <a href={href} target={target} data-method={method} rel='noopener noreferrer' role='button' tabIndex={0} ref={i === 0 ? this.setFocusRef : null} onClick={this.handleClick} onKeyPress={this.handleItemKeyPress} data-index={i}>
           {text}
         </a>
diff --git a/app/javascript/flavours/glitch/components/load_gap.tsx b/app/javascript/flavours/glitch/components/load_gap.tsx
index 52d701d5d..c86e70f9f 100644
--- a/app/javascript/flavours/glitch/components/load_gap.tsx
+++ b/app/javascript/flavours/glitch/components/load_gap.tsx
@@ -1,7 +1,6 @@
 import { useCallback } from 'react';
 
-import type { InjectedIntl } from 'react-intl';
-import { injectIntl, defineMessages } from 'react-intl';
+import { useIntl, defineMessages } from 'react-intl';
 
 import { Icon } from 'flavours/glitch/components/icon';
 
@@ -13,10 +12,11 @@ interface Props {
   disabled: boolean;
   maxId: string;
   onClick: (maxId: string) => void;
-  intl: InjectedIntl;
 }
 
-const _LoadGap: React.FC<Props> = ({ disabled, maxId, onClick, intl }) => {
+export const LoadGap: React.FC<Props> = ({ disabled, maxId, onClick }) => {
+  const intl = useIntl();
+
   const handleClick = useCallback(() => {
     onClick(maxId);
   }, [maxId, onClick]);
@@ -32,5 +32,3 @@ const _LoadGap: React.FC<Props> = ({ disabled, maxId, onClick, intl }) => {
     </button>
   );
 };
-
-export const LoadGap = injectIntl(_LoadGap);
diff --git a/app/javascript/flavours/glitch/components/load_more.jsx b/app/javascript/flavours/glitch/components/load_more.jsx
deleted file mode 100644
index 1cdf6836d..000000000
--- a/app/javascript/flavours/glitch/components/load_more.jsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-
-import { FormattedMessage } from 'react-intl';
-
-export default class LoadMore extends PureComponent {
-
-  static propTypes = {
-    onClick: PropTypes.func,
-    disabled: PropTypes.bool,
-    visible: PropTypes.bool,
-  };
-
-  static defaultProps = {
-    visible: true,
-  };
-
-  render() {
-    const { disabled, visible } = this.props;
-
-    return (
-      <button className='load-more' disabled={disabled || !visible} style={{ visibility: visible ? 'visible' : 'hidden' }} onClick={this.props.onClick}>
-        <FormattedMessage id='status.load_more' defaultMessage='Load more' />
-      </button>
-    );
-  }
-
-}
diff --git a/app/javascript/flavours/glitch/components/load_more.tsx b/app/javascript/flavours/glitch/components/load_more.tsx
new file mode 100644
index 000000000..8b5746ad3
--- /dev/null
+++ b/app/javascript/flavours/glitch/components/load_more.tsx
@@ -0,0 +1,24 @@
+import { FormattedMessage } from 'react-intl';
+
+interface Props {
+  onClick: (event: React.MouseEvent) => void;
+  disabled?: boolean;
+  visible?: boolean;
+}
+export const LoadMore: React.FC<Props> = ({
+  onClick,
+  disabled,
+  visible = true,
+}) => {
+  return (
+    <button
+      type='button'
+      className='load-more'
+      disabled={disabled || !visible}
+      style={{ visibility: visible ? 'visible' : 'hidden' }}
+      onClick={onClick}
+    >
+      <FormattedMessage id='status.load_more' defaultMessage='Load more' />
+    </button>
+  );
+};
diff --git a/app/javascript/flavours/glitch/components/media_attachments.jsx b/app/javascript/flavours/glitch/components/media_attachments.jsx
index 2c1c2831e..4e777437a 100644
--- a/app/javascript/flavours/glitch/components/media_attachments.jsx
+++ b/app/javascript/flavours/glitch/components/media_attachments.jsx
@@ -52,8 +52,9 @@ export default class MediaAttachments extends ImmutablePureComponent {
   };
 
   render () {
-    const { status, lang, width, height, revealed } = this.props;
+    const { status, width, height, revealed } = this.props;
     const mediaAttachments = status.get('media_attachments');
+    const language = status.getIn(['language', 'translation']) || status.get('language') || this.props.lang;
 
     if (mediaAttachments.size === 0) {
       return null;
@@ -61,14 +62,15 @@ export default class MediaAttachments extends ImmutablePureComponent {
 
     if (mediaAttachments.getIn([0, 'type']) === 'audio') {
       const audio = mediaAttachments.get(0);
+      const description = audio.getIn(['translation', 'description']) || audio.get('description');
 
       return (
         <Bundle fetchComponent={Audio} loading={this.renderLoadingAudioPlayer} >
           {Component => (
             <Component
               src={audio.get('url')}
-              alt={audio.get('description')}
-              lang={lang || status.get('language')}
+              alt={description}
+              lang={language}
               width={width}
               height={height}
               poster={audio.get('preview_url') || status.getIn(['account', 'avatar_static'])}
@@ -82,6 +84,7 @@ export default class MediaAttachments extends ImmutablePureComponent {
       );
     } else if (mediaAttachments.getIn([0, 'type']) === 'video') {
       const video = mediaAttachments.get(0);
+      const description = video.getIn(['translation', 'description']) || video.get('description');
 
       return (
         <Bundle fetchComponent={Video} loading={this.renderLoadingVideoPlayer} >
@@ -91,8 +94,8 @@ export default class MediaAttachments extends ImmutablePureComponent {
               frameRate={video.getIn(['meta', 'original', 'frame_rate'])}
               blurhash={video.get('blurhash')}
               src={video.get('url')}
-              alt={video.get('description')}
-              lang={lang || status.get('language')}
+              alt={description}
+              lang={language}
               width={width}
               height={height}
               inline
@@ -109,7 +112,7 @@ export default class MediaAttachments extends ImmutablePureComponent {
           {Component => (
             <Component
               media={mediaAttachments}
-              lang={lang || status.get('language')}
+              lang={language}
               sensitive={status.get('sensitive')}
               defaultWidth={width}
               revealed={revealed}
diff --git a/app/javascript/flavours/glitch/components/media_gallery.jsx b/app/javascript/flavours/glitch/components/media_gallery.jsx
index 19635ba25..4d8f78532 100644
--- a/app/javascript/flavours/glitch/components/media_gallery.jsx
+++ b/app/javascript/flavours/glitch/components/media_gallery.jsx
@@ -124,10 +124,12 @@ class Item extends PureComponent {
       badges.push(<span key='alt' className='media-gallery__gifv__label'>ALT</span>);
     }
 
+    const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
+
     if (attachment.get('type') === 'unknown') {
       return (
         <div className={classNames('media-gallery__item', { standalone, 'media-gallery__item--tall': height === 100, 'media-gallery__item--wide': width === 100 })} key={attachment.get('id')}>
-          <a className='media-gallery__item-thumbnail' href={attachment.get('remote_url') || attachment.get('url')} style={{ cursor: 'pointer' }} title={attachment.get('description')} lang={lang} target='_blank' rel='noopener noreferrer'>
+          <a className='media-gallery__item-thumbnail' href={attachment.get('remote_url') || attachment.get('url')} style={{ cursor: 'pointer' }} title={description} lang={lang} target='_blank' rel='noopener noreferrer'>
             <Blurhash
               hash={attachment.get('blurhash')}
               className='media-gallery__preview'
@@ -166,8 +168,8 @@ class Item extends PureComponent {
             src={previewUrl}
             srcSet={srcSet}
             sizes={sizes}
-            alt={attachment.get('description')}
-            title={attachment.get('description')}
+            alt={description}
+            title={description}
             lang={lang}
             style={{ objectPosition: letterbox ? null : `${x}% ${y}%` }}
             onLoad={this.handleImageLoad}
@@ -183,8 +185,8 @@ class Item extends PureComponent {
         <div className={classNames('media-gallery__gifv', { autoplay: autoPlay })}>
           <video
             className={`media-gallery__item-gifv-thumbnail${letterbox ? ' letterbox' : ''}`}
-            aria-label={attachment.get('description')}
-            title={attachment.get('description')}
+            aria-label={description}
+            title={description}
             lang={lang}
             role='application'
             src={attachment.get('url')}
diff --git a/app/javascript/flavours/glitch/components/poll.jsx b/app/javascript/flavours/glitch/components/poll.jsx
index 3ac9a2273..eca7b5c52 100644
--- a/app/javascript/flavours/glitch/components/poll.jsx
+++ b/app/javascript/flavours/glitch/components/poll.jsx
@@ -58,9 +58,9 @@ class Poll extends ImmutablePureComponent {
   };
 
   static getDerivedStateFromProps (props, state) {
-    const { poll, intl } = props;
+    const { poll } = props;
     const expires_at = poll.get('expires_at');
-    const expired = poll.get('expired') || expires_at !== null && (new Date(expires_at)).getTime() < intl.now();
+    const expired = poll.get('expired') || expires_at !== null && (new Date(expires_at)).getTime() < Date.now();
     return (expired === state.expired) ? null : { expired };
   }
 
@@ -77,10 +77,10 @@ class Poll extends ImmutablePureComponent {
   }
 
   _setupTimer () {
-    const { poll, intl } = this.props;
+    const { poll } = this.props;
     clearTimeout(this._timer);
     if (!this.state.expired) {
-      const delay = (new Date(poll.get('expires_at'))).getTime() - intl.now();
+      const delay = (new Date(poll.get('expires_at'))).getTime() - Date.now();
       this._timer = setTimeout(() => {
         this.setState({ expired: true });
       }, delay);
@@ -139,10 +139,12 @@ class Poll extends ImmutablePureComponent {
     const active          = !!this.state.selected[`${optionIndex}`];
     const voted           = option.get('voted') || (poll.get('own_votes') && poll.get('own_votes').includes(optionIndex));
 
-    let titleEmojified = option.get('title_emojified');
-    if (!titleEmojified) {
+    const title = option.getIn(['translation', 'title']) || option.get('title');
+    let titleHtml = option.getIn(['translation', 'titleHtml']) || option.get('titleHtml');
+
+    if (!titleHtml) {
       const emojiMap = makeEmojiMap(poll);
-      titleEmojified = emojify(escapeTextContentForBrowser(option.get('title')), emojiMap);
+      titleHtml = emojify(escapeTextContentForBrowser(title), emojiMap);
     }
 
     return (
@@ -164,7 +166,7 @@ class Poll extends ImmutablePureComponent {
               role={poll.get('multiple') ? 'checkbox' : 'radio'}
               onKeyPress={this.handleOptionKeyPress}
               aria-checked={active}
-              aria-label={option.get('title')}
+              aria-label={title}
               lang={lang}
               data-index={optionIndex}
             />
@@ -183,7 +185,7 @@ class Poll extends ImmutablePureComponent {
           <span
             className='poll__option__text translate'
             lang={lang}
-            dangerouslySetInnerHTML={{ __html: titleEmojified }}
+            dangerouslySetInnerHTML={{ __html: titleHtml }}
           />
 
           {!!voted && <span className='poll__voted'>
diff --git a/app/javascript/flavours/glitch/components/relative_timestamp.tsx b/app/javascript/flavours/glitch/components/relative_timestamp.tsx
index 205dc2540..04f1bfa90 100644
--- a/app/javascript/flavours/glitch/components/relative_timestamp.tsx
+++ b/app/javascript/flavours/glitch/components/relative_timestamp.tsx
@@ -1,6 +1,6 @@
 import { Component } from 'react';
 
-import type { InjectedIntl } from 'react-intl';
+import type { IntlShape } from 'react-intl';
 import { injectIntl, defineMessages } from 'react-intl';
 
 const messages = defineMessages({
@@ -103,7 +103,7 @@ const getUnitDelay = (units: string) => {
 };
 
 export const timeAgoString = (
-  intl: InjectedIntl,
+  intl: IntlShape,
   date: Date,
   now: number,
   year: number,
@@ -155,7 +155,7 @@ export const timeAgoString = (
 };
 
 const timeRemainingString = (
-  intl: InjectedIntl,
+  intl: IntlShape,
   date: Date,
   now: number,
   timeGiven = true
@@ -190,7 +190,7 @@ const timeRemainingString = (
 };
 
 interface Props {
-  intl: InjectedIntl;
+  intl: IntlShape;
   timestamp: string;
   year: number;
   futureDate?: boolean;
@@ -201,7 +201,7 @@ interface States {
 }
 class RelativeTimestamp extends Component<Props, States> {
   state = {
-    now: this.props.intl.now(),
+    now: Date.now(),
   };
 
   static defaultProps = {
@@ -223,7 +223,7 @@ class RelativeTimestamp extends Component<Props, States> {
 
   UNSAFE_componentWillReceiveProps(nextProps: Props) {
     if (this.props.timestamp !== nextProps.timestamp) {
-      this.setState({ now: this.props.intl.now() });
+      this.setState({ now: Date.now() });
     }
   }
 
@@ -253,7 +253,7 @@ class RelativeTimestamp extends Component<Props, States> {
         : Math.max(updateInterval, unitRemainder);
 
     this._timer = window.setTimeout(() => {
-      this.setState({ now: this.props.intl.now() });
+      this.setState({ now: Date.now() });
     }, delay);
   }
 
diff --git a/app/javascript/flavours/glitch/components/scrollable_list.jsx b/app/javascript/flavours/glitch/components/scrollable_list.jsx
index e7f447f58..f8a12c60c 100644
--- a/app/javascript/flavours/glitch/components/scrollable_list.jsx
+++ b/app/javascript/flavours/glitch/components/scrollable_list.jsx
@@ -15,7 +15,7 @@ import IntersectionObserverWrapper from 'flavours/glitch/features/ui/util/inters
 
 import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../features/ui/util/fullscreen';
 
-import LoadMore from './load_more';
+import { LoadMore } from './load_more';
 import LoadPending from './load_pending';
 import LoadingIndicator from './loading_indicator';
 
diff --git a/app/javascript/flavours/glitch/components/status.jsx b/app/javascript/flavours/glitch/components/status.jsx
index 5ce07f9e1..d6e1623a0 100644
--- a/app/javascript/flavours/glitch/components/status.jsx
+++ b/app/javascript/flavours/glitch/components/status.jsx
@@ -28,13 +28,19 @@ import StatusIcons from './status_icons';
 import StatusPrepend from './status_prepend';
 import StatusReactions from './status_reactions';
 
+const domParser = new DOMParser();
+
 export const textForScreenReader = (intl, status, rebloggedByText = false, expanded = false) => {
   const displayName = status.getIn(['account', 'display_name']);
 
+  const spoilerText = status.getIn(['translation', 'spoiler_text']) || status.get('spoiler_text');
+  const contentHtml = status.getIn(['translation', 'contentHtml']) || status.get('contentHtml');
+  const contentText = domParser.parseFromString(contentHtml, 'text/html').documentElement.textContent;
+
   const values = [
     displayName.length === 0 ? status.getIn(['account', 'acct']).split('@')[0] : displayName,
-    status.get('spoiler_text') && !expanded ? status.get('spoiler_text') : status.get('search_index').slice(status.get('spoiler_text').length),
-    new Date(status.get('created_at')).toLocaleString(undefined, { hour: '2-digit', minute: '2-digit', month: 'short', day: 'numeric' }),
+    spoilerText && !expanded ? spoilerText : contentText,
+    intl.formatDate(status.get('created_at'), { hour: '2-digit', minute: '2-digit', month: 'short', day: 'numeric' }),
     status.getIn(['account', 'acct']),
   ];
 
@@ -395,12 +401,14 @@ class Status extends ImmutablePureComponent {
 
   handleOpenVideo = (options) => {
     const { status } = this.props;
-    this.props.onOpenVideo(status.get('id'), status.getIn(['media_attachments', 0]), status.get('language'), options);
+    const lang = status.getIn(['translation', 'language']) || status.get('language');
+    this.props.onOpenVideo(status.get('id'), status.getIn(['media_attachments', 0]), lang, options);
   };
 
   handleOpenMedia = (media, index) => {
     const { status } = this.props;
-    this.props.onOpenMedia(status.get('id'), media, index, status.get('language'));
+    const lang = status.getIn(['translation', 'language']) || status.get('language');
+    this.props.onOpenMedia(status.get('id'), media, index, lang);
   };
 
   handleHotkeyOpenMedia = e => {
@@ -410,10 +418,11 @@ class Status extends ImmutablePureComponent {
     e.preventDefault();
 
     if (status.get('media_attachments').size > 0) {
+      const lang = status.getIn(['translation', 'language']) || status.get('language');
       if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
-        onOpenVideo(statusId, status.getIn(['media_attachments', 0]), { startTime: 0 });
+        onOpenVideo(statusId, status.getIn(['media_attachments', 0]), lang, { startTime: 0 });
       } else {
-        onOpenMedia(statusId, status.get('media_attachments'), 0);
+        onOpenMedia(statusId, status.get('media_attachments'), 0, lang);
       }
     }
   };
@@ -631,6 +640,8 @@ class Status extends ImmutablePureComponent {
       media.push(<PictureInPicturePlaceholder />);
       mediaIcons.push('video-camera');
     } else if (attachments.size > 0) {
+      const language = status.getIn(['translation', 'language']) || status.get('language');
+
       if (muted || attachments.some(item => item.get('type') === 'unknown')) {
         media.push(
           <AttachmentList
@@ -640,14 +651,15 @@ class Status extends ImmutablePureComponent {
         );
       } else if (attachments.getIn([0, 'type']) === 'audio') {
         const attachment = status.getIn(['media_attachments', 0]);
+        const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
 
         media.push(
           <Bundle fetchComponent={Audio} loading={this.renderLoadingAudioPlayer} >
             {Component => (
               <Component
                 src={attachment.get('url')}
-                alt={attachment.get('description')}
-                lang={status.get('language')}
+                alt={description}
+                lang={language}
                 poster={attachment.get('preview_url') || status.getIn(['account', 'avatar_static'])}
                 backgroundColor={attachment.getIn(['meta', 'colors', 'background'])}
                 foregroundColor={attachment.getIn(['meta', 'colors', 'foreground'])}
@@ -668,6 +680,7 @@ class Status extends ImmutablePureComponent {
         mediaIcons.push('music');
       } else if (attachments.getIn([0, 'type']) === 'video') {
         const attachment = status.getIn(['media_attachments', 0]);
+        const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
 
         media.push(
           <Bundle fetchComponent={Video} loading={this.renderLoadingVideoPlayer} >
@@ -676,8 +689,8 @@ class Status extends ImmutablePureComponent {
               frameRate={attachment.getIn(['meta', 'original', 'frame_rate'])}
               blurhash={attachment.get('blurhash')}
               src={attachment.get('url')}
-              alt={attachment.get('description')}
-              lang={status.get('language')}
+              alt={description}
+              lang={language}
               inline
               sensitive={status.get('sensitive')}
               letterbox={settings.getIn(['media', 'letterbox'])}
@@ -697,7 +710,7 @@ class Status extends ImmutablePureComponent {
             {Component => (
               <Component
                 media={attachments}
-                lang={status.get('language')}
+                lang={language}
                 sensitive={status.get('sensitive')}
                 letterbox={settings.getIn(['media', 'letterbox'])}
                 fullwidth={!rootId && settings.getIn(['media', 'fullwidth'])}
@@ -730,7 +743,8 @@ class Status extends ImmutablePureComponent {
     }
 
     if (status.get('poll')) {
-      contentMedia.push(<PollContainer pollId={status.get('poll')} lang={status.get('language')} />);
+      const language = status.getIn(['translation', 'language']) || status.get('language');
+      contentMedia.push(<PollContainer pollId={status.get('poll')} lang={language} />);
       contentMediaIcons.push('tasks');
     }
 
diff --git a/app/javascript/flavours/glitch/components/status_action_bar.jsx b/app/javascript/flavours/glitch/components/status_action_bar.jsx
index 5add660fc..eb5018797 100644
--- a/app/javascript/flavours/glitch/components/status_action_bar.jsx
+++ b/app/javascript/flavours/glitch/components/status_action_bar.jsx
@@ -21,7 +21,7 @@ const messages = defineMessages({
   delete: { id: 'status.delete', defaultMessage: 'Delete' },
   redraft: { id: 'status.redraft', defaultMessage: 'Delete & re-draft' },
   edit: { id: 'status.edit', defaultMessage: 'Edit' },
-  direct: { id: 'status.direct', defaultMessage: 'Direct message @{name}' },
+  direct: { id: 'status.direct', defaultMessage: 'Privately mention @{name}' },
   mention: { id: 'status.mention', defaultMessage: 'Mention @{name}' },
   mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' },
   block: { id: 'account.block', defaultMessage: 'Block @{name}' },
@@ -252,21 +252,21 @@ class StatusActionBar extends ImmutablePureComponent {
 
     if (writtenByMe) {
       menu.push({ text: intl.formatMessage(messages.edit), action: this.handleEditClick });
-      menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDeleteClick });
-      menu.push({ text: intl.formatMessage(messages.redraft), action: this.handleRedraftClick });
+      menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDeleteClick, dangerous: true });
+      menu.push({ text: intl.formatMessage(messages.redraft), action: this.handleRedraftClick, dangerous: true });
     } else {
       menu.push({ text: intl.formatMessage(messages.mention, { name: status.getIn(['account', 'username']) }), action: this.handleMentionClick });
       menu.push({ text: intl.formatMessage(messages.direct, { name: status.getIn(['account', 'username']) }), action: this.handleDirectClick });
       menu.push(null);
 
       if (!this.props.onFilter) {
-        menu.push({ text: intl.formatMessage(messages.filter), action: this.handleFilterClick });
+        menu.push({ text: intl.formatMessage(messages.filter), action: this.handleFilterClick, dangerous: true });
         menu.push(null);
       }
 
-      menu.push({ text: intl.formatMessage(messages.mute, { name: status.getIn(['account', 'username']) }), action: this.handleMuteClick });
-      menu.push({ text: intl.formatMessage(messages.block, { name: status.getIn(['account', 'username']) }), action: this.handleBlockClick });
-      menu.push({ text: intl.formatMessage(messages.report, { name: status.getIn(['account', 'username']) }), action: this.handleReport });
+      menu.push({ text: intl.formatMessage(messages.mute, { name: status.getIn(['account', 'username']) }), action: this.handleMuteClick, dangerous: true });
+      menu.push({ text: intl.formatMessage(messages.block, { name: status.getIn(['account', 'username']) }), action: this.handleBlockClick, dangerous: true });
+      menu.push({ text: intl.formatMessage(messages.report, { name: status.getIn(['account', 'username']) }), action: this.handleReport, dangerous: true });
 
       if (((permissions & PERMISSION_MANAGE_USERS) === PERMISSION_MANAGE_USERS && (accountAdminLink || statusAdminLink)) || (isRemote && (permissions & PERMISSION_MANAGE_FEDERATION) === PERMISSION_MANAGE_FEDERATION)) {
         menu.push(null);
diff --git a/app/javascript/flavours/glitch/components/status_content.jsx b/app/javascript/flavours/glitch/components/status_content.jsx
index dd35183e0..fc07252dd 100644
--- a/app/javascript/flavours/glitch/components/status_content.jsx
+++ b/app/javascript/flavours/glitch/components/status_content.jsx
@@ -329,11 +329,11 @@ class StatusContent extends PureComponent {
     const hidden = this.props.onExpandedToggle ? !this.props.expanded : this.state.hidden;
     const contentLocale = intl.locale.replace(/[_-].*/, '');
     const targetLanguages = this.props.languages?.get(status.get('language') || 'und');
-    const renderTranslate = this.props.onTranslate && this.context.identity.signedIn && ['public', 'unlisted'].includes(status.get('visibility')) && status.get('contentHtml').length > 0 && targetLanguages?.includes(contentLocale);
+    const renderTranslate = this.props.onTranslate && this.context.identity.signedIn && ['public', 'unlisted'].includes(status.get('visibility')) && status.get('search_index').trim().length > 0 && targetLanguages?.includes(contentLocale);
 
-    const content = { __html: status.get('translation') ? status.getIn(['translation', 'content']) : status.get('contentHtml') };
-    const spoilerContent = { __html: status.get('spoilerHtml') };
-    const lang = status.get('translation') ? intl.locale : status.get('language');
+    const content = { __html: status.getIn(['translation', 'contentHtml']) || status.get('contentHtml') };
+    const spoilerContent = { __html: status.getIn(['translation', 'spoilerHtml']) || status.get('spoilerHtml') };
+    const language = status.getIn(['translation', 'language']) || status.get('language');
     const classNames = classnames('status__content', {
       'status__content--with-action': parseClick && !disabled,
       'status__content--with-spoiler': status.get('spoiler_text').length > 0,
@@ -403,7 +403,7 @@ class StatusContent extends PureComponent {
           <p
             style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }}
           >
-            <span dangerouslySetInnerHTML={spoilerContent} className='translate' lang={lang} />
+            <span dangerouslySetInnerHTML={spoilerContent} className='translate' lang={language} />
             {' '}
             <button type='button' className='status__content__spoiler-link' onClick={this.handleSpoilerClick} aria-expanded={!hidden}>
               {toggleText}
@@ -421,7 +421,7 @@ class StatusContent extends PureComponent {
               className={textClassNames}
               onMouseEnter={this.handleMouseEnter}
               onMouseLeave={this.handleMouseLeave}
-              lang={lang}
+              lang={language}
             />
             {!hidden && translateButton}
             {media}
@@ -446,7 +446,7 @@ class StatusContent extends PureComponent {
             tabIndex={0}
             onMouseEnter={this.handleMouseEnter}
             onMouseLeave={this.handleMouseLeave}
-            lang={lang}
+            lang={language}
           />
           {translateButton}
           {media}
@@ -467,7 +467,7 @@ class StatusContent extends PureComponent {
             tabIndex={0}
             onMouseEnter={this.handleMouseEnter}
             onMouseLeave={this.handleMouseLeave}
-            lang={lang}
+            lang={language}
           />
           {translateButton}
           {media}
diff --git a/app/javascript/flavours/glitch/containers/admin_component.jsx b/app/javascript/flavours/glitch/containers/admin_component.jsx
index d73189d66..06c846f4d 100644
--- a/app/javascript/flavours/glitch/containers/admin_component.jsx
+++ b/app/javascript/flavours/glitch/containers/admin_component.jsx
@@ -1,25 +1,19 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { IntlProvider, addLocaleData } from 'react-intl';
-
-import { getLocale } from 'mastodon/locales';
-
-const { localeData, messages } = getLocale();
-addLocaleData(localeData);
+import { IntlProvider } from 'flavours/glitch/locales';
 
 export default class AdminComponent extends PureComponent {
 
   static propTypes = {
-    locale: PropTypes.string.isRequired,
     children: PropTypes.node.isRequired,
   };
 
   render () {
-    const { locale, children } = this.props;
+    const { children } = this.props;
 
     return (
-      <IntlProvider locale={locale} messages={messages}>
+      <IntlProvider>
         {children}
       </IntlProvider>
     );
diff --git a/app/javascript/flavours/glitch/containers/compose_container.jsx b/app/javascript/flavours/glitch/containers/compose_container.jsx
index a1edfb845..f92bf9797 100644
--- a/app/javascript/flavours/glitch/containers/compose_container.jsx
+++ b/app/javascript/flavours/glitch/containers/compose_container.jsx
@@ -1,38 +1,25 @@
-import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { IntlProvider, addLocaleData } from 'react-intl';
-
 import { Provider } from 'react-redux';
 
 import { fetchCustomEmojis } from 'flavours/glitch/actions/custom_emojis';
 import { hydrateStore } from 'flavours/glitch/actions/store';
 import Compose from 'flavours/glitch/features/standalone/compose';
 import initialState from 'flavours/glitch/initial_state';
+import { IntlProvider } from 'flavours/glitch/locales';
 import { store } from 'flavours/glitch/store';
 
-import { getLocale } from 'mastodon/locales';
-
-const { localeData, messages } = getLocale();
-addLocaleData(localeData);
-
 if (initialState) {
   store.dispatch(hydrateStore(initialState));
 }
 
 store.dispatch(fetchCustomEmojis());
 
-export default class TimelineContainer extends PureComponent {
-
-  static propTypes = {
-    locale: PropTypes.string.isRequired,
-  };
+export default class ComposeContainer extends PureComponent {
 
   render () {
-    const { locale } = this.props;
-
     return (
-      <IntlProvider locale={locale} messages={messages}>
+      <IntlProvider>
         <Provider store={store}>
           <Compose />
         </Provider>
diff --git a/app/javascript/flavours/glitch/containers/mastodon.jsx b/app/javascript/flavours/glitch/containers/mastodon.jsx
index 8f46c1697..ae2eb0b60 100644
--- a/app/javascript/flavours/glitch/containers/mastodon.jsx
+++ b/app/javascript/flavours/glitch/containers/mastodon.jsx
@@ -1,8 +1,6 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { IntlProvider, addLocaleData } from 'react-intl';
-
 import { Helmet } from 'react-helmet';
 import { BrowserRouter, Route } from 'react-router-dom';
 
@@ -17,11 +15,8 @@ import { connectUserStream } from 'flavours/glitch/actions/streaming';
 import ErrorBoundary from 'flavours/glitch/components/error_boundary';
 import UI from 'flavours/glitch/features/ui';
 import initialState, { title as siteTitle } from 'flavours/glitch/initial_state';
+import { IntlProvider } from 'flavours/glitch/locales';
 import { store } from 'flavours/glitch/store';
-import { getLocale } from 'locales';
-
-const { localeData, messages } = getLocale();
-addLocaleData(localeData);
 
 const title = process.env.NODE_ENV === 'production' ? siteTitle : `${siteTitle} (Dev)`;
 
@@ -45,10 +40,6 @@ const createIdentityContext = state => ({
 
 export default class Mastodon extends PureComponent {
 
-  static propTypes = {
-    locale: PropTypes.string.isRequired,
-  };
-
   static childContextTypes = {
     identity: PropTypes.shape({
       signedIn: PropTypes.bool.isRequired,
@@ -84,10 +75,8 @@ export default class Mastodon extends PureComponent {
   }
 
   render () {
-    const { locale } = this.props;
-
     return (
-      <IntlProvider locale={locale} messages={messages}>
+      <IntlProvider>
         <ReduxProvider store={store}>
           <ErrorBoundary>
             <BrowserRouter>
diff --git a/app/javascript/flavours/glitch/containers/media_container.jsx b/app/javascript/flavours/glitch/containers/media_container.jsx
index 0d2f193da..52aac5ebe 100644
--- a/app/javascript/flavours/glitch/containers/media_container.jsx
+++ b/app/javascript/flavours/glitch/containers/media_container.jsx
@@ -2,8 +2,6 @@ import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 import { createPortal } from 'react-dom';
 
-import { IntlProvider, addLocaleData } from 'react-intl';
-
 import { fromJS } from 'immutable';
 
 import { ImmutableHashtag as Hashtag } from 'flavours/glitch/components/hashtag';
@@ -14,19 +12,14 @@ import Audio from 'flavours/glitch/features/audio';
 import Card from 'flavours/glitch/features/status/components/card';
 import MediaModal from 'flavours/glitch/features/ui/components/media_modal';
 import Video from 'flavours/glitch/features/video';
+import { IntlProvider } from 'flavours/glitch/locales';
 import { getScrollbarWidth } from 'flavours/glitch/utils/scrollbar';
 
-import { getLocale } from 'mastodon/locales';
-
-const { localeData, messages } = getLocale();
-addLocaleData(localeData);
-
 const MEDIA_COMPONENTS = { MediaGallery, Video, Card, Poll, Hashtag, Audio };
 
 export default class MediaContainer extends PureComponent {
 
   static propTypes = {
-    locale: PropTypes.string.isRequired,
     components: PropTypes.object.isRequired,
   };
 
@@ -75,7 +68,7 @@ export default class MediaContainer extends PureComponent {
   };
 
   render () {
-    const { locale, components } = this.props;
+    const { components } = this.props;
 
     let handleOpenVideo;
 
@@ -85,7 +78,7 @@ export default class MediaContainer extends PureComponent {
     }
 
     return (
-      <IntlProvider locale={locale} messages={messages}>
+      <IntlProvider>
         <>
           {[].map.call(components, (component, i) => {
             const componentName = component.getAttribute('data-component');
diff --git a/app/javascript/flavours/glitch/containers/status_container.jsx b/app/javascript/flavours/glitch/containers/status_container.jsx
index 0c2d9f0cd..ddb9ec87a 100644
--- a/app/javascript/flavours/glitch/containers/status_container.jsx
+++ b/app/javascript/flavours/glitch/containers/status_container.jsx
@@ -49,7 +49,7 @@ const messages = defineMessages({
   deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
   deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' },
   redraftConfirm: { id: 'confirmations.redraft.confirm', defaultMessage: 'Delete & redraft' },
-  redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.' },
+  redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.' },
   replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
   replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
   editConfirm: { id: 'confirmations.edit.confirm', defaultMessage: 'Edit' },
@@ -228,7 +228,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
 
   onTranslate (status) {
     if (status.get('translation')) {
-      dispatch(undoStatusTranslation(status.get('id')));
+      dispatch(undoStatusTranslation(status.get('id'), status.get('poll')));
     } else {
       dispatch(translateStatus(status.get('id')));
     }
diff --git a/app/javascript/flavours/glitch/features/account/components/header.jsx b/app/javascript/flavours/glitch/features/account/components/header.jsx
index 980bc58a3..86a2f8864 100644
--- a/app/javascript/flavours/glitch/features/account/components/header.jsx
+++ b/app/javascript/flavours/glitch/features/account/components/header.jsx
@@ -30,7 +30,7 @@ const messages = defineMessages({
   linkVerifiedOn: { id: 'account.link_verified_on', defaultMessage: 'Ownership of this link was checked on {date}' },
   account_locked: { id: 'account.locked_info', defaultMessage: 'This account privacy status is set to locked. The owner manually reviews who can follow them.' },
   mention: { id: 'account.mention', defaultMessage: 'Mention @{name}' },
-  direct: { id: 'account.direct', defaultMessage: 'Direct message @{name}' },
+  direct: { id: 'account.direct', defaultMessage: 'Privately mention @{name}' },
   unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
   block: { id: 'account.block', defaultMessage: 'Block @{name}' },
   mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' },
@@ -272,16 +272,16 @@ class Header extends ImmutablePureComponent {
       if (account.getIn(['relationship', 'muting'])) {
         menu.push({ text: intl.formatMessage(messages.unmute, { name: account.get('username') }), action: this.props.onMute });
       } else {
-        menu.push({ text: intl.formatMessage(messages.mute, { name: account.get('username') }), action: this.props.onMute });
+        menu.push({ text: intl.formatMessage(messages.mute, { name: account.get('username') }), action: this.props.onMute, dangerous: true });
       }
 
       if (account.getIn(['relationship', 'blocking'])) {
         menu.push({ text: intl.formatMessage(messages.unblock, { name: account.get('username') }), action: this.props.onBlock });
       } else {
-        menu.push({ text: intl.formatMessage(messages.block, { name: account.get('username') }), action: this.props.onBlock });
+        menu.push({ text: intl.formatMessage(messages.block, { name: account.get('username') }), action: this.props.onBlock, dangerous: true });
       }
 
-      menu.push({ text: intl.formatMessage(messages.report, { name: account.get('username') }), action: this.props.onReport });
+      menu.push({ text: intl.formatMessage(messages.report, { name: account.get('username') }), action: this.props.onReport, dangerous: true });
     }
 
     if (signedIn && isRemote) {
@@ -290,7 +290,7 @@ class Header extends ImmutablePureComponent {
       if (account.getIn(['relationship', 'domain_blocking'])) {
         menu.push({ text: intl.formatMessage(messages.unblockDomain, { domain: remoteDomain }), action: this.props.onUnblockDomain });
       } else {
-        menu.push({ text: intl.formatMessage(messages.blockDomain, { domain: remoteDomain }), action: this.props.onBlockDomain });
+        menu.push({ text: intl.formatMessage(messages.blockDomain, { domain: remoteDomain }), action: this.props.onBlockDomain, dangerous: true });
       }
     }
 
diff --git a/app/javascript/flavours/glitch/features/account_gallery/index.jsx b/app/javascript/flavours/glitch/features/account_gallery/index.jsx
index 33dd54ae8..6fd24870e 100644
--- a/app/javascript/flavours/glitch/features/account_gallery/index.jsx
+++ b/app/javascript/flavours/glitch/features/account_gallery/index.jsx
@@ -9,7 +9,7 @@ import { connect } from 'react-redux';
 import { lookupAccount, fetchAccount } from 'flavours/glitch/actions/accounts';
 import { openModal } from 'flavours/glitch/actions/modal';
 import { expandAccountMediaTimeline } from 'flavours/glitch/actions/timelines';
-import LoadMore from 'flavours/glitch/components/load_more';
+import { LoadMore } from 'flavours/glitch/components/load_more';
 import LoadingIndicator from 'flavours/glitch/components/loading_indicator';
 import ScrollContainer from 'flavours/glitch/containers/scroll_container';
 import ProfileColumnHeader from 'flavours/glitch/features/account/components/profile_column_header';
diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx b/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx
index 5480045b7..717114d5c 100644
--- a/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx
+++ b/app/javascript/flavours/glitch/features/account_timeline/components/header.jsx
@@ -153,7 +153,7 @@ export default class Header extends ImmutablePureComponent {
         {!(hideTabs || hidden) && (
           <div className='account__section-headline'>
             <NavLink exact to={`/@${account.get('acct')}`}><FormattedMessage id='account.posts' defaultMessage='Posts' /></NavLink>
-            <NavLink exact to={`/@${account.get('acct')}/with_replies`}><FormattedMessage id='account.posts_with_replies' defaultMessage='Posts with replies' /></NavLink>
+            <NavLink exact to={`/@${account.get('acct')}/with_replies`}><FormattedMessage id='account.posts_with_replies' defaultMessage='Posts and replies' /></NavLink>
             <NavLink exact to={`/@${account.get('acct')}/media`}><FormattedMessage id='account.media' defaultMessage='Media' /></NavLink>
           </div>
         )}
diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.jsx b/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.jsx
index 7b9f6fa37..2e10ea94a 100644
--- a/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.jsx
+++ b/app/javascript/flavours/glitch/features/account_timeline/components/moved_note.jsx
@@ -38,7 +38,7 @@ export default class MovedNote extends ImmutablePureComponent {
       <div className='account__moved-note'>
         <div className='account__moved-note__message'>
           <div className='account__moved-note__icon-wrapper'><Icon id='suitcase' className='account__moved-note__icon' fixedWidth /></div>
-          <FormattedMessage id='account.moved_to' defaultMessage='{name} has moved to:' values={{ name: <bdi><strong dangerouslySetInnerHTML={displayNameHtml} /></bdi> }} />
+          <FormattedMessage id='account.moved_to' defaultMessage='{name} has indicated that their new account is now:' values={{ name: <bdi><strong dangerouslySetInnerHTML={displayNameHtml} /></bdi> }} />
         </div>
 
         <a href={to.get('url')} onClick={this.handleAccountClick} className='detailed-status__display-name'>
diff --git a/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx b/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx
index 6ee5aba5f..270865df4 100644
--- a/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx
+++ b/app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx
@@ -148,7 +148,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(openModal({
       modalType: 'CONFIRM',
       modalProps: {
-        message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.' values={{ domain: <strong>{domain}</strong> }} />,
+        message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
         confirm: intl.formatMessage(messages.blockDomainConfirm),
         onConfirm: () => dispatch(blockDomain(domain)),
       },
diff --git a/app/javascript/flavours/glitch/features/compose/components/search_results.jsx b/app/javascript/flavours/glitch/features/compose/components/search_results.jsx
index 3c379fe15..9763335f1 100644
--- a/app/javascript/flavours/glitch/features/compose/components/search_results.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/search_results.jsx
@@ -7,7 +7,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { ImmutableHashtag as Hashtag } from 'flavours/glitch/components/hashtag';
 import { Icon } from 'flavours/glitch/components/icon';
-import LoadMore from 'flavours/glitch/components/load_more';
+import { LoadMore } from 'flavours/glitch/components/load_more';
 import AccountContainer from 'flavours/glitch/containers/account_container';
 import StatusContainer from 'flavours/glitch/containers/status_container';
 import { searchEnabled } from 'flavours/glitch/initial_state';
diff --git a/app/javascript/flavours/glitch/features/direct_timeline/index.jsx b/app/javascript/flavours/glitch/features/direct_timeline/index.jsx
index 315a5ee10..1be2d78b5 100644
--- a/app/javascript/flavours/glitch/features/direct_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/direct_timeline/index.jsx
@@ -19,7 +19,7 @@ import ColumnSettingsContainer from './containers/column_settings_container';
 import ConversationsListContainer from './containers/conversations_list_container';
 
 const messages = defineMessages({
-  title: { id: 'column.direct', defaultMessage: 'Direct messages' },
+  title: { id: 'column.direct', defaultMessage: 'Private mentions' },
 });
 
 const mapStateToProps = state => ({
@@ -117,7 +117,7 @@ class DirectTimeline extends PureComponent {
           onLoadMore={this.handleLoadMore}
           prepend={<div className='follow_requests-unlocked_explanation'><span><FormattedMessage id='compose_form.encryption_warning' defaultMessage='Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.' /> <a href='/terms' target='_blank'><FormattedMessage id='compose_form.direct_message_warning_learn_more' defaultMessage='Learn more' /></a></span></div>}
           alwaysPrepend
-          emptyMessage={<FormattedMessage id='empty_column.direct' defaultMessage="You don't have any direct messages yet. When you send or receive one, it will show up here." />}
+          emptyMessage={<FormattedMessage id='empty_column.direct' defaultMessage="You don't have any private mentions yet. When you send or receive one, it will show up here." />}
         />
       );
     } else {
@@ -130,7 +130,7 @@ class DirectTimeline extends PureComponent {
           onLoadMore={this.handleLoadMoreTimeline}
           prepend={<div className='follow_requests-unlocked_explanation'><span><FormattedMessage id='compose_form.encryption_warning' defaultMessage='Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.' /> <a href='/terms' target='_blank'><FormattedMessage id='compose_form.direct_message_warning_learn_more' defaultMessage='Learn more' /></a></span></div>}
           alwaysPrepend
-          emptyMessage={<FormattedMessage id='empty_column.direct' defaultMessage="You don't have any direct messages yet. When you send or receive one, it will show up here." />}
+          emptyMessage={<FormattedMessage id='empty_column.direct' defaultMessage="You don't have any private mentions yet. When you send or receive one, it will show up here." />}
         />
       );
     }
diff --git a/app/javascript/flavours/glitch/features/directory/index.jsx b/app/javascript/flavours/glitch/features/directory/index.jsx
index 4daa5f942..c9ab38c8f 100644
--- a/app/javascript/flavours/glitch/features/directory/index.jsx
+++ b/app/javascript/flavours/glitch/features/directory/index.jsx
@@ -13,7 +13,7 @@ import { addColumn, removeColumn, moveColumn, changeColumnParams } from 'flavour
 import { fetchDirectory, expandDirectory } from 'flavours/glitch/actions/directory';
 import Column from 'flavours/glitch/components/column';
 import ColumnHeader from 'flavours/glitch/components/column_header';
-import LoadMore from 'flavours/glitch/components/load_more';
+import { LoadMore } from 'flavours/glitch/components/load_more';
 import LoadingIndicator from 'flavours/glitch/components/loading_indicator';
 import { RadioButton } from 'flavours/glitch/components/radio_button';
 import ScrollContainer from 'flavours/glitch/containers/scroll_container';
diff --git a/app/javascript/flavours/glitch/features/explore/index.jsx b/app/javascript/flavours/glitch/features/explore/index.jsx
index a6e153add..fa5e8eca9 100644
--- a/app/javascript/flavours/glitch/features/explore/index.jsx
+++ b/app/javascript/flavours/glitch/features/explore/index.jsx
@@ -69,7 +69,7 @@ class Explore extends PureComponent {
           <Search />
         </div>
 
-        <div className='scrollable scrollable--flex'>
+        <div className='scrollable scrollable--flex' data-nosnippet>
           {isSearching ? (
             <SearchResults />
           ) : (
diff --git a/app/javascript/flavours/glitch/features/explore/results.jsx b/app/javascript/flavours/glitch/features/explore/results.jsx
index 601e375a7..d4523a583 100644
--- a/app/javascript/flavours/glitch/features/explore/results.jsx
+++ b/app/javascript/flavours/glitch/features/explore/results.jsx
@@ -11,7 +11,7 @@ import { connect } from 'react-redux';
 
 import { expandSearch } from 'flavours/glitch/actions/search';
 import { ImmutableHashtag as Hashtag } from 'flavours/glitch/components/hashtag';
-import LoadMore from 'flavours/glitch/components/load_more';
+import { LoadMore } from 'flavours/glitch/components/load_more';
 import LoadingIndicator from 'flavours/glitch/components/loading_indicator';
 import Account from 'flavours/glitch/containers/account_container';
 import Status from 'flavours/glitch/containers/status_container';
@@ -113,7 +113,7 @@ class Results extends PureComponent {
           <button onClick={this.handleSelectAll} className={type === 'all' && 'active'}><FormattedMessage id='search_results.all' defaultMessage='All' /></button>
           <button onClick={this.handleSelectAccounts} className={type === 'accounts' && 'active'}><FormattedMessage id='search_results.accounts' defaultMessage='People' /></button>
           <button onClick={this.handleSelectHashtags} className={type === 'hashtags' && 'active'}><FormattedMessage id='search_results.hashtags' defaultMessage='Hashtags' /></button>
-          <button onClick={this.handleSelectStatuses} className={type === 'statuses' && 'active'}><FormattedMessage id='search_results.statuses' defaultMessage='Toots' /></button>
+          <button onClick={this.handleSelectStatuses} className={type === 'statuses' && 'active'}><FormattedMessage id='search_results.statuses' defaultMessage='Posts' /></button>
         </div>
 
         <div className='explore__search-results'>
diff --git a/app/javascript/flavours/glitch/features/getting_started/index.jsx b/app/javascript/flavours/glitch/features/getting_started/index.jsx
index 0f6f3330e..1b3aec552 100644
--- a/app/javascript/flavours/glitch/features/getting_started/index.jsx
+++ b/app/javascript/flavours/glitch/features/getting_started/index.jsx
@@ -34,7 +34,7 @@ const messages = defineMessages({
   settings_subheading: { id: 'column_subheading.settings', defaultMessage: 'Settings' },
   community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
   explore: { id: 'navigation_bar.explore', defaultMessage: 'Explore' },
-  direct: { id: 'navigation_bar.direct', defaultMessage: 'Direct messages' },
+  direct: { id: 'navigation_bar.direct', defaultMessage: 'Private mentions' },
   bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
   settings: { id: 'navigation_bar.app_settings', defaultMessage: 'App settings' },
diff --git a/app/javascript/flavours/glitch/features/home_timeline/components/column_settings.jsx b/app/javascript/flavours/glitch/features/home_timeline/components/column_settings.jsx
index 07d0447a8..52b3ad060 100644
--- a/app/javascript/flavours/glitch/features/home_timeline/components/column_settings.jsx
+++ b/app/javascript/flavours/glitch/features/home_timeline/components/column_settings.jsx
@@ -37,7 +37,7 @@ class ColumnSettings extends PureComponent {
         </div>
 
         <div className='column-settings__row'>
-          <SettingToggle prefix='home_timeline' settings={settings} settingPath={['shows', 'direct']} onChange={onChange} label={<FormattedMessage id='home.column_settings.show_direct' defaultMessage='Show DMs' />} />
+          <SettingToggle prefix='home_timeline' settings={settings} settingPath={['shows', 'direct']} onChange={onChange} label={<FormattedMessage id='home.column_settings.show_direct' defaultMessage='Show private mentions' />} />
         </div>
 
         <span className='column-settings__section'><FormattedMessage id='home.column_settings.advanced' defaultMessage='Advanced' /></span>
diff --git a/app/javascript/flavours/glitch/features/list_timeline/index.jsx b/app/javascript/flavours/glitch/features/list_timeline/index.jsx
index 554a3a0e8..4b002f2b1 100644
--- a/app/javascript/flavours/glitch/features/list_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/list_timeline/index.jsx
@@ -8,6 +8,8 @@ import { Helmet } from 'react-helmet';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
+import Toggle from 'react-toggle';
+
 import { addColumn, removeColumn, moveColumn } from 'flavours/glitch/actions/columns';
 import { fetchList, deleteList, updateList } from 'flavours/glitch/actions/lists';
 import { openModal } from 'flavours/glitch/actions/modal';
@@ -145,7 +147,13 @@ class ListTimeline extends PureComponent {
   handleRepliesPolicyChange = ({ target }) => {
     const { dispatch } = this.props;
     const { id } = this.props.params;
-    dispatch(updateList(id, undefined, false, target.value));
+    dispatch(updateList(id, undefined, false, undefined, target.value));
+  };
+
+  onExclusiveToggle = ({ target }) => {
+    const { dispatch } = this.props;
+    const { id } = this.props.params;
+    dispatch(updateList(id, undefined, false, target.checked, undefined));
   };
 
   render () {
@@ -154,6 +162,7 @@ class ListTimeline extends PureComponent {
     const pinned = !!columnId;
     const title  = list ? list.get('title') : id;
     const replies_policy = list ? list.get('replies_policy') : undefined;
+    const isExclusive = list ? list.get('exclusive') : undefined;
 
     if (typeof list === 'undefined') {
       return (
@@ -191,6 +200,13 @@ class ListTimeline extends PureComponent {
             </button>
           </div>
 
+          <div className='setting-toggle'>
+            <Toggle id={`list-${id}-exclusive`} defaultChecked={isExclusive} onChange={this.onExclusiveToggle} />
+            <label htmlFor={`list-${id}-exclusive`} className='setting-toggle__label'>
+              <FormattedMessage id='lists.exclusive' defaultMessage='Hide these posts from home' />
+            </label>
+          </div>
+
           { replies_policy !== undefined && (
             <div role='group' aria-labelledby={`list-${id}-replies-policy`}>
               <span id={`list-${id}-replies-policy`} className='column-settings__section'>
diff --git a/app/javascript/flavours/glitch/features/local_settings/page/index.jsx b/app/javascript/flavours/glitch/features/local_settings/page/index.jsx
index 101df0413..300df8923 100644
--- a/app/javascript/flavours/glitch/features/local_settings/page/index.jsx
+++ b/app/javascript/flavours/glitch/features/local_settings/page/index.jsx
@@ -283,7 +283,7 @@ class LocalSettingsPage extends PureComponent {
     ),
     ({ intl, onChange, settings }) => (
       <div className='glitch local-settings__page content_warnings'>
-        <h1><FormattedMessage id='settings.content_warnings' defaultMessage='Content warnings' /></h1>
+        <h1><FormattedMessage id='settings.content_warnings' defaultMessage='Content Warnings' /></h1>
         <LocalSettingsPageItem
           settings={settings}
           item={['content_warnings', 'shared_state']}
diff --git a/app/javascript/flavours/glitch/features/status/components/action_bar.jsx b/app/javascript/flavours/glitch/features/status/components/action_bar.jsx
index 7fb9fc819..6790450c6 100644
--- a/app/javascript/flavours/glitch/features/status/components/action_bar.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/action_bar.jsx
@@ -19,7 +19,7 @@ const messages = defineMessages({
   delete: { id: 'status.delete', defaultMessage: 'Delete' },
   redraft: { id: 'status.redraft', defaultMessage: 'Delete & re-draft' },
   edit: { id: 'status.edit', defaultMessage: 'Edit' },
-  direct: { id: 'status.direct', defaultMessage: 'Direct message @{name}' },
+  direct: { id: 'status.direct', defaultMessage: 'Privately mention @{name}' },
   mention: { id: 'status.mention', defaultMessage: 'Mention @{name}' },
   reply: { id: 'status.reply', defaultMessage: 'Reply' },
   reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
@@ -186,15 +186,15 @@ class ActionBar extends PureComponent {
       menu.push({ text: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMuteClick });
       menu.push(null);
       menu.push({ text: intl.formatMessage(messages.edit), action: this.handleEditClick });
-      menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDeleteClick });
-      menu.push({ text: intl.formatMessage(messages.redraft), action: this.handleRedraftClick });
+      menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDeleteClick, dangerous: true });
+      menu.push({ text: intl.formatMessage(messages.redraft), action: this.handleRedraftClick, dangerous: true });
     } else {
       menu.push({ text: intl.formatMessage(messages.mention, { name: status.getIn(['account', 'username']) }), action: this.handleMentionClick });
       menu.push({ text: intl.formatMessage(messages.direct, { name: status.getIn(['account', 'username']) }), action: this.handleDirectClick });
       menu.push(null);
-      menu.push({ text: intl.formatMessage(messages.mute, { name: status.getIn(['account', 'username']) }), action: this.handleMuteClick });
-      menu.push({ text: intl.formatMessage(messages.block, { name: status.getIn(['account', 'username']) }), action: this.handleBlockClick });
-      menu.push({ text: intl.formatMessage(messages.report, { name: status.getIn(['account', 'username']) }), action: this.handleReport });
+      menu.push({ text: intl.formatMessage(messages.mute, { name: status.getIn(['account', 'username']) }), action: this.handleMuteClick, dangerous: true });
+      menu.push({ text: intl.formatMessage(messages.block, { name: status.getIn(['account', 'username']) }), action: this.handleBlockClick, dangerous: true });
+      menu.push({ text: intl.formatMessage(messages.report, { name: status.getIn(['account', 'username']) }), action: this.handleReport, dangerous: true });
       if (((permissions & PERMISSION_MANAGE_USERS) === PERMISSION_MANAGE_USERS && (accountAdminLink || statusAdminLink)) || (isRemote && (permissions & PERMISSION_MANAGE_FEDERATION) === PERMISSION_MANAGE_FEDERATION)) {
         menu.push(null);
         if ((permissions & PERMISSION_MANAGE_USERS) === PERMISSION_MANAGE_USERS) {
diff --git a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx b/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
index e34e537f0..55958f1fa 100644
--- a/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
+++ b/app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
@@ -158,6 +158,8 @@ class DetailedStatus extends ImmutablePureComponent {
       outerStyle.height = `${this.state.height}px`;
     }
 
+    const language = status.getIn(['translation', 'language']) || status.get('language');
+
     if (pictureInPicture.get('inUse')) {
       media.push(<PictureInPicturePlaceholder />);
       mediaIcons.push('video-camera');
@@ -166,12 +168,13 @@ class DetailedStatus extends ImmutablePureComponent {
         media.push(<AttachmentList media={status.get('media_attachments')} />);
       } else if (status.getIn(['media_attachments', 0, 'type']) === 'audio') {
         const attachment = status.getIn(['media_attachments', 0]);
+        const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
 
         media.push(
           <Audio
             src={attachment.get('url')}
-            alt={attachment.get('description')}
-            lang={status.get('language')}
+            alt={description}
+            lang={language}
             duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
             poster={attachment.get('preview_url') || status.getIn(['account', 'avatar_static'])}
             backgroundColor={attachment.getIn(['meta', 'colors', 'background'])}
@@ -187,14 +190,16 @@ class DetailedStatus extends ImmutablePureComponent {
         mediaIcons.push('music');
       } else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
         const attachment = status.getIn(['media_attachments', 0]);
+        const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
+
         media.push(
           <Video
             preview={attachment.get('preview_url')}
             frameRate={attachment.getIn(['meta', 'original', 'frame_rate'])}
             blurhash={attachment.get('blurhash')}
             src={attachment.get('url')}
-            alt={attachment.get('description')}
-            lang={status.get('language')}
+            alt={description}
+            lang={language}
             inline
             sensitive={status.get('sensitive')}
             letterbox={settings.getIn(['media', 'letterbox'])}
@@ -213,7 +218,7 @@ class DetailedStatus extends ImmutablePureComponent {
             standalone
             sensitive={status.get('sensitive')}
             media={status.get('media_attachments')}
-            lang={status.get('language')}
+            lang={language}
             letterbox={settings.getIn(['media', 'letterbox'])}
             fullwidth={settings.getIn(['media', 'fullwidth'])}
             hidden={!expanded}
@@ -251,7 +256,7 @@ class DetailedStatus extends ImmutablePureComponent {
     } else if (this.context.router) {
       reblogLink = (
         <>
-           · 
+          {' · '}
           <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/reblogs`} className='detailed-status__link'>
             <Icon id={reblogIcon} />
             <span className='detailed-status__reblogs'>
@@ -263,7 +268,7 @@ class DetailedStatus extends ImmutablePureComponent {
     } else {
       reblogLink = (
         <>
-           · 
+          {' · '}
           <a href={`/interact/${status.get('id')}?type=reblog`} className='detailed-status__link' onClick={this.handleModalLink}>
             <Icon id={reblogIcon} />
             <span className='detailed-status__reblogs'>
@@ -297,7 +302,7 @@ class DetailedStatus extends ImmutablePureComponent {
     if (status.get('edited_at')) {
       edited = (
         <>
-           · 
+          {' · '}
           <EditedTimestamp statusId={status.get('id')} timestamp={status.get('edited_at')} />
         </>
       );
diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx
index d2e04c2f7..85ed78905 100644
--- a/app/javascript/flavours/glitch/features/status/index.jsx
+++ b/app/javascript/flavours/glitch/features/status/index.jsx
@@ -68,7 +68,7 @@ const messages = defineMessages({
   deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
   deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' },
   redraftConfirm: { id: 'confirmations.redraft.confirm', defaultMessage: 'Delete & redraft' },
-  redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.' },
+  redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.' },
   revealAll: { id: 'status.show_more_all', defaultMessage: 'Show more for all' },
   hideAll: { id: 'status.show_less_all', defaultMessage: 'Show less for all' },
   statusTitleWithAttachments: { id: 'status.title.with_attachments', defaultMessage: '{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}' },
@@ -496,7 +496,7 @@ class Status extends ImmutablePureComponent {
     const { dispatch } = this.props;
 
     if (status.get('translation')) {
-      dispatch(undoStatusTranslation(status.get('id')));
+      dispatch(undoStatusTranslation(status.get('id'), status.get('poll')));
     } else {
       dispatch(translateStatus(status.get('id')));
     }
diff --git a/app/javascript/flavours/glitch/features/ui/components/audio_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/audio_modal.jsx
index 5c1564239..a6e15e543 100644
--- a/app/javascript/flavours/glitch/features/ui/components/audio_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/audio_modal.jsx
@@ -8,7 +8,7 @@ import Audio from 'flavours/glitch/features/audio';
 import Footer from 'flavours/glitch/features/picture_in_picture/components/footer';
 
 const mapStateToProps = (state, { statusId }) => ({
-  language: state.getIn(['statuses', statusId, 'language']),
+  status: state.getIn(['statuses', statusId]),
   accountStaticAvatar: state.getIn(['accounts', state.getIn(['statuses', statusId, 'account']), 'avatar_static']),
 });
 
@@ -17,7 +17,7 @@ class AudioModal extends ImmutablePureComponent {
   static propTypes = {
     media: ImmutablePropTypes.map.isRequired,
     statusId: PropTypes.string.isRequired,
-    language: PropTypes.string,
+    status: ImmutablePropTypes.map.isRequired,
     accountStaticAvatar: PropTypes.string.isRequired,
     options: PropTypes.shape({
       autoPlay: PropTypes.bool,
@@ -31,15 +31,17 @@ class AudioModal extends ImmutablePureComponent {
   };
 
   render () {
-    const { media, language, accountStaticAvatar, statusId, onClose } = this.props;
+    const { media, status, accountStaticAvatar, onClose } = this.props;
     const options = this.props.options || {};
+    const language = status.getIn(['translation', 'language']) || status.get('language');
+    const description = media.getIn(['translation', 'description']) || media.get('description');
 
     return (
       <div className='modal-root__modal audio-modal'>
         <div className='audio-modal__container'>
           <Audio
             src={media.get('url')}
-            alt={media.get('description')}
+            alt={description}
             lang={language}
             duration={media.getIn(['meta', 'original', 'duration'], 0)}
             height={150}
@@ -52,7 +54,7 @@ class AudioModal extends ImmutablePureComponent {
         </div>
 
         <div className='media-modal__overlay'>
-          {statusId && <Footer statusId={statusId} withOpenButton onClose={onClose} />}
+          {status && <Footer statusId={status.get('id')} withOpenButton onClose={onClose} />}
         </div>
       </div>
     );
diff --git a/app/javascript/flavours/glitch/features/ui/components/media_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/media_modal.jsx
index ed7081409..344f97fc0 100644
--- a/app/javascript/flavours/glitch/features/ui/components/media_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/media_modal.jsx
@@ -147,6 +147,7 @@ class MediaModal extends ImmutablePureComponent {
     const content = media.map((image) => {
       const width  = image.getIn(['meta', 'original', 'width']) || null;
       const height = image.getIn(['meta', 'original', 'height']) || null;
+      const description = image.getIn(['translation', 'description']) || image.get('description');
 
       if (image.get('type') === 'image') {
         return (
@@ -155,7 +156,7 @@ class MediaModal extends ImmutablePureComponent {
             src={image.get('url')}
             width={width}
             height={height}
-            alt={image.get('description')}
+            alt={description}
             lang={lang}
             key={image.get('url')}
             onClick={this.toggleNavigation}
@@ -178,7 +179,7 @@ class MediaModal extends ImmutablePureComponent {
             volume={volume || 1}
             onCloseVideo={onClose}
             detailed
-            alt={image.get('description')}
+            alt={description}
             lang={lang}
             key={image.get('url')}
           />
@@ -190,7 +191,7 @@ class MediaModal extends ImmutablePureComponent {
             width={width}
             height={height}
             key={image.get('url')}
-            alt={image.get('description')}
+            alt={description}
             lang={lang}
             onClick={this.toggleNavigation}
           />
diff --git a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
index 4c0f4bf9b..56b647701 100644
--- a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
@@ -20,7 +20,7 @@ const messages = defineMessages({
   explore: { id: 'explore.title', defaultMessage: 'Explore' },
   local: { id: 'tabs_bar.local_timeline', defaultMessage: 'Local' },
   federated: { id: 'tabs_bar.federated_timeline', defaultMessage: 'Federated' },
-  direct: { id: 'navigation_bar.direct', defaultMessage: 'Direct messages' },
+  direct: { id: 'navigation_bar.direct', defaultMessage: 'Private mentions' },
   favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
   bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
   lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
diff --git a/app/javascript/flavours/glitch/features/ui/components/video_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/video_modal.jsx
index 8f0b7254d..489e26a90 100644
--- a/app/javascript/flavours/glitch/features/ui/components/video_modal.jsx
+++ b/app/javascript/flavours/glitch/features/ui/components/video_modal.jsx
@@ -9,7 +9,7 @@ import Footer from 'flavours/glitch/features/picture_in_picture/components/foote
 import Video from 'flavours/glitch/features/video';
 
 const mapStateToProps = (state, { statusId }) => ({
-  language: state.getIn(['statuses', statusId, 'language']),
+  status: state.getIn(['statuses', statusId]),
 });
 
 class VideoModal extends ImmutablePureComponent {
@@ -17,7 +17,7 @@ class VideoModal extends ImmutablePureComponent {
   static propTypes = {
     media: ImmutablePropTypes.map.isRequired,
     statusId: PropTypes.string,
-    language: PropTypes.string,
+    status: ImmutablePropTypes.map,
     options: PropTypes.shape({
       startTime: PropTypes.number,
       autoPlay: PropTypes.bool,
@@ -38,8 +38,10 @@ class VideoModal extends ImmutablePureComponent {
   }
 
   render () {
-    const { media, statusId, language, onClose } = this.props;
+    const { media, status, onClose } = this.props;
     const options = this.props.options || {};
+    const language = status.getIn(['translation', 'language']) || status.get('language');
+    const description = media.getIn(['translation', 'description']) || media.get('description');
 
     return (
       <div className='modal-root__modal video-modal'>
@@ -55,13 +57,13 @@ class VideoModal extends ImmutablePureComponent {
             onCloseVideo={onClose}
             autoFocus
             detailed
-            alt={media.get('description')}
+            alt={description}
             lang={language}
           />
         </div>
 
         <div className='media-modal__overlay'>
-          {statusId && <Footer statusId={statusId} withOpenButton onClose={onClose} />}
+          {status && <Footer statusId={status.get('id')} withOpenButton onClose={onClose} />}
         </div>
       </div>
     );
diff --git a/app/javascript/flavours/glitch/locales/defaultMessages.json b/app/javascript/flavours/glitch/locales/defaultMessages.json
deleted file mode 100644
index f239422e5..000000000
--- a/app/javascript/flavours/glitch/locales/defaultMessages.json
+++ /dev/null
@@ -1,1208 +0,0 @@
-[
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "We're sorry, but something went wrong with the Mastodon app.",
-        "id": "web_app_crash.title"
-      },
-      {
-        "defaultMessage": "You could try any of the following:",
-        "id": "web_app_crash.content"
-      },
-      {
-        "defaultMessage": "Disable browser add-ons or built-in translation tools",
-        "id": "web_app_crash.disable_addons"
-      },
-      {
-        "defaultMessage": "Report a bug in the {issuetracker}",
-        "id": "web_app_crash.report_issue"
-      },
-      {
-        "defaultMessage": "issue tracker",
-        "id": "web_app_crash.issue_tracker"
-      },
-      {
-        "defaultMessage": "Debug information",
-        "id": "web_app_crash.debug_info"
-      },
-      {
-        "defaultMessage": "{reload} the current page",
-        "id": "web_app_crash.reload_page"
-      },
-      {
-        "defaultMessage": "Reload",
-        "id": "web_app_crash.reload"
-      },
-      {
-        "defaultMessage": "Change your {settings}",
-        "id": "web_app_crash.change_your_settings"
-      },
-      {
-        "defaultMessage": "settings",
-        "id": "web_app_crash.settings"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/components/error_boundary.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Sensitive",
-        "id": "media_gallery.sensitive"
-      },
-      {
-        "defaultMessage": "Click to view",
-        "id": "status.sensitive_toggle"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/components/media_gallery.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Select\nall",
-        "id": "notification_purge.btn_all"
-      },
-      {
-        "defaultMessage": "Select\nnone",
-        "id": "notification_purge.btn_none"
-      },
-      {
-        "defaultMessage": "Invert\nselection",
-        "id": "notification_purge.btn_invert"
-      },
-      {
-        "defaultMessage": "Clear\nselected",
-        "id": "notification_purge.btn_apply"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/components/notification_purge_buttons.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "React",
-        "id": "status.react"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/components/status_action_bar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Collapse",
-        "id": "status.collapse"
-      },
-      {
-        "defaultMessage": "Uncollapse",
-        "id": "status.uncollapse"
-      },
-      {
-        "defaultMessage": "This toot is a reply",
-        "id": "status.in_reply_to"
-      },
-      {
-        "defaultMessage": "Features an attached preview card",
-        "id": "status.has_preview_card"
-      },
-      {
-        "defaultMessage": "Features attached pictures",
-        "id": "status.has_pictures"
-      },
-      {
-        "defaultMessage": "This toot is a poll",
-        "id": "status.is_poll"
-      },
-      {
-        "defaultMessage": "Features attached videos",
-        "id": "status.has_video"
-      },
-      {
-        "defaultMessage": "Features attached audio files",
-        "id": "status.has_audio"
-      },
-      {
-        "defaultMessage": "Only visible from your instance",
-        "id": "status.local_only"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/components/status_icons.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "{name} reacted to your status",
-        "id": "notification.reaction"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/components/status_prepend.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Are you sure you want to permanently clear all selected notifications?",
-        "id": "notifications.marked_clear_confirmation"
-      },
-      {
-        "defaultMessage": "Clear selected notifications",
-        "id": "notifications.marked_clear"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/containers/notification_purge_buttons_container.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Show",
-        "id": "confirmations.unfilter.confirm"
-      },
-      {
-        "defaultMessage": "Author",
-        "id": "confirmations.unfilter.author"
-      },
-      {
-        "defaultMessage": "Matching {count, plural, one {filter} other {filters}}",
-        "id": "confirmations.unfilter.filters"
-      },
-      {
-        "defaultMessage": "Edit filter",
-        "id": "confirmations.unfilter.edit_filter"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/containers/status_container.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Glitch-soc is free open source software forked from Mastodon.",
-        "id": "about.fork_disclaimer"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/about/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "No comment provided",
-        "id": "account_note.glitch_placeholder"
-      },
-      {
-        "defaultMessage": "Cancel",
-        "id": "account_note.cancel"
-      },
-      {
-        "defaultMessage": "Save",
-        "id": "account_note.save"
-      },
-      {
-        "defaultMessage": "Edit",
-        "id": "account_note.edit"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/account/components/account_note.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "This user has been suspended by a moderator.",
-        "id": "account.suspended_disclaimer_full"
-      },
-      {
-        "defaultMessage": "Information below may reflect the user's profile incompletely.",
-        "id": "account.disclaimer_full"
-      },
-      {
-        "defaultMessage": "View full profile",
-        "id": "account.view_full_profile"
-      },
-      {
-        "defaultMessage": "Follows",
-        "id": "account.follows"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/account/components/action_bar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Add note for @{name}",
-        "id": "account.add_account_note"
-      },
-      {
-        "defaultMessage": "Joined {date}",
-        "id": "account.joined"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/account/components/header.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Profile",
-        "id": "column_header.profile"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/account/components/profile_column_header.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Filter out by regular expressions",
-        "id": "home.column_settings.filter_regex"
-      },
-      {
-        "defaultMessage": "Column settings",
-        "id": "home.settings"
-      },
-      {
-        "defaultMessage": "Advanced",
-        "id": "home.column_settings.advanced"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/community_timeline/components/column_settings.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "At least one media attachment is lacking a description. Consider describing all media attachments for the visually impaired before sending your toot.",
-        "id": "confirmations.missing_media_description.message"
-      },
-      {
-        "defaultMessage": "Send anyway",
-        "id": "confirmations.missing_media_description.confirm"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/compose/components/compose_form.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "App settings",
-        "id": "navigation_bar.app_settings"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/compose/components/header.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Advanced options",
-        "id": "advanced_options.icon_title"
-      },
-      {
-        "defaultMessage": "Attach...",
-        "id": "compose.attach"
-      },
-      {
-        "defaultMessage": "Content type",
-        "id": "content-type.change"
-      },
-      {
-        "defaultMessage": "Draw something",
-        "id": "compose.attach.doodle"
-      },
-      {
-        "defaultMessage": "HTML",
-        "id": "compose.content-type.html"
-      },
-      {
-        "defaultMessage": "Do not post to other instances",
-        "id": "advanced_options.local-only.long"
-      },
-      {
-        "defaultMessage": "Local-only",
-        "id": "advanced_options.local-only.short"
-      },
-      {
-        "defaultMessage": "Markdown",
-        "id": "compose.content-type.markdown"
-      },
-      {
-        "defaultMessage": "Plain text",
-        "id": "compose.content-type.plain"
-      },
-      {
-        "defaultMessage": "Hide text behind warning",
-        "id": "compose_form.spoiler"
-      },
-      {
-        "defaultMessage": "Automatically opens a reply on posting",
-        "id": "advanced_options.threaded_mode.long"
-      },
-      {
-        "defaultMessage": "Threaded mode",
-        "id": "advanced_options.threaded_mode.short"
-      },
-      {
-        "defaultMessage": "Upload a file",
-        "id": "compose.attach.upload"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/compose/components/options.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Allow one choice",
-        "id": "compose_form.poll.single_choice"
-      },
-      {
-        "defaultMessage": "Allow multiple choices",
-        "id": "compose_form.poll.multiple_choices"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/compose/components/poll_form.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
-        "id": "search_popout.tips.full_text"
-      },
-      {
-        "defaultMessage": "Simple text returns matching display names, usernames and hashtags",
-        "id": "search_popout.tips.text"
-      },
-      {
-        "defaultMessage": "Advanced search format",
-        "id": "search_popout.search_format"
-      },
-      {
-        "defaultMessage": "hashtag",
-        "id": "search_popout.tips.hashtag"
-      },
-      {
-        "defaultMessage": "user",
-        "id": "search_popout.tips.user"
-      },
-      {
-        "defaultMessage": "status",
-        "id": "search_popout.tips.status"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/compose/components/search.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "This post is local-only",
-        "id": "advanced_options.local-only.tooltip"
-      },
-      {
-        "defaultMessage": "Threaded mode enabled",
-        "id": "advanced_options.threaded_mode.tooltip"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/compose/components/textarea_icons.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "At least one media attachment is lacking a description. Consider describing all media attachments for the visually impaired before sending your toot.",
-        "id": "confirmations.missing_media_description.message"
-      },
-      {
-        "defaultMessage": "Send anyway",
-        "id": "confirmations.missing_media_description.confirm"
-      },
-      {
-        "defaultMessage": "Edit media",
-        "id": "confirmations.missing_media_description.edit"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/compose/containers/compose_form_container.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Filter out by regular expressions",
-        "id": "home.column_settings.filter_regex"
-      },
-      {
-        "defaultMessage": "Column settings",
-        "id": "home.settings"
-      },
-      {
-        "defaultMessage": "Group by conversation",
-        "id": "direct.group_by_conversations"
-      },
-      {
-        "defaultMessage": "Advanced",
-        "id": "home.column_settings.advanced"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Favourited by",
-        "id": "column.favourited_by"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/favourites/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Follow people you'd like to see posts from! Here are some suggestions.",
-        "id": "follow_recommendations.heading"
-      },
-      {
-        "defaultMessage": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
-        "id": "follow_recommendations.lead"
-      },
-      {
-        "defaultMessage": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
-        "id": "empty_column.follow_recommendations"
-      },
-      {
-        "defaultMessage": "Done",
-        "id": "follow_recommendations.done"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/follow_recommendations/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Misc",
-        "id": "column.heading"
-      },
-      {
-        "defaultMessage": "Miscellaneous options",
-        "id": "column.subheading"
-      },
-      {
-        "defaultMessage": "Show me around",
-        "id": "getting_started.onboarding"
-      },
-      {
-        "defaultMessage": "Keyboard shortcuts",
-        "id": "navigation_bar.keyboard_shortcuts"
-      },
-      {
-        "defaultMessage": "Featured users",
-        "id": "navigation_bar.featured_users"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/getting_started_misc/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Navigation",
-        "id": "column_subheading.navigation"
-      },
-      {
-        "defaultMessage": "App settings",
-        "id": "navigation_bar.app_settings"
-      },
-      {
-        "defaultMessage": "Keyboard shortcuts",
-        "id": "navigation_bar.keyboard_shortcuts"
-      },
-      {
-        "defaultMessage": "Lists",
-        "id": "column_subheading.lists"
-      },
-      {
-        "defaultMessage": "Misc",
-        "id": "navigation_bar.misc"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/getting_started/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Filter out by regular expressions",
-        "id": "home.column_settings.filter_regex"
-      },
-      {
-        "defaultMessage": "Column settings",
-        "id": "home.settings"
-      },
-      {
-        "defaultMessage": "Show DMs",
-        "id": "home.column_settings.show_direct"
-      },
-      {
-        "defaultMessage": "Advanced",
-        "id": "home.column_settings.advanced"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/home_timeline/components/column_settings.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "to bookmark",
-        "id": "keyboard_shortcuts.bookmark"
-      },
-      {
-        "defaultMessage": "to collapse/uncollapse toots",
-        "id": "keyboard_shortcuts.toggle_collapse"
-      },
-      {
-        "defaultMessage": "to send toot using secondary privacy setting",
-        "id": "keyboard_shortcuts.secondary_toot"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/keyboard_shortcuts/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "General",
-        "id": "settings.general"
-      },
-      {
-        "defaultMessage": "Compose box",
-        "id": "settings.compose_box_opts"
-      },
-      {
-        "defaultMessage": "Content Warnings",
-        "id": "settings.content_warnings"
-      },
-      {
-        "defaultMessage": "Collapsed toots",
-        "id": "settings.collapsed_statuses"
-      },
-      {
-        "defaultMessage": "Media",
-        "id": "settings.media"
-      },
-      {
-        "defaultMessage": "Preferences",
-        "id": "settings.preferences"
-      },
-      {
-        "defaultMessage": "Close",
-        "id": "settings.close"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/local_settings/navigation/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Auto",
-        "id": "layout.auto"
-      },
-      {
-        "defaultMessage": "Automatically chose layout based on “Enable advanced web interface” setting and screen size.",
-        "id": "layout.hint.auto"
-      },
-      {
-        "defaultMessage": "Desktop",
-        "id": "layout.desktop"
-      },
-      {
-        "defaultMessage": "Use multiple-column layout regardless of the “Enable advanced web interface” setting or screen size.",
-        "id": "layout.hint.desktop"
-      },
-      {
-        "defaultMessage": "Mobile",
-        "id": "layout.single"
-      },
-      {
-        "defaultMessage": "Use single-column layout regardless of the “Enable advanced web interface” setting or screen size.",
-        "id": "layout.hint.single"
-      },
-      {
-        "defaultMessage": "None",
-        "id": "settings.side_arm.none"
-      },
-      {
-        "defaultMessage": "Keep its set privacy",
-        "id": "settings.side_arm_reply_mode.keep"
-      },
-      {
-        "defaultMessage": "Copy privacy setting of the toot being replied to",
-        "id": "settings.side_arm_reply_mode.copy"
-      },
-      {
-        "defaultMessage": "Restrict privacy setting to that of the toot being replied to",
-        "id": "settings.side_arm_reply_mode.restrict"
-      },
-      {
-        "defaultMessage": "Regular expression",
-        "id": "settings.content_warnings.regexp"
-      },
-      {
-        "defaultMessage": "Do not rewrite mentions",
-        "id": "settings.rewrite_mentions_no"
-      },
-      {
-        "defaultMessage": "Rewrite with username and domain (when the account is remote)",
-        "id": "settings.rewrite_mentions_acct"
-      },
-      {
-        "defaultMessage": "Rewrite with username",
-        "id": "settings.rewrite_mentions_username"
-      },
-      {
-        "defaultMessage": "Left",
-        "id": "settings.pop_in_left"
-      },
-      {
-        "defaultMessage": "Right",
-        "id": "settings.pop_in_right"
-      },
-      {
-        "defaultMessage": "General",
-        "id": "settings.general"
-      },
-      {
-        "defaultMessage": "Display an estimate of the reply count",
-        "id": "settings.show_reply_counter"
-      },
-      {
-        "defaultMessage": "Zoom in on emojis when hovering over them",
-        "id": "settings.zoom_emojis_on_hover"
-      },
-      {
-        "defaultMessage": "High color privacy icons",
-        "id": "settings.hicolor_privacy_icons"
-      },
-      {
-        "defaultMessage": "Display privacy icons in bright and easily distinguishable colors",
-        "id": "settings.hicolor_privacy_icons.hint"
-      },
-      {
-        "defaultMessage": "Show confirmation dialog before boosting toots lacking media descriptions",
-        "id": "settings.confirm_boost_missing_media_description"
-      },
-      {
-        "defaultMessage": "Tag misleading links",
-        "id": "settings.tag_misleading_links"
-      },
-      {
-        "defaultMessage": "Add a visual indication with the link target host to every link not mentioning it explicitly",
-        "id": "settings.tag_misleading_links.hint"
-      },
-      {
-        "defaultMessage": "Rewrite mentions in displayed statuses",
-        "id": "settings.rewrite_mentions"
-      },
-      {
-        "defaultMessage": "Notifications options",
-        "id": "settings.notifications_opts"
-      },
-      {
-        "defaultMessage": "Unread notifications badge",
-        "id": "settings.notifications.tab_badge"
-      },
-      {
-        "defaultMessage": "Display a badge for unread notifications in the column icons when the notifications column isn't open",
-        "id": "settings.notifications.tab_badge.hint"
-      },
-      {
-        "defaultMessage": "Unread notifications favicon badge",
-        "id": "settings.notifications.favicon_badge"
-      },
-      {
-        "defaultMessage": "Add a badge for unread notifications to the favicon",
-        "id": "settings.notifications.favicon_badge.hint"
-      },
-      {
-        "defaultMessage": "Toot icons",
-        "id": "settings.status_icons"
-      },
-      {
-        "defaultMessage": "Language indicator",
-        "id": "settings.status_icons_language"
-      },
-      {
-        "defaultMessage": "Reply indicator",
-        "id": "settings.status_icons_reply"
-      },
-      {
-        "defaultMessage": "Local-only indicator",
-        "id": "settings.status_icons_local_only"
-      },
-      {
-        "defaultMessage": "Media and poll indicators",
-        "id": "settings.status_icons_media"
-      },
-      {
-        "defaultMessage": "Toot privacy indicator",
-        "id": "settings.status_icons_visibility"
-      },
-      {
-        "defaultMessage": "Layout options",
-        "id": "settings.layout_opts"
-      },
-      {
-        "defaultMessage": "Layout:",
-        "id": "settings.layout"
-      },
-      {
-        "defaultMessage": "Wide view (Desktop mode only)",
-        "id": "settings.wide_view"
-      },
-      {
-        "defaultMessage": "Stretches columns to better fill the available space.",
-        "id": "settings.wide_view_hint"
-      },
-      {
-        "defaultMessage": "Compose box",
-        "id": "settings.compose_box_opts"
-      },
-      {
-        "defaultMessage": "Always enable the Content Warning field",
-        "id": "settings.always_show_spoilers_field"
-      },
-      {
-        "defaultMessage": "Prepend “re: ” to content warnings when replying",
-        "id": "settings.prepend_cw_re"
-      },
-      {
-        "defaultMessage": "Pre-select usernames on reply",
-        "id": "settings.preselect_on_reply"
-      },
-      {
-        "defaultMessage": "When replying to a conversation with multiple participants, pre-select usernames past the first",
-        "id": "settings.preselect_on_reply_hint"
-      },
-      {
-        "defaultMessage": "Show confirmation dialog before sending toots lacking media descriptions",
-        "id": "settings.confirm_missing_media_description"
-      },
-      {
-        "defaultMessage": "Show confirmation dialog before overwriting the message being composed",
-        "id": "settings.confirm_before_clearing_draft"
-      },
-      {
-        "defaultMessage": "Show content-type choice when authoring toots",
-        "id": "settings.show_content_type_choice"
-      },
-      {
-        "defaultMessage": "Secondary toot button:",
-        "id": "settings.side_arm"
-      },
-      {
-        "defaultMessage": "When replying to a toot, the secondary toot button should:",
-        "id": "settings.side_arm_reply_mode"
-      },
-      {
-        "defaultMessage": "Content warnings",
-        "id": "settings.content_warnings"
-      },
-      {
-        "defaultMessage": "Show/hide content of all copies at once",
-        "id": "settings.content_warnings_shared_state"
-      },
-      {
-        "defaultMessage": "Reproduce upstream Mastodon behavior by having the Content Warning button affect all copies of a post at once. This will prevent automatic collapsing of any copy of a toot with unfolded CW",
-        "id": "settings.content_warnings_shared_state_hint"
-      },
-      {
-        "defaultMessage": "Display media attachments outside content warnings",
-        "id": "settings.content_warnings_media_outside"
-      },
-      {
-        "defaultMessage": "Reproduce upstream Mastodon behavior by having the Content Warning toggle not affect media attachments",
-        "id": "settings.content_warnings_media_outside_hint"
-      },
-      {
-        "defaultMessage": "Auto-unfolding options",
-        "id": "settings.content_warnings_unfold_opts"
-      },
-      {
-        "defaultMessage": "Automatically unfold content-warnings",
-        "id": "settings.enable_content_warnings_auto_unfold"
-      },
-      {
-        "defaultMessage": "This setting is now controlled from Mastodon's {settings_page_link}",
-        "id": "settings.deprecated_setting"
-      },
-      {
-        "defaultMessage": "user preferences",
-        "id": "settings.shared_settings_link"
-      },
-      {
-        "defaultMessage": "Content warnings to not automatically unfold:",
-        "id": "settings.content_warnings_filter"
-      },
-      {
-        "defaultMessage": "Collapsed toots",
-        "id": "settings.collapsed_statuses"
-      },
-      {
-        "defaultMessage": "Enable collapsed toots",
-        "id": "settings.enable_collapsed"
-      },
-      {
-        "defaultMessage": "Collapsed posts have parts of their contents hidden to take up less screen space. This is distinct from the Content Warning feature",
-        "id": "settings.enable_collapsed_hint"
-      },
-      {
-        "defaultMessage": "Show action buttons in collapsed toots",
-        "id": "settings.show_action_bar"
-      },
-      {
-        "defaultMessage": "Automatic collapsing",
-        "id": "settings.auto_collapse"
-      },
-      {
-        "defaultMessage": "Everything",
-        "id": "settings.auto_collapse_all"
-      },
-      {
-        "defaultMessage": "Notifications",
-        "id": "settings.auto_collapse_notifications"
-      },
-      {
-        "defaultMessage": "Lengthy toots",
-        "id": "settings.auto_collapse_lengthy"
-      },
-      {
-        "defaultMessage": "Boosts",
-        "id": "settings.auto_collapse_reblogs"
-      },
-      {
-        "defaultMessage": "Replies",
-        "id": "settings.auto_collapse_replies"
-      },
-      {
-        "defaultMessage": "Toots with media",
-        "id": "settings.auto_collapse_media"
-      },
-      {
-        "defaultMessage": "Height (in pixels) for a toot to be considered lengthy",
-        "id": "settings.auto_collapse_height"
-      },
-      {
-        "defaultMessage": "Image backgrounds",
-        "id": "settings.image_backgrounds"
-      },
-      {
-        "defaultMessage": "Give collapsed toots an image background",
-        "id": "settings.image_backgrounds_users"
-      },
-      {
-        "defaultMessage": "Preview collapsed toot media",
-        "id": "settings.image_backgrounds_media"
-      },
-      {
-        "defaultMessage": "If the post has any media attachment, use the first one as a background",
-        "id": "settings.image_backgrounds_media_hint"
-      },
-      {
-        "defaultMessage": "Media",
-        "id": "settings.media"
-      },
-      {
-        "defaultMessage": "Letterbox media",
-        "id": "settings.media_letterbox"
-      },
-      {
-        "defaultMessage": "Scale down and letterbox media to fill the image containers instead of stretching and cropping them",
-        "id": "settings.media_letterbox_hint"
-      },
-      {
-        "defaultMessage": "Full-width media previews",
-        "id": "settings.media_fullwidth"
-      },
-      {
-        "defaultMessage": "Inline preview cards for external links",
-        "id": "settings.inline_preview_cards"
-      },
-      {
-        "defaultMessage": "Reveal sensitive media behind a CW by default",
-        "id": "settings.media_reveal_behind_cw"
-      },
-      {
-        "defaultMessage": "Enable pop-in player",
-        "id": "settings.pop_in_player"
-      },
-      {
-        "defaultMessage": "Pop-in player position:",
-        "id": "settings.pop_in_position"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/local_settings/page/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Reactions:",
-        "id": "notifications.column_settings.reaction"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/notifications/components/column_settings.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Reactions",
-        "id": "notifications.filter.reactions"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/notifications/components/filter_bar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Mark for deletion",
-        "id": "notification.markForDeletion"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/notifications/components/overlay.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Enter notification cleaning mode",
-        "id": "notification_purge.start"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/notifications/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Featured accounts",
-        "id": "endorsed_accounts_editor.endorsed_accounts"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/pinned_accounts_editor/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Filter out by regular expressions",
-        "id": "home.column_settings.filter_regex"
-      },
-      {
-        "defaultMessage": "Show local-only toots",
-        "id": "community.column_settings.allow_local_only"
-      },
-      {
-        "defaultMessage": "Advanced",
-        "id": "home.column_settings.advanced"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/public_timeline/components/column_settings.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Boosted by",
-        "id": "column.reblogged_by"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/reblogs/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "React",
-        "id": "status.react"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/status/components/action_bar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "This toot contains some media without description",
-        "id": "boost_modal.missing_description"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/ui/components/boost_modal.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Do not ask for confirmation again",
-        "id": "confirmation_modal.do_not_ask_again"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/ui/components/confirmation_modal.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Use Mastodon preferences",
-        "id": "confirmations.deprecated_settings.confirm"
-      },
-      {
-        "defaultMessage": "Automatically unfold content-warnings",
-        "id": "settings.enable_content_warnings_auto_unfold"
-      },
-      {
-        "defaultMessage": "Allow swiping to change columns (Mobile only)",
-        "id": "settings.swipe_to_change_columns"
-      },
-      {
-        "defaultMessage": "Some of the glitch-soc device-specific {app_settings} you are using have been replaced by Mastodon {preferences} and will be overriden:",
-        "id": "confirmations.deprecated_settings.message"
-      },
-      {
-        "defaultMessage": "App settings",
-        "id": "navigation_bar.app_settings"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/ui/components/deprecated_settings_modal.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "You can press {combo} to skip this next time",
-        "id": "favourite_modal.combo"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/ui/components/favourite_modal.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "App settings",
-        "id": "navigation_bar.app_settings"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/ui/components/navigation_panel.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Welcome to {domain}!",
-        "id": "onboarding.page_one.welcome"
-      },
-      {
-        "defaultMessage": "{domain} is an \"instance\" of Mastodon. Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.",
-        "id": "onboarding.page_one.federation"
-      },
-      {
-        "defaultMessage": "You are on {domain}, so your full handle is {handle}",
-        "id": "onboarding.page_one.handle"
-      },
-      {
-        "defaultMessage": "Write posts from the compose column. You can upload images, change privacy settings, and add content warnings with the icons below.",
-        "id": "onboarding.page_two.compose"
-      },
-      {
-        "defaultMessage": "Use the search bar to find people and look at hashtags, such as {illustration} and {introductions}. To look for a person who is not on this instance, use their full handle.",
-        "id": "onboarding.page_three.search"
-      },
-      {
-        "defaultMessage": "Edit your profile to change your avatar, bio, and display name. There, you will also find other preferences.",
-        "id": "onboarding.page_three.profile"
-      },
-      {
-        "defaultMessage": "The home timeline shows posts from people you follow.",
-        "id": "onboarding.page_four.home"
-      },
-      {
-        "defaultMessage": "The notifications column shows when someone interacts with you.",
-        "id": "onboarding.page_four.notifications"
-      },
-      {
-        "defaultMessage": "The local timeline shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.",
-        "id": "onboarding.page_five.public_timelines"
-      },
-      {
-        "defaultMessage": "Your instance's admin is {admin}.",
-        "id": "onboarding.page_six.admin"
-      },
-      {
-        "defaultMessage": "Please read {domain}'s {guidelines}!",
-        "id": "onboarding.page_six.read_guidelines"
-      },
-      {
-        "defaultMessage": "community guidelines",
-        "id": "onboarding.page_six.guidelines"
-      },
-      {
-        "defaultMessage": "Almost done...",
-        "id": "onboarding.page_six.almost_done"
-      },
-      {
-        "defaultMessage": "{domain} runs on Glitchsoc. Glitchsoc is a friendly {fork} of {Mastodon}. Glitchsoc is fully compatible with all Mastodon apps and instances. Glitchsoc is free open-source software. You can report bugs, request features, or contribute to the code on {github}.",
-        "id": "onboarding.page_six.github"
-      },
-      {
-        "defaultMessage": "There are {apps} available for iOS, Android and other platforms.",
-        "id": "onboarding.page_six.apps_available"
-      },
-      {
-        "defaultMessage": "mobile apps",
-        "id": "onboarding.page_six.various_app"
-      },
-      {
-        "defaultMessage": "Bon Appetoot!",
-        "id": "onboarding.page_six.appetoot"
-      },
-      {
-        "defaultMessage": "Next",
-        "id": "onboarding.next"
-      },
-      {
-        "defaultMessage": "Done",
-        "id": "onboarding.done"
-      },
-      {
-        "defaultMessage": "Skip",
-        "id": "onboarding.skip"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/ui/components/onboarding_modal.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "This account is marked as moved to {moved_to_link}, and may thus not accept new follows.",
-        "id": "moved_to_warning"
-      }
-    ],
-    "path": "app/javascript/flavours/glitch/features/ui/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "React",
-        "id": "status.react"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/status_action_bar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Reactions:",
-        "id": "notifications.column_settings.reaction"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/notifications/components/column_settings.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Reactions",
-        "id": "notifications.filter.reactions"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/notifications/components/filter_bar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "{name} reacted to your status",
-        "id": "notification.reaction"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/notifications/components/notification.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "React",
-        "id": "status.react"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/status/components/action_bar.json"
-  }
-]
diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json
index ede1362f7..5e2940f2f 100644
--- a/app/javascript/flavours/glitch/locales/en.json
+++ b/app/javascript/flavours/glitch/locales/en.json
@@ -4,7 +4,9 @@
   "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.follows": "Follows",
   "account.joined": "Joined {date}",
+  "account.mute_notifications": "Mute notifications from @{name}",
   "account.suspended_disclaimer_full": "This user has been suspended by a moderator.",
+  "account.unmute_notifications": "Unmute notifications from @{name}",
   "account.view_full_profile": "View full profile",
   "account_note.cancel": "Cancel",
   "account_note.edit": "Edit",
@@ -56,7 +58,7 @@
   "getting_started.onboarding": "Show me around",
   "home.column_settings.advanced": "Advanced",
   "home.column_settings.filter_regex": "Filter out by regular expressions",
-  "home.column_settings.show_direct": "Show DMs",
+  "home.column_settings.show_direct": "Show private mentions",
   "home.settings": "Column settings",
   "keyboard_shortcuts.bookmark": "to bookmark",
   "keyboard_shortcuts.secondary_toot": "to send toot using secondary privacy setting",
diff --git a/app/javascript/flavours/glitch/locales/global_locale.ts b/app/javascript/flavours/glitch/locales/global_locale.ts
new file mode 100644
index 000000000..01133ca23
--- /dev/null
+++ b/app/javascript/flavours/glitch/locales/global_locale.ts
@@ -0,0 +1,22 @@
+export interface LocaleData {
+  locale: string;
+  messages: Record<string, string>;
+}
+
+let loadedLocale: LocaleData;
+
+export function setLocale(locale: LocaleData) {
+  loadedLocale = locale;
+}
+
+export function getLocale() {
+  if (!loadedLocale && process.env.NODE_ENV === 'development') {
+    throw new Error('getLocale() called before any locale has been set');
+  }
+
+  return loadedLocale;
+}
+
+export function isLocaleLoaded() {
+  return !!loadedLocale;
+}
diff --git a/app/javascript/flavours/glitch/locales/index.ts b/app/javascript/flavours/glitch/locales/index.ts
new file mode 100644
index 000000000..63f45c304
--- /dev/null
+++ b/app/javascript/flavours/glitch/locales/index.ts
@@ -0,0 +1,5 @@
+export type { LocaleData } from './global_locale';
+export { setLocale, getLocale, isLocaleLoaded } from './global_locale';
+export { loadLocale } from './load_locale';
+
+export { IntlProvider } from './intl_provider';
diff --git a/app/javascript/flavours/glitch/locales/intl_provider.tsx b/app/javascript/flavours/glitch/locales/intl_provider.tsx
new file mode 100644
index 000000000..4fa8b2247
--- /dev/null
+++ b/app/javascript/flavours/glitch/locales/intl_provider.tsx
@@ -0,0 +1,57 @@
+import { useEffect, useState } from 'react';
+
+import { IntlProvider as BaseIntlProvider } from 'react-intl';
+
+import { getLocale, isLocaleLoaded } from './global_locale';
+import { loadLocale } from './load_locale';
+
+function onProviderError(error: unknown) {
+  // Silent the error, like upstream does
+  if (process.env.NODE_ENV === 'production') return;
+
+  // This browser does not advertise Intl support for this locale, we only print a warning
+  // As-per the spec, the browser should select the best matching locale
+  if (
+    error &&
+    typeof error === 'object' &&
+    error instanceof Error &&
+    error.message.match('MISSING_DATA')
+  ) {
+    console.warn(error.message);
+  }
+
+  console.error(error);
+}
+
+export const IntlProvider: React.FC<
+  Omit<React.ComponentProps<typeof BaseIntlProvider>, 'locale' | 'messages'>
+> = ({ children, ...props }) => {
+  const [localeLoaded, setLocaleLoaded] = useState(false);
+
+  useEffect(() => {
+    async function loadLocaleData() {
+      if (!isLocaleLoaded()) {
+        await loadLocale();
+      }
+
+      setLocaleLoaded(true);
+    }
+    void loadLocaleData();
+  }, []);
+
+  if (!localeLoaded) return null;
+
+  const { locale, messages } = getLocale();
+
+  return (
+    <BaseIntlProvider
+      locale={locale}
+      messages={messages}
+      onError={onProviderError}
+      textComponent='span'
+      {...props}
+    >
+      {children}
+    </BaseIntlProvider>
+  );
+};
diff --git a/app/javascript/flavours/glitch/locales/load_locale.ts b/app/javascript/flavours/glitch/locales/load_locale.ts
new file mode 100644
index 000000000..fa5d13bbc
--- /dev/null
+++ b/app/javascript/flavours/glitch/locales/load_locale.ts
@@ -0,0 +1,37 @@
+import { Semaphore } from 'async-mutex';
+
+import type { LocaleData } from './global_locale';
+import { isLocaleLoaded, setLocale } from './global_locale';
+
+const localeLoadingSemaphore = new Semaphore(1);
+
+export async function loadLocale() {
+  const locale = document.querySelector<HTMLElement>('html')?.lang || 'en';
+
+  // We use a Semaphore here so only one thing can try to load the locales at
+  // the same time. If one tries to do it while its in progress, it will wait
+  // for the initial load to finish before it is resumed (and will see that locale
+  // data is already loaded)
+  await localeLoadingSemaphore.runExclusive(async () => {
+    // if the locale is already set, then do nothing
+    if (isLocaleLoaded()) return;
+
+    const upstreamLocaleData = await import(
+      /* webpackMode: "lazy" */
+      /* webpackChunkName: "locales/vanilla/[request]" */
+      /* webpackInclude: /\.json$/ */
+      /* webpackPreload: true */
+      `mastodon/locales/${locale}.json`
+    ) as LocaleData['messages'];
+
+    const localeData = await import(
+      /* webpackMode: "lazy" */
+      /* webpackChunkName: "locales/glitch/[request]" */
+      /* webpackInclude: /\.json$/ */
+      /* webpackPreload: true */
+      `flavours/glitch/locales/${locale}.json`
+    ) as LocaleData['messages'];
+
+    setLocale({ messages: { ...upstreamLocaleData, ...localeData }, locale });
+  });
+}
diff --git a/app/javascript/flavours/glitch/locales/whitelist_af.json b/app/javascript/flavours/glitch/locales/whitelist_af.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_af.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_an.json b/app/javascript/flavours/glitch/locales/whitelist_an.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_an.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_ar.json b/app/javascript/flavours/glitch/locales/whitelist_ar.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_ar.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_ast.json b/app/javascript/flavours/glitch/locales/whitelist_ast.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_ast.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_be.json b/app/javascript/flavours/glitch/locales/whitelist_be.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_be.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_bg.json b/app/javascript/flavours/glitch/locales/whitelist_bg.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_bg.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_bn.json b/app/javascript/flavours/glitch/locales/whitelist_bn.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_bn.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_br.json b/app/javascript/flavours/glitch/locales/whitelist_br.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_br.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_bs.json b/app/javascript/flavours/glitch/locales/whitelist_bs.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_bs.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_ca.json b/app/javascript/flavours/glitch/locales/whitelist_ca.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_ca.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_ckb.json b/app/javascript/flavours/glitch/locales/whitelist_ckb.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_ckb.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_co.json b/app/javascript/flavours/glitch/locales/whitelist_co.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_co.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_cs.json b/app/javascript/flavours/glitch/locales/whitelist_cs.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_cs.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_cy.json b/app/javascript/flavours/glitch/locales/whitelist_cy.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_cy.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_da.json b/app/javascript/flavours/glitch/locales/whitelist_da.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_da.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_de.json b/app/javascript/flavours/glitch/locales/whitelist_de.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_de.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_el.json b/app/javascript/flavours/glitch/locales/whitelist_el.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_el.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_en-GB.json b/app/javascript/flavours/glitch/locales/whitelist_en-GB.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_en-GB.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_en.json b/app/javascript/flavours/glitch/locales/whitelist_en.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_en.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_eo.json b/app/javascript/flavours/glitch/locales/whitelist_eo.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_eo.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_es-AR.json b/app/javascript/flavours/glitch/locales/whitelist_es-AR.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_es-AR.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_es-MX.json b/app/javascript/flavours/glitch/locales/whitelist_es-MX.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_es-MX.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_es.json b/app/javascript/flavours/glitch/locales/whitelist_es.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_es.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_et.json b/app/javascript/flavours/glitch/locales/whitelist_et.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_et.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_eu.json b/app/javascript/flavours/glitch/locales/whitelist_eu.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_eu.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_fa.json b/app/javascript/flavours/glitch/locales/whitelist_fa.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_fa.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_fi.json b/app/javascript/flavours/glitch/locales/whitelist_fi.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_fi.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_fo.json b/app/javascript/flavours/glitch/locales/whitelist_fo.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_fo.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_fr-QC.json b/app/javascript/flavours/glitch/locales/whitelist_fr-QC.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_fr-QC.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_fr.json b/app/javascript/flavours/glitch/locales/whitelist_fr.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_fr.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_fy.json b/app/javascript/flavours/glitch/locales/whitelist_fy.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_fy.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_ga.json b/app/javascript/flavours/glitch/locales/whitelist_ga.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_ga.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_gd.json b/app/javascript/flavours/glitch/locales/whitelist_gd.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_gd.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_gl.json b/app/javascript/flavours/glitch/locales/whitelist_gl.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_gl.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_he.json b/app/javascript/flavours/glitch/locales/whitelist_he.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_he.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_hi.json b/app/javascript/flavours/glitch/locales/whitelist_hi.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_hi.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_hr.json b/app/javascript/flavours/glitch/locales/whitelist_hr.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_hr.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_hu.json b/app/javascript/flavours/glitch/locales/whitelist_hu.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_hu.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_hy.json b/app/javascript/flavours/glitch/locales/whitelist_hy.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_hy.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_id.json b/app/javascript/flavours/glitch/locales/whitelist_id.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_id.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_ig.json b/app/javascript/flavours/glitch/locales/whitelist_ig.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_ig.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_io.json b/app/javascript/flavours/glitch/locales/whitelist_io.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_io.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_is.json b/app/javascript/flavours/glitch/locales/whitelist_is.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_is.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_it.json b/app/javascript/flavours/glitch/locales/whitelist_it.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_it.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_ja.json b/app/javascript/flavours/glitch/locales/whitelist_ja.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_ja.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_ka.json b/app/javascript/flavours/glitch/locales/whitelist_ka.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_ka.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_kab.json b/app/javascript/flavours/glitch/locales/whitelist_kab.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_kab.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_kk.json b/app/javascript/flavours/glitch/locales/whitelist_kk.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_kk.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_kn.json b/app/javascript/flavours/glitch/locales/whitelist_kn.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_kn.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_ko.json b/app/javascript/flavours/glitch/locales/whitelist_ko.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_ko.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_ku.json b/app/javascript/flavours/glitch/locales/whitelist_ku.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_ku.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_kw.json b/app/javascript/flavours/glitch/locales/whitelist_kw.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_kw.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_la.json b/app/javascript/flavours/glitch/locales/whitelist_la.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_la.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_lt.json b/app/javascript/flavours/glitch/locales/whitelist_lt.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_lt.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_lv.json b/app/javascript/flavours/glitch/locales/whitelist_lv.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_lv.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_mk.json b/app/javascript/flavours/glitch/locales/whitelist_mk.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_mk.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_ml.json b/app/javascript/flavours/glitch/locales/whitelist_ml.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_ml.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_mr.json b/app/javascript/flavours/glitch/locales/whitelist_mr.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_mr.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_ms.json b/app/javascript/flavours/glitch/locales/whitelist_ms.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_ms.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_my.json b/app/javascript/flavours/glitch/locales/whitelist_my.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_my.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_nl.json b/app/javascript/flavours/glitch/locales/whitelist_nl.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_nl.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_nn.json b/app/javascript/flavours/glitch/locales/whitelist_nn.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_nn.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_no.json b/app/javascript/flavours/glitch/locales/whitelist_no.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_no.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_oc.json b/app/javascript/flavours/glitch/locales/whitelist_oc.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_oc.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_pa.json b/app/javascript/flavours/glitch/locales/whitelist_pa.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_pa.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_pl.json b/app/javascript/flavours/glitch/locales/whitelist_pl.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_pl.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_pt-BR.json b/app/javascript/flavours/glitch/locales/whitelist_pt-BR.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_pt-BR.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_pt-PT.json b/app/javascript/flavours/glitch/locales/whitelist_pt-PT.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_pt-PT.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_ro.json b/app/javascript/flavours/glitch/locales/whitelist_ro.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_ro.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_ru.json b/app/javascript/flavours/glitch/locales/whitelist_ru.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_ru.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_sa.json b/app/javascript/flavours/glitch/locales/whitelist_sa.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_sa.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_sc.json b/app/javascript/flavours/glitch/locales/whitelist_sc.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_sc.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_sco.json b/app/javascript/flavours/glitch/locales/whitelist_sco.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_sco.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_si.json b/app/javascript/flavours/glitch/locales/whitelist_si.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_si.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_sk.json b/app/javascript/flavours/glitch/locales/whitelist_sk.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_sk.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_sl.json b/app/javascript/flavours/glitch/locales/whitelist_sl.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_sl.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_sq.json b/app/javascript/flavours/glitch/locales/whitelist_sq.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_sq.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_sr-Latn.json b/app/javascript/flavours/glitch/locales/whitelist_sr-Latn.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_sr-Latn.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_sr.json b/app/javascript/flavours/glitch/locales/whitelist_sr.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_sr.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_sv.json b/app/javascript/flavours/glitch/locales/whitelist_sv.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_sv.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_szl.json b/app/javascript/flavours/glitch/locales/whitelist_szl.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_szl.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_ta.json b/app/javascript/flavours/glitch/locales/whitelist_ta.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_ta.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_tai.json b/app/javascript/flavours/glitch/locales/whitelist_tai.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_tai.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_te.json b/app/javascript/flavours/glitch/locales/whitelist_te.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_te.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_th.json b/app/javascript/flavours/glitch/locales/whitelist_th.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_th.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_tr.json b/app/javascript/flavours/glitch/locales/whitelist_tr.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_tr.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_tt.json b/app/javascript/flavours/glitch/locales/whitelist_tt.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_tt.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_ug.json b/app/javascript/flavours/glitch/locales/whitelist_ug.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_ug.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_uk.json b/app/javascript/flavours/glitch/locales/whitelist_uk.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_uk.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_ur.json b/app/javascript/flavours/glitch/locales/whitelist_ur.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_ur.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_vi.json b/app/javascript/flavours/glitch/locales/whitelist_vi.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_vi.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_zgh.json b/app/javascript/flavours/glitch/locales/whitelist_zgh.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_zgh.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_zh-CN.json b/app/javascript/flavours/glitch/locales/whitelist_zh-CN.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_zh-CN.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_zh-HK.json b/app/javascript/flavours/glitch/locales/whitelist_zh-HK.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_zh-HK.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/locales/whitelist_zh-TW.json b/app/javascript/flavours/glitch/locales/whitelist_zh-TW.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/flavours/glitch/locales/whitelist_zh-TW.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/flavours/glitch/packs/admin.jsx b/app/javascript/flavours/glitch/packs/admin.jsx
index 4a5a50b49..596611dad 100644
--- a/app/javascript/flavours/glitch/packs/admin.jsx
+++ b/app/javascript/flavours/glitch/packs/admin.jsx
@@ -6,14 +6,14 @@ import ready from 'flavours/glitch/ready';
 ready(() => {
   [].forEach.call(document.querySelectorAll('[data-admin-component]'), element => {
     const componentName  = element.getAttribute('data-admin-component');
-    const { locale, ...componentProps } = JSON.parse(element.getAttribute('data-props'));
+    const { ...componentProps } = JSON.parse(element.getAttribute('data-props'));
 
     import('flavours/glitch/containers/admin_component').then(({ default: AdminComponent }) => {
       return import('flavours/glitch/components/admin/' + componentName).then(({ default: Component }) => {
         const root = createRoot(element);
 
         root.render (
-          <AdminComponent locale={locale}>
+          <AdminComponent>
             <Component {...componentProps} />
           </AdminComponent>,
         );
diff --git a/app/javascript/flavours/glitch/packs/home.js b/app/javascript/flavours/glitch/packs/home.js
index a28625d33..842430354 100644
--- a/app/javascript/flavours/glitch/packs/home.js
+++ b/app/javascript/flavours/glitch/packs/home.js
@@ -1,10 +1,11 @@
 import 'packs/public-path';
+import { loadLocale } from 'flavours/glitch/locales';
+import main from "flavours/glitch/main";
 import { loadPolyfills } from 'flavours/glitch/polyfills';
 
-loadPolyfills().then(async () => {
-  const { default: main } = await import('flavours/glitch/main');
-
-  return main();
-}).catch(e => {
-  console.error(e);
-});
+loadPolyfills()
+  .then(loadLocale)
+  .then(main)
+  .catch(e => {
+    console.error(e);
+  });
diff --git a/app/javascript/flavours/glitch/packs/public.jsx b/app/javascript/flavours/glitch/packs/public.jsx
index 2acabb676..049bff286 100644
--- a/app/javascript/flavours/glitch/packs/public.jsx
+++ b/app/javascript/flavours/glitch/packs/public.jsx
@@ -1,7 +1,7 @@
 import 'packs/public-path';
 import { createRoot }  from 'react-dom/client';
 
-import * as IntlMessageFormat  from 'intl-messageformat';
+import { IntlMessageFormat } from 'intl-messageformat';
 import { defineMessages } from 'react-intl';
 
 import { delegate }  from '@rails/ujs';
@@ -12,9 +12,9 @@ import { throttle } from 'lodash';
 import { timeAgoString }  from 'flavours/glitch/components/relative_timestamp';
 import emojify  from 'flavours/glitch/features/emoji/emoji';
 import loadKeyboardExtensions from 'flavours/glitch/load_keyboard_extensions';
+import { loadLocale, getLocale } from 'flavours/glitch/locales';
 import { loadPolyfills } from 'flavours/glitch/polyfills';
 import ready from 'flavours/glitch/ready';
-import { getLocale }  from 'locales';
 
 const messages = defineMessages({
   usernameTaken: { id: 'username.taken', defaultMessage: 'That username is taken. Try another' },
@@ -23,7 +23,7 @@ const messages = defineMessages({
 });
 
 function main() {
-  const { localeData } = getLocale();
+  const { messages: localeData } = getLocale();
 
   const scrollToDetailedStatus = () => {
     const history = createBrowserHistory();
@@ -237,6 +237,7 @@ function main() {
 }
 
 loadPolyfills()
+  .then(loadLocale)
   .then(main)
   .then(loadKeyboardExtensions)
   .catch(error => {
diff --git a/app/javascript/flavours/glitch/polyfills/base_polyfills.ts b/app/javascript/flavours/glitch/polyfills/base_polyfills.ts
index e008d8f02..3cde1b1ed 100644
--- a/app/javascript/flavours/glitch/polyfills/base_polyfills.ts
+++ b/app/javascript/flavours/glitch/polyfills/base_polyfills.ts
@@ -1,5 +1,3 @@
-import 'intl';
-import 'intl/locale-data/jsonp/en';
 import 'core-js/features/object/assign';
 import 'core-js/features/object/values';
 import 'core-js/features/symbol';
diff --git a/app/javascript/flavours/glitch/polyfills/index.ts b/app/javascript/flavours/glitch/polyfills/index.ts
index 6d2e5426e..b2dbfdac0 100644
--- a/app/javascript/flavours/glitch/polyfills/index.ts
+++ b/app/javascript/flavours/glitch/polyfills/index.ts
@@ -2,6 +2,8 @@
 // If there are no polyfills, then this is just Promise.resolve() which means
 // it will execute in the same tick of the event loop (i.e. near-instant).
 
+import { loadIntlPolyfills } from './intl';
+
 function importBasePolyfills() {
   return import(/* webpackChunkName: "base_polyfills" */ './base_polyfills');
 }
@@ -13,7 +15,6 @@ function importExtraPolyfills() {
 export function loadPolyfills() {
   const needsBasePolyfills = !(
     'toBlob' in HTMLCanvasElement.prototype &&
-    'Intl' in window &&
     'assign' in Object &&
     'values' in Object &&
     'Symbol' in window &&
@@ -32,6 +33,7 @@ export function loadPolyfills() {
   );
 
   return Promise.all([
+    loadIntlPolyfills(),
     needsBasePolyfills && importBasePolyfills(),
     needsExtraPolyfills && importExtraPolyfills(),
   ]);
diff --git a/app/javascript/flavours/glitch/polyfills/intl.ts b/app/javascript/flavours/glitch/polyfills/intl.ts
new file mode 100644
index 000000000..4d5ee3ccf
--- /dev/null
+++ b/app/javascript/flavours/glitch/polyfills/intl.ts
@@ -0,0 +1,105 @@
+// import { shouldPolyfill as shouldPolyfillCanonicalLocales } from '@formatjs/intl-getcanonicallocales/should-polyfill';
+// import { shouldPolyfill as shouldPolyfillLocale } from '@formatjs/intl-locale/should-polyfill';
+import { shouldPolyfill as shoudPolyfillPluralRules } from '@formatjs/intl-pluralrules/should-polyfill';
+// import { shouldPolyfill as shouldPolyfillNumberFormat } from '@formatjs/intl-numberformat/should-polyfill';
+// import { shouldPolyfill as shouldPolyfillIntlDateTimeFormat } from '@formatjs/intl-datetimeformat/should-polyfill';
+// import { shouldPolyfill as shouldPolyfillIntlRelativeTimeFormat } from '@formatjs/intl-relativetimeformat/should-polyfill';
+
+// async function loadGetCanonicalLocalesPolyfill() {
+//   // This platform already supports Intl.getCanonicalLocales
+//   if (shouldPolyfillCanonicalLocales()) {
+//     await import('@formatjs/intl-getcanonicallocales/polyfill');
+//   }
+// }
+
+// async function loadLocalePolyfill() {
+//   // This platform already supports Intl.Locale
+//   if (shouldPolyfillLocale()) {
+//     await import('@formatjs/intl-locale/polyfill');
+//   }
+// }
+
+// async function loadIntlNumberFormatPolyfill(locale: string) {
+//   const unsupportedLocale = shouldPolyfillNumberFormat(locale);
+//   // This locale is supported
+//   if (!unsupportedLocale) {
+//     return;
+//   }
+//   // Load the polyfill 1st BEFORE loading data
+//   await import('@formatjs/intl-numberformat/polyfill-force');
+//   await import(`@formatjs/intl-numberformat/locale-data/${unsupportedLocale}`);
+// }
+
+// async function loadIntlDateTimeFormatPolyfill(locale: string) {
+//   const unsupportedLocale = shouldPolyfillIntlDateTimeFormat(locale);
+//   // This locale is supported
+//   if (!unsupportedLocale) {
+//     return;
+//   }
+//   // Load the polyfill 1st BEFORE loading data
+//   await import('@formatjs/intl-datetimeformat/polyfill-force');
+
+//   // Parallelize CLDR data loading
+//   const dataPolyfills = [
+//     import('@formatjs/intl-datetimeformat/add-all-tz'),
+//     import(`@formatjs/intl-datetimeformat/locale-data/${unsupportedLocale}`),
+//   ];
+//   await Promise.all(dataPolyfills);
+// }
+
+async function loadIntlPluralRulesPolyfills(locale: string) {
+  const unsupportedLocale = shoudPolyfillPluralRules(locale);
+  // This locale is supported
+  if (!unsupportedLocale) {
+    return;
+  }
+  // Load the polyfill 1st BEFORE loading data
+  await import(
+    /* webpackChunkName: "i18n-pluralrules-polyfill" */ '@formatjs/intl-pluralrules/polyfill-force'
+  );
+  await import(
+    /* webpackChunkName: "i18n-pluralrules-polyfill-[request]" */ `@formatjs/intl-pluralrules/locale-data/${unsupportedLocale}`
+  );
+}
+
+// async function loadIntlRelativeTimeFormatPolyfill(locale: string) {
+//   const unsupportedLocale = shouldPolyfillIntlRelativeTimeFormat(locale);
+//   // This locale is supported
+//   if (!unsupportedLocale) {
+//     return;
+//   }
+//   // Load the polyfill 1st BEFORE loading data
+//   await import(
+//     /* webpackChunkName: "i18n-relativetimeformat-polyfill" */
+//     '@formatjs/intl-relativetimeformat/polyfill-force'
+//   );
+//   await import(
+//     /* webpackChunkName: "i18n-relativetimeformat-polyfill-[request]" */
+//     `@formatjs/intl-relativetimeformat/locale-data/${unsupportedLocale}`
+//   );
+// }
+
+export async function loadIntlPolyfills() {
+  const locale = document.querySelector('html')?.lang || 'en';
+
+  // order is important here
+
+  // Supported in IE11 and most other browsers, not useful
+  // await loadGetCanonicalLocalesPolyfill()
+
+  // Supported in IE11 and most other browsers, not useful
+  // await loadLocalePolyfill()
+
+  // Supported in IE11 and most other browsers, not useful
+  // await loadIntlNumberFormatPolyfill(locale)
+
+  // Supported in IE11 and most other browsers, not useful
+  // await loadIntlDateTimeFormatPolyfill(locale)
+
+  // Supported from Safari 13+, may still be useful
+  await loadIntlPluralRulesPolyfills(locale);
+
+  // This is not used yet in the codebase yet
+  // Supported from Safari 14+
+  // await loadIntlRelativeTimeFormatPolyfill(locale);
+}
diff --git a/app/javascript/flavours/glitch/reducers/list_editor.js b/app/javascript/flavours/glitch/reducers/list_editor.js
index ceceb27c7..d3fd62ade 100644
--- a/app/javascript/flavours/glitch/reducers/list_editor.js
+++ b/app/javascript/flavours/glitch/reducers/list_editor.js
@@ -25,6 +25,7 @@ const initialState = ImmutableMap({
   isSubmitting: false,
   isChanged: false,
   title: '',
+  isExclusive: false,
 
   accounts: ImmutableMap({
     items: ImmutableList(),
@@ -46,6 +47,7 @@ export default function listEditorReducer(state = initialState, action) {
     return state.withMutations(map => {
       map.set('listId', action.list.get('id'));
       map.set('title', action.list.get('title'));
+      map.set('isExclusive', action.list.get('is_exclusive'));
       map.set('isSubmitting', false);
     });
   case LIST_EDITOR_TITLE_CHANGE:
diff --git a/app/javascript/flavours/glitch/reducers/polls.js b/app/javascript/flavours/glitch/reducers/polls.js
index 8712c6ebf..3a15cb49c 100644
--- a/app/javascript/flavours/glitch/reducers/polls.js
+++ b/app/javascript/flavours/glitch/reducers/polls.js
@@ -2,14 +2,43 @@ import { Map as ImmutableMap, fromJS } from 'immutable';
 
 import { POLLS_IMPORT } from 'flavours/glitch/actions/importer';
 
+import { normalizePollOptionTranslation } from '../actions/importer/normalizer';
+import { STATUS_TRANSLATE_SUCCESS, STATUS_TRANSLATE_UNDO } from '../actions/statuses';
+
 const importPolls = (state, polls) => state.withMutations(map => polls.forEach(poll => map.set(poll.id, fromJS(poll))));
 
+const statusTranslateSuccess = (state, pollTranslation) => {
+  return state.withMutations(map => {
+    if (pollTranslation) {
+      const poll = state.get(pollTranslation.id);
+
+      pollTranslation.options.forEach((item, index) => {
+        map.setIn([pollTranslation.id, 'options', index, 'translation'], fromJS(normalizePollOptionTranslation(item, poll)));
+      });
+    }
+  });
+};
+
+const statusTranslateUndo = (state, id) => {
+  return state.withMutations(map => {
+    const options = map.getIn([id, 'options']);
+
+    if (options) {
+      options.forEach((item, index) => map.deleteIn([id, 'options', index, 'translation']));
+    }
+  });
+};
+
 const initialState = ImmutableMap();
 
 export default function polls(state = initialState, action) {
   switch(action.type) {
   case POLLS_IMPORT:
     return importPolls(state, action.polls);
+  case STATUS_TRANSLATE_SUCCESS:
+    return statusTranslateSuccess(state, action.translation.poll);
+  case STATUS_TRANSLATE_UNDO:
+    return statusTranslateUndo(state, action.pollId);
   default:
     return state;
   }
diff --git a/app/javascript/flavours/glitch/reducers/statuses.js b/app/javascript/flavours/glitch/reducers/statuses.js
index babc42678..801765c45 100644
--- a/app/javascript/flavours/glitch/reducers/statuses.js
+++ b/app/javascript/flavours/glitch/reducers/statuses.js
@@ -30,6 +30,7 @@ import {
 } from 'flavours/glitch/actions/timelines';
 
 import { STATUS_IMPORT, STATUSES_IMPORT } from '../actions/importer';
+import { normalizeStatusTranslation } from '../actions/importer/normalizer';
 
 const importStatus = (state, status) => state.set(status.id, fromJS(status));
 
@@ -81,6 +82,27 @@ const removeReaction = (state, id, name) => updateReaction(
   x => x.set('me', false).update('count', n => n - 1),
 );
 
+const statusTranslateSuccess = (state, id, translation) => {
+  return state.withMutations(map => {
+    map.setIn([id, 'translation'], fromJS(normalizeStatusTranslation(translation, map.get(id))));
+
+    const list = map.getIn([id, 'media_attachments']);
+    if (translation.media_attachments && list) {
+      translation.media_attachments.forEach(item => {
+        const index = list.findIndex(i => i.get('id') === item.id);
+        map.setIn([id, 'media_attachments', index, 'translation'], fromJS({ description: item.description }));
+      });
+    }
+  });
+};
+
+const statusTranslateUndo = (state, id) => {
+  return state.withMutations(map => {
+    map.deleteIn([id, 'translation']);
+    map.getIn([id, 'media_attachments']).forEach((item, index) => map.deleteIn([id, 'media_attachments', index, 'translation']));
+  });
+};
+
 const initialState = ImmutableMap();
 
 export default function statuses(state = initialState, action) {
@@ -140,9 +162,9 @@ export default function statuses(state = initialState, action) {
   case TIMELINE_DELETE:
     return deleteStatus(state, action.id, action.references);
   case STATUS_TRANSLATE_SUCCESS:
-    return state.setIn([action.id, 'translation'], fromJS(action.translation));
+    return statusTranslateSuccess(state, action.id, action.translation);
   case STATUS_TRANSLATE_UNDO:
-    return state.deleteIn([action.id, 'translation']);
+    return statusTranslateUndo(state, action.id);
   default:
     return state;
   }
diff --git a/app/javascript/flavours/glitch/styles/accounts.scss b/app/javascript/flavours/glitch/styles/accounts.scss
index d10169e02..ad0dfe017 100644
--- a/app/javascript/flavours/glitch/styles/accounts.scss
+++ b/app/javascript/flavours/glitch/styles/accounts.scss
@@ -3,11 +3,8 @@
     display: block;
     text-decoration: none;
     color: inherit;
-    box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-
-    @media screen and (max-width: $no-gap-breakpoint) {
-      box-shadow: none;
-    }
+    overflow: hidden;
+    border-radius: 4px;
 
     &:hover,
     &:active,
@@ -22,7 +19,6 @@
     height: 130px;
     position: relative;
     background: darken($ui-base-color, 12%);
-    border-radius: 4px 4px 0 0;
 
     img {
       display: block;
@@ -30,7 +26,6 @@
       height: 100%;
       margin: 0;
       object-fit: cover;
-      border-radius: 4px 4px 0 0;
     }
 
     @media screen and (width <= 600px) {
@@ -45,11 +40,6 @@
     justify-content: flex-start;
     align-items: center;
     background: lighten($ui-base-color, 4%);
-    border-radius: 0 0 4px 4px;
-
-    @media screen and (max-width: $no-gap-breakpoint) {
-      border-radius: 0;
-    }
 
     .avatar {
       flex: 0 0 auto;
diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss
index 2adee62d6..a57e014e9 100644
--- a/app/javascript/flavours/glitch/styles/admin.scss
+++ b/app/javascript/flavours/glitch/styles/admin.scss
@@ -1315,6 +1315,15 @@ a.sparkline {
     &:last-child {
       border-bottom: 0;
     }
+
+    &.negative {
+      color: $error-value-color;
+      font-weight: 700;
+
+      .dimension__item__value {
+        color: $error-value-color;
+      }
+    }
   }
 }
 
diff --git a/app/javascript/flavours/glitch/styles/components/media.scss b/app/javascript/flavours/glitch/styles/components/media.scss
index 92633fc3f..535af9d0f 100644
--- a/app/javascript/flavours/glitch/styles/components/media.scss
+++ b/app/javascript/flavours/glitch/styles/components/media.scss
@@ -236,7 +236,7 @@
   background: transparent;
   box-sizing: border-box;
   border: 0;
-  color: rgba($primary-text-color, 0.7);
+  color: rgba($white, 0.7);
   cursor: pointer;
   display: flex;
   align-items: center;
@@ -251,7 +251,7 @@
   &:hover,
   &:focus,
   &:active {
-    color: $primary-text-color;
+    color: $white;
   }
 }
 
diff --git a/app/javascript/flavours/glitch/styles/components/misc.scss b/app/javascript/flavours/glitch/styles/components/misc.scss
index d6666acd2..53620eeb3 100644
--- a/app/javascript/flavours/glitch/styles/components/misc.scss
+++ b/app/javascript/flavours/glitch/styles/components/misc.scss
@@ -534,36 +534,18 @@ body > [data-popper-placement] {
 }
 
 .dropdown-animation {
-  animation: dropdown 300ms cubic-bezier(0.1, 0.7, 0.1, 1);
+  animation: dropdown 150ms cubic-bezier(0.1, 0.7, 0.1, 1);
 
   @keyframes dropdown {
     from {
       opacity: 0;
-      transform: scaleX(0.85) scaleY(0.75);
     }
 
     to {
       opacity: 1;
-      transform: scaleX(1) scaleY(1);
     }
   }
 
-  &.top {
-    transform-origin: bottom;
-  }
-
-  &.right {
-    transform-origin: left;
-  }
-
-  &.bottom {
-    transform-origin: top;
-  }
-
-  &.left {
-    transform-origin: right;
-  }
-
   .reduce-motion & {
     animation: none;
   }
@@ -579,16 +561,17 @@ body > [data-popper-placement] {
 }
 
 .dropdown-menu__separator {
-  border-bottom: 1px solid darken($ui-secondary-color, 8%);
-  margin: 5px 7px 6px;
+  border-bottom: 1px solid var(--dropdown-border-color);
+  margin: 5px 0;
   height: 0;
 }
 
 .dropdown-menu {
-  background: $ui-secondary-color;
-  padding: 4px 0;
+  background: var(--dropdown-background-color);
+  border: 1px solid var(--dropdown-border-color);
+  padding: 4px;
   border-radius: 4px;
-  box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);
+  box-shadow: var(--dropdown-shadow);
   z-index: 9999;
 
   &__text-button {
@@ -609,12 +592,13 @@ body > [data-popper-placement] {
 
   &__container {
     &__header {
-      border-bottom: 1px solid darken($ui-secondary-color, 8%);
-      padding: 4px 14px;
-      padding-bottom: 8px;
+      border-bottom: 1px solid var(--dropdown-border-color);
+      padding: 10px 14px;
+      padding-bottom: 14px;
+      margin-bottom: 4px;
       font-size: 13px;
       line-height: 18px;
-      color: $inverted-text-color;
+      color: $darker-text-color;
     }
 
     &__list {
@@ -635,103 +619,43 @@ body > [data-popper-placement] {
   }
 }
 
-.dropdown-menu__arrow {
-  position: absolute;
-
-  &::before {
-    content: '';
-    display: block;
-    width: 14px;
-    height: 5px;
-    background-color: $ui-secondary-color;
-    mask-image: url("data:image/svg+xml;utf8,<svg width='14' height='5' xmlns='http://www.w3.org/2000/svg'><path d='M7 0L0 5h14L7 0z' fill='white'/></svg>");
-  }
-
-  &.top {
-    bottom: -5px;
-
-    &::before {
-      transform: rotate(180deg);
-    }
-  }
-
-  &.right {
-    inset-inline-start: -9px;
-
-    &::before {
-      transform: rotate(-90deg);
-    }
-  }
-
-  &.bottom {
-    top: -5px;
-  }
-
-  &.left {
-    inset-inline-end: -9px;
-
-    &::before {
-      transform: rotate(90deg);
-    }
-  }
-}
-
 .dropdown-menu__item {
   font-size: 13px;
   line-height: 18px;
+  font-weight: 500;
   display: block;
-  color: $inverted-text-color;
+
+  &--dangerous {
+    color: $error-value-color;
+  }
 
   a,
   button {
-    font-family: inherit;
-    font-size: inherit;
-    line-height: inherit;
+    font: inherit;
     display: block;
     width: 100%;
-    padding: 4px 14px;
+    padding: 10px 14px;
     border: 0;
     margin: 0;
+    background: transparent;
     box-sizing: border-box;
     text-decoration: none;
-    background: $ui-secondary-color;
     color: inherit;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
     text-align: inherit;
+    border-radius: 4px;
 
     &:focus,
     &:hover,
     &:active {
-      background: $ui-highlight-color;
-      color: $secondary-text-color;
+      background: var(--dropdown-border-color);
       outline: 0;
     }
   }
 }
 
-.dropdown-menu__item--text {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  padding: 4px 14px;
-}
-
-.dropdown-menu__item.edited-timestamp__history__item {
-  border-bottom: 1px solid darken($ui-secondary-color, 8%);
-
-  &:last-child {
-    border-bottom: 0;
-  }
-
-  &.dropdown-menu__item--text,
-  a,
-  button {
-    padding: 8px 14px;
-  }
-}
-
 .inline-account {
   display: inline-flex;
   align-items: center;
@@ -747,62 +671,6 @@ body > [data-popper-placement] {
   }
 }
 
-.dropdown--active .dropdown__content {
-  display: block;
-  line-height: 18px;
-  max-width: 311px;
-  inset-inline-end: 0;
-  text-align: start;
-  z-index: 9999;
-
-  & > ul {
-    list-style: none;
-    background: $ui-secondary-color;
-    padding: 4px 0;
-    border-radius: 4px;
-    box-shadow: 0 0 15px rgba($base-shadow-color, 0.4);
-    min-width: 140px;
-    position: relative;
-  }
-
-  &.dropdown__right {
-    inset-inline-end: 0;
-  }
-
-  &.dropdown__left {
-    & > ul {
-      inset-inline-start: -98px;
-    }
-  }
-
-  & > ul > li > a {
-    font-size: 13px;
-    line-height: 18px;
-    display: block;
-    padding: 4px 14px;
-    box-sizing: border-box;
-    text-decoration: none;
-    background: $ui-secondary-color;
-    color: $inverted-text-color;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-
-    &:focus {
-      outline: 0;
-    }
-
-    &:hover {
-      background: $ui-highlight-color;
-      color: $secondary-text-color;
-    }
-  }
-}
-
-.dropdown__icon {
-  vertical-align: middle;
-}
-
 .static-content {
   padding: 10px;
   padding-top: 20px;
diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss
index 0f77da5ae..0eb65d1ee 100644
--- a/app/javascript/flavours/glitch/styles/components/status.scss
+++ b/app/javascript/flavours/glitch/styles/components/status.scss
@@ -312,7 +312,7 @@
     background: lighten($ui-base-color, 4%);
 
     &.status.status-direct {
-      background: lighten($ui-base-color, 12%);
+      background: mix(lighten($ui-base-color, 4%), $ui-highlight-color, 95%);
 
       &.muted {
         background: transparent;
@@ -358,7 +358,7 @@
   }
 
   &.status-direct {
-    background: lighten($ui-base-color, 8%);
+    background: mix($ui-base-color, $ui-highlight-color, 95%);
     border-bottom-color: lighten($ui-base-color, 12%);
 
     .status__collapse-button.active {
diff --git a/app/javascript/flavours/glitch/styles/forms.scss b/app/javascript/flavours/glitch/styles/forms.scss
index 6bb21c189..6c49879ee 100644
--- a/app/javascript/flavours/glitch/styles/forms.scss
+++ b/app/javascript/flavours/glitch/styles/forms.scss
@@ -138,6 +138,10 @@ code {
     color: $secondary-text-color;
     margin-bottom: 30px;
 
+    &.invited-by {
+      margin-bottom: 15px;
+    }
+
     a {
       color: $highlight-text-color;
     }
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index ef248bf4f..2294f2d7c 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -264,7 +264,7 @@ html {
 
 // Change the background colors of statuses
 .focusable:focus {
-  background: $ui-base-color;
+  background: lighten($white, 4%);
 }
 
 .detailed-status,
diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss
index 0132da51f..8608fec72 100644
--- a/app/javascript/flavours/glitch/styles/variables.scss
+++ b/app/javascript/flavours/glitch/styles/variables.scss
@@ -67,3 +67,10 @@ $ui-avatar-border-size: 8%;
 
 // More variables
 $dismiss-overlay-width: 4rem;
+
+:root {
+  --dropdown-border-color: #{lighten($ui-base-color, 12%)};
+  --dropdown-background-color: #{lighten($ui-base-color, 4%)};
+  --dropdown-shadow: 0 20px 25px -5px #{rgba($base-shadow-color, 0.25)},
+    0 8px 10px -6px #{rgba($base-shadow-color, 0.25)};
+}
diff --git a/app/javascript/locales/index.js b/app/javascript/locales/index.js
deleted file mode 100644
index 421cb7fab..000000000
--- a/app/javascript/locales/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-let theLocale;
-
-export function setLocale(locale) {
-  theLocale = locale;
-}
-
-export function getLocale() {
-  return theLocale;
-}
diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js
index 61062fd2c..9ed6b583b 100644
--- a/app/javascript/mastodon/actions/importer/normalizer.js
+++ b/app/javascript/mastodon/actions/importer/normalizer.js
@@ -6,7 +6,7 @@ import { unescapeHTML } from '../../utils/html';
 
 const domParser = new DOMParser();
 
-const makeEmojiMap = record => record.emojis.reduce((obj, emoji) => {
+const makeEmojiMap = emojis => emojis.reduce((obj, emoji) => {
   obj[`:${emoji.shortcode}:`] = emoji;
   return obj;
 }, {});
@@ -20,7 +20,7 @@ export function searchTextFromRawStatus (status) {
 export function normalizeAccount(account) {
   account = { ...account };
 
-  const emojiMap = makeEmojiMap(account);
+  const emojiMap = makeEmojiMap(account.emojis);
   const displayName = account.display_name.trim().length === 0 ? account.username : account.display_name;
 
   account.display_name_html = emojify(escapeTextContentForBrowser(displayName), emojiMap);
@@ -86,7 +86,7 @@ export function normalizeStatus(status, normalOldStatus) {
 
     const spoilerText   = normalStatus.spoiler_text || '';
     const searchContent = ([spoilerText, status.content].concat((status.poll && status.poll.options) ? status.poll.options.map(option => option.title) : [])).concat(status.media_attachments.map(att => att.description)).join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
-    const emojiMap      = makeEmojiMap(normalStatus);
+    const emojiMap      = makeEmojiMap(normalStatus.emojis);
 
     normalStatus.search_index = domParser.parseFromString(searchContent, 'text/html').documentElement.textContent;
     normalStatus.contentHtml  = emojify(normalStatus.content, emojiMap);
@@ -97,22 +97,48 @@ export function normalizeStatus(status, normalOldStatus) {
   return normalStatus;
 }
 
+export function normalizeStatusTranslation(translation, status) {
+  const emojiMap = makeEmojiMap(status.get('emojis').toJS());
+
+  const normalTranslation = {
+    detected_source_language: translation.detected_source_language,
+    language: translation.language,
+    provider: translation.provider,
+    contentHtml: emojify(translation.content, emojiMap),
+    spoilerHtml: emojify(escapeTextContentForBrowser(translation.spoiler_text), emojiMap),
+    spoiler_text: translation.spoiler_text,
+  };
+
+  return normalTranslation;
+}
+
 export function normalizePoll(poll) {
   const normalPoll = { ...poll };
-  const emojiMap = makeEmojiMap(normalPoll);
+  const emojiMap = makeEmojiMap(poll.emojis);
 
   normalPoll.options = poll.options.map((option, index) => ({
     ...option,
     voted: poll.own_votes && poll.own_votes.includes(index),
-    title_emojified: emojify(escapeTextContentForBrowser(option.title), emojiMap),
+    titleHtml: emojify(escapeTextContentForBrowser(option.title), emojiMap),
   }));
 
   return normalPoll;
 }
 
+export function normalizePollOptionTranslation(translation, poll) {
+  const emojiMap = makeEmojiMap(poll.get('emojis').toJS());
+
+  const normalTranslation = {
+    ...translation,
+    titleHtml: emojify(escapeTextContentForBrowser(translation.title), emojiMap),
+  };
+
+  return normalTranslation;
+}
+
 export function normalizeAnnouncement(announcement) {
   const normalAnnouncement = { ...announcement };
-  const emojiMap = makeEmojiMap(normalAnnouncement);
+  const emojiMap = makeEmojiMap(normalAnnouncement.emojis);
 
   normalAnnouncement.contentHtml = emojify(normalAnnouncement.content, emojiMap);
 
diff --git a/app/javascript/mastodon/actions/lists.js b/app/javascript/mastodon/actions/lists.js
index 2faa54b95..b0789cd42 100644
--- a/app/javascript/mastodon/actions/lists.js
+++ b/app/javascript/mastodon/actions/lists.js
@@ -151,10 +151,10 @@ export const createListFail = error => ({
   error,
 });
 
-export const updateList = (id, title, shouldReset, replies_policy) => (dispatch, getState) => {
+export const updateList = (id, title, shouldReset, isExclusive, replies_policy) => (dispatch, getState) => {
   dispatch(updateListRequest(id));
 
-  api(getState).put(`/api/v1/lists/${id}`, { title, replies_policy }).then(({ data }) => {
+  api(getState).put(`/api/v1/lists/${id}`, { title, replies_policy, exclusive: typeof isExclusive === 'undefined' ? undefined : !!isExclusive }).then(({ data }) => {
     dispatch(updateListSuccess(data));
 
     if (shouldReset) {
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index 216964f8e..f8163e283 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -1,4 +1,4 @@
-import IntlMessageFormat from 'intl-messageformat';
+import { IntlMessageFormat } from 'intl-messageformat';
 import { defineMessages } from 'react-intl';
 
 import { List as ImmutableList } from 'immutable';
diff --git a/app/javascript/mastodon/actions/statuses.js b/app/javascript/mastodon/actions/statuses.js
index 84a1271b8..3aed80735 100644
--- a/app/javascript/mastodon/actions/statuses.js
+++ b/app/javascript/mastodon/actions/statuses.js
@@ -343,7 +343,8 @@ export const translateStatusFail = (id, error) => ({
   error,
 });
 
-export const undoStatusTranslation = id => ({
+export const undoStatusTranslation = (id, pollId) => ({
   type: STATUS_TRANSLATE_UNDO,
   id,
+  pollId,
 });
diff --git a/app/javascript/mastodon/actions/streaming.js b/app/javascript/mastodon/actions/streaming.js
index 562e72655..9daeb3c60 100644
--- a/app/javascript/mastodon/actions/streaming.js
+++ b/app/javascript/mastodon/actions/streaming.js
@@ -24,8 +24,6 @@ import {
   fillListTimelineGaps,
 } from './timelines';
 
-const { messages } = getLocale();
-
 /**
  * @param {number} max
  * @returns {number}
@@ -43,8 +41,10 @@ const randomUpTo = max =>
  * @param {function(object): boolean} [options.accept]
  * @returns {function(): void}
  */
-export const connectTimelineStream = (timelineId, channelName, params = {}, options = {}) =>
-  connectStream(channelName, params, (dispatch, getState) => {
+export const connectTimelineStream = (timelineId, channelName, params = {}, options = {}) => {
+  const { messages } = getLocale();
+
+  return connectStream(channelName, params, (dispatch, getState) => {
     const locale = getState().getIn(['meta', 'locale']);
 
     // @ts-expect-error
@@ -121,6 +121,7 @@ export const connectTimelineStream = (timelineId, channelName, params = {}, opti
       },
     };
   });
+};
 
 /**
  * @param {Function} dispatch
diff --git a/app/javascript/mastodon/components/account.jsx b/app/javascript/mastodon/components/account.jsx
index 68a456c1b..0f3b85388 100644
--- a/app/javascript/mastodon/components/account.jsx
+++ b/app/javascript/mastodon/components/account.jsx
@@ -16,6 +16,7 @@ import { VerifiedBadge } from 'mastodon/components/verified_badge';
 import { me } from '../initial_state';
 
 import { Avatar } from './avatar';
+import Button from './button';
 import { DisplayName } from './display_name';
 import { IconButton } from './icon_button';
 import { RelativeTimestamp } from './relative_timestamp';
@@ -23,13 +24,13 @@ import { RelativeTimestamp } from './relative_timestamp';
 const messages = defineMessages({
   follow: { id: 'account.follow', defaultMessage: 'Follow' },
   unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
-  requested: { id: 'account.requested', defaultMessage: 'Awaiting approval. Click to cancel follow request' },
-  unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
-  unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
-  mute_notifications: { id: 'account.mute_notifications', defaultMessage: 'Mute notifications from @{name}' },
-  unmute_notifications: { id: 'account.unmute_notifications', defaultMessage: 'Unmute notifications from @{name}' },
-  mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' },
-  block: { id: 'account.block', defaultMessage: 'Block @{name}' },
+  cancel_follow_request: { id: 'account.cancel_follow_request', defaultMessage: 'Withdraw follow request' },
+  unblock: { id: 'account.unblock_short', defaultMessage: 'Unblock' },
+  unmute: { id: 'account.unmute_short', defaultMessage: 'Unmute' },
+  mute_notifications: { id: 'account.mute_notifications_short', defaultMessage: 'Mute notifications' },
+  unmute_notifications: { id: 'account.unmute_notifications_short', defaultMessage: 'Unmute notifications' },
+  mute: { id: 'account.mute_short', defaultMessage: 'Mute' },
+  block: { id: 'account.block_short', defaultMessage: 'Block' },
 });
 
 class Account extends ImmutablePureComponent {
@@ -96,39 +97,39 @@ class Account extends ImmutablePureComponent {
 
     let buttons;
 
-    if (actionIcon) {
-      if (onActionClick) {
-        buttons = <IconButton icon={actionIcon} title={actionTitle} onClick={this.handleAction} />;
-      }
-    } else if (account.get('id') !== me && account.get('relationship', null) !== null) {
+    if (actionIcon && onActionClick) {
+      buttons = <IconButton icon={actionIcon} title={actionTitle} onClick={this.handleAction} />;
+    } else if (!actionIcon && account.get('id') !== me && account.get('relationship', null) !== null) {
       const following = account.getIn(['relationship', 'following']);
       const requested = account.getIn(['relationship', 'requested']);
       const blocking  = account.getIn(['relationship', 'blocking']);
       const muting  = account.getIn(['relationship', 'muting']);
 
       if (requested) {
-        buttons = <IconButton disabled icon='hourglass' title={intl.formatMessage(messages.requested)} />;
+        buttons = <Button text={intl.formatMessage(messages.cancel_follow_request)} onClick={this.handleFollow} />;
       } else if (blocking) {
-        buttons = <IconButton active icon='unlock' title={intl.formatMessage(messages.unblock, { name: account.get('username') })} onClick={this.handleBlock} />;
+        buttons = <Button text={intl.formatMessage(messages.unblock)} onClick={this.handleBlock} />;
       } else if (muting) {
         let hidingNotificationsButton;
+
         if (account.getIn(['relationship', 'muting_notifications'])) {
-          hidingNotificationsButton = <IconButton active icon='bell' title={intl.formatMessage(messages.unmute_notifications, { name: account.get('username') })} onClick={this.handleUnmuteNotifications} />;
+          hidingNotificationsButton = <Button text={intl.formatMessage(messages.unmute_notifications)} onClick={this.handleUnmuteNotifications} />;
         } else {
-          hidingNotificationsButton = <IconButton active icon='bell-slash' title={intl.formatMessage(messages.mute_notifications, { name: account.get('username')  })} onClick={this.handleMuteNotifications} />;
+          hidingNotificationsButton = <Button text={intl.formatMessage(messages.mute_notifications)} onClick={this.handleMuteNotifications} />;
         }
+
         buttons = (
           <>
-            <IconButton active icon='volume-up' title={intl.formatMessage(messages.unmute, { name: account.get('username') })} onClick={this.handleMute} />
+            <Button text={intl.formatMessage(messages.unmute)} onClick={this.handleMute} />
             {hidingNotificationsButton}
           </>
         );
       } else if (defaultAction === 'mute') {
-        buttons = <IconButton icon='volume-off' title={intl.formatMessage(messages.mute, { name: account.get('username') })} onClick={this.handleMute} />;
+        buttons = <Button title={intl.formatMessage(messages.mute)} onClick={this.handleMute} />;
       } else if (defaultAction === 'block') {
-        buttons = <IconButton icon='lock' title={intl.formatMessage(messages.block, { name: account.get('username') })} onClick={this.handleBlock} />;
+        buttons = <Button text={intl.formatMessage(messages.block)} onClick={this.handleBlock} />;
       } else if (!account.get('moved') || following) {
-        buttons = <IconButton icon={following ? 'user-times' : 'user-plus'} title={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={this.handleFollow} active={following} />;
+        buttons = <Button text={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={this.handleFollow} />;
       }
     }
 
@@ -143,7 +144,7 @@ class Account extends ImmutablePureComponent {
     const firstVerifiedField = account.get('fields').find(item => !!item.get('verified_at'));
 
     if (firstVerifiedField) {
-      verification = <>· <VerifiedBadge link={firstVerifiedField.get('value')} /></>;
+      verification = <VerifiedBadge link={firstVerifiedField.get('value')} />;
     }
 
     return (
@@ -154,9 +155,13 @@ class Account extends ImmutablePureComponent {
               <Avatar account={account} size={size} />
             </div>
 
-            <div>
+            <div className='account__contents'>
               <DisplayName account={account} />
-              {!minimal && <><ShortNumber value={account.get('followers_count')} renderer={counterRenderer('followers')} /> {verification} {muteTimeRemaining}</>}
+              {!minimal && (
+                <div className='account__details'>
+                  <ShortNumber value={account.get('followers_count')} renderer={counterRenderer('followers')} /> {verification} {muteTimeRemaining}
+                </div>
+              )}
             </div>
           </Link>
 
diff --git a/app/javascript/mastodon/components/admin/ImpactReport.jsx b/app/javascript/mastodon/components/admin/ImpactReport.jsx
new file mode 100644
index 000000000..c27ee0ab0
--- /dev/null
+++ b/app/javascript/mastodon/components/admin/ImpactReport.jsx
@@ -0,0 +1,91 @@
+import PropTypes from 'prop-types';
+import { PureComponent } from 'react';
+
+import { FormattedNumber, FormattedMessage } from 'react-intl';
+
+import classNames from 'classnames';
+
+import api from 'mastodon/api';
+import { Skeleton } from 'mastodon/components/skeleton';
+
+export default class ImpactReport extends PureComponent {
+
+  static propTypes = {
+    domain: PropTypes.string.isRequired,
+  };
+
+  state = {
+    loading: true,
+    data: null,
+  };
+
+  componentDidMount () {
+    const { domain } = this.props;
+
+    const params = {
+      domain: domain,
+      include_subdomains: true,
+    };
+
+    api().post('/api/v1/admin/measures', {
+      keys: ['instance_accounts', 'instance_follows', 'instance_followers'],
+      start_at: null,
+      end_at: null,
+      instance_accounts: params,
+      instance_follows: params,
+      instance_followers: params,
+    }).then(res => {
+      this.setState({
+        loading: false,
+        data: res.data,
+      });
+    }).catch(err => {
+      console.error(err);
+    });
+  }
+
+  render () {
+    const { loading, data } = this.state;
+
+    return (
+      <div className='dimension'>
+        <h4><FormattedMessage id='admin.impact_report.title' defaultMessage='Impact summary' /></h4>
+
+        <table>
+          <tbody>
+            <tr className='dimension__item'>
+              <td className='dimension__item__key'>
+                <FormattedMessage id='admin.impact_report.instance_accounts' defaultMessage='Accounts profiles this would delete' />
+              </td>
+
+              <td className='dimension__item__value'>
+                {loading ? <Skeleton width={60} /> : <FormattedNumber value={data[0].total} />}
+              </td>
+            </tr>
+
+            <tr className={classNames('dimension__item', { negative: !loading && data[1].total > 0 })}>
+              <td className='dimension__item__key'>
+                <FormattedMessage id='admin.impact_report.instance_follows' defaultMessage='Followers their users would lose' />
+              </td>
+
+              <td className='dimension__item__value'>
+                {loading ? <Skeleton width={60} /> : <FormattedNumber value={data[1].total} />}
+              </td>
+            </tr>
+
+            <tr className={classNames('dimension__item', { negative: !loading && data[2].total > 0 })}>
+              <td className='dimension__item__key'>
+                <FormattedMessage id='admin.impact_report.instance_followers' defaultMessage='Followers our users would lose' />
+              </td>
+
+              <td className='dimension__item__value'>
+                {loading ? <Skeleton width={60} /> : <FormattedNumber value={data[2].total} />}
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/components/domain.tsx b/app/javascript/mastodon/components/domain.tsx
index db18635be..f4a3b9d4b 100644
--- a/app/javascript/mastodon/components/domain.tsx
+++ b/app/javascript/mastodon/components/domain.tsx
@@ -1,7 +1,6 @@
 import { useCallback } from 'react';
 
-import type { InjectedIntl } from 'react-intl';
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 
 import { IconButton } from './icon_button';
 
@@ -15,9 +14,11 @@ const messages = defineMessages({
 interface Props {
   domain: string;
   onUnblockDomain: (domain: string) => void;
-  intl: InjectedIntl;
 }
-const _Domain: React.FC<Props> = ({ domain, onUnblockDomain, intl }) => {
+
+export const Domain: React.FC<Props> = ({ domain, onUnblockDomain }) => {
+  const intl = useIntl();
+
   const handleDomainUnblock = useCallback(() => {
     onUnblockDomain(domain);
   }, [domain, onUnblockDomain]);
@@ -41,5 +42,3 @@ const _Domain: React.FC<Props> = ({ domain, onUnblockDomain, intl }) => {
     </div>
   );
 };
-
-export const Domain = injectIntl(_Domain);
diff --git a/app/javascript/mastodon/components/dropdown_menu.jsx b/app/javascript/mastodon/components/dropdown_menu.jsx
index 4cadf907e..3cfa0ee12 100644
--- a/app/javascript/mastodon/components/dropdown_menu.jsx
+++ b/app/javascript/mastodon/components/dropdown_menu.jsx
@@ -121,10 +121,10 @@ class DropdownMenu extends PureComponent {
       return <li key={`sep-${i}`} className='dropdown-menu__separator' />;
     }
 
-    const { text, href = '#', target = '_blank', method } = option;
+    const { text, href = '#', target = '_blank', method, dangerous } = option;
 
     return (
-      <li className='dropdown-menu__item' key={`${text}-${i}`}>
+      <li className={classNames('dropdown-menu__item', { 'dropdown-menu__item--dangerous': dangerous })} key={`${text}-${i}`}>
         <a href={href} target={target} data-method={method} rel='noopener noreferrer' role='button' tabIndex={0} ref={i === 0 ? this.setFocusRef : null} onClick={this.handleClick} onKeyPress={this.handleItemKeyPress} data-index={i}>
           {text}
         </a>
diff --git a/app/javascript/mastodon/components/load_gap.tsx b/app/javascript/mastodon/components/load_gap.tsx
index e6d3060eb..7e2cd447b 100644
--- a/app/javascript/mastodon/components/load_gap.tsx
+++ b/app/javascript/mastodon/components/load_gap.tsx
@@ -1,7 +1,6 @@
 import { useCallback } from 'react';
 
-import type { InjectedIntl } from 'react-intl';
-import { injectIntl, defineMessages } from 'react-intl';
+import { useIntl, defineMessages } from 'react-intl';
 
 import { Icon } from 'mastodon/components/icon';
 
@@ -13,10 +12,11 @@ interface Props {
   disabled: boolean;
   maxId: string;
   onClick: (maxId: string) => void;
-  intl: InjectedIntl;
 }
 
-const _LoadGap: React.FC<Props> = ({ disabled, maxId, onClick, intl }) => {
+export const LoadGap: React.FC<Props> = ({ disabled, maxId, onClick }) => {
+  const intl = useIntl();
+
   const handleClick = useCallback(() => {
     onClick(maxId);
   }, [maxId, onClick]);
@@ -32,5 +32,3 @@ const _LoadGap: React.FC<Props> = ({ disabled, maxId, onClick, intl }) => {
     </button>
   );
 };
-
-export const LoadGap = injectIntl(_LoadGap);
diff --git a/app/javascript/mastodon/components/load_more.jsx b/app/javascript/mastodon/components/load_more.jsx
deleted file mode 100644
index 6b7ecdea0..000000000
--- a/app/javascript/mastodon/components/load_more.jsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import PropTypes from 'prop-types';
-import { PureComponent } from 'react';
-
-import { FormattedMessage } from 'react-intl';
-
-export default class LoadMore extends PureComponent {
-
-  static propTypes = {
-    onClick: PropTypes.func,
-    disabled: PropTypes.bool,
-    visible: PropTypes.bool,
-  };
-
-  static defaultProps = {
-    visible: true,
-  };
-
-  render() {
-    const { disabled, visible } = this.props;
-
-    return (
-      <button type='button' className='load-more' disabled={disabled || !visible} style={{ visibility: visible ? 'visible' : 'hidden' }} onClick={this.props.onClick}>
-        <FormattedMessage id='status.load_more' defaultMessage='Load more' />
-      </button>
-    );
-  }
-
-}
diff --git a/app/javascript/mastodon/components/load_more.tsx b/app/javascript/mastodon/components/load_more.tsx
new file mode 100644
index 000000000..8b5746ad3
--- /dev/null
+++ b/app/javascript/mastodon/components/load_more.tsx
@@ -0,0 +1,24 @@
+import { FormattedMessage } from 'react-intl';
+
+interface Props {
+  onClick: (event: React.MouseEvent) => void;
+  disabled?: boolean;
+  visible?: boolean;
+}
+export const LoadMore: React.FC<Props> = ({
+  onClick,
+  disabled,
+  visible = true,
+}) => {
+  return (
+    <button
+      type='button'
+      className='load-more'
+      disabled={disabled || !visible}
+      style={{ visibility: visible ? 'visible' : 'hidden' }}
+      onClick={onClick}
+    >
+      <FormattedMessage id='status.load_more' defaultMessage='Load more' />
+    </button>
+  );
+};
diff --git a/app/javascript/mastodon/components/media_attachments.jsx b/app/javascript/mastodon/components/media_attachments.jsx
index d2f171243..7b945a0ea 100644
--- a/app/javascript/mastodon/components/media_attachments.jsx
+++ b/app/javascript/mastodon/components/media_attachments.jsx
@@ -51,8 +51,9 @@ export default class MediaAttachments extends ImmutablePureComponent {
   };
 
   render () {
-    const { status, lang, width, height } = this.props;
+    const { status, width, height } = this.props;
     const mediaAttachments = status.get('media_attachments');
+    const language = status.getIn(['language', 'translation']) || status.get('language') || this.props.lang;
 
     if (mediaAttachments.size === 0) {
       return null;
@@ -60,14 +61,15 @@ export default class MediaAttachments extends ImmutablePureComponent {
 
     if (mediaAttachments.getIn([0, 'type']) === 'audio') {
       const audio = mediaAttachments.get(0);
+      const description = audio.getIn(['translation', 'description']) || audio.get('description');
 
       return (
         <Bundle fetchComponent={Audio} loading={this.renderLoadingAudioPlayer} >
           {Component => (
             <Component
               src={audio.get('url')}
-              alt={audio.get('description')}
-              lang={lang || status.get('language')}
+              alt={description}
+              lang={language}
               width={width}
               height={height}
               poster={audio.get('preview_url') || status.getIn(['account', 'avatar_static'])}
@@ -81,6 +83,7 @@ export default class MediaAttachments extends ImmutablePureComponent {
       );
     } else if (mediaAttachments.getIn([0, 'type']) === 'video') {
       const video = mediaAttachments.get(0);
+      const description = video.getIn(['translation', 'description']) || video.get('description');
 
       return (
         <Bundle fetchComponent={Video} loading={this.renderLoadingVideoPlayer} >
@@ -90,8 +93,8 @@ export default class MediaAttachments extends ImmutablePureComponent {
               frameRate={video.getIn(['meta', 'original', 'frame_rate'])}
               blurhash={video.get('blurhash')}
               src={video.get('url')}
-              alt={video.get('description')}
-              lang={lang || status.get('language')}
+              alt={description}
+              lang={language}
               width={width}
               height={height}
               inline
@@ -107,7 +110,7 @@ export default class MediaAttachments extends ImmutablePureComponent {
           {Component => (
             <Component
               media={mediaAttachments}
-              lang={lang || status.get('language')}
+              lang={language}
               sensitive={status.get('sensitive')}
               defaultWidth={width}
               height={height}
diff --git a/app/javascript/mastodon/components/media_gallery.jsx b/app/javascript/mastodon/components/media_gallery.jsx
index 152426656..1044b729b 100644
--- a/app/javascript/mastodon/components/media_gallery.jsx
+++ b/app/javascript/mastodon/components/media_gallery.jsx
@@ -105,10 +105,12 @@ class Item extends PureComponent {
       badges.push(<span key='alt' className='media-gallery__gifv__label'>ALT</span>);
     }
 
+    const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
+
     if (attachment.get('type') === 'unknown') {
       return (
         <div className={classNames('media-gallery__item', { standalone, 'media-gallery__item--tall': height === 100, 'media-gallery__item--wide': width === 100 })} key={attachment.get('id')}>
-          <a className='media-gallery__item-thumbnail' href={attachment.get('remote_url') || attachment.get('url')} style={{ cursor: 'pointer' }} title={attachment.get('description')} lang={lang} target='_blank' rel='noopener noreferrer'>
+          <a className='media-gallery__item-thumbnail' href={attachment.get('remote_url') || attachment.get('url')} style={{ cursor: 'pointer' }} title={description} lang={lang} target='_blank' rel='noopener noreferrer'>
             <Blurhash
               hash={attachment.get('blurhash')}
               className='media-gallery__preview'
@@ -146,8 +148,8 @@ class Item extends PureComponent {
             src={previewUrl}
             srcSet={srcSet}
             sizes={sizes}
-            alt={attachment.get('description')}
-            title={attachment.get('description')}
+            alt={description}
+            title={description}
             lang={lang}
             style={{ objectPosition: `${x}% ${y}%` }}
             onLoad={this.handleImageLoad}
@@ -163,8 +165,8 @@ class Item extends PureComponent {
         <div className={classNames('media-gallery__gifv', { autoplay: autoPlay })}>
           <video
             className='media-gallery__item-gifv-thumbnail'
-            aria-label={attachment.get('description')}
-            title={attachment.get('description')}
+            aria-label={description}
+            title={description}
             lang={lang}
             role='application'
             src={attachment.get('url')}
diff --git a/app/javascript/mastodon/components/poll.jsx b/app/javascript/mastodon/components/poll.jsx
index 84e4e660a..dfc4034fa 100644
--- a/app/javascript/mastodon/components/poll.jsx
+++ b/app/javascript/mastodon/components/poll.jsx
@@ -57,9 +57,9 @@ class Poll extends ImmutablePureComponent {
   };
 
   static getDerivedStateFromProps (props, state) {
-    const { poll, intl } = props;
+    const { poll } = props;
     const expires_at = poll.get('expires_at');
-    const expired = poll.get('expired') || expires_at !== null && (new Date(expires_at)).getTime() < intl.now();
+    const expired = poll.get('expired') || expires_at !== null && (new Date(expires_at)).getTime() < Date.now();
     return (expired === state.expired) ? null : { expired };
   }
 
@@ -76,10 +76,10 @@ class Poll extends ImmutablePureComponent {
   }
 
   _setupTimer () {
-    const { poll, intl } = this.props;
+    const { poll } = this.props;
     clearTimeout(this._timer);
     if (!this.state.expired) {
-      const delay = (new Date(poll.get('expires_at'))).getTime() - intl.now();
+      const delay = (new Date(poll.get('expires_at'))).getTime() - Date.now();
       this._timer = setTimeout(() => {
         this.setState({ expired: true });
       }, delay);
@@ -138,10 +138,12 @@ class Poll extends ImmutablePureComponent {
     const active          = !!this.state.selected[`${optionIndex}`];
     const voted           = option.get('voted') || (poll.get('own_votes') && poll.get('own_votes').includes(optionIndex));
 
-    let titleEmojified = option.get('title_emojified');
-    if (!titleEmojified) {
+    const title = option.getIn(['translation', 'title']) || option.get('title');
+    let titleHtml = option.getIn(['translation', 'titleHtml']) || option.get('titleHtml');
+
+    if (!titleHtml) {
       const emojiMap = makeEmojiMap(poll);
-      titleEmojified = emojify(escapeTextContentForBrowser(option.get('title')), emojiMap);
+      titleHtml = emojify(escapeTextContentForBrowser(title), emojiMap);
     }
 
     return (
@@ -163,7 +165,7 @@ class Poll extends ImmutablePureComponent {
               role={poll.get('multiple') ? 'checkbox' : 'radio'}
               onKeyPress={this.handleOptionKeyPress}
               aria-checked={active}
-              aria-label={option.get('title')}
+              aria-label={title}
               lang={lang}
               data-index={optionIndex}
             />
@@ -182,7 +184,7 @@ class Poll extends ImmutablePureComponent {
           <span
             className='poll__option__text translate'
             lang={lang}
-            dangerouslySetInnerHTML={{ __html: titleEmojified }}
+            dangerouslySetInnerHTML={{ __html: titleHtml }}
           />
 
           {!!voted && <span className='poll__voted'>
diff --git a/app/javascript/mastodon/components/relative_timestamp.tsx b/app/javascript/mastodon/components/relative_timestamp.tsx
index 0cdced8a4..d37c3dd79 100644
--- a/app/javascript/mastodon/components/relative_timestamp.tsx
+++ b/app/javascript/mastodon/components/relative_timestamp.tsx
@@ -1,6 +1,6 @@
 import { Component } from 'react';
 
-import type { InjectedIntl } from 'react-intl';
+import type { IntlShape } from 'react-intl';
 import { injectIntl, defineMessages } from 'react-intl';
 
 const messages = defineMessages({
@@ -103,7 +103,7 @@ const getUnitDelay = (units: string) => {
 };
 
 export const timeAgoString = (
-  intl: InjectedIntl,
+  intl: IntlShape,
   date: Date,
   now: number,
   year: number,
@@ -155,7 +155,7 @@ export const timeAgoString = (
 };
 
 const timeRemainingString = (
-  intl: InjectedIntl,
+  intl: IntlShape,
   date: Date,
   now: number,
   timeGiven = true
@@ -190,7 +190,7 @@ const timeRemainingString = (
 };
 
 interface Props {
-  intl: InjectedIntl;
+  intl: IntlShape;
   timestamp: string;
   year: number;
   futureDate?: boolean;
@@ -201,7 +201,7 @@ interface States {
 }
 class RelativeTimestamp extends Component<Props, States> {
   state = {
-    now: this.props.intl.now(),
+    now: Date.now(),
   };
 
   static defaultProps = {
@@ -223,7 +223,7 @@ class RelativeTimestamp extends Component<Props, States> {
 
   UNSAFE_componentWillReceiveProps(nextProps: Props) {
     if (this.props.timestamp !== nextProps.timestamp) {
-      this.setState({ now: this.props.intl.now() });
+      this.setState({ now: Date.now() });
     }
   }
 
@@ -253,7 +253,7 @@ class RelativeTimestamp extends Component<Props, States> {
         : Math.max(updateInterval, unitRemainder);
 
     this._timer = window.setTimeout(() => {
-      this.setState({ now: this.props.intl.now() });
+      this.setState({ now: Date.now() });
     }, delay);
   }
 
diff --git a/app/javascript/mastodon/components/scrollable_list.jsx b/app/javascript/mastodon/components/scrollable_list.jsx
index 9a0c4c8a7..53a84ecb5 100644
--- a/app/javascript/mastodon/components/scrollable_list.jsx
+++ b/app/javascript/mastodon/components/scrollable_list.jsx
@@ -15,7 +15,7 @@ import IntersectionObserverArticleContainer from '../containers/intersection_obs
 import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../features/ui/util/fullscreen';
 import IntersectionObserverWrapper from '../features/ui/util/intersection_observer_wrapper';
 
-import LoadMore from './load_more';
+import { LoadMore } from './load_more';
 import LoadPending from './load_pending';
 import LoadingIndicator from './loading_indicator';
 
diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index 03af6ffa5..28d9c61a1 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -28,13 +28,19 @@ import StatusActionBar from './status_action_bar';
 import StatusContent from './status_content';
 import StatusReactions from './status_reactions';
 
+const domParser = new DOMParser();
+
 export const textForScreenReader = (intl, status, rebloggedByText = false) => {
   const displayName = status.getIn(['account', 'display_name']);
 
+  const spoilerText = status.getIn(['translation', 'spoiler_text']) || status.get('spoiler_text');
+  const contentHtml = status.getIn(['translation', 'contentHtml']) || status.get('contentHtml');
+  const contentText = domParser.parseFromString(contentHtml, 'text/html').documentElement.textContent;
+
   const values = [
     displayName.length === 0 ? status.getIn(['account', 'acct']).split('@')[0] : displayName,
-    status.get('spoiler_text') && status.get('hidden') ? status.get('spoiler_text') : status.get('search_index').slice(status.get('spoiler_text').length),
-    new Date(status.get('created_at')).toLocaleString(undefined, { hour: '2-digit', minute: '2-digit', month: 'short', day: 'numeric' }),
+    spoilerText && status.get('hidden') ? spoilerText : contentText,
+    intl.formatDate(status.get('created_at'), { hour: '2-digit', minute: '2-digit', month: 'short', day: 'numeric' }),
     status.getIn(['account', 'acct']),
   ];
 
@@ -204,12 +210,14 @@ class Status extends ImmutablePureComponent {
 
   handleOpenVideo = (options) => {
     const status = this._properStatus();
-    this.props.onOpenVideo(status.get('id'), status.getIn(['media_attachments', 0]), status.get('language'), options);
+    const lang = status.getIn(['translation', 'language']) || status.get('language');
+    this.props.onOpenVideo(status.get('id'), status.getIn(['media_attachments', 0]), lang, options);
   };
 
   handleOpenMedia = (media, index) => {
     const status = this._properStatus();
-    this.props.onOpenMedia(status.get('id'), media, index, status.get('language'));
+    const lang = status.getIn(['translation', 'language']) || status.get('language');
+    this.props.onOpenMedia(status.get('id'), media, index, lang);
   };
 
   handleHotkeyOpenMedia = e => {
@@ -219,7 +227,7 @@ class Status extends ImmutablePureComponent {
     e.preventDefault();
 
     if (status.get('media_attachments').size > 0) {
-      const lang = status.get('language');
+      const lang = status.getIn(['translation', 'language']) || status.get('language');
       if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
         onOpenVideo(status.get('id'), status.getIn(['media_attachments', 0]), lang, { startTime: 0 });
       } else {
@@ -425,6 +433,8 @@ class Status extends ImmutablePureComponent {
     if (pictureInPicture.get('inUse')) {
       media = <PictureInPicturePlaceholder />;
     } else if (status.get('media_attachments').size > 0) {
+      const language = status.getIn(['translation', 'language']) || status.get('language');
+
       if (this.props.muted) {
         media = (
           <AttachmentList
@@ -434,14 +444,15 @@ class Status extends ImmutablePureComponent {
         );
       } else if (status.getIn(['media_attachments', 0, 'type']) === 'audio') {
         const attachment = status.getIn(['media_attachments', 0]);
+        const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
 
         media = (
           <Bundle fetchComponent={Audio} loading={this.renderLoadingAudioPlayer} >
             {Component => (
               <Component
                 src={attachment.get('url')}
-                alt={attachment.get('description')}
-                lang={status.get('language')}
+                alt={description}
+                lang={language}
                 poster={attachment.get('preview_url') || status.getIn(['account', 'avatar_static'])}
                 backgroundColor={attachment.getIn(['meta', 'colors', 'background'])}
                 foregroundColor={attachment.getIn(['meta', 'colors', 'foreground'])}
@@ -461,6 +472,7 @@ class Status extends ImmutablePureComponent {
         );
       } else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
         const attachment = status.getIn(['media_attachments', 0]);
+        const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
 
         media = (
           <Bundle fetchComponent={Video} loading={this.renderLoadingVideoPlayer} >
@@ -470,8 +482,8 @@ class Status extends ImmutablePureComponent {
                 frameRate={attachment.getIn(['meta', 'original', 'frame_rate'])}
                 blurhash={attachment.get('blurhash')}
                 src={attachment.get('url')}
-                alt={attachment.get('description')}
-                lang={status.get('language')}
+                alt={description}
+                lang={language}
                 inline
                 sensitive={status.get('sensitive')}
                 onOpenVideo={this.handleOpenVideo}
@@ -488,7 +500,7 @@ class Status extends ImmutablePureComponent {
             {Component => (
               <Component
                 media={status.get('media_attachments')}
-                lang={status.get('language')}
+                lang={language}
                 sensitive={status.get('sensitive')}
                 height={110}
                 onOpenMedia={this.handleOpenMedia}
diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar.jsx
index 7e2073223..72f456aba 100644
--- a/app/javascript/mastodon/components/status_action_bar.jsx
+++ b/app/javascript/mastodon/components/status_action_bar.jsx
@@ -289,8 +289,8 @@ class StatusActionBar extends ImmutablePureComponent {
 
     if (writtenByMe) {
       menu.push({ text: intl.formatMessage(messages.edit), action: this.handleEditClick });
-      menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDeleteClick });
-      menu.push({ text: intl.formatMessage(messages.redraft), action: this.handleRedraftClick });
+      menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDeleteClick, dangerous: true });
+      menu.push({ text: intl.formatMessage(messages.redraft), action: this.handleRedraftClick, dangerous: true });
     } else {
       menu.push({ text: intl.formatMessage(messages.mention, { name: account.get('username') }), action: this.handleMentionClick });
       menu.push({ text: intl.formatMessage(messages.direct, { name: account.get('username') }), action: this.handleDirectClick });
@@ -299,22 +299,22 @@ class StatusActionBar extends ImmutablePureComponent {
       if (relationship && relationship.get('muting')) {
         menu.push({ text: intl.formatMessage(messages.unmute, { name: account.get('username') }), action: this.handleMuteClick });
       } else {
-        menu.push({ text: intl.formatMessage(messages.mute, { name: account.get('username') }), action: this.handleMuteClick });
+        menu.push({ text: intl.formatMessage(messages.mute, { name: account.get('username') }), action: this.handleMuteClick, dangerous: true });
       }
 
       if (relationship && relationship.get('blocking')) {
         menu.push({ text: intl.formatMessage(messages.unblock, { name: account.get('username') }), action: this.handleBlockClick });
       } else {
-        menu.push({ text: intl.formatMessage(messages.block, { name: account.get('username') }), action: this.handleBlockClick });
+        menu.push({ text: intl.formatMessage(messages.block, { name: account.get('username') }), action: this.handleBlockClick, dangerous: true });
       }
 
       if (!this.props.onFilter) {
         menu.push(null);
-        menu.push({ text: intl.formatMessage(messages.filter), action: this.handleFilterClick });
+        menu.push({ text: intl.formatMessage(messages.filter), action: this.handleFilterClick, dangerous: true });
         menu.push(null);
       }
 
-      menu.push({ text: intl.formatMessage(messages.report, { name: account.get('username') }), action: this.handleReport });
+      menu.push({ text: intl.formatMessage(messages.report, { name: account.get('username') }), action: this.handleReport, dangerous: true });
 
       if (account.get('acct') !== account.get('username')) {
         const domain = account.get('acct').split('@')[1];
@@ -324,7 +324,7 @@ class StatusActionBar extends ImmutablePureComponent {
         if (relationship && relationship.get('domain_blocking')) {
           menu.push({ text: intl.formatMessage(messages.unblockDomain, { domain }), action: this.handleUnblockDomain });
         } else {
-          menu.push({ text: intl.formatMessage(messages.blockDomain, { domain }), action: this.handleBlockDomain });
+          menu.push({ text: intl.formatMessage(messages.blockDomain, { domain }), action: this.handleBlockDomain, dangerous: true });
         }
       }
 
diff --git a/app/javascript/mastodon/components/status_content.jsx b/app/javascript/mastodon/components/status_content.jsx
index 4c8ae7e15..3b3a191d6 100644
--- a/app/javascript/mastodon/components/status_content.jsx
+++ b/app/javascript/mastodon/components/status_content.jsx
@@ -231,11 +231,11 @@ class StatusContent extends PureComponent {
     const renderReadMore = this.props.onClick && status.get('collapsed');
     const contentLocale = intl.locale.replace(/[_-].*/, '');
     const targetLanguages = this.props.languages?.get(status.get('language') || 'und');
-    const renderTranslate = this.props.onTranslate && this.context.identity.signedIn && ['public', 'unlisted'].includes(status.get('visibility')) && status.get('contentHtml').length > 0 && targetLanguages?.includes(contentLocale);
+    const renderTranslate = this.props.onTranslate && this.context.identity.signedIn && ['public', 'unlisted'].includes(status.get('visibility')) && status.get('search_index').trim().length > 0 && targetLanguages?.includes(contentLocale);
 
-    const content = { __html: status.get('translation') ? status.getIn(['translation', 'content']) : status.get('contentHtml') };
-    const spoilerContent = { __html: status.get('spoilerHtml') };
-    const lang = status.get('translation') ? intl.locale : status.get('language');
+    const content = { __html: status.getIn(['translation', 'contentHtml']) || status.get('contentHtml') };
+    const spoilerContent = { __html: status.getIn(['translation', 'spoilerHtml']) || status.get('spoilerHtml') };
+    const language = status.getIn(['translation', 'language']) || status.get('language');
     const classNames = classnames('status__content', {
       'status__content--with-action': this.props.onClick && this.context.router,
       'status__content--with-spoiler': status.get('spoiler_text').length > 0,
@@ -253,7 +253,7 @@ class StatusContent extends PureComponent {
     );
 
     const poll = !!status.get('poll') && (
-      <PollContainer pollId={status.get('poll')} lang={status.get('language')} />
+      <PollContainer pollId={status.get('poll')} lang={language} />
     );
 
     if (status.get('spoiler_text').length > 0) {
@@ -274,24 +274,24 @@ class StatusContent extends PureComponent {
       return (
         <div className={classNames} ref={this.setRef} tabIndex={0} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
           <p style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }}>
-            <span dangerouslySetInnerHTML={spoilerContent} className='translate' lang={lang} />
+            <span dangerouslySetInnerHTML={spoilerContent} className='translate' lang={language} />
             {' '}
             <button type='button' className={`status__content__spoiler-link ${hidden ? 'status__content__spoiler-link--show-more' : 'status__content__spoiler-link--show-less'}`} onClick={this.handleSpoilerClick} aria-expanded={!hidden}>{toggleText}</button>
           </p>
 
           {mentionsPlaceholder}
 
-          <div tabIndex={!hidden ? 0 : null} className={`status__content__text ${!hidden ? 'status__content__text--visible' : ''} translate`} lang={lang} dangerouslySetInnerHTML={content} />
+          <div tabIndex={!hidden ? 0 : null} className={`status__content__text ${!hidden ? 'status__content__text--visible' : ''} translate`} lang={language} dangerouslySetInnerHTML={content} />
 
           {!hidden && poll}
-          {!hidden && translateButton}
+          {translateButton}
         </div>
       );
     } else if (this.props.onClick) {
       return (
         <>
           <div className={classNames} ref={this.setRef} tabIndex={0} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp} key='status-content' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
-            <div className='status__content__text status__content__text--visible translate' lang={lang} dangerouslySetInnerHTML={content} />
+            <div className='status__content__text status__content__text--visible translate' lang={language} dangerouslySetInnerHTML={content} />
 
             {poll}
             {translateButton}
@@ -303,7 +303,7 @@ class StatusContent extends PureComponent {
     } else {
       return (
         <div className={classNames} ref={this.setRef} tabIndex={0} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
-          <div className='status__content__text status__content__text--visible translate' lang={lang} dangerouslySetInnerHTML={content} />
+          <div className='status__content__text status__content__text--visible translate' lang={language} dangerouslySetInnerHTML={content} />
 
           {poll}
           {translateButton}
diff --git a/app/javascript/mastodon/containers/admin_component.jsx b/app/javascript/mastodon/containers/admin_component.jsx
index f5fa53f08..740011129 100644
--- a/app/javascript/mastodon/containers/admin_component.jsx
+++ b/app/javascript/mastodon/containers/admin_component.jsx
@@ -1,25 +1,19 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { IntlProvider, addLocaleData } from 'react-intl';
-
-import { getLocale } from '../locales';
-
-const { localeData, messages } = getLocale();
-addLocaleData(localeData);
+import { IntlProvider } from 'mastodon/locales';
 
 export default class AdminComponent extends PureComponent {
 
   static propTypes = {
-    locale: PropTypes.string.isRequired,
     children: PropTypes.node.isRequired,
   };
 
   render () {
-    const { locale, children } = this.props;
+    const { children } = this.props;
 
     return (
-      <IntlProvider locale={locale} messages={messages}>
+      <IntlProvider>
         {children}
       </IntlProvider>
     );
diff --git a/app/javascript/mastodon/containers/compose_container.jsx b/app/javascript/mastodon/containers/compose_container.jsx
index b93399aa9..f76550678 100644
--- a/app/javascript/mastodon/containers/compose_container.jsx
+++ b/app/javascript/mastodon/containers/compose_container.jsx
@@ -1,19 +1,14 @@
-import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { IntlProvider, addLocaleData } from 'react-intl';
-
 import { Provider } from 'react-redux';
 
 import { fetchCustomEmojis } from '../actions/custom_emojis';
 import { hydrateStore } from '../actions/store';
 import Compose from '../features/standalone/compose';
 import initialState from '../initial_state';
-import { getLocale } from '../locales';
+import { IntlProvider } from '../locales';
 import { store } from '../store';
 
-const { localeData, messages } = getLocale();
-addLocaleData(localeData);
 
 if (initialState) {
   store.dispatch(hydrateStore(initialState));
@@ -21,17 +16,11 @@ if (initialState) {
 
 store.dispatch(fetchCustomEmojis());
 
-export default class TimelineContainer extends PureComponent {
-
-  static propTypes = {
-    locale: PropTypes.string.isRequired,
-  };
+export default class ComposeContainer extends PureComponent {
 
   render () {
-    const { locale } = this.props;
-
     return (
-      <IntlProvider locale={locale} messages={messages}>
+      <IntlProvider>
         <Provider store={store}>
           <Compose />
         </Provider>
diff --git a/app/javascript/mastodon/containers/mastodon.jsx b/app/javascript/mastodon/containers/mastodon.jsx
index 5be163f5a..4538db050 100644
--- a/app/javascript/mastodon/containers/mastodon.jsx
+++ b/app/javascript/mastodon/containers/mastodon.jsx
@@ -1,8 +1,6 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { IntlProvider, addLocaleData } from 'react-intl';
-
 import { Helmet } from 'react-helmet';
 import { BrowserRouter, Route } from 'react-router-dom';
 
@@ -16,12 +14,9 @@ import { connectUserStream } from 'mastodon/actions/streaming';
 import ErrorBoundary from 'mastodon/components/error_boundary';
 import UI from 'mastodon/features/ui';
 import initialState, { title as siteTitle } from 'mastodon/initial_state';
-import { getLocale } from 'mastodon/locales';
+import { IntlProvider } from 'mastodon/locales';
 import { store } from 'mastodon/store';
 
-const { localeData, messages } = getLocale();
-addLocaleData(localeData);
-
 const title = process.env.NODE_ENV === 'production' ? siteTitle : `${siteTitle} (Dev)`;
 
 const hydrateAction = hydrateStore(initialState);
@@ -41,10 +36,6 @@ const createIdentityContext = state => ({
 
 export default class Mastodon extends PureComponent {
 
-  static propTypes = {
-    locale: PropTypes.string.isRequired,
-  };
-
   static childContextTypes = {
     identity: PropTypes.shape({
       signedIn: PropTypes.bool.isRequired,
@@ -80,10 +71,8 @@ export default class Mastodon extends PureComponent {
   }
 
   render () {
-    const { locale } = this.props;
-
     return (
-      <IntlProvider locale={locale} messages={messages}>
+      <IntlProvider>
         <ReduxProvider store={store}>
           <ErrorBoundary>
             <BrowserRouter>
diff --git a/app/javascript/mastodon/containers/media_container.jsx b/app/javascript/mastodon/containers/media_container.jsx
index 7ed8f1719..fba3c5df7 100644
--- a/app/javascript/mastodon/containers/media_container.jsx
+++ b/app/javascript/mastodon/containers/media_container.jsx
@@ -2,8 +2,6 @@ import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 import { createPortal } from 'react-dom';
 
-import { IntlProvider, addLocaleData } from 'react-intl';
-
 import { fromJS } from 'immutable';
 
 import { ImmutableHashtag as Hashtag } from 'mastodon/components/hashtag';
@@ -14,18 +12,14 @@ import Audio from 'mastodon/features/audio';
 import Card from 'mastodon/features/status/components/card';
 import MediaModal from 'mastodon/features/ui/components/media_modal';
 import Video from 'mastodon/features/video';
-import { getLocale } from 'mastodon/locales';
+import { IntlProvider } from 'mastodon/locales';
 import { getScrollbarWidth } from 'mastodon/utils/scrollbar';
 
-const { localeData, messages } = getLocale();
-addLocaleData(localeData);
-
 const MEDIA_COMPONENTS = { MediaGallery, Video, Card, Poll, Hashtag, Audio };
 
 export default class MediaContainer extends PureComponent {
 
   static propTypes = {
-    locale: PropTypes.string.isRequired,
     components: PropTypes.object.isRequired,
   };
 
@@ -74,7 +68,7 @@ export default class MediaContainer extends PureComponent {
   };
 
   render () {
-    const { locale, components } = this.props;
+    const { components } = this.props;
 
     let handleOpenVideo;
 
@@ -84,7 +78,7 @@ export default class MediaContainer extends PureComponent {
     }
 
     return (
-      <IntlProvider locale={locale} messages={messages}>
+      <IntlProvider>
         <>
           {[].map.call(components, (component, i) => {
             const componentName = component.getAttribute('data-component');
diff --git a/app/javascript/mastodon/containers/status_container.jsx b/app/javascript/mastodon/containers/status_container.jsx
index a00c03b37..5e3cc034c 100644
--- a/app/javascript/mastodon/containers/status_container.jsx
+++ b/app/javascript/mastodon/containers/status_container.jsx
@@ -190,7 +190,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
 
   onTranslate (status) {
     if (status.get('translation')) {
-      dispatch(undoStatusTranslation(status.get('id')));
+      dispatch(undoStatusTranslation(status.get('id'), status.get('poll')));
     } else {
       dispatch(translateStatus(status.get('id')));
     }
diff --git a/app/javascript/mastodon/features/account/components/header.jsx b/app/javascript/mastodon/features/account/components/header.jsx
index 904148b81..09e9a7df1 100644
--- a/app/javascript/mastodon/features/account/components/header.jsx
+++ b/app/javascript/mastodon/features/account/components/header.jsx
@@ -332,16 +332,16 @@ class Header extends ImmutablePureComponent {
       if (account.getIn(['relationship', 'muting'])) {
         menu.push({ text: intl.formatMessage(messages.unmute, { name: account.get('username') }), action: this.props.onMute });
       } else {
-        menu.push({ text: intl.formatMessage(messages.mute, { name: account.get('username') }), action: this.props.onMute });
+        menu.push({ text: intl.formatMessage(messages.mute, { name: account.get('username') }), action: this.props.onMute, dangerous: true });
       }
 
       if (account.getIn(['relationship', 'blocking'])) {
         menu.push({ text: intl.formatMessage(messages.unblock, { name: account.get('username') }), action: this.props.onBlock });
       } else {
-        menu.push({ text: intl.formatMessage(messages.block, { name: account.get('username') }), action: this.props.onBlock });
+        menu.push({ text: intl.formatMessage(messages.block, { name: account.get('username') }), action: this.props.onBlock, dangerous: true });
       }
 
-      menu.push({ text: intl.formatMessage(messages.report, { name: account.get('username') }), action: this.props.onReport });
+      menu.push({ text: intl.formatMessage(messages.report, { name: account.get('username') }), action: this.props.onReport, dangerous: true });
     }
 
     if (signedIn && isRemote) {
@@ -350,7 +350,7 @@ class Header extends ImmutablePureComponent {
       if (account.getIn(['relationship', 'domain_blocking'])) {
         menu.push({ text: intl.formatMessage(messages.unblockDomain, { domain: remoteDomain }), action: this.props.onUnblockDomain });
       } else {
-        menu.push({ text: intl.formatMessage(messages.blockDomain, { domain: remoteDomain }), action: this.props.onBlockDomain });
+        menu.push({ text: intl.formatMessage(messages.blockDomain, { domain: remoteDomain }), action: this.props.onBlockDomain, dangerous: true });
       }
     }
 
diff --git a/app/javascript/mastodon/features/account_gallery/index.jsx b/app/javascript/mastodon/features/account_gallery/index.jsx
index 27de4740c..653a25866 100644
--- a/app/javascript/mastodon/features/account_gallery/index.jsx
+++ b/app/javascript/mastodon/features/account_gallery/index.jsx
@@ -9,7 +9,7 @@ import { connect } from 'react-redux';
 import { lookupAccount, fetchAccount } from 'mastodon/actions/accounts';
 import { openModal } from 'mastodon/actions/modal';
 import ColumnBackButton from 'mastodon/components/column_back_button';
-import LoadMore from 'mastodon/components/load_more';
+import { LoadMore } from 'mastodon/components/load_more';
 import LoadingIndicator from 'mastodon/components/loading_indicator';
 import ScrollContainer from 'mastodon/containers/scroll_container';
 import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error';
diff --git a/app/javascript/mastodon/features/compose/components/search_results.jsx b/app/javascript/mastodon/features/compose/components/search_results.jsx
index b329cae79..b11ac478a 100644
--- a/app/javascript/mastodon/features/compose/components/search_results.jsx
+++ b/app/javascript/mastodon/features/compose/components/search_results.jsx
@@ -6,7 +6,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { Icon }  from 'mastodon/components/icon';
-import LoadMore from 'mastodon/components/load_more';
+import { LoadMore } from 'mastodon/components/load_more';
 
 import { ImmutableHashtag as Hashtag } from '../../../components/hashtag';
 import AccountContainer from '../../../containers/account_container';
diff --git a/app/javascript/mastodon/features/directory/index.jsx b/app/javascript/mastodon/features/directory/index.jsx
index d4854f186..635b6f411 100644
--- a/app/javascript/mastodon/features/directory/index.jsx
+++ b/app/javascript/mastodon/features/directory/index.jsx
@@ -13,7 +13,7 @@ import { addColumn, removeColumn, moveColumn, changeColumnParams } from 'mastodo
 import { fetchDirectory, expandDirectory } from 'mastodon/actions/directory';
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
-import LoadMore from 'mastodon/components/load_more';
+import { LoadMore } from 'mastodon/components/load_more';
 import LoadingIndicator from 'mastodon/components/loading_indicator';
 import { RadioButton } from 'mastodon/components/radio_button';
 import ScrollContainer from 'mastodon/containers/scroll_container';
diff --git a/app/javascript/mastodon/features/explore/index.jsx b/app/javascript/mastodon/features/explore/index.jsx
index dbc0400e8..185db0732 100644
--- a/app/javascript/mastodon/features/explore/index.jsx
+++ b/app/javascript/mastodon/features/explore/index.jsx
@@ -67,7 +67,7 @@ class Explore extends PureComponent {
           <Search />
         </div>
 
-        <div className='scrollable scrollable--flex'>
+        <div className='scrollable scrollable--flex' data-nosnippet>
           {isSearching ? (
             <SearchResults />
           ) : (
diff --git a/app/javascript/mastodon/features/explore/results.jsx b/app/javascript/mastodon/features/explore/results.jsx
index 6b053a9dc..dc1f72022 100644
--- a/app/javascript/mastodon/features/explore/results.jsx
+++ b/app/javascript/mastodon/features/explore/results.jsx
@@ -11,7 +11,7 @@ import { connect } from 'react-redux';
 
 import { expandSearch } from 'mastodon/actions/search';
 import { ImmutableHashtag as Hashtag } from 'mastodon/components/hashtag';
-import LoadMore from 'mastodon/components/load_more';
+import { LoadMore } from 'mastodon/components/load_more';
 import LoadingIndicator from 'mastodon/components/loading_indicator';
 import Account from 'mastodon/containers/account_container';
 import Status from 'mastodon/containers/status_container';
diff --git a/app/javascript/mastodon/features/list_timeline/index.jsx b/app/javascript/mastodon/features/list_timeline/index.jsx
index f41e8e6f2..f9f3a7c31 100644
--- a/app/javascript/mastodon/features/list_timeline/index.jsx
+++ b/app/javascript/mastodon/features/list_timeline/index.jsx
@@ -8,6 +8,8 @@ import { Helmet } from 'react-helmet';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
+import Toggle from 'react-toggle';
+
 import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
 import { fetchList, deleteList, updateList } from 'mastodon/actions/lists';
 import { openModal } from 'mastodon/actions/modal';
@@ -145,7 +147,13 @@ class ListTimeline extends PureComponent {
   handleRepliesPolicyChange = ({ target }) => {
     const { dispatch } = this.props;
     const { id } = this.props.params;
-    dispatch(updateList(id, undefined, false, target.value));
+    dispatch(updateList(id, undefined, false, undefined, target.value));
+  };
+
+  onExclusiveToggle = ({ target }) => {
+    const { dispatch } = this.props;
+    const { id } = this.props.params;
+    dispatch(updateList(id, undefined, false, target.checked, undefined));
   };
 
   render () {
@@ -154,6 +162,7 @@ class ListTimeline extends PureComponent {
     const pinned = !!columnId;
     const title  = list ? list.get('title') : id;
     const replies_policy = list ? list.get('replies_policy') : undefined;
+    const isExclusive = list ? list.get('exclusive') : undefined;
 
     if (typeof list === 'undefined') {
       return (
@@ -191,6 +200,13 @@ class ListTimeline extends PureComponent {
             </button>
           </div>
 
+          <div className='setting-toggle'>
+            <Toggle id={`list-${id}-exclusive`} defaultChecked={isExclusive} onChange={this.onExclusiveToggle} />
+            <label htmlFor={`list-${id}-exclusive`} className='setting-toggle__label'>
+              <FormattedMessage id='lists.exclusive' defaultMessage='Hide these posts from home' />
+            </label>
+          </div>
+
           { replies_policy !== undefined && (
             <div role='group' aria-labelledby={`list-${id}-replies-policy`}>
               <span id={`list-${id}-replies-policy`} className='column-settings__section'>
diff --git a/app/javascript/mastodon/features/onboarding/follows.jsx b/app/javascript/mastodon/features/onboarding/follows.jsx
index 3807ce922..8b4ad0b08 100644
--- a/app/javascript/mastodon/features/onboarding/follows.jsx
+++ b/app/javascript/mastodon/features/onboarding/follows.jsx
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { FormattedMessage, FormattedHTMLMessage } from 'react-intl';
+import { FormattedMessage } from 'react-intl';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
@@ -77,7 +77,7 @@ class Follows extends PureComponent {
             {loadedContent}
           </div>
 
-          <p className='onboarding__lead'><FormattedHTMLMessage id='onboarding.tips.accounts_from_other_servers' defaultMessage='<strong>Did you know?</strong> Since Mastodon is decentralized, some profiles you come across will be hosted on servers other than yours. And yet you can interact with them seamlessly! Their server is in the second half of their username!' /></p>
+          <p className='onboarding__lead'><FormattedMessage id='onboarding.tips.accounts_from_other_servers' defaultMessage='<strong>Did you know?</strong> Since Mastodon is decentralized, some profiles you come across will be hosted on servers other than yours. And yet you can interact with them seamlessly! Their server is in the second half of their username!' values={{ strong: chunks => <strong>{chunks}</strong> }} /></p>
 
           <div className='onboarding__footer'>
             <button className='link-button' onClick={onBack}><FormattedMessage id='onboarding.actions.back' defaultMessage='Take me back' /></button>
diff --git a/app/javascript/mastodon/features/onboarding/index.jsx b/app/javascript/mastodon/features/onboarding/index.jsx
index cc0c79790..f1447b771 100644
--- a/app/javascript/mastodon/features/onboarding/index.jsx
+++ b/app/javascript/mastodon/features/onboarding/index.jsx
@@ -121,7 +121,7 @@ class Onboarding extends ImmutablePureComponent {
 
           <div className='onboarding__steps'>
             <Step onClick={this.handleProfileClick} href='/settings/profile' completed={(!account.get('avatar').endsWith('missing.png')) || (account.get('display_name').length > 0 && account.get('note').length > 0)} icon='address-book-o' label={<FormattedMessage id='onboarding.steps.setup_profile.title' defaultMessage='Customize your profile' />} description={<FormattedMessage id='onboarding.steps.setup_profile.body' defaultMessage='Others are more likely to interact with you with a filled out profile.' />} />
-            <Step onClick={this.handleFollowClick} completed={(account.get('following_count') * 1) >= 7} icon='user-plus' label={<FormattedMessage id='onboarding.steps.follow_people.title' defaultMessage='Follow {count, plural, one {one person} other {# people}}' values={{ count: 7 }} />} description={<FormattedMessage id='onboarding.steps.follow_people.body' defaultMessage="You curate your own feed. Let's fill it with interesting people." />} />
+            <Step onClick={this.handleFollowClick} completed={(account.get('following_count') * 1) >= 7} icon='user-plus' label={<FormattedMessage id='onboarding.steps.follow_people.title' defaultMessage='Find at least {count, plural, one {one person} other {# people}} to follow' values={{ count: 7 }} />} description={<FormattedMessage id='onboarding.steps.follow_people.body' defaultMessage="You curate your own home feed. Let's fill it with interesting people." />} />
             <Step onClick={this.handleComposeClick} completed={(account.get('statuses_count') * 1) >= 1} icon='pencil-square-o' label={<FormattedMessage id='onboarding.steps.publish_status.title' defaultMessage='Make your first post' />} description={<FormattedMessage id='onboarding.steps.publish_status.body' defaultMessage='Say hello to the world.' />} />
             <Step onClick={this.handleShareClick} completed={shareClicked} icon='copy' label={<FormattedMessage id='onboarding.steps.share_profile.title' defaultMessage='Share your profile' />} description={<FormattedMessage id='onboarding.steps.share_profile.body' defaultMessage='Let your friends know how to find you on Mastodon!' />} />
           </div>
diff --git a/app/javascript/mastodon/features/onboarding/share.jsx b/app/javascript/mastodon/features/onboarding/share.jsx
index 1895af912..687179302 100644
--- a/app/javascript/mastodon/features/onboarding/share.jsx
+++ b/app/javascript/mastodon/features/onboarding/share.jsx
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { defineMessages, injectIntl, FormattedMessage, FormattedHTMLMessage } from 'react-intl';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
 import { Link } from 'react-router-dom';
@@ -168,9 +168,9 @@ class Share extends PureComponent {
           <CopyPasteText value={intl.formatMessage(messages.shareableMessage, { username: `@${account.get('username')}@${domain}`, url })} />
 
           <TipCarousel>
-            <div><p className='onboarding__lead'><FormattedHTMLMessage id='onboarding.tips.verification' defaultMessage='<strong>Did you know?</strong> You can verify your account by putting a link to your Mastodon profile on your own website and adding the website to your profile. No fees or documents necessary!' /></p></div>
-            <div><p className='onboarding__lead'><FormattedHTMLMessage id='onboarding.tips.migration' defaultMessage='<strong>Did you know?</strong> If you feel like {domain} is not a great server choice for you in the future, you can move to another Mastodon server without losing your followers. You can even host your own server!' values={{ domain }} /></p></div>
-            <div><p className='onboarding__lead'><FormattedHTMLMessage id='onboarding.tips.2fa' defaultMessage='<strong>Did you know?</strong> You can secure your account by setting up two-factor authentication in your account settings. It works with any TOTP app of your choice, no phone number necessary!' /></p></div>
+            <div><p className='onboarding__lead'><FormattedMessage id='onboarding.tips.verification' defaultMessage='<strong>Did you know?</strong> You can verify your account by putting a link to your Mastodon profile on your own website and adding the website to your profile. No fees or documents necessary!'  values={{ strong: chunks => <strong>{chunks}</strong> }}  /></p></div>
+            <div><p className='onboarding__lead'><FormattedMessage id='onboarding.tips.migration' defaultMessage='<strong>Did you know?</strong> If you feel like {domain} is not a great server choice for you in the future, you can move to another Mastodon server without losing your followers. You can even host your own server!' values={{ domain, strong: chunks => <strong>{chunks}</strong> }} /></p></div>
+            <div><p className='onboarding__lead'><FormattedMessage id='onboarding.tips.2fa' defaultMessage='<strong>Did you know?</strong> You can secure your account by setting up two-factor authentication in your account settings. It works with any TOTP app of your choice, no phone number necessary!'  values={{ strong: chunks => <strong>{chunks}</strong> }}  /></p></div>
           </TipCarousel>
 
           <p className='onboarding__lead'><FormattedMessage id='onboarding.share.next_steps' defaultMessage='Possible next steps:' /></p>
diff --git a/app/javascript/mastodon/features/report/category.jsx b/app/javascript/mastodon/features/report/category.jsx
index a6e817c73..fb9e55c57 100644
--- a/app/javascript/mastodon/features/report/category.jsx
+++ b/app/javascript/mastodon/features/report/category.jsx
@@ -16,6 +16,8 @@ const messages = defineMessages({
   dislike_description: { id: 'report.reasons.dislike_description', defaultMessage: 'It is not something you want to see' },
   spam: { id: 'report.reasons.spam', defaultMessage: 'It\'s spam' },
   spam_description: { id: 'report.reasons.spam_description', defaultMessage: 'Malicious links, fake engagement, or repetitive replies' },
+  legal: { id: 'report.reasons.legal', defaultMessage: 'It\'s illegal' },
+  legal_description: { id: 'report.reasons.legal_description', defaultMessage: 'You believe it violates the law of your or the server\'s country' },
   violation: { id: 'report.reasons.violation', defaultMessage: 'It violates server rules' },
   violation_description: { id: 'report.reasons.violation_description', defaultMessage: 'You are aware that it breaks specific rules' },
   other: { id: 'report.reasons.other', defaultMessage: 'It\'s something else' },
@@ -69,11 +71,13 @@ class Category extends PureComponent {
     const options = rules.size > 0 ? [
       'dislike',
       'spam',
+      'legal',
       'violation',
       'other',
     ] : [
       'dislike',
       'spam',
+      'legal',
       'other',
     ];
 
diff --git a/app/javascript/mastodon/features/status/components/action_bar.jsx b/app/javascript/mastodon/features/status/components/action_bar.jsx
index 9c2fd90e7..3e69c3c04 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/status/components/action_bar.jsx
@@ -229,8 +229,8 @@ class ActionBar extends PureComponent {
       menu.push({ text: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMuteClick });
       menu.push(null);
       menu.push({ text: intl.formatMessage(messages.edit), action: this.handleEditClick });
-      menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDeleteClick });
-      menu.push({ text: intl.formatMessage(messages.redraft), action: this.handleRedraftClick });
+      menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDeleteClick, dangerous: true });
+      menu.push({ text: intl.formatMessage(messages.redraft), action: this.handleRedraftClick, dangerous: true });
     } else {
       menu.push({ text: intl.formatMessage(messages.mention, { name: status.getIn(['account', 'username']) }), action: this.handleMentionClick });
       menu.push(null);
@@ -238,16 +238,16 @@ class ActionBar extends PureComponent {
       if (relationship && relationship.get('muting')) {
         menu.push({ text: intl.formatMessage(messages.unmute, { name: account.get('username') }), action: this.handleMuteClick });
       } else {
-        menu.push({ text: intl.formatMessage(messages.mute, { name: account.get('username') }), action: this.handleMuteClick });
+        menu.push({ text: intl.formatMessage(messages.mute, { name: account.get('username') }), action: this.handleMuteClick, dangerous: true });
       }
 
       if (relationship && relationship.get('blocking')) {
         menu.push({ text: intl.formatMessage(messages.unblock, { name: account.get('username') }), action: this.handleBlockClick });
       } else {
-        menu.push({ text: intl.formatMessage(messages.block, { name: account.get('username') }), action: this.handleBlockClick });
+        menu.push({ text: intl.formatMessage(messages.block, { name: account.get('username') }), action: this.handleBlockClick, dangerous: true });
       }
 
-      menu.push({ text: intl.formatMessage(messages.report, { name: status.getIn(['account', 'username']) }), action: this.handleReport });
+      menu.push({ text: intl.formatMessage(messages.report, { name: status.getIn(['account', 'username']) }), action: this.handleReport, dangerous: true });
 
       if (account.get('acct') !== account.get('username')) {
         const domain = account.get('acct').split('@')[1];
@@ -257,7 +257,7 @@ class ActionBar extends PureComponent {
         if (relationship && relationship.get('domain_blocking')) {
           menu.push({ text: intl.formatMessage(messages.unblockDomain, { domain }), action: this.handleUnblockDomain });
         } else {
-          menu.push({ text: intl.formatMessage(messages.blockDomain, { domain }), action: this.handleBlockDomain });
+          menu.push({ text: intl.formatMessage(messages.blockDomain, { domain }), action: this.handleBlockDomain, dangerous: true });
         }
       }
 
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.jsx b/app/javascript/mastodon/features/status/components/detailed_status.jsx
index cb0b70e1d..55db48276 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.jsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.jsx
@@ -137,17 +137,20 @@ class DetailedStatus extends ImmutablePureComponent {
       outerStyle.height = `${this.state.height}px`;
     }
 
+    const language = status.getIn(['translation', 'language']) || status.get('language');
+
     if (pictureInPicture.get('inUse')) {
       media = <PictureInPicturePlaceholder />;
     } else if (status.get('media_attachments').size > 0) {
       if (status.getIn(['media_attachments', 0, 'type']) === 'audio') {
         const attachment = status.getIn(['media_attachments', 0]);
+        const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
 
         media = (
           <Audio
             src={attachment.get('url')}
-            alt={attachment.get('description')}
-            lang={status.get('language')}
+            alt={description}
+            lang={language}
             duration={attachment.getIn(['meta', 'original', 'duration'], 0)}
             poster={attachment.get('preview_url') || status.getIn(['account', 'avatar_static'])}
             backgroundColor={attachment.getIn(['meta', 'colors', 'background'])}
@@ -162,6 +165,7 @@ class DetailedStatus extends ImmutablePureComponent {
         );
       } else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
         const attachment = status.getIn(['media_attachments', 0]);
+        const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
 
         media = (
           <Video
@@ -169,8 +173,8 @@ class DetailedStatus extends ImmutablePureComponent {
             frameRate={attachment.getIn(['meta', 'original', 'frame_rate'])}
             blurhash={attachment.get('blurhash')}
             src={attachment.get('url')}
-            alt={attachment.get('description')}
-            lang={status.get('language')}
+            alt={description}
+            lang={language}
             width={300}
             height={150}
             inline
@@ -186,7 +190,7 @@ class DetailedStatus extends ImmutablePureComponent {
             standalone
             sensitive={status.get('sensitive')}
             media={status.get('media_attachments')}
-            lang={status.get('language')}
+            lang={language}
             height={300}
             onOpenMedia={this.props.onOpenMedia}
             visible={this.props.showMedia}
@@ -217,7 +221,7 @@ class DetailedStatus extends ImmutablePureComponent {
     } else if (this.context.router) {
       reblogLink = (
         <>
-           ·
+          {' · '}
           <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/reblogs`} className='detailed-status__link'>
             <Icon id={reblogIcon} />
             <span className='detailed-status__reblogs'>
@@ -229,7 +233,7 @@ class DetailedStatus extends ImmutablePureComponent {
     } else {
       reblogLink = (
         <>
-           ·
+          {' · '}
           <a href={`/interact/${status.get('id')}?type=reblog`} className='detailed-status__link' onClick={this.handleModalLink}>
             <Icon id={reblogIcon} />
             <span className='detailed-status__reblogs'>
@@ -263,7 +267,7 @@ class DetailedStatus extends ImmutablePureComponent {
     if (status.get('edited_at')) {
       edited = (
         <>
-           ·
+          {' · '}
           <EditedTimestamp statusId={status.get('id')} timestamp={status.get('edited_at')} />
         </>
       );
diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index a377258b3..847fba3e3 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -445,7 +445,7 @@ class Status extends ImmutablePureComponent {
     const { dispatch } = this.props;
 
     if (status.get('translation')) {
-      dispatch(undoStatusTranslation(status.get('id')));
+      dispatch(undoStatusTranslation(status.get('id'), status.get('poll')));
     } else {
       dispatch(translateStatus(status.get('id')));
     }
diff --git a/app/javascript/mastodon/features/ui/components/audio_modal.jsx b/app/javascript/mastodon/features/ui/components/audio_modal.jsx
index b8e6ee5e4..5baed2b3f 100644
--- a/app/javascript/mastodon/features/ui/components/audio_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/audio_modal.jsx
@@ -8,7 +8,7 @@ import Audio from 'mastodon/features/audio';
 import Footer from 'mastodon/features/picture_in_picture/components/footer';
 
 const mapStateToProps = (state, { statusId }) => ({
-  language: state.getIn(['statuses', statusId, 'language']),
+  status: state.getIn(['statuses', statusId]),
   accountStaticAvatar: state.getIn(['accounts', state.getIn(['statuses', statusId, 'account']), 'avatar_static']),
 });
 
@@ -17,7 +17,7 @@ class AudioModal extends ImmutablePureComponent {
   static propTypes = {
     media: ImmutablePropTypes.map.isRequired,
     statusId: PropTypes.string.isRequired,
-    language: PropTypes.string,
+    status: ImmutablePropTypes.map.isRequired,
     accountStaticAvatar: PropTypes.string.isRequired,
     options: PropTypes.shape({
       autoPlay: PropTypes.bool,
@@ -27,15 +27,17 @@ class AudioModal extends ImmutablePureComponent {
   };
 
   render () {
-    const { media, language, accountStaticAvatar, statusId, onClose } = this.props;
+    const { media, status, accountStaticAvatar, onClose } = this.props;
     const options = this.props.options || {};
+    const language = status.getIn(['translation', 'language']) || status.get('language');
+    const description = media.getIn(['translation', 'description']) || media.get('description');
 
     return (
       <div className='modal-root__modal audio-modal'>
         <div className='audio-modal__container'>
           <Audio
             src={media.get('url')}
-            alt={media.get('description')}
+            alt={description}
             lang={language}
             duration={media.getIn(['meta', 'original', 'duration'], 0)}
             height={150}
@@ -48,7 +50,7 @@ class AudioModal extends ImmutablePureComponent {
         </div>
 
         <div className='media-modal__overlay'>
-          {statusId && <Footer statusId={statusId} withOpenButton onClose={onClose} />}
+          {status && <Footer statusId={status.get('id')} withOpenButton onClose={onClose} />}
         </div>
       </div>
     );
diff --git a/app/javascript/mastodon/features/ui/components/media_modal.jsx b/app/javascript/mastodon/features/ui/components/media_modal.jsx
index fad08b675..d38dc1804 100644
--- a/app/javascript/mastodon/features/ui/components/media_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/media_modal.jsx
@@ -145,6 +145,7 @@ class MediaModal extends ImmutablePureComponent {
     const content = media.map((image) => {
       const width  = image.getIn(['meta', 'original', 'width']) || null;
       const height = image.getIn(['meta', 'original', 'height']) || null;
+      const description = image.getIn(['translation', 'description']) || image.get('description');
 
       if (image.get('type') === 'image') {
         return (
@@ -153,7 +154,7 @@ class MediaModal extends ImmutablePureComponent {
             src={image.get('url')}
             width={width}
             height={height}
-            alt={image.get('description')}
+            alt={description}
             lang={lang}
             key={image.get('url')}
             onClick={this.toggleNavigation}
@@ -176,7 +177,7 @@ class MediaModal extends ImmutablePureComponent {
             volume={volume || 1}
             onCloseVideo={onClose}
             detailed
-            alt={image.get('description')}
+            alt={description}
             lang={lang}
             key={image.get('url')}
           />
@@ -188,7 +189,7 @@ class MediaModal extends ImmutablePureComponent {
             width={width}
             height={height}
             key={image.get('url')}
-            alt={image.get('description')}
+            alt={description}
             lang={lang}
             onClick={this.toggleNavigation}
           />
diff --git a/app/javascript/mastodon/features/ui/components/video_modal.jsx b/app/javascript/mastodon/features/ui/components/video_modal.jsx
index 2cc88c043..48c6301a5 100644
--- a/app/javascript/mastodon/features/ui/components/video_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/video_modal.jsx
@@ -9,7 +9,7 @@ import Footer from 'mastodon/features/picture_in_picture/components/footer';
 import Video from 'mastodon/features/video';
 
 const mapStateToProps = (state, { statusId }) => ({
-  language: state.getIn(['statuses', statusId, 'language']),
+  status: state.getIn(['statuses', statusId]),
 });
 
 class VideoModal extends ImmutablePureComponent {
@@ -17,7 +17,7 @@ class VideoModal extends ImmutablePureComponent {
   static propTypes = {
     media: ImmutablePropTypes.map.isRequired,
     statusId: PropTypes.string,
-    language: PropTypes.string,
+    status: ImmutablePropTypes.map,
     options: PropTypes.shape({
       startTime: PropTypes.number,
       autoPlay: PropTypes.bool,
@@ -38,8 +38,10 @@ class VideoModal extends ImmutablePureComponent {
   }
 
   render () {
-    const { media, statusId, language, onClose } = this.props;
+    const { media, status, onClose } = this.props;
     const options = this.props.options || {};
+    const language = status.getIn(['translation', 'language']) || status.get('language');
+    const description = media.getIn(['translation', 'description']) || media.get('description');
 
     return (
       <div className='modal-root__modal video-modal'>
@@ -55,13 +57,13 @@ class VideoModal extends ImmutablePureComponent {
             onCloseVideo={onClose}
             autoFocus
             detailed
-            alt={media.get('description')}
+            alt={description}
             lang={language}
           />
         </div>
 
         <div className='media-modal__overlay'>
-          {statusId && <Footer statusId={statusId} withOpenButton onClose={onClose} />}
+          {status && <Footer statusId={status.get('id')} withOpenButton onClose={onClose} />}
         </div>
       </div>
     );
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
deleted file mode 100644
index d446989ab..000000000
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ /dev/null
@@ -1,4484 +0,0 @@
-[
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Oops!",
-        "id": "alert.unexpected.title"
-      },
-      {
-        "defaultMessage": "An unexpected error occurred.",
-        "id": "alert.unexpected.message"
-      },
-      {
-        "defaultMessage": "Rate limited",
-        "id": "alert.rate_limited.title"
-      },
-      {
-        "defaultMessage": "Please retry after {retry_time, time, medium}.",
-        "id": "alert.rate_limited.message"
-      }
-    ],
-    "path": "app/javascript/mastodon/actions/alerts.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "File upload limit exceeded.",
-        "id": "upload_error.limit"
-      },
-      {
-        "defaultMessage": "File upload not allowed with polls.",
-        "id": "upload_error.poll"
-      }
-    ],
-    "path": "app/javascript/mastodon/actions/compose.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "{name} mentioned you",
-        "id": "notification.mention"
-      },
-      {
-        "defaultMessage": "{count} notifications",
-        "id": "notifications.group"
-      }
-    ],
-    "path": "app/javascript/mastodon/actions/notifications.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Follow",
-        "id": "account.follow"
-      },
-      {
-        "defaultMessage": "Unfollow",
-        "id": "account.unfollow"
-      },
-      {
-        "defaultMessage": "Awaiting approval. Click to cancel follow request",
-        "id": "account.requested"
-      },
-      {
-        "defaultMessage": "Unblock @{name}",
-        "id": "account.unblock"
-      },
-      {
-        "defaultMessage": "Unmute @{name}",
-        "id": "account.unmute"
-      },
-      {
-        "defaultMessage": "Mute notifications from @{name}",
-        "id": "account.mute_notifications"
-      },
-      {
-        "defaultMessage": "Unmute notifications from @{name}",
-        "id": "account.unmute_notifications"
-      },
-      {
-        "defaultMessage": "Mute @{name}",
-        "id": "account.mute"
-      },
-      {
-        "defaultMessage": "Block @{name}",
-        "id": "account.block"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/account.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Other",
-        "id": "report.categories.other"
-      },
-      {
-        "defaultMessage": "Spam",
-        "id": "report.categories.spam"
-      },
-      {
-        "defaultMessage": "Content violates one or more server rules",
-        "id": "report.categories.violation"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/admin/ReportReasonSelector.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Loading...",
-        "id": "loading_indicator.label"
-      },
-      {
-        "defaultMessage": "Sign-up month",
-        "id": "admin.dashboard.retention.cohort"
-      },
-      {
-        "defaultMessage": "New users",
-        "id": "admin.dashboard.retention.cohort_size"
-      },
-      {
-        "defaultMessage": "Average",
-        "id": "admin.dashboard.retention.average"
-      },
-      {
-        "defaultMessage": "User retention rate by day after sign-up",
-        "id": "admin.dashboard.daily_retention"
-      },
-      {
-        "defaultMessage": "User retention rate by month after sign-up",
-        "id": "admin.dashboard.monthly_retention"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/admin/Retention.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Trending now",
-        "id": "trends.trending_now"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/admin/Trends.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "(unprocessed)",
-        "id": "attachments_list.unprocessed"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/attachment_list.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "{count} per week",
-        "id": "autosuggest_hashtag.per_week"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/autosuggest_hashtag.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Back",
-        "id": "column_back_button.label"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/column_back_button_slim.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Back",
-        "id": "column_back_button.label"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/column_back_button.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Show settings",
-        "id": "column_header.show_settings"
-      },
-      {
-        "defaultMessage": "Hide settings",
-        "id": "column_header.hide_settings"
-      },
-      {
-        "defaultMessage": "Move column to the left",
-        "id": "column_header.moveLeft_settings"
-      },
-      {
-        "defaultMessage": "Move column to the right",
-        "id": "column_header.moveRight_settings"
-      },
-      {
-        "defaultMessage": "Unpin",
-        "id": "column_header.unpin"
-      },
-      {
-        "defaultMessage": "Pin",
-        "id": "column_header.pin"
-      },
-      {
-        "defaultMessage": "Back",
-        "id": "column_back_button.label"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/column_header.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "{count, plural, one {{counter} Post} other {{counter} Posts}}",
-        "id": "account.statuses_counter"
-      },
-      {
-        "defaultMessage": "{count, plural, one {{counter} Following} other {{counter} Following}}",
-        "id": "account.following_counter"
-      },
-      {
-        "defaultMessage": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-        "id": "account.followers_counter"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/common_counter.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Dismiss",
-        "id": "dismissable_banner.dismiss"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/dismissable_banner.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Unblock domain {domain}",
-        "id": "account.unblock_domain"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/domain.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Edited {count, plural, one {# time} other {# times}}",
-        "id": "status.edited_x_times"
-      },
-      {
-        "defaultMessage": "{name} created {date}",
-        "id": "status.history.created"
-      },
-      {
-        "defaultMessage": "{name} edited {date}",
-        "id": "status.history.edited"
-      },
-      {
-        "defaultMessage": "Edited {date}",
-        "id": "status.edited"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/edited_timestamp/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
-        "id": "error.unexpected_crash.explanation_addons"
-      },
-      {
-        "defaultMessage": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
-        "id": "error.unexpected_crash.explanation"
-      },
-      {
-        "defaultMessage": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-        "id": "error.unexpected_crash.next_steps_addons"
-      },
-      {
-        "defaultMessage": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-        "id": "error.unexpected_crash.next_steps"
-      },
-      {
-        "defaultMessage": "Report issue",
-        "id": "errors.unexpected_crash.report_issue"
-      },
-      {
-        "defaultMessage": "Copy stacktrace to clipboard",
-        "id": "errors.unexpected_crash.copy_stacktrace"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/error_boundary.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
-        "id": "trends.counter_by_accounts"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/hashtag.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Load more",
-        "id": "status.load_more"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/load_gap.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Load more",
-        "id": "status.load_more"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/load_more.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "{count, plural, one {# new item} other {# new items}}",
-        "id": "load_pending"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/load_pending.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "{number, plural, one {Hide image} other {Hide images}}",
-        "id": "media_gallery.toggle_visible"
-      },
-      {
-        "defaultMessage": "Not available",
-        "id": "status.uncached_media_warning"
-      },
-      {
-        "defaultMessage": "Sensitive content",
-        "id": "status.sensitive_warning"
-      },
-      {
-        "defaultMessage": "Media hidden",
-        "id": "status.media_hidden"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/media_gallery.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "You need to login to access this resource.",
-        "id": "not_signed_in_indicator.not_signed_in"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/not_signed_in_indicator.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Put it back",
-        "id": "picture_in_picture.restore"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/picture_in_picture_placeholder.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Closed",
-        "id": "poll.closed"
-      },
-      {
-        "defaultMessage": "You voted for this answer",
-        "id": "poll.voted"
-      },
-      {
-        "defaultMessage": "{votes, plural, one {# vote} other {# votes}}",
-        "id": "poll.votes"
-      },
-      {
-        "defaultMessage": "{count, plural, one {# person} other {# people}}",
-        "id": "poll.total_people"
-      },
-      {
-        "defaultMessage": "{count, plural, one {# vote} other {# votes}}",
-        "id": "poll.total_votes"
-      },
-      {
-        "defaultMessage": "Vote",
-        "id": "poll.vote"
-      },
-      {
-        "defaultMessage": "Refresh",
-        "id": "poll.refresh"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/poll.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Loading…",
-        "id": "regeneration_indicator.label"
-      },
-      {
-        "defaultMessage": "Your home feed is being prepared!",
-        "id": "regeneration_indicator.sublabel"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/regeneration_indicator.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "today",
-        "id": "relative_time.today"
-      },
-      {
-        "defaultMessage": "now",
-        "id": "relative_time.just_now"
-      },
-      {
-        "defaultMessage": "just now",
-        "id": "relative_time.full.just_now"
-      },
-      {
-        "defaultMessage": "{number}s",
-        "id": "relative_time.seconds"
-      },
-      {
-        "defaultMessage": "{number, plural, one {# second} other {# seconds}} ago",
-        "id": "relative_time.full.seconds"
-      },
-      {
-        "defaultMessage": "{number}m",
-        "id": "relative_time.minutes"
-      },
-      {
-        "defaultMessage": "{number, plural, one {# minute} other {# minutes}} ago",
-        "id": "relative_time.full.minutes"
-      },
-      {
-        "defaultMessage": "{number}h",
-        "id": "relative_time.hours"
-      },
-      {
-        "defaultMessage": "{number, plural, one {# hour} other {# hours}} ago",
-        "id": "relative_time.full.hours"
-      },
-      {
-        "defaultMessage": "{number}d",
-        "id": "relative_time.days"
-      },
-      {
-        "defaultMessage": "{number, plural, one {# day} other {# days}} ago",
-        "id": "relative_time.full.days"
-      },
-      {
-        "defaultMessage": "Moments remaining",
-        "id": "time_remaining.moments"
-      },
-      {
-        "defaultMessage": "{number, plural, one {# second} other {# seconds}} left",
-        "id": "time_remaining.seconds"
-      },
-      {
-        "defaultMessage": "{number, plural, one {# minute} other {# minutes}} left",
-        "id": "time_remaining.minutes"
-      },
-      {
-        "defaultMessage": "{number, plural, one {# hour} other {# hours}} left",
-        "id": "time_remaining.hours"
-      },
-      {
-        "defaultMessage": "{number, plural, one {# day} other {# days}} left",
-        "id": "time_remaining.days"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/relative_timestamp.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "People using this server during the last 30 days (Monthly Active Users)",
-        "id": "server_banner.about_active_users"
-      },
-      {
-        "defaultMessage": "{domain} is part of the decentralized social network powered by {mastodon}.",
-        "id": "server_banner.introduction"
-      },
-      {
-        "defaultMessage": "Administered by:",
-        "id": "server_banner.administered_by"
-      },
-      {
-        "defaultMessage": "Server stats:",
-        "id": "server_banner.server_stats"
-      },
-      {
-        "defaultMessage": "active users",
-        "id": "server_banner.active_users"
-      },
-      {
-        "defaultMessage": "Learn more",
-        "id": "server_banner.learn_more"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/server_banner.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "{count}K",
-        "id": "units.short.thousand"
-      },
-      {
-        "defaultMessage": "{count}M",
-        "id": "units.short.million"
-      },
-      {
-        "defaultMessage": "{count}B",
-        "id": "units.short.billion"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/short_number.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Delete",
-        "id": "status.delete"
-      },
-      {
-        "defaultMessage": "Delete & re-draft",
-        "id": "status.redraft"
-      },
-      {
-        "defaultMessage": "Edit",
-        "id": "status.edit"
-      },
-      {
-        "defaultMessage": "Privately mention @{name}",
-        "id": "status.direct"
-      },
-      {
-        "defaultMessage": "Mention @{name}",
-        "id": "status.mention"
-      },
-      {
-        "defaultMessage": "Mute @{name}",
-        "id": "account.mute"
-      },
-      {
-        "defaultMessage": "Block @{name}",
-        "id": "account.block"
-      },
-      {
-        "defaultMessage": "Reply",
-        "id": "status.reply"
-      },
-      {
-        "defaultMessage": "Share",
-        "id": "status.share"
-      },
-      {
-        "defaultMessage": "More",
-        "id": "status.more"
-      },
-      {
-        "defaultMessage": "Reply to thread",
-        "id": "status.replyAll"
-      },
-      {
-        "defaultMessage": "Boost",
-        "id": "status.reblog"
-      },
-      {
-        "defaultMessage": "Boost with original visibility",
-        "id": "status.reblog_private"
-      },
-      {
-        "defaultMessage": "Unboost",
-        "id": "status.cancel_reblog_private"
-      },
-      {
-        "defaultMessage": "This post cannot be boosted",
-        "id": "status.cannot_reblog"
-      },
-      {
-        "defaultMessage": "Favourite",
-        "id": "status.favourite"
-      },
-      {
-        "defaultMessage": "Bookmark",
-        "id": "status.bookmark"
-      },
-      {
-        "defaultMessage": "Remove bookmark",
-        "id": "status.remove_bookmark"
-      },
-      {
-        "defaultMessage": "Expand this status",
-        "id": "status.open"
-      },
-      {
-        "defaultMessage": "Report @{name}",
-        "id": "status.report"
-      },
-      {
-        "defaultMessage": "Mute conversation",
-        "id": "status.mute_conversation"
-      },
-      {
-        "defaultMessage": "Unmute conversation",
-        "id": "status.unmute_conversation"
-      },
-      {
-        "defaultMessage": "Pin on profile",
-        "id": "status.pin"
-      },
-      {
-        "defaultMessage": "Unpin from profile",
-        "id": "status.unpin"
-      },
-      {
-        "defaultMessage": "Embed",
-        "id": "status.embed"
-      },
-      {
-        "defaultMessage": "Open moderation interface for @{name}",
-        "id": "status.admin_account"
-      },
-      {
-        "defaultMessage": "Open this post in the moderation interface",
-        "id": "status.admin_status"
-      },
-      {
-        "defaultMessage": "Open moderation interface for {domain}",
-        "id": "status.admin_domain"
-      },
-      {
-        "defaultMessage": "Copy link to post",
-        "id": "status.copy"
-      },
-      {
-        "defaultMessage": "Hide post",
-        "id": "status.hide"
-      },
-      {
-        "defaultMessage": "Block domain {domain}",
-        "id": "account.block_domain"
-      },
-      {
-        "defaultMessage": "Unblock domain {domain}",
-        "id": "account.unblock_domain"
-      },
-      {
-        "defaultMessage": "Unmute @{name}",
-        "id": "account.unmute"
-      },
-      {
-        "defaultMessage": "Unblock @{name}",
-        "id": "account.unblock"
-      },
-      {
-        "defaultMessage": "Filter this post",
-        "id": "status.filter"
-      },
-      {
-        "defaultMessage": "Open original page",
-        "id": "account.open_original_page"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/status_action_bar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Translated from {lang} using {provider}",
-        "id": "status.translated_from_with"
-      },
-      {
-        "defaultMessage": "Show original",
-        "id": "status.show_original"
-      },
-      {
-        "defaultMessage": "Translate",
-        "id": "status.translate"
-      },
-      {
-        "defaultMessage": "Read more",
-        "id": "status.read_more"
-      },
-      {
-        "defaultMessage": "Show more",
-        "id": "status.show_more"
-      },
-      {
-        "defaultMessage": "Show less",
-        "id": "status.show_less"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/status_content.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Public",
-        "id": "privacy.public.short"
-      },
-      {
-        "defaultMessage": "Unlisted",
-        "id": "privacy.unlisted.short"
-      },
-      {
-        "defaultMessage": "Followers only",
-        "id": "privacy.private.short"
-      },
-      {
-        "defaultMessage": "Mentioned people only",
-        "id": "privacy.direct.short"
-      },
-      {
-        "defaultMessage": "Edited {date}",
-        "id": "status.edited"
-      },
-      {
-        "defaultMessage": "Filtered",
-        "id": "status.filtered"
-      },
-      {
-        "defaultMessage": "Show anyway",
-        "id": "status.show_filter_reason"
-      },
-      {
-        "defaultMessage": "Pinned post",
-        "id": "status.pinned"
-      },
-      {
-        "defaultMessage": "{name} boosted",
-        "id": "status.reblogged_by"
-      },
-      {
-        "defaultMessage": "Private mention",
-        "id": "status.direct_indicator"
-      },
-      {
-        "defaultMessage": "Replied to {name}",
-        "id": "status.replied_to"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/status.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "{resource} from other servers are not displayed.",
-        "id": "timeline_hint.remote_resource_not_displayed"
-      },
-      {
-        "defaultMessage": "Browse more on the original profile",
-        "id": "account.browse_more_on_origin_server"
-      }
-    ],
-    "path": "app/javascript/mastodon/components/timeline_hint.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Unfollow",
-        "id": "confirmations.unfollow.confirm"
-      },
-      {
-        "defaultMessage": "Are you sure you want to unfollow {name}?",
-        "id": "confirmations.unfollow.message"
-      }
-    ],
-    "path": "app/javascript/mastodon/containers/account_container.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Block entire domain",
-        "id": "confirmations.domain_block.confirm"
-      },
-      {
-        "defaultMessage": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
-        "id": "confirmations.domain_block.message"
-      }
-    ],
-    "path": "app/javascript/mastodon/containers/domain_container.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Delete",
-        "id": "confirmations.delete.confirm"
-      },
-      {
-        "defaultMessage": "Are you sure you want to delete this status?",
-        "id": "confirmations.delete.message"
-      },
-      {
-        "defaultMessage": "Delete & redraft",
-        "id": "confirmations.redraft.confirm"
-      },
-      {
-        "defaultMessage": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
-        "id": "confirmations.redraft.message"
-      },
-      {
-        "defaultMessage": "Reply",
-        "id": "confirmations.reply.confirm"
-      },
-      {
-        "defaultMessage": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
-        "id": "confirmations.reply.message"
-      },
-      {
-        "defaultMessage": "Edit",
-        "id": "confirmations.edit.confirm"
-      },
-      {
-        "defaultMessage": "Editing now will overwrite the message you are currently composing. Are you sure you want to proceed?",
-        "id": "confirmations.edit.message"
-      },
-      {
-        "defaultMessage": "Block entire domain",
-        "id": "confirmations.domain_block.confirm"
-      },
-      {
-        "defaultMessage": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
-        "id": "confirmations.domain_block.message"
-      }
-    ],
-    "path": "app/javascript/mastodon/containers/status_container.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "About",
-        "id": "column.about"
-      },
-      {
-        "defaultMessage": "Server rules",
-        "id": "about.rules"
-      },
-      {
-        "defaultMessage": "Moderated servers",
-        "id": "about.blocks"
-      },
-      {
-        "defaultMessage": "Limited",
-        "id": "about.domain_blocks.silenced.title"
-      },
-      {
-        "defaultMessage": "You will generally not see profiles and content from this server, unless you explicitly look it up or opt into it by following.",
-        "id": "about.domain_blocks.silenced.explanation"
-      },
-      {
-        "defaultMessage": "Suspended",
-        "id": "about.domain_blocks.suspended.title"
-      },
-      {
-        "defaultMessage": "No data from this server will be processed, stored or exchanged, making any interaction or communication with users from this server impossible.",
-        "id": "about.domain_blocks.suspended.explanation"
-      },
-      {
-        "defaultMessage": "Decentralized social media powered by {mastodon}",
-        "id": "about.powered_by"
-      },
-      {
-        "defaultMessage": "Administered by:",
-        "id": "server_banner.administered_by"
-      },
-      {
-        "defaultMessage": "Contact:",
-        "id": "about.contact"
-      },
-      {
-        "defaultMessage": "This information has not been made available on this server.",
-        "id": "about.not_available"
-      },
-      {
-        "defaultMessage": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
-        "id": "about.domain_blocks.preamble"
-      },
-      {
-        "defaultMessage": "Reason not available",
-        "id": "about.domain_blocks.no_reason_available"
-      },
-      {
-        "defaultMessage": "Mastodon is free, open-source software, and a trademark of Mastodon gGmbH.",
-        "id": "about.disclaimer"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/about/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Account suspended",
-        "id": "empty_column.account_suspended"
-      },
-      {
-        "defaultMessage": "Profile unavailable",
-        "id": "empty_column.account_unavailable"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/account_gallery/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Posts",
-        "id": "account.posts"
-      },
-      {
-        "defaultMessage": "Posts and replies",
-        "id": "account.posts_with_replies"
-      },
-      {
-        "defaultMessage": "Media",
-        "id": "account.media"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/account_timeline/components/header.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "This profile has been hidden by the moderators of {domain}.",
-        "id": "limited_account_hint.title"
-      },
-      {
-        "defaultMessage": "Show profile anyway",
-        "id": "limited_account_hint.action"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/account_timeline/components/limited_account_hint.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "In Memoriam.",
-        "id": "account.in_memoriam"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/account_timeline/components/memorial_note.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "{name} has indicated that their new account is now:",
-        "id": "account.moved_to"
-      },
-      {
-        "defaultMessage": "Go to profile",
-        "id": "account.go_to_profile"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/account_timeline/components/moved_note.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Withdraw request",
-        "id": "confirmations.cancel_follow_request.confirm"
-      },
-      {
-        "defaultMessage": "Unfollow",
-        "id": "confirmations.unfollow.confirm"
-      },
-      {
-        "defaultMessage": "Block entire domain",
-        "id": "confirmations.domain_block.confirm"
-      },
-      {
-        "defaultMessage": "Are you sure you want to unfollow {name}?",
-        "id": "confirmations.unfollow.message"
-      },
-      {
-        "defaultMessage": "Are you sure you want to withdraw your request to follow {name}?",
-        "id": "confirmations.cancel_follow_request.message"
-      },
-      {
-        "defaultMessage": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
-        "id": "confirmations.domain_block.message"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/account_timeline/containers/header_container.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Older posts",
-        "id": "timeline_hint.resources.statuses"
-      },
-      {
-        "defaultMessage": "Account suspended",
-        "id": "empty_column.account_suspended"
-      },
-      {
-        "defaultMessage": "Profile unavailable",
-        "id": "empty_column.account_unavailable"
-      },
-      {
-        "defaultMessage": "No posts found",
-        "id": "empty_column.account_timeline"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/account_timeline/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Click to add a note",
-        "id": "account_note.placeholder"
-      },
-      {
-        "defaultMessage": "Saved",
-        "id": "generic.saved"
-      },
-      {
-        "defaultMessage": "Note",
-        "id": "account.account_note_header"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/account/components/account_note.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Last post on {date}",
-        "id": "account.featured_tags.last_status_at"
-      },
-      {
-        "defaultMessage": "No posts",
-        "id": "account.featured_tags.last_status_never"
-      },
-      {
-        "defaultMessage": "{name}'s featured hashtags",
-        "id": "account.featured_tags.title"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/account/components/featured_tags.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "{name} has requested to follow you",
-        "id": "account.requested_follow"
-      },
-      {
-        "defaultMessage": "Authorize",
-        "id": "follow_request.authorize"
-      },
-      {
-        "defaultMessage": "Reject",
-        "id": "follow_request.reject"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/account/components/follow_request_note.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Unfollow",
-        "id": "account.unfollow"
-      },
-      {
-        "defaultMessage": "Follow",
-        "id": "account.follow"
-      },
-      {
-        "defaultMessage": "Withdraw follow request",
-        "id": "account.cancel_follow_request"
-      },
-      {
-        "defaultMessage": "Awaiting approval. Click to cancel follow request",
-        "id": "account.requested"
-      },
-      {
-        "defaultMessage": "Unblock @{name}",
-        "id": "account.unblock"
-      },
-      {
-        "defaultMessage": "Edit profile",
-        "id": "account.edit_profile"
-      },
-      {
-        "defaultMessage": "Ownership of this link was checked on {date}",
-        "id": "account.link_verified_on"
-      },
-      {
-        "defaultMessage": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
-        "id": "account.locked_info"
-      },
-      {
-        "defaultMessage": "Mention @{name}",
-        "id": "account.mention"
-      },
-      {
-        "defaultMessage": "Privately mention @{name}",
-        "id": "account.direct"
-      },
-      {
-        "defaultMessage": "Unmute @{name}",
-        "id": "account.unmute"
-      },
-      {
-        "defaultMessage": "Block @{name}",
-        "id": "account.block"
-      },
-      {
-        "defaultMessage": "Mute @{name}",
-        "id": "account.mute"
-      },
-      {
-        "defaultMessage": "Report @{name}",
-        "id": "account.report"
-      },
-      {
-        "defaultMessage": "Share @{name}'s profile",
-        "id": "account.share"
-      },
-      {
-        "defaultMessage": "Media",
-        "id": "account.media"
-      },
-      {
-        "defaultMessage": "Block domain {domain}",
-        "id": "account.block_domain"
-      },
-      {
-        "defaultMessage": "Unblock domain {domain}",
-        "id": "account.unblock_domain"
-      },
-      {
-        "defaultMessage": "Hide boosts from @{name}",
-        "id": "account.hide_reblogs"
-      },
-      {
-        "defaultMessage": "Show boosts from @{name}",
-        "id": "account.show_reblogs"
-      },
-      {
-        "defaultMessage": "Notify me when @{name} posts",
-        "id": "account.enable_notifications"
-      },
-      {
-        "defaultMessage": "Stop notifying me when @{name} posts",
-        "id": "account.disable_notifications"
-      },
-      {
-        "defaultMessage": "Pinned posts",
-        "id": "navigation_bar.pins"
-      },
-      {
-        "defaultMessage": "Preferences",
-        "id": "navigation_bar.preferences"
-      },
-      {
-        "defaultMessage": "Follow requests",
-        "id": "navigation_bar.follow_requests"
-      },
-      {
-        "defaultMessage": "Favourites",
-        "id": "navigation_bar.favourites"
-      },
-      {
-        "defaultMessage": "Lists",
-        "id": "navigation_bar.lists"
-      },
-      {
-        "defaultMessage": "Followed hashtags",
-        "id": "navigation_bar.followed_tags"
-      },
-      {
-        "defaultMessage": "Blocked users",
-        "id": "navigation_bar.blocks"
-      },
-      {
-        "defaultMessage": "Blocked domains",
-        "id": "navigation_bar.domain_blocks"
-      },
-      {
-        "defaultMessage": "Muted users",
-        "id": "navigation_bar.mutes"
-      },
-      {
-        "defaultMessage": "Feature on profile",
-        "id": "account.endorse"
-      },
-      {
-        "defaultMessage": "Don't feature on profile",
-        "id": "account.unendorse"
-      },
-      {
-        "defaultMessage": "Add or Remove from lists",
-        "id": "account.add_or_remove_from_list"
-      },
-      {
-        "defaultMessage": "Open moderation interface for @{name}",
-        "id": "status.admin_account"
-      },
-      {
-        "defaultMessage": "Open moderation interface for {domain}",
-        "id": "status.admin_domain"
-      },
-      {
-        "defaultMessage": "Change subscribed languages",
-        "id": "account.languages"
-      },
-      {
-        "defaultMessage": "Open original page",
-        "id": "account.open_original_page"
-      },
-      {
-        "defaultMessage": "Follows you",
-        "id": "account.follows_you"
-      },
-      {
-        "defaultMessage": "Blocked",
-        "id": "account.blocked"
-      },
-      {
-        "defaultMessage": "Muted",
-        "id": "account.muted"
-      },
-      {
-        "defaultMessage": "Domain blocked",
-        "id": "account.domain_blocked"
-      },
-      {
-        "defaultMessage": "Bot",
-        "id": "account.badges.bot"
-      },
-      {
-        "defaultMessage": "Group",
-        "id": "account.badges.group"
-      },
-      {
-        "defaultMessage": "Joined",
-        "id": "account.joined_short"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/account/components/header.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Play",
-        "id": "video.play"
-      },
-      {
-        "defaultMessage": "Pause",
-        "id": "video.pause"
-      },
-      {
-        "defaultMessage": "Mute sound",
-        "id": "video.mute"
-      },
-      {
-        "defaultMessage": "Unmute sound",
-        "id": "video.unmute"
-      },
-      {
-        "defaultMessage": "Download file",
-        "id": "video.download"
-      },
-      {
-        "defaultMessage": "Hide audio",
-        "id": "audio.hide"
-      },
-      {
-        "defaultMessage": "Sensitive content",
-        "id": "status.sensitive_warning"
-      },
-      {
-        "defaultMessage": "Media hidden",
-        "id": "status.media_hidden"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/audio/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Blocked users",
-        "id": "column.blocks"
-      },
-      {
-        "defaultMessage": "You haven't blocked any users yet.",
-        "id": "empty_column.blocks"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/blocks/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Bookmarks",
-        "id": "column.bookmarks"
-      },
-      {
-        "defaultMessage": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.",
-        "id": "empty_column.bookmarked_statuses"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/bookmarked_statuses/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Creating an account on {domain} is currently not possible, but please keep in mind that you do not need an account specifically on {domain} to use Mastodon.",
-        "id": "closed_registrations_modal.description"
-      },
-      {
-        "defaultMessage": "Signing up on Mastodon",
-        "id": "closed_registrations_modal.title"
-      },
-      {
-        "defaultMessage": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
-        "id": "closed_registrations_modal.preamble"
-      },
-      {
-        "defaultMessage": "On this server",
-        "id": "interaction_modal.on_this_server"
-      },
-      {
-        "defaultMessage": "On a different server",
-        "id": "interaction_modal.on_another_server"
-      },
-      {
-        "defaultMessage": "Since Mastodon is decentralized, you can create an account on another server and still interact with this one.",
-        "id": "closed_registrations.other_server_instructions"
-      },
-      {
-        "defaultMessage": "Find another server",
-        "id": "closed_registrations_modal.find_another_server"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/closed_registrations_modal/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Media only",
-        "id": "community.column_settings.media_only"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/community_timeline/components/column_settings.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Local timeline",
-        "id": "column.community"
-      },
-      {
-        "defaultMessage": "These are the most recent public posts from people whose accounts are hosted by {domain}.",
-        "id": "dismissable_banner.community_timeline"
-      },
-      {
-        "defaultMessage": "The local timeline is empty. Write something publicly to get the ball rolling!",
-        "id": "empty_column.community"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/community_timeline/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Edit profile",
-        "id": "account.edit_profile"
-      },
-      {
-        "defaultMessage": "Pinned posts",
-        "id": "navigation_bar.pins"
-      },
-      {
-        "defaultMessage": "Preferences",
-        "id": "navigation_bar.preferences"
-      },
-      {
-        "defaultMessage": "Follow requests",
-        "id": "navigation_bar.follow_requests"
-      },
-      {
-        "defaultMessage": "Favourites",
-        "id": "navigation_bar.favourites"
-      },
-      {
-        "defaultMessage": "Lists",
-        "id": "navigation_bar.lists"
-      },
-      {
-        "defaultMessage": "Followed hashtags",
-        "id": "navigation_bar.followed_tags"
-      },
-      {
-        "defaultMessage": "Blocked users",
-        "id": "navigation_bar.blocks"
-      },
-      {
-        "defaultMessage": "Blocked domains",
-        "id": "navigation_bar.domain_blocks"
-      },
-      {
-        "defaultMessage": "Muted users",
-        "id": "navigation_bar.mutes"
-      },
-      {
-        "defaultMessage": "Muted words",
-        "id": "navigation_bar.filters"
-      },
-      {
-        "defaultMessage": "Logout",
-        "id": "navigation_bar.logout"
-      },
-      {
-        "defaultMessage": "Bookmarks",
-        "id": "navigation_bar.bookmarks"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/compose/components/action_bar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "What is on your mind?",
-        "id": "compose_form.placeholder"
-      },
-      {
-        "defaultMessage": "Write your warning here",
-        "id": "compose_form.spoiler_placeholder"
-      },
-      {
-        "defaultMessage": "Publish",
-        "id": "compose_form.publish"
-      },
-      {
-        "defaultMessage": "{publish}!",
-        "id": "compose_form.publish_loud"
-      },
-      {
-        "defaultMessage": "Save changes",
-        "id": "compose_form.save_changes"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/compose/components/compose_form.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Insert emoji",
-        "id": "emoji_button.label"
-      },
-      {
-        "defaultMessage": "Search...",
-        "id": "emoji_button.search"
-      },
-      {
-        "defaultMessage": "Custom",
-        "id": "emoji_button.custom"
-      },
-      {
-        "defaultMessage": "Frequently used",
-        "id": "emoji_button.recent"
-      },
-      {
-        "defaultMessage": "Search results",
-        "id": "emoji_button.search_results"
-      },
-      {
-        "defaultMessage": "People",
-        "id": "emoji_button.people"
-      },
-      {
-        "defaultMessage": "Nature",
-        "id": "emoji_button.nature"
-      },
-      {
-        "defaultMessage": "Food & Drink",
-        "id": "emoji_button.food"
-      },
-      {
-        "defaultMessage": "Activity",
-        "id": "emoji_button.activity"
-      },
-      {
-        "defaultMessage": "Travel & Places",
-        "id": "emoji_button.travel"
-      },
-      {
-        "defaultMessage": "Objects",
-        "id": "emoji_button.objects"
-      },
-      {
-        "defaultMessage": "Symbols",
-        "id": "emoji_button.symbols"
-      },
-      {
-        "defaultMessage": "Flags",
-        "id": "emoji_button.flags"
-      },
-      {
-        "defaultMessage": "No matching emojis found",
-        "id": "emoji_button.not_found"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Change language",
-        "id": "compose.language.change"
-      },
-      {
-        "defaultMessage": "Search languages...",
-        "id": "compose.language.search"
-      },
-      {
-        "defaultMessage": "Clear",
-        "id": "emoji_button.clear"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/compose/components/language_dropdown.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Edit profile",
-        "id": "navigation_bar.edit_profile"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/compose/components/navigation_bar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Add a poll",
-        "id": "poll_button.add_poll"
-      },
-      {
-        "defaultMessage": "Remove poll",
-        "id": "poll_button.remove_poll"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/compose/components/poll_button.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Choice {number}",
-        "id": "compose_form.poll.option_placeholder"
-      },
-      {
-        "defaultMessage": "Add a choice",
-        "id": "compose_form.poll.add_option"
-      },
-      {
-        "defaultMessage": "Remove this choice",
-        "id": "compose_form.poll.remove_option"
-      },
-      {
-        "defaultMessage": "Poll duration",
-        "id": "compose_form.poll.duration"
-      },
-      {
-        "defaultMessage": "Change poll to allow multiple choices",
-        "id": "compose_form.poll.switch_to_multiple"
-      },
-      {
-        "defaultMessage": "Change poll to allow for a single choice",
-        "id": "compose_form.poll.switch_to_single"
-      },
-      {
-        "defaultMessage": "{number, plural, one {# minute} other {# minutes}}",
-        "id": "intervals.full.minutes"
-      },
-      {
-        "defaultMessage": "{number, plural, one {# hour} other {# hours}}",
-        "id": "intervals.full.hours"
-      },
-      {
-        "defaultMessage": "{number, plural, one {# day} other {# days}}",
-        "id": "intervals.full.days"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/compose/components/poll_form.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Public",
-        "id": "privacy.public.short"
-      },
-      {
-        "defaultMessage": "Visible for all",
-        "id": "privacy.public.long"
-      },
-      {
-        "defaultMessage": "Unlisted",
-        "id": "privacy.unlisted.short"
-      },
-      {
-        "defaultMessage": "Visible for all, but opted-out of discovery features",
-        "id": "privacy.unlisted.long"
-      },
-      {
-        "defaultMessage": "Followers only",
-        "id": "privacy.private.short"
-      },
-      {
-        "defaultMessage": "Visible for followers only",
-        "id": "privacy.private.long"
-      },
-      {
-        "defaultMessage": "Mentioned people only",
-        "id": "privacy.direct.short"
-      },
-      {
-        "defaultMessage": "Visible for mentioned users only",
-        "id": "privacy.direct.long"
-      },
-      {
-        "defaultMessage": "Adjust status privacy",
-        "id": "privacy.change"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/compose/components/privacy_dropdown.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Cancel",
-        "id": "reply_indicator.cancel"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/compose/components/reply_indicator.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Dismiss suggestion",
-        "id": "suggestions.dismiss"
-      },
-      {
-        "defaultMessage": "You might be interested in…",
-        "id": "suggestions.header"
-      },
-      {
-        "defaultMessage": "Profiles",
-        "id": "search_results.accounts"
-      },
-      {
-        "defaultMessage": "Posts",
-        "id": "search_results.statuses"
-      },
-      {
-        "defaultMessage": "Searching posts by their content is not enabled on this Mastodon server.",
-        "id": "search_results.statuses_fts_disabled"
-      },
-      {
-        "defaultMessage": "Hashtags",
-        "id": "search_results.hashtags"
-      },
-      {
-        "defaultMessage": "{count, plural, one {# result} other {# results}}",
-        "id": "search_results.total"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/compose/components/search_results.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Search",
-        "id": "search.placeholder"
-      },
-      {
-        "defaultMessage": "Search or paste URL",
-        "id": "search.search_or_paste"
-      },
-      {
-        "defaultMessage": "Open URL in Mastodon",
-        "id": "search.quick_action.open_url"
-      },
-      {
-        "defaultMessage": "Go to hashtag {x}",
-        "id": "search.quick_action.go_to_hashtag"
-      },
-      {
-        "defaultMessage": "Go to profile {x}",
-        "id": "search.quick_action.go_to_account"
-      },
-      {
-        "defaultMessage": "Posts matching {x}",
-        "id": "search.quick_action.status_search"
-      },
-      {
-        "defaultMessage": "Profiles matching {x}",
-        "id": "search.quick_action.account_search"
-      },
-      {
-        "defaultMessage": "Recent searches",
-        "id": "search_popout.recent"
-      },
-      {
-        "defaultMessage": "No recent searches",
-        "id": "search.no_recent_searches"
-      },
-      {
-        "defaultMessage": "Quick actions",
-        "id": "search_popout.quick_actions"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/compose/components/search.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Add images, a video or an audio file",
-        "id": "upload_button.label"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/compose/components/upload_button.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Processing…",
-        "id": "upload_progress.processing"
-      },
-      {
-        "defaultMessage": "Uploading…",
-        "id": "upload_progress.label"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/compose/components/upload_progress.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Delete",
-        "id": "upload_form.undo"
-      },
-      {
-        "defaultMessage": "Edit",
-        "id": "upload_form.edit"
-      },
-      {
-        "defaultMessage": "No description added",
-        "id": "upload_form.description_missing"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/compose/components/upload.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Are you sure you want to log out?",
-        "id": "confirmations.logout.message"
-      },
-      {
-        "defaultMessage": "Log out",
-        "id": "confirmations.logout.confirm"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/compose/containers/navigation_container.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
-        "id": "compose_form.sensitive.marked"
-      },
-      {
-        "defaultMessage": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
-        "id": "compose_form.sensitive.unmarked"
-      },
-      {
-        "defaultMessage": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
-        "id": "compose_form.sensitive.hide"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/compose/containers/sensitive_button_container.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Text is hidden behind warning",
-        "id": "compose_form.spoiler.marked"
-      },
-      {
-        "defaultMessage": "Text is not hidden",
-        "id": "compose_form.spoiler.unmarked"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/compose/containers/spoiler_button_container.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
-        "id": "compose_form.lock_disclaimer"
-      },
-      {
-        "defaultMessage": "locked",
-        "id": "compose_form.lock_disclaimer.lock"
-      },
-      {
-        "defaultMessage": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
-        "id": "compose_form.hashtag_warning"
-      },
-      {
-        "defaultMessage": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
-        "id": "compose_form.encryption_warning"
-      },
-      {
-        "defaultMessage": "Learn more",
-        "id": "compose_form.direct_message_warning_learn_more"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/compose/containers/warning_container.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Getting started",
-        "id": "getting_started.heading"
-      },
-      {
-        "defaultMessage": "Home",
-        "id": "tabs_bar.home"
-      },
-      {
-        "defaultMessage": "Notifications",
-        "id": "tabs_bar.notifications"
-      },
-      {
-        "defaultMessage": "Federated timeline",
-        "id": "navigation_bar.public_timeline"
-      },
-      {
-        "defaultMessage": "Local timeline",
-        "id": "navigation_bar.community_timeline"
-      },
-      {
-        "defaultMessage": "Preferences",
-        "id": "navigation_bar.preferences"
-      },
-      {
-        "defaultMessage": "Logout",
-        "id": "navigation_bar.logout"
-      },
-      {
-        "defaultMessage": "Compose new post",
-        "id": "navigation_bar.compose"
-      },
-      {
-        "defaultMessage": "Are you sure you want to log out?",
-        "id": "confirmations.logout.message"
-      },
-      {
-        "defaultMessage": "Log out",
-        "id": "confirmations.logout.confirm"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/compose/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "More",
-        "id": "status.more"
-      },
-      {
-        "defaultMessage": "View conversation",
-        "id": "conversation.open"
-      },
-      {
-        "defaultMessage": "Reply",
-        "id": "status.reply"
-      },
-      {
-        "defaultMessage": "Mark as read",
-        "id": "conversation.mark_as_read"
-      },
-      {
-        "defaultMessage": "Delete conversation",
-        "id": "conversation.delete"
-      },
-      {
-        "defaultMessage": "Mute conversation",
-        "id": "status.mute_conversation"
-      },
-      {
-        "defaultMessage": "Unmute conversation",
-        "id": "status.unmute_conversation"
-      },
-      {
-        "defaultMessage": "With {names}",
-        "id": "conversation.with"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/direct_timeline/components/conversation.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Reply",
-        "id": "confirmations.reply.confirm"
-      },
-      {
-        "defaultMessage": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
-        "id": "confirmations.reply.message"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/direct_timeline/containers/conversation_container.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Private mentions",
-        "id": "column.direct"
-      },
-      {
-        "defaultMessage": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
-        "id": "compose_form.encryption_warning"
-      },
-      {
-        "defaultMessage": "Learn more",
-        "id": "compose_form.direct_message_warning_learn_more"
-      },
-      {
-        "defaultMessage": "You don't have any private mentions yet. When you send or receive one, it will show up here.",
-        "id": "empty_column.direct"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/direct_timeline/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Unfollow",
-        "id": "account.unfollow"
-      },
-      {
-        "defaultMessage": "Follow",
-        "id": "account.follow"
-      },
-      {
-        "defaultMessage": "Withdraw follow request",
-        "id": "account.cancel_follow_request"
-      },
-      {
-        "defaultMessage": "Withdraw request",
-        "id": "confirmations.cancel_follow_request.confirm"
-      },
-      {
-        "defaultMessage": "Awaiting approval. Click to cancel follow request",
-        "id": "account.requested"
-      },
-      {
-        "defaultMessage": "Unblock",
-        "id": "account.unblock_short"
-      },
-      {
-        "defaultMessage": "Unmute",
-        "id": "account.unmute_short"
-      },
-      {
-        "defaultMessage": "Unfollow",
-        "id": "confirmations.unfollow.confirm"
-      },
-      {
-        "defaultMessage": "Edit profile",
-        "id": "account.edit_profile"
-      },
-      {
-        "defaultMessage": "Are you sure you want to unfollow {name}?",
-        "id": "confirmations.unfollow.message"
-      },
-      {
-        "defaultMessage": "Are you sure you want to withdraw your request to follow {name}?",
-        "id": "confirmations.cancel_follow_request.message"
-      },
-      {
-        "defaultMessage": "Posts",
-        "id": "account.posts"
-      },
-      {
-        "defaultMessage": "Followers",
-        "id": "account.followers"
-      },
-      {
-        "defaultMessage": "Following",
-        "id": "account.following"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/directory/components/account_card.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Browse profiles",
-        "id": "column.directory"
-      },
-      {
-        "defaultMessage": "Recently active",
-        "id": "directory.recently_active"
-      },
-      {
-        "defaultMessage": "New arrivals",
-        "id": "directory.new_arrivals"
-      },
-      {
-        "defaultMessage": "From {domain} only",
-        "id": "directory.local"
-      },
-      {
-        "defaultMessage": "From known fediverse",
-        "id": "directory.federated"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/directory/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Blocked domains",
-        "id": "column.domain_blocks"
-      },
-      {
-        "defaultMessage": "Unblock domain {domain}",
-        "id": "account.unblock_domain"
-      },
-      {
-        "defaultMessage": "There are no blocked domains yet.",
-        "id": "empty_column.domain_blocks"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/domain_blocks/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Explore",
-        "id": "explore.title"
-      },
-      {
-        "defaultMessage": "Search results",
-        "id": "explore.search_results"
-      },
-      {
-        "defaultMessage": "Posts",
-        "id": "explore.trending_statuses"
-      },
-      {
-        "defaultMessage": "Hashtags",
-        "id": "explore.trending_tags"
-      },
-      {
-        "defaultMessage": "People",
-        "id": "explore.suggested_follows"
-      },
-      {
-        "defaultMessage": "News",
-        "id": "explore.trending_links"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/explore/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
-        "id": "dismissable_banner.explore_links"
-      },
-      {
-        "defaultMessage": "Nothing is trending right now. Check back later!",
-        "id": "empty_column.explore_statuses"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/explore/links.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Search for {q}",
-        "id": "search_results.title"
-      },
-      {
-        "defaultMessage": "Could not find anything for these search terms",
-        "id": "search_results.nothing_found"
-      },
-      {
-        "defaultMessage": "All",
-        "id": "search_results.all"
-      },
-      {
-        "defaultMessage": "Profiles",
-        "id": "search_results.accounts"
-      },
-      {
-        "defaultMessage": "Hashtags",
-        "id": "search_results.hashtags"
-      },
-      {
-        "defaultMessage": "Posts",
-        "id": "search_results.statuses"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/explore/results.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Nothing is trending right now. Check back later!",
-        "id": "empty_column.explore_statuses"
-      },
-      {
-        "defaultMessage": "These posts from this and other servers in the decentralized network are gaining traction on this server right now.",
-        "id": "dismissable_banner.explore_statuses"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/explore/statuses.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Nothing is trending right now. Check back later!",
-        "id": "empty_column.explore_statuses"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/explore/suggestions.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
-        "id": "dismissable_banner.explore_tags"
-      },
-      {
-        "defaultMessage": "Nothing is trending right now. Check back later!",
-        "id": "empty_column.explore_statuses"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/explore/tags.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Favourites",
-        "id": "column.favourites"
-      },
-      {
-        "defaultMessage": "You don't have any favourite posts yet. When you favourite one, it will show up here.",
-        "id": "empty_column.favourited_statuses"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/favourited_statuses/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Refresh",
-        "id": "refresh"
-      },
-      {
-        "defaultMessage": "No one has favourited this post yet. When someone does, they will show up here.",
-        "id": "empty_column.favourites"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/favourites/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Expired filter!",
-        "id": "filter_modal.added.expired_title"
-      },
-      {
-        "defaultMessage": "This filter category has expired, you will need to change the expiration date for it to apply.",
-        "id": "filter_modal.added.expired_explanation"
-      },
-      {
-        "defaultMessage": "Context mismatch!",
-        "id": "filter_modal.added.context_mismatch_title"
-      },
-      {
-        "defaultMessage": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
-        "id": "filter_modal.added.context_mismatch_explanation"
-      },
-      {
-        "defaultMessage": "settings page",
-        "id": "filter_modal.added.settings_link"
-      },
-      {
-        "defaultMessage": "Filter added!",
-        "id": "filter_modal.added.title"
-      },
-      {
-        "defaultMessage": "This post has been added to the following filter category: {title}.",
-        "id": "filter_modal.added.short_explanation"
-      },
-      {
-        "defaultMessage": "Filter settings",
-        "id": "filter_modal.added.review_and_configure_title"
-      },
-      {
-        "defaultMessage": "To review and further configure this filter category, go to the {settings_link}.",
-        "id": "filter_modal.added.review_and_configure"
-      },
-      {
-        "defaultMessage": "Done",
-        "id": "report.close"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/filters/added_to_filter.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Search or create",
-        "id": "filter_modal.select_filter.search"
-      },
-      {
-        "defaultMessage": "Clear",
-        "id": "emoji_button.clear"
-      },
-      {
-        "defaultMessage": "expired",
-        "id": "filter_modal.select_filter.expired"
-      },
-      {
-        "defaultMessage": "does not apply to this context",
-        "id": "filter_modal.select_filter.context_mismatch"
-      },
-      {
-        "defaultMessage": "New category: {name}",
-        "id": "filter_modal.select_filter.prompt_new"
-      },
-      {
-        "defaultMessage": "Filter this post",
-        "id": "filter_modal.select_filter.title"
-      },
-      {
-        "defaultMessage": "Use an existing category or create a new one",
-        "id": "filter_modal.select_filter.subtitle"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/filters/select_filter.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Authorize",
-        "id": "follow_request.authorize"
-      },
-      {
-        "defaultMessage": "Reject",
-        "id": "follow_request.reject"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/follow_requests/components/account_authorize.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Follow requests",
-        "id": "column.follow_requests"
-      },
-      {
-        "defaultMessage": "You don't have any follow requests yet. When you receive one, it will show up here.",
-        "id": "empty_column.follow_requests"
-      },
-      {
-        "defaultMessage": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
-        "id": "follow_requests.unlocked_explanation"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/follow_requests/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Followed hashtags",
-        "id": "followed_tags"
-      },
-      {
-        "defaultMessage": "You have not followed any hashtags yet. When you do, they will show up here.",
-        "id": "empty_column.followed_tags"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/followed_tags/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Followers",
-        "id": "timeline_hint.resources.followers"
-      },
-      {
-        "defaultMessage": "Account suspended",
-        "id": "empty_column.account_suspended"
-      },
-      {
-        "defaultMessage": "Profile unavailable",
-        "id": "empty_column.account_unavailable"
-      },
-      {
-        "defaultMessage": "No one follows this user yet.",
-        "id": "account.followers.empty"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/followers/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Follows",
-        "id": "timeline_hint.resources.follows"
-      },
-      {
-        "defaultMessage": "Account suspended",
-        "id": "empty_column.account_suspended"
-      },
-      {
-        "defaultMessage": "Profile unavailable",
-        "id": "empty_column.account_unavailable"
-      },
-      {
-        "defaultMessage": "This user doesn't follow anyone yet.",
-        "id": "account.follows.empty"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/following/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Close",
-        "id": "lightbox.close"
-      },
-      {
-        "defaultMessage": "Previous",
-        "id": "lightbox.previous"
-      },
-      {
-        "defaultMessage": "Next",
-        "id": "lightbox.next"
-      },
-      {
-        "defaultMessage": "Announcement",
-        "id": "announcement.announcement"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/getting_started/components/announcements.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Trending now",
-        "id": "trends.trending_now"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/getting_started/components/trends.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Home",
-        "id": "tabs_bar.home"
-      },
-      {
-        "defaultMessage": "Notifications",
-        "id": "tabs_bar.notifications"
-      },
-      {
-        "defaultMessage": "Federated timeline",
-        "id": "navigation_bar.public_timeline"
-      },
-      {
-        "defaultMessage": "Settings",
-        "id": "column_subheading.settings"
-      },
-      {
-        "defaultMessage": "Local timeline",
-        "id": "navigation_bar.community_timeline"
-      },
-      {
-        "defaultMessage": "Explore",
-        "id": "navigation_bar.explore"
-      },
-      {
-        "defaultMessage": "Private mentions",
-        "id": "navigation_bar.direct"
-      },
-      {
-        "defaultMessage": "Bookmarks",
-        "id": "navigation_bar.bookmarks"
-      },
-      {
-        "defaultMessage": "Preferences",
-        "id": "navigation_bar.preferences"
-      },
-      {
-        "defaultMessage": "Follow requests",
-        "id": "navigation_bar.follow_requests"
-      },
-      {
-        "defaultMessage": "Favourites",
-        "id": "navigation_bar.favourites"
-      },
-      {
-        "defaultMessage": "Blocked users",
-        "id": "navigation_bar.blocks"
-      },
-      {
-        "defaultMessage": "Blocked domains",
-        "id": "navigation_bar.domain_blocks"
-      },
-      {
-        "defaultMessage": "Muted users",
-        "id": "navigation_bar.mutes"
-      },
-      {
-        "defaultMessage": "Pinned posts",
-        "id": "navigation_bar.pins"
-      },
-      {
-        "defaultMessage": "Lists",
-        "id": "navigation_bar.lists"
-      },
-      {
-        "defaultMessage": "Discover",
-        "id": "navigation_bar.discover"
-      },
-      {
-        "defaultMessage": "Personal",
-        "id": "navigation_bar.personal"
-      },
-      {
-        "defaultMessage": "Security",
-        "id": "navigation_bar.security"
-      },
-      {
-        "defaultMessage": "Getting started",
-        "id": "getting_started.heading"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/getting_started/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Enter hashtags…",
-        "id": "hashtag.column_settings.select.placeholder"
-      },
-      {
-        "defaultMessage": "No suggestions found",
-        "id": "hashtag.column_settings.select.no_options_message"
-      },
-      {
-        "defaultMessage": "Any of these",
-        "id": "hashtag.column_settings.tag_mode.any"
-      },
-      {
-        "defaultMessage": "All of these",
-        "id": "hashtag.column_settings.tag_mode.all"
-      },
-      {
-        "defaultMessage": "None of these",
-        "id": "hashtag.column_settings.tag_mode.none"
-      },
-      {
-        "defaultMessage": "Include additional tags in this column",
-        "id": "hashtag.column_settings.tag_toggle"
-      },
-      {
-        "defaultMessage": "Local only",
-        "id": "community.column_settings.local_only"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/hashtag_timeline/components/column_settings.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Follow hashtag",
-        "id": "hashtag.follow"
-      },
-      {
-        "defaultMessage": "Unfollow hashtag",
-        "id": "hashtag.unfollow"
-      },
-      {
-        "defaultMessage": "or {additional}",
-        "id": "hashtag.column_header.tag_mode.any"
-      },
-      {
-        "defaultMessage": "and {additional}",
-        "id": "hashtag.column_header.tag_mode.all"
-      },
-      {
-        "defaultMessage": "without {additional}",
-        "id": "hashtag.column_header.tag_mode.none"
-      },
-      {
-        "defaultMessage": "There is nothing in this hashtag yet.",
-        "id": "empty_column.hashtag"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/hashtag_timeline/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Basic",
-        "id": "home.column_settings.basic"
-      },
-      {
-        "defaultMessage": "Show boosts",
-        "id": "home.column_settings.show_reblogs"
-      },
-      {
-        "defaultMessage": "Show replies",
-        "id": "home.column_settings.show_replies"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/home_timeline/components/column_settings.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Home",
-        "id": "column.home"
-      },
-      {
-        "defaultMessage": "Show announcements",
-        "id": "home.show_announcements"
-      },
-      {
-        "defaultMessage": "Hide announcements",
-        "id": "home.hide_announcements"
-      },
-      {
-        "defaultMessage": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
-        "id": "empty_column.home"
-      },
-      {
-        "defaultMessage": "See some suggestions",
-        "id": "empty_column.home.suggestions"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/home_timeline/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Copied",
-        "id": "copypaste.copied"
-      },
-      {
-        "defaultMessage": "Copy",
-        "id": "copypaste.copy"
-      },
-      {
-        "defaultMessage": "Reply to {name}'s post",
-        "id": "interaction_modal.title.reply"
-      },
-      {
-        "defaultMessage": "With an account on Mastodon, you can respond to this post.",
-        "id": "interaction_modal.description.reply"
-      },
-      {
-        "defaultMessage": "Boost {name}'s post",
-        "id": "interaction_modal.title.reblog"
-      },
-      {
-        "defaultMessage": "With an account on Mastodon, you can boost this post to share it with your own followers.",
-        "id": "interaction_modal.description.reblog"
-      },
-      {
-        "defaultMessage": "Favourite {name}'s post",
-        "id": "interaction_modal.title.favourite"
-      },
-      {
-        "defaultMessage": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
-        "id": "interaction_modal.description.favourite"
-      },
-      {
-        "defaultMessage": "Follow {name}",
-        "id": "interaction_modal.title.follow"
-      },
-      {
-        "defaultMessage": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
-        "id": "interaction_modal.description.follow"
-      },
-      {
-        "defaultMessage": "Create account",
-        "id": "sign_in_banner.create_account"
-      },
-      {
-        "defaultMessage": "Since Mastodon is decentralized, you can use your existing account hosted by another Mastodon server or compatible platform if you don't have an account on this one.",
-        "id": "interaction_modal.preamble"
-      },
-      {
-        "defaultMessage": "On this server",
-        "id": "interaction_modal.on_this_server"
-      },
-      {
-        "defaultMessage": "Login",
-        "id": "sign_in_banner.sign_in"
-      },
-      {
-        "defaultMessage": "On a different server",
-        "id": "interaction_modal.on_another_server"
-      },
-      {
-        "defaultMessage": "Copy and paste this URL into the search field of your favourite Mastodon app or the web interface of your Mastodon server.",
-        "id": "interaction_modal.other_server_instructions"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/interaction_modal/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Keyboard Shortcuts",
-        "id": "keyboard_shortcuts.heading"
-      },
-      {
-        "defaultMessage": "Hotkey",
-        "id": "keyboard_shortcuts.hotkey"
-      },
-      {
-        "defaultMessage": "Description",
-        "id": "keyboard_shortcuts.description"
-      },
-      {
-        "defaultMessage": "to reply",
-        "id": "keyboard_shortcuts.reply"
-      },
-      {
-        "defaultMessage": "to mention author",
-        "id": "keyboard_shortcuts.mention"
-      },
-      {
-        "defaultMessage": "to open author's profile",
-        "id": "keyboard_shortcuts.profile"
-      },
-      {
-        "defaultMessage": "to favourite",
-        "id": "keyboard_shortcuts.favourite"
-      },
-      {
-        "defaultMessage": "to boost",
-        "id": "keyboard_shortcuts.boost"
-      },
-      {
-        "defaultMessage": "to open status",
-        "id": "keyboard_shortcuts.enter"
-      },
-      {
-        "defaultMessage": "to open media",
-        "id": "keyboard_shortcuts.open_media"
-      },
-      {
-        "defaultMessage": "to show/hide text behind CW",
-        "id": "keyboard_shortcuts.toggle_hidden"
-      },
-      {
-        "defaultMessage": "to show/hide media",
-        "id": "keyboard_shortcuts.toggle_sensitivity"
-      },
-      {
-        "defaultMessage": "to move up in the list",
-        "id": "keyboard_shortcuts.up"
-      },
-      {
-        "defaultMessage": "to move down in the list",
-        "id": "keyboard_shortcuts.down"
-      },
-      {
-        "defaultMessage": "to focus a status in one of the columns",
-        "id": "keyboard_shortcuts.column"
-      },
-      {
-        "defaultMessage": "to focus the compose textarea",
-        "id": "keyboard_shortcuts.compose"
-      },
-      {
-        "defaultMessage": "to start a brand new post",
-        "id": "keyboard_shortcuts.toot"
-      },
-      {
-        "defaultMessage": "to show/hide CW field",
-        "id": "keyboard_shortcuts.spoilers"
-      },
-      {
-        "defaultMessage": "to navigate back",
-        "id": "keyboard_shortcuts.back"
-      },
-      {
-        "defaultMessage": "to focus search",
-        "id": "keyboard_shortcuts.search"
-      },
-      {
-        "defaultMessage": "to un-focus compose textarea/search",
-        "id": "keyboard_shortcuts.unfocus"
-      },
-      {
-        "defaultMessage": "to open home timeline",
-        "id": "keyboard_shortcuts.home"
-      },
-      {
-        "defaultMessage": "to open notifications column",
-        "id": "keyboard_shortcuts.notifications"
-      },
-      {
-        "defaultMessage": "to open local timeline",
-        "id": "keyboard_shortcuts.local"
-      },
-      {
-        "defaultMessage": "to open federated timeline",
-        "id": "keyboard_shortcuts.federated"
-      },
-      {
-        "defaultMessage": "to open direct messages column",
-        "id": "keyboard_shortcuts.direct"
-      },
-      {
-        "defaultMessage": "to open \"get started\" column",
-        "id": "keyboard_shortcuts.start"
-      },
-      {
-        "defaultMessage": "to open favourites list",
-        "id": "keyboard_shortcuts.favourites"
-      },
-      {
-        "defaultMessage": "to open pinned posts list",
-        "id": "keyboard_shortcuts.pinned"
-      },
-      {
-        "defaultMessage": "to open your profile",
-        "id": "keyboard_shortcuts.my_profile"
-      },
-      {
-        "defaultMessage": "to open blocked users list",
-        "id": "keyboard_shortcuts.blocked"
-      },
-      {
-        "defaultMessage": "to open muted users list",
-        "id": "keyboard_shortcuts.muted"
-      },
-      {
-        "defaultMessage": "to open follow requests list",
-        "id": "keyboard_shortcuts.requests"
-      },
-      {
-        "defaultMessage": "to display this legend",
-        "id": "keyboard_shortcuts.legend"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/keyboard_shortcuts/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Remove from list",
-        "id": "lists.account.remove"
-      },
-      {
-        "defaultMessage": "Add to list",
-        "id": "lists.account.add"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/list_adder/components/list.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Remove from list",
-        "id": "lists.account.remove"
-      },
-      {
-        "defaultMessage": "Add to list",
-        "id": "lists.account.add"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/list_editor/components/account.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Change title",
-        "id": "lists.edit.submit"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/list_editor/components/edit_list_form.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Search among people you follow",
-        "id": "lists.search"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/list_editor/components/search.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Are you sure you want to permanently delete this list?",
-        "id": "confirmations.delete_list.message"
-      },
-      {
-        "defaultMessage": "Delete",
-        "id": "confirmations.delete_list.confirm"
-      },
-      {
-        "defaultMessage": "Any followed user",
-        "id": "lists.replies_policy.followed"
-      },
-      {
-        "defaultMessage": "No one",
-        "id": "lists.replies_policy.none"
-      },
-      {
-        "defaultMessage": "Members of the list",
-        "id": "lists.replies_policy.list"
-      },
-      {
-        "defaultMessage": "Edit list",
-        "id": "lists.edit"
-      },
-      {
-        "defaultMessage": "Delete list",
-        "id": "lists.delete"
-      },
-      {
-        "defaultMessage": "Show replies to:",
-        "id": "lists.replies_policy.title"
-      },
-      {
-        "defaultMessage": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
-        "id": "empty_column.list"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/list_timeline/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "New list title",
-        "id": "lists.new.title_placeholder"
-      },
-      {
-        "defaultMessage": "Add list",
-        "id": "lists.new.create"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/lists/components/new_list_form.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Lists",
-        "id": "column.lists"
-      },
-      {
-        "defaultMessage": "Your lists",
-        "id": "lists.subheading"
-      },
-      {
-        "defaultMessage": "You don't have any lists yet. When you create one, it will show up here.",
-        "id": "empty_column.lists"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/lists/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Muted users",
-        "id": "column.mutes"
-      },
-      {
-        "defaultMessage": "You haven't muted any users yet.",
-        "id": "empty_column.mutes"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/mutes/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Clear notifications",
-        "id": "notifications.clear"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/notifications/components/clear_column_button.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Highlight unread notifications",
-        "id": "notifications.column_settings.unread_notifications.highlight"
-      },
-      {
-        "defaultMessage": "Show filter bar",
-        "id": "notifications.column_settings.filter_bar.show_bar"
-      },
-      {
-        "defaultMessage": "Display all categories",
-        "id": "notifications.column_settings.filter_bar.advanced"
-      },
-      {
-        "defaultMessage": "Desktop notifications",
-        "id": "notifications.column_settings.alert"
-      },
-      {
-        "defaultMessage": "Show in column",
-        "id": "notifications.column_settings.show"
-      },
-      {
-        "defaultMessage": "Play sound",
-        "id": "notifications.column_settings.sound"
-      },
-      {
-        "defaultMessage": "Push notifications",
-        "id": "notifications.column_settings.push"
-      },
-      {
-        "defaultMessage": "Desktop notifications are unavailable due to previously denied browser permissions request",
-        "id": "notifications.permission_denied"
-      },
-      {
-        "defaultMessage": "Desktop notifications are unavailable because the required permission has not been granted.",
-        "id": "notifications.permission_required"
-      },
-      {
-        "defaultMessage": "Unread notifications",
-        "id": "notifications.column_settings.unread_notifications.category"
-      },
-      {
-        "defaultMessage": "Quick filter bar",
-        "id": "notifications.column_settings.filter_bar.category"
-      },
-      {
-        "defaultMessage": "New followers:",
-        "id": "notifications.column_settings.follow"
-      },
-      {
-        "defaultMessage": "New follow requests:",
-        "id": "notifications.column_settings.follow_request"
-      },
-      {
-        "defaultMessage": "Favourites:",
-        "id": "notifications.column_settings.favourite"
-      },
-      {
-        "defaultMessage": "Mentions:",
-        "id": "notifications.column_settings.mention"
-      },
-      {
-        "defaultMessage": "Boosts:",
-        "id": "notifications.column_settings.reblog"
-      },
-      {
-        "defaultMessage": "Poll results:",
-        "id": "notifications.column_settings.poll"
-      },
-      {
-        "defaultMessage": "New posts:",
-        "id": "notifications.column_settings.status"
-      },
-      {
-        "defaultMessage": "Edits:",
-        "id": "notifications.column_settings.update"
-      },
-      {
-        "defaultMessage": "New sign-ups:",
-        "id": "notifications.column_settings.admin.sign_up"
-      },
-      {
-        "defaultMessage": "New reports:",
-        "id": "notifications.column_settings.admin.report"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/notifications/components/column_settings.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Mentions",
-        "id": "notifications.filter.mentions"
-      },
-      {
-        "defaultMessage": "Favourites",
-        "id": "notifications.filter.favourites"
-      },
-      {
-        "defaultMessage": "Boosts",
-        "id": "notifications.filter.boosts"
-      },
-      {
-        "defaultMessage": "Poll results",
-        "id": "notifications.filter.polls"
-      },
-      {
-        "defaultMessage": "Follows",
-        "id": "notifications.filter.follows"
-      },
-      {
-        "defaultMessage": "Updates from people you follow",
-        "id": "notifications.filter.statuses"
-      },
-      {
-        "defaultMessage": "All",
-        "id": "notifications.filter.all"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/notifications/components/filter_bar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Authorize",
-        "id": "follow_request.authorize"
-      },
-      {
-        "defaultMessage": "Reject",
-        "id": "follow_request.reject"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/notifications/components/follow_request.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Grant permission.",
-        "id": "notifications.grant_permission"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/notifications/components/grant_permission_button.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "{name} favourited your status",
-        "id": "notification.favourite"
-      },
-      {
-        "defaultMessage": "{name} followed you",
-        "id": "notification.follow"
-      },
-      {
-        "defaultMessage": "Your poll has ended",
-        "id": "notification.own_poll"
-      },
-      {
-        "defaultMessage": "A poll you have voted in has ended",
-        "id": "notification.poll"
-      },
-      {
-        "defaultMessage": "{name} boosted your status",
-        "id": "notification.reblog"
-      },
-      {
-        "defaultMessage": "{name} just posted",
-        "id": "notification.status"
-      },
-      {
-        "defaultMessage": "{name} edited a post",
-        "id": "notification.update"
-      },
-      {
-        "defaultMessage": "{name} signed up",
-        "id": "notification.admin.sign_up"
-      },
-      {
-        "defaultMessage": "{name} reported {target}",
-        "id": "notification.admin.report"
-      },
-      {
-        "defaultMessage": "{name} has requested to follow you",
-        "id": "notification.follow_request"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/notifications/components/notification.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Close",
-        "id": "lightbox.close"
-      },
-      {
-        "defaultMessage": "Never miss a thing",
-        "id": "notifications_permission_banner.title"
-      },
-      {
-        "defaultMessage": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
-        "id": "notifications_permission_banner.how_to_control"
-      },
-      {
-        "defaultMessage": "Enable desktop notifications",
-        "id": "notifications_permission_banner.enable"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/notifications/components/notifications_permission_banner.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Open report",
-        "id": "report_notification.open"
-      },
-      {
-        "defaultMessage": "Other",
-        "id": "report_notification.categories.other"
-      },
-      {
-        "defaultMessage": "Spam",
-        "id": "report_notification.categories.spam"
-      },
-      {
-        "defaultMessage": "Rule violation",
-        "id": "report_notification.categories.violation"
-      },
-      {
-        "defaultMessage": "{count, plural, one {# post} other {# posts}} attached",
-        "id": "report_notification.attached_statuses"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/notifications/components/report.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Are you sure you want to permanently clear all your notifications?",
-        "id": "notifications.clear_confirmation"
-      },
-      {
-        "defaultMessage": "Clear notifications",
-        "id": "notifications.clear"
-      },
-      {
-        "defaultMessage": "Desktop notifications can't be enabled, as browser permission has been denied before",
-        "id": "notifications.permission_denied_alert"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/notifications/containers/column_settings_container.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Notifications",
-        "id": "column.notifications"
-      },
-      {
-        "defaultMessage": "Mark every notification as read",
-        "id": "notifications.mark_as_read"
-      },
-      {
-        "defaultMessage": "You don't have any notifications yet. When other people interact with you, you will see it here.",
-        "id": "empty_column.notifications"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/notifications/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Unfortunately, no results can be shown right now. You can try using search or browsing the explore page to find people to follow, or try again later.",
-        "id": "onboarding.follows.empty"
-      },
-      {
-        "defaultMessage": "Popular on Mastodon",
-        "id": "onboarding.follows.title"
-      },
-      {
-        "defaultMessage": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
-        "id": "onboarding.follows.lead"
-      },
-      {
-        "defaultMessage": "<strong>Did you know?</strong> Since Mastodon is decentralized, some profiles you come across will be hosted on servers other than yours. And yet you can interact with them seamlessly! Their server is in the second half of their username!",
-        "id": "onboarding.tips.accounts_from_other_servers"
-      },
-      {
-        "defaultMessage": "Take me back",
-        "id": "onboarding.actions.back"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/onboarding/follows.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Hello #Mastodon!",
-        "id": "onboarding.compose.template"
-      },
-      {
-        "defaultMessage": "You've made it!",
-        "id": "onboarding.start.title"
-      },
-      {
-        "defaultMessage": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
-        "id": "onboarding.start.lead"
-      },
-      {
-        "defaultMessage": "Customize your profile",
-        "id": "onboarding.steps.setup_profile.title"
-      },
-      {
-        "defaultMessage": "Others are more likely to interact with you with a filled out profile.",
-        "id": "onboarding.steps.setup_profile.body"
-      },
-      {
-        "defaultMessage": "Follow {count, plural, one {one person} other {# people}}",
-        "id": "onboarding.steps.follow_people.title"
-      },
-      {
-        "defaultMessage": "You curate your own feed. Let's fill it with interesting people.",
-        "id": "onboarding.steps.follow_people.body"
-      },
-      {
-        "defaultMessage": "Make your first post",
-        "id": "onboarding.steps.publish_status.title"
-      },
-      {
-        "defaultMessage": "Say hello to the world.",
-        "id": "onboarding.steps.publish_status.body"
-      },
-      {
-        "defaultMessage": "Share your profile",
-        "id": "onboarding.steps.share_profile.title"
-      },
-      {
-        "defaultMessage": "Let your friends know how to find you on Mastodon!",
-        "id": "onboarding.steps.share_profile.body"
-      },
-      {
-        "defaultMessage": "Want to skip right ahead?",
-        "id": "onboarding.start.skip"
-      },
-      {
-        "defaultMessage": "See what's trending",
-        "id": "onboarding.actions.go_to_explore"
-      },
-      {
-        "defaultMessage": "Don't show this screen again",
-        "id": "onboarding.actions.close"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/onboarding/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "I'm {username} on #Mastodon! Come follow me at {url}",
-        "id": "onboarding.share.message"
-      },
-      {
-        "defaultMessage": "Copied",
-        "id": "copypaste.copied"
-      },
-      {
-        "defaultMessage": "Copy to clipboard",
-        "id": "copypaste.copy_to_clipboard"
-      },
-      {
-        "defaultMessage": "Share your profile",
-        "id": "onboarding.share.title"
-      },
-      {
-        "defaultMessage": "Let people know how they can find you on Mastodon!",
-        "id": "onboarding.share.lead"
-      },
-      {
-        "defaultMessage": "<strong>Did you know?</strong> You can verify your account by putting a link to your Mastodon profile on your own website and adding the website to your profile. No fees or documents necessary!",
-        "id": "onboarding.tips.verification"
-      },
-      {
-        "defaultMessage": "<strong>Did you know?</strong> If you feel like {domain} is not a great server choice for you in the future, you can move to another Mastodon server without losing your followers. You can even host your own server!",
-        "id": "onboarding.tips.migration"
-      },
-      {
-        "defaultMessage": "<strong>Did you know?</strong> You can secure your account by setting up two-factor authentication in your account settings. It works with any TOTP app of your choice, no phone number necessary!",
-        "id": "onboarding.tips.2fa"
-      },
-      {
-        "defaultMessage": "Possible next steps:",
-        "id": "onboarding.share.next_steps"
-      },
-      {
-        "defaultMessage": "Go to your home feed",
-        "id": "onboarding.actions.go_to_home"
-      },
-      {
-        "defaultMessage": "See what's trending",
-        "id": "onboarding.actions.go_to_explore"
-      },
-      {
-        "defaultMessage": "Take me back",
-        "id": "onboarding.action.back"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/onboarding/share.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Reply",
-        "id": "status.reply"
-      },
-      {
-        "defaultMessage": "Reply to thread",
-        "id": "status.replyAll"
-      },
-      {
-        "defaultMessage": "Boost",
-        "id": "status.reblog"
-      },
-      {
-        "defaultMessage": "Boost with original visibility",
-        "id": "status.reblog_private"
-      },
-      {
-        "defaultMessage": "Unboost",
-        "id": "status.cancel_reblog_private"
-      },
-      {
-        "defaultMessage": "This post cannot be boosted",
-        "id": "status.cannot_reblog"
-      },
-      {
-        "defaultMessage": "Favourite",
-        "id": "status.favourite"
-      },
-      {
-        "defaultMessage": "Reply",
-        "id": "confirmations.reply.confirm"
-      },
-      {
-        "defaultMessage": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
-        "id": "confirmations.reply.message"
-      },
-      {
-        "defaultMessage": "Expand this status",
-        "id": "status.open"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/picture_in_picture/components/footer.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Close",
-        "id": "lightbox.close"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/picture_in_picture/components/header.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Pinned post",
-        "id": "column.pins"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/pinned_statuses/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Privacy Policy",
-        "id": "privacy_policy.title"
-      },
-      {
-        "defaultMessage": "Last updated {date}",
-        "id": "privacy_policy.last_updated"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/privacy_policy/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Media only",
-        "id": "community.column_settings.media_only"
-      },
-      {
-        "defaultMessage": "Remote only",
-        "id": "community.column_settings.remote_only"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/public_timeline/components/column_settings.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Federated timeline",
-        "id": "column.public"
-      },
-      {
-        "defaultMessage": "These are the most recent public posts from people on this and other servers of the decentralized network that this server knows about.",
-        "id": "dismissable_banner.public_timeline"
-      },
-      {
-        "defaultMessage": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
-        "id": "empty_column.public"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/public_timeline/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Refresh",
-        "id": "refresh"
-      },
-      {
-        "defaultMessage": "No one has boosted this post yet. When someone does, they will show up here.",
-        "id": "status.reblogs.empty"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/reblogs/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "I don't like it",
-        "id": "report.reasons.dislike"
-      },
-      {
-        "defaultMessage": "It is not something you want to see",
-        "id": "report.reasons.dislike_description"
-      },
-      {
-        "defaultMessage": "It's spam",
-        "id": "report.reasons.spam"
-      },
-      {
-        "defaultMessage": "Malicious links, fake engagement, or repetitive replies",
-        "id": "report.reasons.spam_description"
-      },
-      {
-        "defaultMessage": "It violates server rules",
-        "id": "report.reasons.violation"
-      },
-      {
-        "defaultMessage": "You are aware that it breaks specific rules",
-        "id": "report.reasons.violation_description"
-      },
-      {
-        "defaultMessage": "It's something else",
-        "id": "report.reasons.other"
-      },
-      {
-        "defaultMessage": "The issue does not fit into other categories",
-        "id": "report.reasons.other_description"
-      },
-      {
-        "defaultMessage": "post",
-        "id": "report.category.title_status"
-      },
-      {
-        "defaultMessage": "profile",
-        "id": "report.category.title_account"
-      },
-      {
-        "defaultMessage": "Tell us what's going on with this {type}",
-        "id": "report.category.title"
-      },
-      {
-        "defaultMessage": "Choose the best match",
-        "id": "report.category.subtitle"
-      },
-      {
-        "defaultMessage": "Next",
-        "id": "report.next"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/report/category.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Type or paste additional comments",
-        "id": "report.placeholder"
-      },
-      {
-        "defaultMessage": "Is there anything else you think we should know?",
-        "id": "report.comment.title"
-      },
-      {
-        "defaultMessage": "The account is from another server. Send an anonymized copy of the report there as well?",
-        "id": "report.forward_hint"
-      },
-      {
-        "defaultMessage": "Forward to {target}",
-        "id": "report.forward"
-      },
-      {
-        "defaultMessage": "Submit report",
-        "id": "report.submit"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/report/comment.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Public",
-        "id": "privacy.public.short"
-      },
-      {
-        "defaultMessage": "Unlisted",
-        "id": "privacy.unlisted.short"
-      },
-      {
-        "defaultMessage": "Followers only",
-        "id": "privacy.private.short"
-      },
-      {
-        "defaultMessage": "Mentioned people only",
-        "id": "privacy.direct.short"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/report/components/status_check_box.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Which rules are being violated?",
-        "id": "report.rules.title"
-      },
-      {
-        "defaultMessage": "Select all that apply",
-        "id": "report.rules.subtitle"
-      },
-      {
-        "defaultMessage": "Next",
-        "id": "report.next"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/report/rules.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Are there any posts that back up this report?",
-        "id": "report.statuses.title"
-      },
-      {
-        "defaultMessage": "Select all that apply",
-        "id": "report.statuses.subtitle"
-      },
-      {
-        "defaultMessage": "Next",
-        "id": "report.next"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/report/statuses.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Thanks for reporting, we'll look into this.",
-        "id": "report.thanks.title_actionable"
-      },
-      {
-        "defaultMessage": "Don't want to see this?",
-        "id": "report.thanks.title"
-      },
-      {
-        "defaultMessage": "While we review this, you can take action against @{name}:",
-        "id": "report.thanks.take_action_actionable"
-      },
-      {
-        "defaultMessage": "Here are your options for controlling what you see on Mastodon:",
-        "id": "report.thanks.take_action"
-      },
-      {
-        "defaultMessage": "Unfollow @{name}",
-        "id": "report.unfollow"
-      },
-      {
-        "defaultMessage": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
-        "id": "report.unfollow_explanation"
-      },
-      {
-        "defaultMessage": "Unfollow",
-        "id": "account.unfollow"
-      },
-      {
-        "defaultMessage": "Mute @{name}",
-        "id": "account.mute"
-      },
-      {
-        "defaultMessage": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
-        "id": "report.mute_explanation"
-      },
-      {
-        "defaultMessage": "Mute",
-        "id": "report.mute"
-      },
-      {
-        "defaultMessage": "Muted",
-        "id": "account.muted"
-      },
-      {
-        "defaultMessage": "Block @{name}",
-        "id": "account.block"
-      },
-      {
-        "defaultMessage": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
-        "id": "report.block_explanation"
-      },
-      {
-        "defaultMessage": "Block",
-        "id": "report.block"
-      },
-      {
-        "defaultMessage": "Blocked",
-        "id": "account.blocked"
-      },
-      {
-        "defaultMessage": "Done",
-        "id": "report.close"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/report/thanks.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Delete",
-        "id": "status.delete"
-      },
-      {
-        "defaultMessage": "Delete & re-draft",
-        "id": "status.redraft"
-      },
-      {
-        "defaultMessage": "Edit",
-        "id": "status.edit"
-      },
-      {
-        "defaultMessage": "Privately mention @{name}",
-        "id": "status.direct"
-      },
-      {
-        "defaultMessage": "Mention @{name}",
-        "id": "status.mention"
-      },
-      {
-        "defaultMessage": "Reply",
-        "id": "status.reply"
-      },
-      {
-        "defaultMessage": "Boost",
-        "id": "status.reblog"
-      },
-      {
-        "defaultMessage": "Boost with original visibility",
-        "id": "status.reblog_private"
-      },
-      {
-        "defaultMessage": "Unboost",
-        "id": "status.cancel_reblog_private"
-      },
-      {
-        "defaultMessage": "This post cannot be boosted",
-        "id": "status.cannot_reblog"
-      },
-      {
-        "defaultMessage": "Favourite",
-        "id": "status.favourite"
-      },
-      {
-        "defaultMessage": "Bookmark",
-        "id": "status.bookmark"
-      },
-      {
-        "defaultMessage": "More",
-        "id": "status.more"
-      },
-      {
-        "defaultMessage": "Mute @{name}",
-        "id": "status.mute"
-      },
-      {
-        "defaultMessage": "Mute conversation",
-        "id": "status.mute_conversation"
-      },
-      {
-        "defaultMessage": "Unmute conversation",
-        "id": "status.unmute_conversation"
-      },
-      {
-        "defaultMessage": "Block @{name}",
-        "id": "status.block"
-      },
-      {
-        "defaultMessage": "Report @{name}",
-        "id": "status.report"
-      },
-      {
-        "defaultMessage": "Share",
-        "id": "status.share"
-      },
-      {
-        "defaultMessage": "Pin on profile",
-        "id": "status.pin"
-      },
-      {
-        "defaultMessage": "Unpin from profile",
-        "id": "status.unpin"
-      },
-      {
-        "defaultMessage": "Embed",
-        "id": "status.embed"
-      },
-      {
-        "defaultMessage": "Open moderation interface for @{name}",
-        "id": "status.admin_account"
-      },
-      {
-        "defaultMessage": "Open this post in the moderation interface",
-        "id": "status.admin_status"
-      },
-      {
-        "defaultMessage": "Open moderation interface for {domain}",
-        "id": "status.admin_domain"
-      },
-      {
-        "defaultMessage": "Copy link to post",
-        "id": "status.copy"
-      },
-      {
-        "defaultMessage": "Block domain {domain}",
-        "id": "account.block_domain"
-      },
-      {
-        "defaultMessage": "Unblock domain {domain}",
-        "id": "account.unblock_domain"
-      },
-      {
-        "defaultMessage": "Unmute @{name}",
-        "id": "account.unmute"
-      },
-      {
-        "defaultMessage": "Unblock @{name}",
-        "id": "account.unblock"
-      },
-      {
-        "defaultMessage": "Open original page",
-        "id": "account.open_original_page"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/status/components/action_bar.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Sensitive content",
-        "id": "status.sensitive_warning"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/status/components/card.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Public",
-        "id": "privacy.public.short"
-      },
-      {
-        "defaultMessage": "Unlisted",
-        "id": "privacy.unlisted.short"
-      },
-      {
-        "defaultMessage": "Followers only",
-        "id": "privacy.private.short"
-      },
-      {
-        "defaultMessage": "Mentioned people only",
-        "id": "privacy.direct.short"
-      },
-      {
-        "defaultMessage": "Private mention",
-        "id": "status.direct_indicator"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/status/components/detailed_status.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Delete",
-        "id": "confirmations.delete.confirm"
-      },
-      {
-        "defaultMessage": "Are you sure you want to delete this status?",
-        "id": "confirmations.delete.message"
-      },
-      {
-        "defaultMessage": "Delete & redraft",
-        "id": "confirmations.redraft.confirm"
-      },
-      {
-        "defaultMessage": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
-        "id": "confirmations.redraft.message"
-      },
-      {
-        "defaultMessage": "Show more for all",
-        "id": "status.show_more_all"
-      },
-      {
-        "defaultMessage": "Show less for all",
-        "id": "status.show_less_all"
-      },
-      {
-        "defaultMessage": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
-        "id": "status.title.with_attachments"
-      },
-      {
-        "defaultMessage": "Detailed conversation view",
-        "id": "status.detailed_status"
-      },
-      {
-        "defaultMessage": "Reply",
-        "id": "confirmations.reply.confirm"
-      },
-      {
-        "defaultMessage": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
-        "id": "confirmations.reply.message"
-      },
-      {
-        "defaultMessage": "Block entire domain",
-        "id": "confirmations.domain_block.confirm"
-      },
-      {
-        "defaultMessage": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
-        "id": "confirmations.domain_block.message"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/status/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Close",
-        "id": "lightbox.close"
-      },
-      {
-        "defaultMessage": "Change subscribed languages for {target}",
-        "id": "subscribed_languages.target"
-      },
-      {
-        "defaultMessage": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
-        "id": "subscribed_languages.lead"
-      },
-      {
-        "defaultMessage": "Save changes",
-        "id": "subscribed_languages.save"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/subscribed_languages_modal/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Are you sure you want to block {name}?",
-        "id": "confirmations.block.message"
-      },
-      {
-        "defaultMessage": "Cancel",
-        "id": "confirmation_modal.cancel"
-      },
-      {
-        "defaultMessage": "Block & Report",
-        "id": "confirmations.block.block_and_report"
-      },
-      {
-        "defaultMessage": "Block",
-        "id": "confirmations.block.confirm"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/block_modal.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Unboost",
-        "id": "status.cancel_reblog_private"
-      },
-      {
-        "defaultMessage": "Boost",
-        "id": "status.reblog"
-      },
-      {
-        "defaultMessage": "Public",
-        "id": "privacy.public.short"
-      },
-      {
-        "defaultMessage": "Unlisted",
-        "id": "privacy.unlisted.short"
-      },
-      {
-        "defaultMessage": "Followers only",
-        "id": "privacy.private.short"
-      },
-      {
-        "defaultMessage": "Mentioned people only",
-        "id": "privacy.direct.short"
-      },
-      {
-        "defaultMessage": "You can press {combo} to skip this next time",
-        "id": "boost_modal.combo"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/boost_modal.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Copied",
-        "id": "copypaste.copied"
-      },
-      {
-        "defaultMessage": "404",
-        "id": "bundle_column_error.routing.title"
-      },
-      {
-        "defaultMessage": "The requested page could not be found. Are you sure the URL in the address bar is correct?",
-        "id": "bundle_column_error.routing.body"
-      },
-      {
-        "defaultMessage": "Network error",
-        "id": "bundle_column_error.network.title"
-      },
-      {
-        "defaultMessage": "There was an error when trying to load this page. This could be due to a temporary problem with your internet connection or this server.",
-        "id": "bundle_column_error.network.body"
-      },
-      {
-        "defaultMessage": "Oh, no!",
-        "id": "bundle_column_error.error.title"
-      },
-      {
-        "defaultMessage": "The requested page could not be rendered. It could be due to a bug in our code, or a browser compatibility issue.",
-        "id": "bundle_column_error.error.body"
-      },
-      {
-        "defaultMessage": "Try again",
-        "id": "bundle_column_error.retry"
-      },
-      {
-        "defaultMessage": "Copy error report",
-        "id": "bundle_column_error.copy_stacktrace"
-      },
-      {
-        "defaultMessage": "Go back home",
-        "id": "bundle_column_error.return"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/bundle_column_error.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Something went wrong while loading this component.",
-        "id": "bundle_modal_error.message"
-      },
-      {
-        "defaultMessage": "Try again",
-        "id": "bundle_modal_error.retry"
-      },
-      {
-        "defaultMessage": "Close",
-        "id": "bundle_modal_error.close"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/bundle_modal_error.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "{name} created {date}",
-        "id": "status.history.created"
-      },
-      {
-        "defaultMessage": "{name} edited {date}",
-        "id": "status.history.edited"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/compare_history_modal.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Cancel",
-        "id": "confirmation_modal.cancel"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/confirmation_modal.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Are you sure you want to log out?",
-        "id": "confirmations.logout.message"
-      },
-      {
-        "defaultMessage": "Log out",
-        "id": "confirmations.logout.confirm"
-      },
-      {
-        "defaultMessage": "Your account {disabledAccount} is currently disabled because you moved to {movedToAccount}.",
-        "id": "moved_to_account_banner.text"
-      },
-      {
-        "defaultMessage": "Your account {disabledAccount} is currently disabled.",
-        "id": "disabled_account_banner.text"
-      },
-      {
-        "defaultMessage": "Account settings",
-        "id": "disabled_account_banner.account_settings"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/disabled_account_banner.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Close",
-        "id": "lightbox.close"
-      },
-      {
-        "defaultMessage": "Embed",
-        "id": "status.embed"
-      },
-      {
-        "defaultMessage": "Embed this status on your website by copying the code below.",
-        "id": "embed.instructions"
-      },
-      {
-        "defaultMessage": "Here is what it will look like:",
-        "id": "embed.preview"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/embed_modal.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Close",
-        "id": "lightbox.close"
-      },
-      {
-        "defaultMessage": "Filter a post",
-        "id": "filter_modal.title.status"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/filter_modal.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Close",
-        "id": "lightbox.close"
-      },
-      {
-        "defaultMessage": "Apply",
-        "id": "upload_modal.apply"
-      },
-      {
-        "defaultMessage": "Applying…",
-        "id": "upload_modal.applying"
-      },
-      {
-        "defaultMessage": "A quick brown fox jumps over the lazy dog",
-        "id": "upload_modal.description_placeholder"
-      },
-      {
-        "defaultMessage": "Choose image",
-        "id": "upload_modal.choose_image"
-      },
-      {
-        "defaultMessage": "You have unsaved changes to the media description or preview, discard them anyway?",
-        "id": "confirmations.discard_edit_media.message"
-      },
-      {
-        "defaultMessage": "Discard",
-        "id": "confirmations.discard_edit_media.confirm"
-      },
-      {
-        "defaultMessage": "Describe for people who are hard of hearing",
-        "id": "upload_form.audio_description"
-      },
-      {
-        "defaultMessage": "Describe for people who are deaf, hard of hearing, blind or have low vision",
-        "id": "upload_form.video_description"
-      },
-      {
-        "defaultMessage": "Describe for people who are blind or have low vision",
-        "id": "upload_form.description"
-      },
-      {
-        "defaultMessage": "Analyzing picture…",
-        "id": "upload_modal.analyzing_picture"
-      },
-      {
-        "defaultMessage": "Preparing OCR…",
-        "id": "upload_modal.preparing_ocr"
-      },
-      {
-        "defaultMessage": "Edit media",
-        "id": "upload_modal.edit_media"
-      },
-      {
-        "defaultMessage": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
-        "id": "upload_modal.hint"
-      },
-      {
-        "defaultMessage": "Change thumbnail",
-        "id": "upload_form.thumbnail"
-      },
-      {
-        "defaultMessage": "Detect text from picture",
-        "id": "upload_modal.detect_text"
-      },
-      {
-        "defaultMessage": "Preview ({ratio})",
-        "id": "upload_modal.preview_label"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/focal_point_modal.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Follow requests",
-        "id": "navigation_bar.follow_requests"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/follow_requests_column_link.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Publish",
-        "id": "compose_form.publish_form"
-      },
-      {
-        "defaultMessage": "Create account",
-        "id": "sign_in_banner.create_account"
-      },
-      {
-        "defaultMessage": "Login",
-        "id": "sign_in_banner.sign_in"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/header.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Close",
-        "id": "lightbox.close"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/image_modal.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Are you sure you want to log out?",
-        "id": "confirmations.logout.message"
-      },
-      {
-        "defaultMessage": "Log out",
-        "id": "confirmations.logout.confirm"
-      },
-      {
-        "defaultMessage": "About",
-        "id": "footer.about"
-      },
-      {
-        "defaultMessage": "Status",
-        "id": "footer.status"
-      },
-      {
-        "defaultMessage": "Invite people",
-        "id": "footer.invite"
-      },
-      {
-        "defaultMessage": "Profiles directory",
-        "id": "footer.directory"
-      },
-      {
-        "defaultMessage": "Privacy policy",
-        "id": "footer.privacy_policy"
-      },
-      {
-        "defaultMessage": "Get the app",
-        "id": "footer.get_app"
-      },
-      {
-        "defaultMessage": "Keyboard shortcuts",
-        "id": "footer.keyboard_shortcuts"
-      },
-      {
-        "defaultMessage": "View source code",
-        "id": "footer.source_code"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/link_footer.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Close",
-        "id": "lightbox.close"
-      },
-      {
-        "defaultMessage": "Previous",
-        "id": "lightbox.previous"
-      },
-      {
-        "defaultMessage": "Next",
-        "id": "lightbox.next"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/media_modal.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "{number, plural, one {# minute} other {# minutes}}",
-        "id": "intervals.full.minutes"
-      },
-      {
-        "defaultMessage": "{number, plural, one {# hour} other {# hours}}",
-        "id": "intervals.full.hours"
-      },
-      {
-        "defaultMessage": "{number, plural, one {# day} other {# days}}",
-        "id": "intervals.full.days"
-      },
-      {
-        "defaultMessage": "Indefinite",
-        "id": "mute_modal.indefinite"
-      },
-      {
-        "defaultMessage": "Are you sure you want to mute {name}?",
-        "id": "confirmations.mute.message"
-      },
-      {
-        "defaultMessage": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
-        "id": "confirmations.mute.explanation"
-      },
-      {
-        "defaultMessage": "Hide notifications from this user?",
-        "id": "mute_modal.hide_notifications"
-      },
-      {
-        "defaultMessage": "Duration",
-        "id": "mute_modal.duration"
-      },
-      {
-        "defaultMessage": "Cancel",
-        "id": "confirmation_modal.cancel"
-      },
-      {
-        "defaultMessage": "Mute",
-        "id": "confirmations.mute.confirm"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/mute_modal.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Home",
-        "id": "tabs_bar.home"
-      },
-      {
-        "defaultMessage": "Notifications",
-        "id": "tabs_bar.notifications"
-      },
-      {
-        "defaultMessage": "Explore",
-        "id": "explore.title"
-      },
-      {
-        "defaultMessage": "Local",
-        "id": "tabs_bar.local_timeline"
-      },
-      {
-        "defaultMessage": "Federated",
-        "id": "tabs_bar.federated_timeline"
-      },
-      {
-        "defaultMessage": "Private mentions",
-        "id": "navigation_bar.direct"
-      },
-      {
-        "defaultMessage": "Favourites",
-        "id": "navigation_bar.favourites"
-      },
-      {
-        "defaultMessage": "Bookmarks",
-        "id": "navigation_bar.bookmarks"
-      },
-      {
-        "defaultMessage": "Lists",
-        "id": "navigation_bar.lists"
-      },
-      {
-        "defaultMessage": "Preferences",
-        "id": "navigation_bar.preferences"
-      },
-      {
-        "defaultMessage": "Follows and followers",
-        "id": "navigation_bar.follows_and_followers"
-      },
-      {
-        "defaultMessage": "About",
-        "id": "navigation_bar.about"
-      },
-      {
-        "defaultMessage": "Search",
-        "id": "navigation_bar.search"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/navigation_panel.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Close",
-        "id": "lightbox.close"
-      },
-      {
-        "defaultMessage": "Report {target}",
-        "id": "report.target"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/report_modal.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Create account",
-        "id": "sign_in_banner.create_account"
-      },
-      {
-        "defaultMessage": "Login to follow profiles or hashtags, favourite, share and reply to posts. You can also interact from your account on a different server.",
-        "id": "sign_in_banner.text"
-      },
-      {
-        "defaultMessage": "Login",
-        "id": "sign_in_banner.sign_in"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/sign_in_banner.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Drag & drop to upload",
-        "id": "upload_area.title"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/upload_area.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Compress image view box",
-        "id": "lightbox.compress"
-      },
-      {
-        "defaultMessage": "Expand image view box",
-        "id": "lightbox.expand"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/zoomable_image.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Your draft will be lost if you leave Mastodon.",
-        "id": "ui.beforeunload"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Play",
-        "id": "video.play"
-      },
-      {
-        "defaultMessage": "Pause",
-        "id": "video.pause"
-      },
-      {
-        "defaultMessage": "Mute sound",
-        "id": "video.mute"
-      },
-      {
-        "defaultMessage": "Unmute sound",
-        "id": "video.unmute"
-      },
-      {
-        "defaultMessage": "Hide video",
-        "id": "video.hide"
-      },
-      {
-        "defaultMessage": "Expand video",
-        "id": "video.expand"
-      },
-      {
-        "defaultMessage": "Close video",
-        "id": "video.close"
-      },
-      {
-        "defaultMessage": "Full screen",
-        "id": "video.fullscreen"
-      },
-      {
-        "defaultMessage": "Exit full screen",
-        "id": "video.exit_fullscreen"
-      },
-      {
-        "defaultMessage": "Sensitive content",
-        "id": "status.sensitive_warning"
-      },
-      {
-        "defaultMessage": "Media hidden",
-        "id": "status.media_hidden"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/video/index.json"
-  },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "That username is taken. Try another",
-        "id": "username.taken"
-      },
-      {
-        "defaultMessage": "Password confirmation exceeds the maximum password length",
-        "id": "password_confirmation.exceeds_maxlength"
-      },
-      {
-        "defaultMessage": "Password confirmation does not match",
-        "id": "password_confirmation.mismatching"
-      }
-    ],
-    "path": "app/javascript/packs/public.json"
-  }
-]
\ No newline at end of file
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index c6b89ad4d..9fb610b18 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -17,9 +17,10 @@
   "account.badges.group": "Group",
   "account.block": "Block @{name}",
   "account.block_domain": "Block domain {domain}",
+  "account.block_short": "Block",
   "account.blocked": "Blocked",
   "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Withdraw follow request",
+  "account.cancel_follow_request": "Cancel follow",
   "account.direct": "Privately mention @{name}",
   "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocked": "Domain blocked",
@@ -48,7 +49,8 @@
   "account.mention": "Mention @{name}",
   "account.moved_to": "{name} has indicated that their new account is now:",
   "account.mute": "Mute @{name}",
-  "account.mute_notifications": "Mute notifications from @{name}",
+  "account.mute_notifications_short": "Mute notifications",
+  "account.mute_short": "Mute",
   "account.muted": "Muted",
   "account.open_original_page": "Open original page",
   "account.posts": "Posts",
@@ -65,7 +67,7 @@
   "account.unendorse": "Don't feature on profile",
   "account.unfollow": "Unfollow",
   "account.unmute": "Unmute @{name}",
-  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute_notifications_short": "Unmute notifications",
   "account.unmute_short": "Unmute",
   "account_note.placeholder": "Click to add note",
   "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
@@ -73,6 +75,10 @@
   "admin.dashboard.retention.average": "Average",
   "admin.dashboard.retention.cohort": "Sign-up month",
   "admin.dashboard.retention.cohort_size": "New users",
+  "admin.impact_report.instance_accounts": "Accounts profiles this would delete",
+  "admin.impact_report.instance_followers": "Followers our users would lose",
+  "admin.impact_report.instance_follows": "Followers their users would lose",
+  "admin.impact_report.title": "Impact summary",
   "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
   "alert.rate_limited.title": "Rate limited",
   "alert.unexpected.message": "An unexpected error occurred.",
@@ -352,6 +358,7 @@
   "lists.delete": "Delete list",
   "lists.edit": "Edit list",
   "lists.edit.submit": "Change title",
+  "lists.exclusive": "Hide these posts from home",
   "lists.new.create": "Add list",
   "lists.new.title_placeholder": "New list title",
   "lists.replies_policy.followed": "Any followed user",
@@ -458,8 +465,8 @@
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
   "onboarding.start.skip": "Want to skip right ahead?",
   "onboarding.start.title": "You've made it!",
-  "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
-  "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
+  "onboarding.steps.follow_people.body": "You curate your own home feed. Let's fill it with interesting people.",
+  "onboarding.steps.follow_people.title": "Find at least {count, plural, one {one person} other {# people}} to follow",
   "onboarding.steps.publish_status.body": "Say hello to the world.",
   "onboarding.steps.publish_status.title": "Make your first post",
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
@@ -527,6 +534,8 @@
   "report.placeholder": "Additional comments",
   "report.reasons.dislike": "I don't like it",
   "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.legal": "It's illegal",
+  "report.reasons.legal_description": "You believe it violates the law of your or the server's country",
   "report.reasons.other": "It's something else",
   "report.reasons.other_description": "The issue does not fit into other categories",
   "report.reasons.spam": "It's spam",
diff --git a/app/javascript/mastodon/locales/global_locale.ts b/app/javascript/mastodon/locales/global_locale.ts
new file mode 100644
index 000000000..01133ca23
--- /dev/null
+++ b/app/javascript/mastodon/locales/global_locale.ts
@@ -0,0 +1,22 @@
+export interface LocaleData {
+  locale: string;
+  messages: Record<string, string>;
+}
+
+let loadedLocale: LocaleData;
+
+export function setLocale(locale: LocaleData) {
+  loadedLocale = locale;
+}
+
+export function getLocale() {
+  if (!loadedLocale && process.env.NODE_ENV === 'development') {
+    throw new Error('getLocale() called before any locale has been set');
+  }
+
+  return loadedLocale;
+}
+
+export function isLocaleLoaded() {
+  return !!loadedLocale;
+}
diff --git a/app/javascript/mastodon/locales/index.js b/app/javascript/mastodon/locales/index.js
deleted file mode 100644
index 7e7297561..000000000
--- a/app/javascript/mastodon/locales/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from 'locales';
diff --git a/app/javascript/mastodon/locales/index.ts b/app/javascript/mastodon/locales/index.ts
new file mode 100644
index 000000000..63f45c304
--- /dev/null
+++ b/app/javascript/mastodon/locales/index.ts
@@ -0,0 +1,5 @@
+export type { LocaleData } from './global_locale';
+export { setLocale, getLocale, isLocaleLoaded } from './global_locale';
+export { loadLocale } from './load_locale';
+
+export { IntlProvider } from './intl_provider';
diff --git a/app/javascript/mastodon/locales/intl_provider.tsx b/app/javascript/mastodon/locales/intl_provider.tsx
new file mode 100644
index 000000000..4fa8b2247
--- /dev/null
+++ b/app/javascript/mastodon/locales/intl_provider.tsx
@@ -0,0 +1,57 @@
+import { useEffect, useState } from 'react';
+
+import { IntlProvider as BaseIntlProvider } from 'react-intl';
+
+import { getLocale, isLocaleLoaded } from './global_locale';
+import { loadLocale } from './load_locale';
+
+function onProviderError(error: unknown) {
+  // Silent the error, like upstream does
+  if (process.env.NODE_ENV === 'production') return;
+
+  // This browser does not advertise Intl support for this locale, we only print a warning
+  // As-per the spec, the browser should select the best matching locale
+  if (
+    error &&
+    typeof error === 'object' &&
+    error instanceof Error &&
+    error.message.match('MISSING_DATA')
+  ) {
+    console.warn(error.message);
+  }
+
+  console.error(error);
+}
+
+export const IntlProvider: React.FC<
+  Omit<React.ComponentProps<typeof BaseIntlProvider>, 'locale' | 'messages'>
+> = ({ children, ...props }) => {
+  const [localeLoaded, setLocaleLoaded] = useState(false);
+
+  useEffect(() => {
+    async function loadLocaleData() {
+      if (!isLocaleLoaded()) {
+        await loadLocale();
+      }
+
+      setLocaleLoaded(true);
+    }
+    void loadLocaleData();
+  }, []);
+
+  if (!localeLoaded) return null;
+
+  const { locale, messages } = getLocale();
+
+  return (
+    <BaseIntlProvider
+      locale={locale}
+      messages={messages}
+      onError={onProviderError}
+      textComponent='span'
+      {...props}
+    >
+      {children}
+    </BaseIntlProvider>
+  );
+};
diff --git a/app/javascript/mastodon/locales/load_locale.ts b/app/javascript/mastodon/locales/load_locale.ts
new file mode 100644
index 000000000..3cf95dd07
--- /dev/null
+++ b/app/javascript/mastodon/locales/load_locale.ts
@@ -0,0 +1,29 @@
+import { Semaphore } from 'async-mutex';
+
+import type { LocaleData } from './global_locale';
+import { isLocaleLoaded, setLocale } from './global_locale';
+
+const localeLoadingSemaphore = new Semaphore(1);
+
+export async function loadLocale() {
+  const locale = document.querySelector<HTMLElement>('html')?.lang || 'en';
+
+  // We use a Semaphore here so only one thing can try to load the locales at
+  // the same time. If one tries to do it while its in progress, it will wait
+  // for the initial load to finish before it is resumed (and will see that locale
+  // data is already loaded)
+  await localeLoadingSemaphore.runExclusive(async () => {
+    // if the locale is already set, then do nothing
+    if (isLocaleLoaded()) return;
+
+    const localeData = (await import(
+      /* webpackMode: "lazy" */
+      /* webpackChunkName: "locales/vanilla/[request]" */
+      /* webpackInclude: /\.json$/ */
+      /* webpackPreload: true */
+      `mastodon/locales/${locale}.json`
+    )) as LocaleData['messages'];
+
+    setLocale({ messages: localeData, locale });
+  });
+}
diff --git a/app/javascript/mastodon/locales/locale-data/README.md b/app/javascript/mastodon/locales/locale-data/README.md
deleted file mode 100644
index 83368fae7..000000000
--- a/app/javascript/mastodon/locales/locale-data/README.md
+++ /dev/null
@@ -1,221 +0,0 @@
-# Custom Locale Data
-
-This folder is used to store custom locale data. These custom locale data are
-not yet provided by [Unicode Common Locale Data Repository](http://cldr.unicode.org/development/new-cldr-developers)
-and hence not provided in [react-intl/locale-data/*](https://github.com/yahoo/react-intl).
-
-The locale data should support [Locale Data APIs](https://github.com/yahoo/react-intl/wiki/API#locale-data-apis)
-of the react-intl library.
-
-It is recommended to start your custom locale data from this sample English
-locale data ([*](#plural-rules)):
-
-```javascript
-/*eslint eqeqeq: "off"*/
-/*eslint no-nested-ternary: "off"*/
-
-export default [
-  {
-    locale: "en",
-    pluralRuleFunction: function(e, a) {
-      var n = String(e).split("."),
-        l = !n[1],
-        o = Number(n[0]) == e,
-        t = o && n[0].slice(-1),
-        r = o && n[0].slice(-2);
-      return a ? 1 == t && 11 != r ? "one" : 2 == t && 12 != r ? "two" : 3 == t && 13 != r ? "few" : "other" : 1 == e && l ? "one" : "other"
-    },
-    fields: {
-      year: {
-        displayName: "year",
-        relative: {
-          0: "this year",
-          1: "next year",
-          "-1": "last year"
-        },
-        relativeTime: {
-          future: {
-            one: "in {0} year",
-            other: "in {0} years"
-          },
-          past: {
-            one: "{0} year ago",
-            other: "{0} years ago"
-          }
-        }
-      },
-      month: {
-        displayName: "month",
-        relative: {
-          0: "this month",
-          1: "next month",
-          "-1": "last month"
-        },
-        relativeTime: {
-          future: {
-            one: "in {0} month",
-            other: "in {0} months"
-          },
-          past: {
-            one: "{0} month ago",
-            other: "{0} months ago"
-          }
-        }
-      },
-      day: {
-        displayName: "day",
-        relative: {
-          0: "today",
-          1: "tomorrow",
-          "-1": "yesterday"
-        },
-        relativeTime: {
-          future: {
-            one: "in {0} day",
-            other: "in {0} days"
-          },
-          past: {
-            one: "{0} day ago",
-            other: "{0} days ago"
-          }
-        }
-      },
-      hour: {
-        displayName: "hour",
-        relativeTime: {
-          future: {
-            one: "in {0} hour",
-            other: "in {0} hours"
-          },
-          past: {
-            one: "{0} hour ago",
-            other: "{0} hours ago"
-          }
-        }
-      },
-      minute: {
-        displayName: "minute",
-        relativeTime: {
-          future: {
-            one: "in {0} minute",
-            other: "in {0} minutes"
-          },
-          past: {
-            one: "{0} minute ago",
-            other: "{0} minutes ago"
-          }
-        }
-      },
-      second: {
-        displayName: "second",
-        relative: {
-          0: "now"
-        },
-        relativeTime: {
-          future: {
-            one: "in {0} second",
-            other: "in {0} seconds"
-          },
-          past: {
-            one: "{0} second ago",
-            other: "{0} seconds ago"
-          }
-        }
-      }
-    }
-  }
-]
-
-```
-
-## Notes
-
-### Plural Rules
-
-The function `pluralRuleFunction()` should return the key to proper string of
-a plural form(s). The purpose of the function is to provide key of translate
-strings of correct plural form according. The different forms are described in
-[CLDR's Plural Rules][cldr-plural-rules],
-
-[cldr-plural-rules]: http://cldr.unicode.org/index/cldr-spec/plural-rules
-
-#### Quick Overview on CLDR Rules
-
-Let's take English as an example.
-
-When you describe a number, you can be either describe it as:
-* Cardinals: 1st, 2nd, 3rd ... 11th, 12th ... 21st, 22nd, 23nd ....
-* Ordinals: 1, 2, 3 ...
-
-In any of these cases, the nouns will reflect the number with singular or plural
-form. For example:
-* in 0 days
-* in 1 day
-* in 2 days
-
-The `pluralRuleFunction` receives 2 parameters:
-* `e`: a string representation of the number. Such as, "`1`", "`2`", "`2.1`".
-* `a`: `true` if this is "cardinal" type of description. `false` for ordinal and other case.
-
-#### How you should write `pluralRuleFunction`
-
-The first rule to write pluralRuleFunction is never translate the output string
-into your language. [Plural Rules][cldr-plural-rules] specified you should use
-these as the return values:
-
-  * "`zero`"
-  * "`one`" (singular)
-  * "`two`" (dual)
-  * "`few`" (paucal)
-  * "`many`" (also used for fractions if they have a separate class)
-  * "`other`" (required—general plural form—also used if the language only has a single form)
-
-Again, we'll use English as the example here.
-
-Let's read the `return` statement in the pluralRuleFunction above:
-```javascript
-  return a ? 1 == t && 11 != r ? "one" : 2 == t && 12 != r ? "two" : 3 == t && 13 != r ? "few" : "other" : 1 == e && l ? "one" : "other"
-```
-
-This nested ternary is hard to read. It basically means:
-```javascript
-// e: the number variable to examine
-// a: "true" if cardinals
-// l: "true" if the variable e has nothin after decimal mark (e.g. "1.0" would be false)
-// o: "true" if the variable e is an integer
-// t: the "ones" of the number. e.g. "3" for number "9123"
-// r: the "ones" and "tens" of the number. e.g. "23" for number "9123"
-if (a == true) {
-  if (t == 1 && r != 11) {
-    return "one"; // i.e. 1st, 21st, 101st, 121st ...
-  } else if (t == 2 && r != 12) {
-    return "two"; // i.e. 2nd, 22nd, 102nd, 122nd ...
-  } else if (t == 3 && r != 13) {
-    return "few"; // i.e. 3rd, 23rd, 103rd, 123rd ...
-  } else {
-    return "other"; // i.e. 4th, 11th, 12th, 24th ...
-  }
-} else {
-  if (e == 1 && l) {
-    return "one"; // i.e. 1 day
-  } else {
-    return "other"; // i.e. 0 days, 2 days, 3 days
-  }
-}
-```
-
-If your language, like French, do not have complicated cardinal rules, you may
-use the French's version of it:
-```javascript
-function (e, a) {
-  return a ? 1 == e ? "one" : "other" : e >= 0 && e < 2 ? "one" : "other";
-}
-```
-
-If your language, like Chinese, do not have any pluralization rule at all you
-may use the Chinese's version of it:
-```javascript
-function (e, a) {
-  return "other";
-}
-```
diff --git a/app/javascript/mastodon/locales/locale-data/co.js b/app/javascript/mastodon/locales/locale-data/co.js
deleted file mode 100644
index dff8a54da..000000000
--- a/app/javascript/mastodon/locales/locale-data/co.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/*eslint eqeqeq: "off"*/
-/*eslint no-nested-ternary: "off"*/
-/*eslint quotes: "off"*/
-
-const rules = [{
-  locale: "co",
-  pluralRuleFunction: function (e, a) {
-    return a ? 1 == e ? "one" : "other" : e >= 0 && e < 2 ? "one" : "other";
-  },
-  fields: {
-    year: {
-      displayName: "annu",
-      relative: {
-        0: "quist'annu",
-        1: "l'annu chì vene",
-        "-1": "l'annu passatu",
-      },
-      relativeTime: {
-        future: {
-          one: "in {0} annu",
-          other: "in {0} anni",
-        },
-        past: {
-          one: "{0} annu fà",
-          other: "{0} anni fà",
-        },
-      },
-    },
-    month: {
-      displayName: "mese",
-      relative: {
-        0: "Questu mese",
-        1: "u mese chì vene",
-        "-1": "u mese passatu",
-      },
-      relativeTime: {
-        future: {
-          one: "in {0} mese",
-          other: "in {0} mesi",
-        },
-        past: {
-          one: "{0} mese fà",
-          other: "{0} mesi fà",
-        },
-      },
-    },
-    day: {
-      displayName: "ghjornu",
-      relative: {
-        0: "oghje",
-        1: "dumane",
-        "-1": "eri",
-      },
-      relativeTime: {
-        future: {
-          one: "in {0} ghjornu",
-          other: "in {0} ghjornu",
-        },
-        past: {
-          one: "{0} ghjornu fà",
-          other: "{0} ghjorni fà",
-        },
-      },
-    },
-    hour: {
-      displayName: "ora",
-      relativeTime: {
-        future: {
-          one: "in {0} ora",
-          other: "in {0} ore",
-        },
-        past: {
-          one: "{0} ora fà",
-          other: "{0} ore fà",
-        },
-      },
-    },
-    minute: {
-      displayName: "minuta",
-      relativeTime: {
-        future: {
-          one: "in {0} minuta",
-          other: "in {0} minute",
-        },
-        past: {
-          one: "{0} minuta fà",
-          other: "{0} minute fà",
-        },
-      },
-    },
-    second: {
-      displayName: "siconda",
-      relative: {
-        0: "avà",
-      },
-      relativeTime: {
-        future: {
-          one: "in {0} siconda",
-          other: "in {0} siconde",
-        },
-        past: {
-          one: "{0} siconda fà",
-          other: "{0} siconde fà",
-        },
-      },
-    },
-  },
-}];
-
-export default rules;
diff --git a/app/javascript/mastodon/locales/locale-data/oc.js b/app/javascript/mastodon/locales/locale-data/oc.js
deleted file mode 100644
index 6ab306b8c..000000000
--- a/app/javascript/mastodon/locales/locale-data/oc.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/*eslint eqeqeq: "off"*/
-/*eslint no-nested-ternary: "off"*/
-/*eslint quotes: "off"*/
-
-const rules = [{
-  locale: "oc",
-  pluralRuleFunction: function (e, a) {
-    return a ? 1 == e ? "one" : "other" : e >= 0 && e < 2 ? "one" : "other";
-  },
-  fields: {
-    year: {
-      displayName: "an",
-      relative: {
-        0: "ongan",
-        1: "l'an que ven",
-        "-1": "l'an passat",
-      },
-      relativeTime: {
-        future: {
-          one: "d’aquí {0} an",
-          other: "d’aquí {0} ans",
-        },
-        past: {
-          one: "fa {0} an",
-          other: "fa {0} ans",
-        },
-      },
-    },
-    month: {
-      displayName: "mes",
-      relative: {
-        0: "aqueste mes",
-        1: "lo mes que ven",
-        "-1": "lo mes passat",
-      },
-      relativeTime: {
-        future: {
-          one: "d’aquí {0} mes",
-          other: "d’aquí {0} meses",
-        },
-        past: {
-          one: "fa {0} mes",
-          other: "fa {0} meses",
-        },
-      },
-    },
-    day: {
-      displayName: "jorn",
-      relative: {
-        0: "uèi",
-        1: "deman",
-        "-1": "ièr",
-      },
-      relativeTime: {
-        future: {
-          one: "d’aquí {0} jorn",
-          other: "d’aquí {0} jorns",
-        },
-        past: {
-          one: "fa {0} jorn",
-          other: "fa {0} jorns",
-        },
-      },
-    },
-    hour: {
-      displayName: "ora",
-      relativeTime: {
-        future: {
-          one: "d’aquí {0} ora",
-          other: "d’aquí {0} oras",
-        },
-        past: {
-          one: "fa {0} ora",
-          other: "fa {0} oras",
-        },
-      },
-    },
-    minute: {
-      displayName: "minuta",
-      relativeTime: {
-        future: {
-          one: "d’aquí {0} minuta",
-          other: "d’aquí {0} minutas",
-        },
-        past: {
-          one: "fa {0} minuta",
-          other: "fa {0} minutas",
-        },
-      },
-    },
-    second: {
-      displayName: "segonda",
-      relative: {
-        0: "ara",
-      },
-      relativeTime: {
-        future: {
-          one: "d’aquí {0} segonda",
-          other: "d’aquí {0} segondas",
-        },
-        past: {
-          one: "fa {0} segonda",
-          other: "fa {0} segondas",
-        },
-      },
-    },
-  },
-}];
-
-export default rules;
diff --git a/app/javascript/mastodon/locales/locale-data/sa.js b/app/javascript/mastodon/locales/locale-data/sa.js
deleted file mode 100644
index 65e09e97f..000000000
--- a/app/javascript/mastodon/locales/locale-data/sa.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/*eslint eqeqeq: "off"*/
-/*eslint no-nested-ternary: "off"*/
-/*eslint quotes: "off"*/
-/*eslint comma-dangle: "off"*/
-
-const rules = [
-  {
-    locale: "sa",
-    fields: {
-      year: {
-        displayName: "year",
-        relative: {
-          0: "this year",
-          1: "next year",
-          "-1": "last year"
-        },
-        relativeTime: {
-          future: {
-            other: "+{0} y"
-          },
-          past: {
-            other: "-{0} y"
-          }
-        }
-      },
-      month: {
-        displayName: "month",
-        relative: {
-          0: "this month",
-          1: "next month",
-          "-1": "last month"
-        },
-        relativeTime: {
-          future: {
-            other: "+{0} m"
-          },
-          past: {
-            other: "-{0} m"
-          }
-        }
-      },
-      day: {
-        displayName: "day",
-        relative: {
-          0: "अद्य",
-          1: "श्वः",
-          "-1": "गतदिनम्"
-        },
-        relativeTime: {
-          future: {
-            other: "+{0} d"
-          },
-          past: {
-            other: "-{0} d"
-          }
-        }
-      },
-      hour: {
-        displayName: "hour",
-        relativeTime: {
-          future: {
-            other: "+{0} h"
-          },
-          past: {
-            other: "-{0} h"
-          }
-        }
-      },
-      minute: {
-        displayName: "minute",
-        relativeTime: {
-          future: {
-            other: "+{0} min"
-          },
-          past: {
-            other: "-{0} min"
-          }
-        }
-      },
-      second: {
-        displayName: "second",
-        relative: {
-          0: "now"
-        },
-        relativeTime: {
-          future: {
-            other: "+{0} s"
-          },
-          past: {
-            other: "-{0} s"
-          }
-        }
-      }
-    }
-  }
-];
-
-export default rules;
diff --git a/app/javascript/mastodon/locales/whitelist_af.json b/app/javascript/mastodon/locales/whitelist_af.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_af.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_an.json b/app/javascript/mastodon/locales/whitelist_an.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_an.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_ar.json b/app/javascript/mastodon/locales/whitelist_ar.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_ar.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_ast.json b/app/javascript/mastodon/locales/whitelist_ast.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_ast.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_be.json b/app/javascript/mastodon/locales/whitelist_be.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_be.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_bg.json b/app/javascript/mastodon/locales/whitelist_bg.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_bg.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_bn.json b/app/javascript/mastodon/locales/whitelist_bn.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_bn.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_br.json b/app/javascript/mastodon/locales/whitelist_br.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_br.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_bs.json b/app/javascript/mastodon/locales/whitelist_bs.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_bs.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_ca.json b/app/javascript/mastodon/locales/whitelist_ca.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_ca.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_ckb.json b/app/javascript/mastodon/locales/whitelist_ckb.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_ckb.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_co.json b/app/javascript/mastodon/locales/whitelist_co.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_co.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_cs.json b/app/javascript/mastodon/locales/whitelist_cs.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_cs.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_csb.json b/app/javascript/mastodon/locales/whitelist_csb.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_csb.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_cy.json b/app/javascript/mastodon/locales/whitelist_cy.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_cy.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_da.json b/app/javascript/mastodon/locales/whitelist_da.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_da.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_de.json b/app/javascript/mastodon/locales/whitelist_de.json
deleted file mode 100644
index c311ad048..000000000
--- a/app/javascript/mastodon/locales/whitelist_de.json
+++ /dev/null
@@ -1,5 +0,0 @@
-[
-  "account.badges.bot",
-  "compose_form.publish_loud",
-  "search_results.hashtags"
-]
diff --git a/app/javascript/mastodon/locales/whitelist_el.json b/app/javascript/mastodon/locales/whitelist_el.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_el.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_en-GB.json b/app/javascript/mastodon/locales/whitelist_en-GB.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_en-GB.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_en.json b/app/javascript/mastodon/locales/whitelist_en.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_en.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_eo.json b/app/javascript/mastodon/locales/whitelist_eo.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_eo.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_es-AR.json b/app/javascript/mastodon/locales/whitelist_es-AR.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_es-AR.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_es-MX.json b/app/javascript/mastodon/locales/whitelist_es-MX.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_es-MX.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_es.json b/app/javascript/mastodon/locales/whitelist_es.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_es.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_et.json b/app/javascript/mastodon/locales/whitelist_et.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_et.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_eu.json b/app/javascript/mastodon/locales/whitelist_eu.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_eu.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_fa.json b/app/javascript/mastodon/locales/whitelist_fa.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_fa.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_fi.json b/app/javascript/mastodon/locales/whitelist_fi.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_fi.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_fo.json b/app/javascript/mastodon/locales/whitelist_fo.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_fo.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_fr-QC.json b/app/javascript/mastodon/locales/whitelist_fr-QC.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_fr-QC.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_fr.json b/app/javascript/mastodon/locales/whitelist_fr.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_fr.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_fy.json b/app/javascript/mastodon/locales/whitelist_fy.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_fy.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_ga.json b/app/javascript/mastodon/locales/whitelist_ga.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_ga.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_gd.json b/app/javascript/mastodon/locales/whitelist_gd.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_gd.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_gl.json b/app/javascript/mastodon/locales/whitelist_gl.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_gl.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_he.json b/app/javascript/mastodon/locales/whitelist_he.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_he.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_hi.json b/app/javascript/mastodon/locales/whitelist_hi.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_hi.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_hr.json b/app/javascript/mastodon/locales/whitelist_hr.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_hr.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_hu.json b/app/javascript/mastodon/locales/whitelist_hu.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_hu.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_hy.json b/app/javascript/mastodon/locales/whitelist_hy.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_hy.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_id.json b/app/javascript/mastodon/locales/whitelist_id.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_id.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_ig.json b/app/javascript/mastodon/locales/whitelist_ig.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_ig.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_io.json b/app/javascript/mastodon/locales/whitelist_io.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_io.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_is.json b/app/javascript/mastodon/locales/whitelist_is.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_is.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_it.json b/app/javascript/mastodon/locales/whitelist_it.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_it.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_ja.json b/app/javascript/mastodon/locales/whitelist_ja.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_ja.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_ka.json b/app/javascript/mastodon/locales/whitelist_ka.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_ka.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_kab.json b/app/javascript/mastodon/locales/whitelist_kab.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_kab.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_kk.json b/app/javascript/mastodon/locales/whitelist_kk.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_kk.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_kn.json b/app/javascript/mastodon/locales/whitelist_kn.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_kn.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_ko.json b/app/javascript/mastodon/locales/whitelist_ko.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_ko.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_ku.json b/app/javascript/mastodon/locales/whitelist_ku.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_ku.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_kw.json b/app/javascript/mastodon/locales/whitelist_kw.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_kw.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_la.json b/app/javascript/mastodon/locales/whitelist_la.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_la.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_lt.json b/app/javascript/mastodon/locales/whitelist_lt.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_lt.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_lv.json b/app/javascript/mastodon/locales/whitelist_lv.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_lv.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_mk.json b/app/javascript/mastodon/locales/whitelist_mk.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_mk.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_ml.json b/app/javascript/mastodon/locales/whitelist_ml.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_ml.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_mr.json b/app/javascript/mastodon/locales/whitelist_mr.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_mr.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_ms.json b/app/javascript/mastodon/locales/whitelist_ms.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_ms.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_my.json b/app/javascript/mastodon/locales/whitelist_my.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_my.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_nl.json b/app/javascript/mastodon/locales/whitelist_nl.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_nl.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_nn.json b/app/javascript/mastodon/locales/whitelist_nn.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_nn.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_no.json b/app/javascript/mastodon/locales/whitelist_no.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_no.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_oc.json b/app/javascript/mastodon/locales/whitelist_oc.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_oc.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_pa.json b/app/javascript/mastodon/locales/whitelist_pa.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_pa.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_pl.json b/app/javascript/mastodon/locales/whitelist_pl.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_pl.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_pt-BR.json b/app/javascript/mastodon/locales/whitelist_pt-BR.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_pt-BR.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_pt-PT.json b/app/javascript/mastodon/locales/whitelist_pt-PT.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_pt-PT.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_ro.json b/app/javascript/mastodon/locales/whitelist_ro.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_ro.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_ru.json b/app/javascript/mastodon/locales/whitelist_ru.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_ru.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_sa.json b/app/javascript/mastodon/locales/whitelist_sa.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_sa.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_sc.json b/app/javascript/mastodon/locales/whitelist_sc.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_sc.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_sco.json b/app/javascript/mastodon/locales/whitelist_sco.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_sco.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_si.json b/app/javascript/mastodon/locales/whitelist_si.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_si.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_sk.json b/app/javascript/mastodon/locales/whitelist_sk.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_sk.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_sl.json b/app/javascript/mastodon/locales/whitelist_sl.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_sl.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_sq.json b/app/javascript/mastodon/locales/whitelist_sq.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_sq.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_sr-Latn.json b/app/javascript/mastodon/locales/whitelist_sr-Latn.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_sr-Latn.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_sr.json b/app/javascript/mastodon/locales/whitelist_sr.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_sr.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_sv.json b/app/javascript/mastodon/locales/whitelist_sv.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_sv.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_szl.json b/app/javascript/mastodon/locales/whitelist_szl.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_szl.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_ta.json b/app/javascript/mastodon/locales/whitelist_ta.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_ta.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_tai.json b/app/javascript/mastodon/locales/whitelist_tai.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_tai.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_te.json b/app/javascript/mastodon/locales/whitelist_te.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_te.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_th.json b/app/javascript/mastodon/locales/whitelist_th.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_th.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_tr.json b/app/javascript/mastodon/locales/whitelist_tr.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_tr.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_tt.json b/app/javascript/mastodon/locales/whitelist_tt.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_tt.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_ug.json b/app/javascript/mastodon/locales/whitelist_ug.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_ug.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_uk.json b/app/javascript/mastodon/locales/whitelist_uk.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_uk.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_ur.json b/app/javascript/mastodon/locales/whitelist_ur.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_ur.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_uz.json b/app/javascript/mastodon/locales/whitelist_uz.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_uz.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_vi.json b/app/javascript/mastodon/locales/whitelist_vi.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_vi.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_zgh.json b/app/javascript/mastodon/locales/whitelist_zgh.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_zgh.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_zh-CN.json b/app/javascript/mastodon/locales/whitelist_zh-CN.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_zh-CN.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_zh-HK.json b/app/javascript/mastodon/locales/whitelist_zh-HK.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_zh-HK.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/locales/whitelist_zh-TW.json b/app/javascript/mastodon/locales/whitelist_zh-TW.json
deleted file mode 100644
index 0d4f101c7..000000000
--- a/app/javascript/mastodon/locales/whitelist_zh-TW.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/app/javascript/mastodon/polyfills/base_polyfills.ts b/app/javascript/mastodon/polyfills/base_polyfills.ts
index e008d8f02..3cde1b1ed 100644
--- a/app/javascript/mastodon/polyfills/base_polyfills.ts
+++ b/app/javascript/mastodon/polyfills/base_polyfills.ts
@@ -1,5 +1,3 @@
-import 'intl';
-import 'intl/locale-data/jsonp/en';
 import 'core-js/features/object/assign';
 import 'core-js/features/object/values';
 import 'core-js/features/symbol';
diff --git a/app/javascript/mastodon/polyfills/index.ts b/app/javascript/mastodon/polyfills/index.ts
index 6d2e5426e..b2dbfdac0 100644
--- a/app/javascript/mastodon/polyfills/index.ts
+++ b/app/javascript/mastodon/polyfills/index.ts
@@ -2,6 +2,8 @@
 // If there are no polyfills, then this is just Promise.resolve() which means
 // it will execute in the same tick of the event loop (i.e. near-instant).
 
+import { loadIntlPolyfills } from './intl';
+
 function importBasePolyfills() {
   return import(/* webpackChunkName: "base_polyfills" */ './base_polyfills');
 }
@@ -13,7 +15,6 @@ function importExtraPolyfills() {
 export function loadPolyfills() {
   const needsBasePolyfills = !(
     'toBlob' in HTMLCanvasElement.prototype &&
-    'Intl' in window &&
     'assign' in Object &&
     'values' in Object &&
     'Symbol' in window &&
@@ -32,6 +33,7 @@ export function loadPolyfills() {
   );
 
   return Promise.all([
+    loadIntlPolyfills(),
     needsBasePolyfills && importBasePolyfills(),
     needsExtraPolyfills && importExtraPolyfills(),
   ]);
diff --git a/app/javascript/mastodon/polyfills/intl.ts b/app/javascript/mastodon/polyfills/intl.ts
new file mode 100644
index 000000000..4d5ee3ccf
--- /dev/null
+++ b/app/javascript/mastodon/polyfills/intl.ts
@@ -0,0 +1,105 @@
+// import { shouldPolyfill as shouldPolyfillCanonicalLocales } from '@formatjs/intl-getcanonicallocales/should-polyfill';
+// import { shouldPolyfill as shouldPolyfillLocale } from '@formatjs/intl-locale/should-polyfill';
+import { shouldPolyfill as shoudPolyfillPluralRules } from '@formatjs/intl-pluralrules/should-polyfill';
+// import { shouldPolyfill as shouldPolyfillNumberFormat } from '@formatjs/intl-numberformat/should-polyfill';
+// import { shouldPolyfill as shouldPolyfillIntlDateTimeFormat } from '@formatjs/intl-datetimeformat/should-polyfill';
+// import { shouldPolyfill as shouldPolyfillIntlRelativeTimeFormat } from '@formatjs/intl-relativetimeformat/should-polyfill';
+
+// async function loadGetCanonicalLocalesPolyfill() {
+//   // This platform already supports Intl.getCanonicalLocales
+//   if (shouldPolyfillCanonicalLocales()) {
+//     await import('@formatjs/intl-getcanonicallocales/polyfill');
+//   }
+// }
+
+// async function loadLocalePolyfill() {
+//   // This platform already supports Intl.Locale
+//   if (shouldPolyfillLocale()) {
+//     await import('@formatjs/intl-locale/polyfill');
+//   }
+// }
+
+// async function loadIntlNumberFormatPolyfill(locale: string) {
+//   const unsupportedLocale = shouldPolyfillNumberFormat(locale);
+//   // This locale is supported
+//   if (!unsupportedLocale) {
+//     return;
+//   }
+//   // Load the polyfill 1st BEFORE loading data
+//   await import('@formatjs/intl-numberformat/polyfill-force');
+//   await import(`@formatjs/intl-numberformat/locale-data/${unsupportedLocale}`);
+// }
+
+// async function loadIntlDateTimeFormatPolyfill(locale: string) {
+//   const unsupportedLocale = shouldPolyfillIntlDateTimeFormat(locale);
+//   // This locale is supported
+//   if (!unsupportedLocale) {
+//     return;
+//   }
+//   // Load the polyfill 1st BEFORE loading data
+//   await import('@formatjs/intl-datetimeformat/polyfill-force');
+
+//   // Parallelize CLDR data loading
+//   const dataPolyfills = [
+//     import('@formatjs/intl-datetimeformat/add-all-tz'),
+//     import(`@formatjs/intl-datetimeformat/locale-data/${unsupportedLocale}`),
+//   ];
+//   await Promise.all(dataPolyfills);
+// }
+
+async function loadIntlPluralRulesPolyfills(locale: string) {
+  const unsupportedLocale = shoudPolyfillPluralRules(locale);
+  // This locale is supported
+  if (!unsupportedLocale) {
+    return;
+  }
+  // Load the polyfill 1st BEFORE loading data
+  await import(
+    /* webpackChunkName: "i18n-pluralrules-polyfill" */ '@formatjs/intl-pluralrules/polyfill-force'
+  );
+  await import(
+    /* webpackChunkName: "i18n-pluralrules-polyfill-[request]" */ `@formatjs/intl-pluralrules/locale-data/${unsupportedLocale}`
+  );
+}
+
+// async function loadIntlRelativeTimeFormatPolyfill(locale: string) {
+//   const unsupportedLocale = shouldPolyfillIntlRelativeTimeFormat(locale);
+//   // This locale is supported
+//   if (!unsupportedLocale) {
+//     return;
+//   }
+//   // Load the polyfill 1st BEFORE loading data
+//   await import(
+//     /* webpackChunkName: "i18n-relativetimeformat-polyfill" */
+//     '@formatjs/intl-relativetimeformat/polyfill-force'
+//   );
+//   await import(
+//     /* webpackChunkName: "i18n-relativetimeformat-polyfill-[request]" */
+//     `@formatjs/intl-relativetimeformat/locale-data/${unsupportedLocale}`
+//   );
+// }
+
+export async function loadIntlPolyfills() {
+  const locale = document.querySelector('html')?.lang || 'en';
+
+  // order is important here
+
+  // Supported in IE11 and most other browsers, not useful
+  // await loadGetCanonicalLocalesPolyfill()
+
+  // Supported in IE11 and most other browsers, not useful
+  // await loadLocalePolyfill()
+
+  // Supported in IE11 and most other browsers, not useful
+  // await loadIntlNumberFormatPolyfill(locale)
+
+  // Supported in IE11 and most other browsers, not useful
+  // await loadIntlDateTimeFormatPolyfill(locale)
+
+  // Supported from Safari 13+, may still be useful
+  await loadIntlPluralRulesPolyfills(locale);
+
+  // This is not used yet in the codebase yet
+  // Supported from Safari 14+
+  // await loadIntlRelativeTimeFormatPolyfill(locale);
+}
diff --git a/app/javascript/mastodon/reducers/list_editor.js b/app/javascript/mastodon/reducers/list_editor.js
index ceceb27c7..d3fd62ade 100644
--- a/app/javascript/mastodon/reducers/list_editor.js
+++ b/app/javascript/mastodon/reducers/list_editor.js
@@ -25,6 +25,7 @@ const initialState = ImmutableMap({
   isSubmitting: false,
   isChanged: false,
   title: '',
+  isExclusive: false,
 
   accounts: ImmutableMap({
     items: ImmutableList(),
@@ -46,6 +47,7 @@ export default function listEditorReducer(state = initialState, action) {
     return state.withMutations(map => {
       map.set('listId', action.list.get('id'));
       map.set('title', action.list.get('title'));
+      map.set('isExclusive', action.list.get('is_exclusive'));
       map.set('isSubmitting', false);
     });
   case LIST_EDITOR_TITLE_CHANGE:
diff --git a/app/javascript/mastodon/reducers/polls.js b/app/javascript/mastodon/reducers/polls.js
index 901fdc449..5e8e775da 100644
--- a/app/javascript/mastodon/reducers/polls.js
+++ b/app/javascript/mastodon/reducers/polls.js
@@ -2,14 +2,43 @@ import { Map as ImmutableMap, fromJS } from 'immutable';
 
 import { POLLS_IMPORT } from 'mastodon/actions/importer';
 
+import { normalizePollOptionTranslation } from '../actions/importer/normalizer';
+import { STATUS_TRANSLATE_SUCCESS, STATUS_TRANSLATE_UNDO } from '../actions/statuses';
+
 const importPolls = (state, polls) => state.withMutations(map => polls.forEach(poll => map.set(poll.id, fromJS(poll))));
 
+const statusTranslateSuccess = (state, pollTranslation) => {
+  return state.withMutations(map => {
+    if (pollTranslation) {
+      const poll = state.get(pollTranslation.id);
+
+      pollTranslation.options.forEach((item, index) => {
+        map.setIn([pollTranslation.id, 'options', index, 'translation'], fromJS(normalizePollOptionTranslation(item, poll)));
+      });
+    }
+  });
+};
+
+const statusTranslateUndo = (state, id) => {
+  return state.withMutations(map => {
+    const options = map.getIn([id, 'options']);
+
+    if (options) {
+      options.forEach((item, index) => map.deleteIn([id, 'options', index, 'translation']));
+    }
+  });
+};
+
 const initialState = ImmutableMap();
 
 export default function polls(state = initialState, action) {
   switch(action.type) {
   case POLLS_IMPORT:
     return importPolls(state, action.polls);
+  case STATUS_TRANSLATE_SUCCESS:
+    return statusTranslateSuccess(state, action.translation.poll);
+  case STATUS_TRANSLATE_UNDO:
+    return statusTranslateUndo(state, action.pollId);
   default:
     return state;
   }
diff --git a/app/javascript/mastodon/reducers/statuses.js b/app/javascript/mastodon/reducers/statuses.js
index cf6f3e379..e983c7521 100644
--- a/app/javascript/mastodon/reducers/statuses.js
+++ b/app/javascript/mastodon/reducers/statuses.js
@@ -1,6 +1,7 @@
 import { Map as ImmutableMap, fromJS } from 'immutable';
 
 import { STATUS_IMPORT, STATUSES_IMPORT } from '../actions/importer';
+import { normalizeStatusTranslation } from '../actions/importer/normalizer';
 import {
   REBLOG_REQUEST,
   REBLOG_FAIL,
@@ -78,6 +79,27 @@ const removeReaction = (state, id, name) => updateReaction(
   x => x.set('me', false).update('count', n => n - 1),
 );
 
+const statusTranslateSuccess = (state, id, translation) => {
+  return state.withMutations(map => {
+    map.setIn([id, 'translation'], fromJS(normalizeStatusTranslation(translation, map.get(id))));
+
+    const list = map.getIn([id, 'media_attachments']);
+    if (translation.media_attachments && list) {
+      translation.media_attachments.forEach(item => {
+        const index = list.findIndex(i => i.get('id') === item.id);
+        map.setIn([id, 'media_attachments', index, 'translation'], fromJS({ description: item.description }));
+      });
+    }
+  });
+};
+
+const statusTranslateUndo = (state, id) => {
+  return state.withMutations(map => {
+    map.deleteIn([id, 'translation']);
+    map.getIn([id, 'media_attachments']).forEach((item, index) => map.deleteIn([id, 'media_attachments', index, 'translation']));
+  });
+};
+
 const initialState = ImmutableMap();
 
 export default function statuses(state = initialState, action) {
@@ -137,9 +159,9 @@ export default function statuses(state = initialState, action) {
   case TIMELINE_DELETE:
     return deleteStatus(state, action.id, action.references);
   case STATUS_TRANSLATE_SUCCESS:
-    return state.setIn([action.id, 'translation'], fromJS(action.translation));
+    return statusTranslateSuccess(state, action.id, action.translation);
   case STATUS_TRANSLATE_UNDO:
-    return state.deleteIn([action.id, 'translation']);
+    return statusTranslateUndo(state, action.id);
   default:
     return state;
   }
diff --git a/app/javascript/mastodon/service_worker/web_push_locales.js b/app/javascript/mastodon/service_worker/web_push_locales.js
index 3912f75c7..89ae20007 100644
--- a/app/javascript/mastodon/service_worker/web_push_locales.js
+++ b/app/javascript/mastodon/service_worker/web_push_locales.js
@@ -10,7 +10,7 @@ const filtered  = {};
 const filenames = fs.readdirSync(path.resolve(__dirname, '../locales'));
 
 filenames.forEach(filename => {
-  if (!filename.match(/\.json$/) || filename.match(/defaultMessages|whitelist/)) return;
+  if (!filename.match(/\.json$/)) return;
 
   const content = fs.readFileSync(path.resolve(__dirname, `../locales/${filename}`), 'utf-8');
   const full    = JSON.parse(content);
diff --git a/app/javascript/mastodon/service_worker/web_push_notifications.js b/app/javascript/mastodon/service_worker/web_push_notifications.js
index 54247e6f6..77187a59e 100644
--- a/app/javascript/mastodon/service_worker/web_push_notifications.js
+++ b/app/javascript/mastodon/service_worker/web_push_notifications.js
@@ -1,4 +1,4 @@
-import IntlMessageFormat from 'intl-messageformat';
+import { IntlMessageFormat } from 'intl-messageformat';
 
 import { unescape } from 'lodash';
 
diff --git a/app/javascript/packs/admin.jsx b/app/javascript/packs/admin.jsx
index 7dd6aef90..9ad84b70c 100644
--- a/app/javascript/packs/admin.jsx
+++ b/app/javascript/packs/admin.jsx
@@ -6,14 +6,14 @@ import ready from '../mastodon/ready';
 ready(() => {
   [].forEach.call(document.querySelectorAll('[data-admin-component]'), element => {
     const componentName  = element.getAttribute('data-admin-component');
-    const { locale, ...componentProps } = JSON.parse(element.getAttribute('data-props'));
+    const componentProps = JSON.parse(element.getAttribute('data-props'));
 
     import('../mastodon/containers/admin_component').then(({ default: AdminComponent }) => {
       return import('../mastodon/components/admin/' + componentName).then(({ default: Component }) => {
         const root = createRoot(element);
 
         root.render (
-          <AdminComponent locale={locale}>
+          <AdminComponent>
             <Component {...componentProps} />
           </AdminComponent>,
         );
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 29fd5cde9..f26321c41 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -1,13 +1,15 @@
 import './public-path';
+import main from "mastodon/main"
+
 import { start } from '../mastodon/common';
+import { loadLocale } from '../mastodon/locales';
 import { loadPolyfills } from '../mastodon/polyfills';
 
 start();
 
-loadPolyfills().then(async () => {
-  const { default: main } = await import('mastodon/main');
-
-  return main();
-}).catch(e => {
-  console.error(e);
-});
+loadPolyfills()
+  .then(loadLocale)
+  .then(main)
+  .catch(e => {
+    console.error(e);
+  });
diff --git a/app/javascript/packs/public.jsx b/app/javascript/packs/public.jsx
index 0e0dfc40e..5e358263b 100644
--- a/app/javascript/packs/public.jsx
+++ b/app/javascript/packs/public.jsx
@@ -2,7 +2,7 @@ import './public-path';
 
 import { createRoot }  from 'react-dom/client';
 
-import * as IntlMessageFormat  from 'intl-messageformat';
+import { IntlMessageFormat }  from 'intl-messageformat';
 import { defineMessages } from 'react-intl';
 
 import { delegate }  from '@rails/ujs';
@@ -14,7 +14,7 @@ import { start } from '../mastodon/common';
 import { timeAgoString }  from '../mastodon/components/relative_timestamp';
 import emojify  from '../mastodon/features/emoji/emoji';
 import loadKeyboardExtensions from '../mastodon/load_keyboard_extensions';
-import { getLocale }  from '../mastodon/locales';
+import { loadLocale, getLocale } from '../mastodon/locales';
 import { loadPolyfills } from '../mastodon/polyfills';
 import ready from '../mastodon/ready';
 
@@ -29,7 +29,7 @@ const messages = defineMessages({
 });
 
 function loaded() {
-  const { localeData } = getLocale();
+  const { messages: localeData } = getLocale();
 
   const scrollToDetailedStatus = () => {
     const history = createBrowserHistory();
@@ -249,6 +249,7 @@ function main() {
 }
 
 loadPolyfills()
+  .then(loadLocale)
   .then(main)
   .then(loadKeyboardExtensions)
   .catch(error => {
diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss
index 8b7b63407..b50306ded 100644
--- a/app/javascript/styles/mastodon/accounts.scss
+++ b/app/javascript/styles/mastodon/accounts.scss
@@ -3,11 +3,8 @@
     display: block;
     text-decoration: none;
     color: inherit;
-    box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-
-    @media screen and (max-width: $no-gap-breakpoint) {
-      box-shadow: none;
-    }
+    overflow: hidden;
+    border-radius: 4px;
 
     &:hover,
     &:active,
@@ -22,7 +19,6 @@
     height: 130px;
     position: relative;
     background: darken($ui-base-color, 12%);
-    border-radius: 4px 4px 0 0;
 
     img {
       display: block;
@@ -30,7 +26,6 @@
       height: 100%;
       margin: 0;
       object-fit: cover;
-      border-radius: 4px 4px 0 0;
     }
 
     @media screen and (width <= 600px) {
@@ -45,11 +40,6 @@
     justify-content: flex-start;
     align-items: center;
     background: lighten($ui-base-color, 4%);
-    border-radius: 0 0 4px 4px;
-
-    @media screen and (max-width: $no-gap-breakpoint) {
-      border-radius: 0;
-    }
 
     .avatar {
       flex: 0 0 auto;
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index a439b0e39..f4dfe5560 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -1309,6 +1309,15 @@ a.sparkline {
     &:last-child {
       border-bottom: 0;
     }
+
+    &.negative {
+      color: $error-value-color;
+      font-weight: 700;
+
+      .dimension__item__value {
+        color: $error-value-color;
+      }
+    }
   }
 }
 
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 9607ecc36..44527b687 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1545,6 +1545,7 @@ body > [data-popper-placement] {
 .account__wrapper {
   display: flex;
   gap: 10px;
+  align-items: center;
 }
 
 .account__avatar {
@@ -1613,108 +1614,10 @@ a .account__avatar {
 }
 
 .account__relationship {
-  height: 18px;
-  padding: 10px;
   white-space: nowrap;
-}
-
-.account__disclaimer {
-  padding: 10px;
-  border-top: 1px solid lighten($ui-base-color, 8%);
-  color: $dark-text-color;
-
-  strong {
-    font-weight: 500;
-
-    @each $lang in $cjk-langs {
-      &:lang(#{$lang}) {
-        font-weight: 700;
-      }
-    }
-  }
-
-  a {
-    font-weight: 500;
-    color: inherit;
-    text-decoration: underline;
-
-    &:hover,
-    &:focus,
-    &:active {
-      text-decoration: none;
-    }
-  }
-}
-
-.account__action-bar {
-  border-top: 1px solid lighten($ui-base-color, 8%);
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
-  line-height: 36px;
-  overflow: hidden;
-  flex: 0 0 auto;
   display: flex;
-}
-
-.account__action-bar-dropdown {
-  padding: 10px;
-
-  .icon-button {
-    vertical-align: middle;
-  }
-
-  .dropdown--active {
-    .dropdown__content.dropdown__right {
-      inset-inline-start: 6px;
-      inset-inline-end: initial;
-    }
-
-    &::after {
-      bottom: initial;
-      margin-inline-start: 11px;
-      margin-top: -7px;
-      inset-inline-end: initial;
-    }
-  }
-}
-
-.account__action-bar-links {
-  display: flex;
-  flex: 1 1 auto;
-  line-height: 18px;
-  text-align: center;
-}
-
-.account__action-bar__tab {
-  text-decoration: none;
-  overflow: hidden;
-  flex: 0 1 100%;
-  border-inline-end: 1px solid lighten($ui-base-color, 8%);
-  padding: 10px 0;
-  border-bottom: 4px solid transparent;
-
-  &.active {
-    border-bottom: 4px solid $ui-highlight-color;
-  }
-
-  & > span {
-    display: block;
-    text-transform: uppercase;
-    font-size: 11px;
-    color: $darker-text-color;
-  }
-
-  strong {
-    display: block;
-    font-size: 15px;
-    font-weight: 500;
-    color: $primary-text-color;
-
-    @each $lang in $cjk-langs {
-      &:lang(#{$lang}) {
-        font-weight: 700;
-      }
-    }
-  }
+  align-items: center;
+  gap: 4px;
 }
 
 .account-authorize {
@@ -2068,36 +1971,18 @@ a.account__display-name {
 }
 
 .dropdown-animation {
-  animation: dropdown 300ms cubic-bezier(0.1, 0.7, 0.1, 1);
+  animation: dropdown 150ms cubic-bezier(0.1, 0.7, 0.1, 1);
 
   @keyframes dropdown {
     from {
       opacity: 0;
-      transform: scaleX(0.85) scaleY(0.75);
     }
 
     to {
       opacity: 1;
-      transform: scaleX(1) scaleY(1);
     }
   }
 
-  &.top {
-    transform-origin: bottom;
-  }
-
-  &.right {
-    transform-origin: left;
-  }
-
-  &.bottom {
-    transform-origin: top;
-  }
-
-  &.left {
-    transform-origin: right;
-  }
-
   .reduce-motion & {
     animation: none;
   }
@@ -2113,16 +1998,17 @@ a.account__display-name {
 }
 
 .dropdown-menu__separator {
-  border-bottom: 1px solid darken($ui-secondary-color, 8%);
-  margin: 5px 7px 6px;
+  border-bottom: 1px solid var(--dropdown-border-color);
+  margin: 5px 0;
   height: 0;
 }
 
 .dropdown-menu {
-  background: $ui-secondary-color;
-  padding: 4px 0;
+  background: var(--dropdown-background-color);
+  border: 1px solid var(--dropdown-border-color);
+  padding: 4px;
   border-radius: 4px;
-  box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);
+  box-shadow: var(--dropdown-shadow);
   z-index: 9999;
 
   &__text-button {
@@ -2143,12 +2029,13 @@ a.account__display-name {
 
   &__container {
     &__header {
-      border-bottom: 1px solid darken($ui-secondary-color, 8%);
-      padding: 4px 14px;
-      padding-bottom: 8px;
+      border-bottom: 1px solid var(--dropdown-border-color);
+      padding: 10px 14px;
+      padding-bottom: 14px;
+      margin-bottom: 4px;
       font-size: 13px;
       line-height: 18px;
-      color: $inverted-text-color;
+      color: $darker-text-color;
     }
 
     &__list {
@@ -2185,103 +2072,43 @@ a.account__display-name {
   }
 }
 
-.dropdown-menu__arrow {
-  position: absolute;
-
-  &::before {
-    content: '';
-    display: block;
-    width: 14px;
-    height: 5px;
-    background-color: $ui-secondary-color;
-    mask-image: url("data:image/svg+xml;utf8,<svg width='14' height='5' xmlns='http://www.w3.org/2000/svg'><path d='M7 0L0 5h14L7 0z' fill='white'/></svg>");
-  }
-
-  &.top {
-    bottom: -5px;
-
-    &::before {
-      transform: rotate(180deg);
-    }
-  }
-
-  &.right {
-    inset-inline-start: -9px;
-
-    &::before {
-      transform: rotate(-90deg);
-    }
-  }
-
-  &.bottom {
-    top: -5px;
-  }
-
-  &.left {
-    inset-inline-end: -9px;
-
-    &::before {
-      transform: rotate(90deg);
-    }
-  }
-}
-
 .dropdown-menu__item {
   font-size: 13px;
   line-height: 18px;
+  font-weight: 500;
   display: block;
-  color: $inverted-text-color;
+
+  &--dangerous {
+    color: $error-value-color;
+  }
 
   a,
   button {
-    font-family: inherit;
-    font-size: inherit;
-    line-height: inherit;
+    font: inherit;
     display: block;
     width: 100%;
-    padding: 4px 14px;
+    padding: 10px 14px;
     border: 0;
     margin: 0;
+    background: transparent;
     box-sizing: border-box;
     text-decoration: none;
-    background: $ui-secondary-color;
     color: inherit;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
     text-align: inherit;
+    border-radius: 4px;
 
     &:focus,
     &:hover,
     &:active {
-      background: $ui-highlight-color;
-      color: $secondary-text-color;
+      background: var(--dropdown-border-color);
       outline: 0;
     }
   }
 }
 
-.dropdown-menu__item--text {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  padding: 4px 14px;
-}
-
-.dropdown-menu__item.edited-timestamp__history__item {
-  border-bottom: 1px solid darken($ui-secondary-color, 8%);
-
-  &:last-child {
-    border-bottom: 0;
-  }
-
-  &.dropdown-menu__item--text,
-  a,
-  button {
-    padding: 8px 14px;
-  }
-}
-
 .inline-account {
   display: inline-flex;
   align-items: center;
@@ -2297,62 +2124,6 @@ a.account__display-name {
   }
 }
 
-.dropdown--active .dropdown__content {
-  display: block;
-  line-height: 18px;
-  max-width: 311px;
-  inset-inline-end: 0;
-  text-align: start;
-  z-index: 9999;
-
-  & > ul {
-    list-style: none;
-    background: $ui-secondary-color;
-    padding: 4px 0;
-    border-radius: 4px;
-    box-shadow: 0 0 15px rgba($base-shadow-color, 0.4);
-    min-width: 140px;
-    position: relative;
-  }
-
-  &.dropdown__right {
-    inset-inline-end: 0;
-  }
-
-  &.dropdown__left {
-    & > ul {
-      inset-inline-start: -98px;
-    }
-  }
-
-  & > ul > li > a {
-    font-size: 13px;
-    line-height: 18px;
-    display: block;
-    padding: 4px 14px;
-    box-sizing: border-box;
-    text-decoration: none;
-    background: $ui-secondary-color;
-    color: $inverted-text-color;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-
-    &:focus {
-      outline: 0;
-    }
-
-    &:hover {
-      background: $ui-highlight-color;
-      color: $secondary-text-color;
-    }
-  }
-}
-
-.dropdown__icon {
-  vertical-align: middle;
-}
-
 .columns-area {
   display: flex;
   flex: 1 1 auto;
@@ -3130,10 +2901,10 @@ $ui-header-height: 55px;
 .compose-form__highlightable {
   display: flex;
   flex-direction: column;
-  overflow: hidden;
   flex: 0 1 auto;
   border-radius: 4px;
   transition: box-shadow 300ms linear;
+  min-height: 0;
 
   &.active {
     transition: none;
@@ -3175,7 +2946,6 @@ $ui-header-height: 55px;
 
   .compose-form {
     flex: 1;
-    overflow-y: hidden;
     display: flex;
     flex-direction: column;
     min-height: 310px;
@@ -5493,7 +5263,7 @@ a.status-card.compact:hover {
   background: transparent;
   box-sizing: border-box;
   border: 0;
-  color: rgba($primary-text-color, 0.7);
+  color: rgba($white, 0.7);
   cursor: pointer;
   display: flex;
   align-items: center;
@@ -5508,7 +5278,7 @@ a.status-card.compact:hover {
   &:hover,
   &:focus,
   &:active {
-    color: $primary-text-color;
+    color: $white;
   }
 }
 
@@ -7837,13 +7607,28 @@ noscript {
   }
 }
 
+.account__contents {
+  overflow: hidden;
+}
+
+.account__details {
+  display: flex;
+  flex-wrap: wrap;
+  column-gap: 1em;
+}
+
 .verified-badge {
   display: inline-flex;
   align-items: center;
   color: $valid-value-color;
   gap: 4px;
   overflow: hidden;
-  text-overflow: ellipsis;
+  white-space: nowrap;
+
+  > span {
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
 
   a {
     color: inherit;
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 57f077c4e..d63a42557 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -137,6 +137,10 @@ code {
     color: $secondary-text-color;
     margin-bottom: 30px;
 
+    &.invited-by {
+      margin-bottom: 15px;
+    }
+
     a {
       color: $highlight-text-color;
     }
diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss
index 7de25f8fd..d6dda1b3c 100644
--- a/app/javascript/styles/mastodon/variables.scss
+++ b/app/javascript/styles/mastodon/variables.scss
@@ -61,3 +61,10 @@ $no-gap-breakpoint: 1175px;
 $font-sans-serif: 'mastodon-font-sans-serif' !default;
 $font-display: 'mastodon-font-display' !default;
 $font-monospace: 'mastodon-font-monospace' !default;
+
+:root {
+  --dropdown-border-color: #{lighten($ui-base-color, 12%)};
+  --dropdown-background-color: #{lighten($ui-base-color, 4%)};
+  --dropdown-shadow: 0 20px 25px -5px #{rgba($base-shadow-color, 0.25)},
+    0 8px 10px -6px #{rgba($base-shadow-color, 0.25)};
+}
diff --git a/app/lib/admin/metrics/dimension/instance_accounts_dimension.rb b/app/lib/admin/metrics/dimension/instance_accounts_dimension.rb
index 4eac8e611..f8eb9d7bf 100644
--- a/app/lib/admin/metrics/dimension/instance_accounts_dimension.rb
+++ b/app/lib/admin/metrics/dimension/instance_accounts_dimension.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Dimension::InstanceAccountsDimension < Admin::Metrics::Dimension::BaseDimension
+  include Admin::Metrics::Dimension::QueryHelper
   include LanguagesHelper
 
   def self.with_params?
@@ -14,19 +15,23 @@ class Admin::Metrics::Dimension::InstanceAccountsDimension < Admin::Metrics::Dim
   protected
 
   def perform_query
-    sql = <<-SQL.squish
+    dimension_data_rows.map { |row| { key: row['username'], human_key: row['username'], value: row['value'].to_s } }
+  end
+
+  def sql_array
+    [sql_query_string, { domain: params[:domain], limit: @limit }]
+  end
+
+  def sql_query_string
+    <<~SQL.squish
       SELECT accounts.username, count(follows.*) AS value
       FROM accounts
       LEFT JOIN follows ON follows.target_account_id = accounts.id
-      WHERE accounts.domain = $1
+      WHERE accounts.domain = :domain
       GROUP BY accounts.id, follows.target_account_id
       ORDER BY value DESC
-      LIMIT $2
+      LIMIT :limit
     SQL
-
-    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, params[:domain]], [nil, @limit]])
-
-    rows.map { |row| { key: row['username'], human_key: row['username'], value: row['value'].to_s } }
   end
 
   def params
diff --git a/app/lib/admin/metrics/dimension/instance_languages_dimension.rb b/app/lib/admin/metrics/dimension/instance_languages_dimension.rb
index 1ede1a56e..b47821380 100644
--- a/app/lib/admin/metrics/dimension/instance_languages_dimension.rb
+++ b/app/lib/admin/metrics/dimension/instance_languages_dimension.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Dimension::InstanceLanguagesDimension < Admin::Metrics::Dimension::BaseDimension
+  include Admin::Metrics::Dimension::QueryHelper
   include LanguagesHelper
 
   def self.with_params?
@@ -14,21 +15,33 @@ class Admin::Metrics::Dimension::InstanceLanguagesDimension < Admin::Metrics::Di
   protected
 
   def perform_query
-    sql = <<-SQL.squish
+    dimension_data_rows.map { |row| { key: row['language'], human_key: standard_locale_name(row['language']), value: row['value'].to_s } }
+  end
+
+  def sql_array
+    [sql_query_string, { domain: params[:domain], earliest_status_id: earliest_status_id, latest_status_id: latest_status_id, limit: @limit }]
+  end
+
+  def sql_query_string
+    <<~SQL.squish
       SELECT COALESCE(statuses.language, 'und') AS language, count(*) AS value
       FROM statuses
       INNER JOIN accounts ON accounts.id = statuses.account_id
-      WHERE accounts.domain = $1
-        AND statuses.id BETWEEN $2 AND $3
+      WHERE accounts.domain = :domain
+        AND statuses.id BETWEEN :earliest_status_id AND :latest_status_id
         AND statuses.reblog_of_id IS NULL
       GROUP BY COALESCE(statuses.language, 'und')
       ORDER BY count(*) DESC
-      LIMIT $4
+      LIMIT :limit
     SQL
+  end
 
-    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, params[:domain]], [nil, Mastodon::Snowflake.id_at(@start_at, with_random: false)], [nil, Mastodon::Snowflake.id_at(@end_at, with_random: false)], [nil, @limit]])
+  def earliest_status_id
+    Mastodon::Snowflake.id_at(@start_at, with_random: false)
+  end
 
-    rows.map { |row| { key: row['language'], human_key: standard_locale_name(row['language']), value: row['value'].to_s } }
+  def latest_status_id
+    Mastodon::Snowflake.id_at(@end_at, with_random: false)
   end
 
   def params
diff --git a/app/lib/admin/metrics/dimension/languages_dimension.rb b/app/lib/admin/metrics/dimension/languages_dimension.rb
index f1cf82cf2..100692a17 100644
--- a/app/lib/admin/metrics/dimension/languages_dimension.rb
+++ b/app/lib/admin/metrics/dimension/languages_dimension.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Dimension::LanguagesDimension < Admin::Metrics::Dimension::BaseDimension
+  include Admin::Metrics::Dimension::QueryHelper
   include LanguagesHelper
 
   def key
@@ -10,18 +11,22 @@ class Admin::Metrics::Dimension::LanguagesDimension < Admin::Metrics::Dimension:
   protected
 
   def perform_query
-    sql = <<-SQL.squish
+    dimension_data_rows.map { |row| { key: row['locale'], human_key: standard_locale_name(row['locale']), value: row['value'].to_s } }
+  end
+
+  def sql_array
+    [sql_query_string, { start_at: @start_at, end_at: @end_at, limit: @limit }]
+  end
+
+  def sql_query_string
+    <<~SQL.squish
       SELECT locale, count(*) AS value
       FROM users
-      WHERE current_sign_in_at BETWEEN $1 AND $2
+      WHERE current_sign_in_at BETWEEN :start_at AND :end_at
         AND locale IS NOT NULL
       GROUP BY locale
       ORDER BY count(*) DESC
-      LIMIT $3
+      LIMIT :limit
     SQL
-
-    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, @start_at], [nil, @end_at], [nil, @limit]])
-
-    rows.map { |row| { key: row['locale'], human_key: standard_locale_name(row['locale']), value: row['value'].to_s } }
   end
 end
diff --git a/app/lib/admin/metrics/dimension/query_helper.rb b/app/lib/admin/metrics/dimension/query_helper.rb
new file mode 100644
index 000000000..9fc953cb3
--- /dev/null
+++ b/app/lib/admin/metrics/dimension/query_helper.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Admin::Metrics::Dimension::QueryHelper
+  protected
+
+  def dimension_data_rows
+    ActiveRecord::Base.connection.select_all(sanitized_sql_string)
+  end
+
+  def sanitized_sql_string
+    ActiveRecord::Base.sanitize_sql_array(sql_array)
+  end
+end
diff --git a/app/lib/admin/metrics/dimension/servers_dimension.rb b/app/lib/admin/metrics/dimension/servers_dimension.rb
index 91bcce655..42aba8e21 100644
--- a/app/lib/admin/metrics/dimension/servers_dimension.rb
+++ b/app/lib/admin/metrics/dimension/servers_dimension.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Dimension::ServersDimension < Admin::Metrics::Dimension::BaseDimension
+  include Admin::Metrics::Dimension::QueryHelper
+
   def key
     'servers'
   end
@@ -8,18 +10,30 @@ class Admin::Metrics::Dimension::ServersDimension < Admin::Metrics::Dimension::B
   protected
 
   def perform_query
-    sql = <<-SQL.squish
+    dimension_data_rows.map { |row| { key: row['domain'] || Rails.configuration.x.local_domain, human_key: row['domain'] || Rails.configuration.x.local_domain, value: row['value'].to_s } }
+  end
+
+  def sql_array
+    [sql_query_string, { earliest_status_id: earliest_status_id, latest_status_id: latest_status_id, limit: @limit }]
+  end
+
+  def sql_query_string
+    <<~SQL.squish
       SELECT accounts.domain, count(*) AS value
       FROM statuses
       INNER JOIN accounts ON accounts.id = statuses.account_id
-      WHERE statuses.id BETWEEN $1 AND $2
+      WHERE statuses.id BETWEEN :earliest_status_id AND :latest_status_id
       GROUP BY accounts.domain
       ORDER BY count(*) DESC
-      LIMIT $3
+      LIMIT :limit
     SQL
+  end
 
-    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, Mastodon::Snowflake.id_at(@start_at)], [nil, Mastodon::Snowflake.id_at(@end_at)], [nil, @limit]])
+  def earliest_status_id
+    Mastodon::Snowflake.id_at(@start_at)
+  end
 
-    rows.map { |row| { key: row['domain'] || Rails.configuration.x.local_domain, human_key: row['domain'] || Rails.configuration.x.local_domain, value: row['value'].to_s } }
+  def latest_status_id
+    Mastodon::Snowflake.id_at(@end_at)
   end
 end
diff --git a/app/lib/admin/metrics/dimension/sources_dimension.rb b/app/lib/admin/metrics/dimension/sources_dimension.rb
index 122807cdc..a14c3e7c1 100644
--- a/app/lib/admin/metrics/dimension/sources_dimension.rb
+++ b/app/lib/admin/metrics/dimension/sources_dimension.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Dimension::SourcesDimension < Admin::Metrics::Dimension::BaseDimension
+  include Admin::Metrics::Dimension::QueryHelper
+
   def key
     'sources'
   end
@@ -8,18 +10,22 @@ class Admin::Metrics::Dimension::SourcesDimension < Admin::Metrics::Dimension::B
   protected
 
   def perform_query
-    sql = <<-SQL.squish
+    dimension_data_rows.map { |row| { key: row['name'] || 'web', human_key: row['name'] || I18n.t('admin.dashboard.website'), value: row['value'].to_s } }
+  end
+
+  def sql_array
+    [sql_query_string, { start_at: @start_at, end_at: @end_at, limit: @limit }]
+  end
+
+  def sql_query_string
+    <<~SQL.squish
       SELECT oauth_applications.name, count(*) AS value
       FROM users
       LEFT JOIN oauth_applications ON oauth_applications.id = users.created_by_application_id
-      WHERE users.created_at BETWEEN $1 AND $2
+      WHERE users.created_at BETWEEN :start_at AND :end_at
       GROUP BY oauth_applications.name
       ORDER BY count(*) DESC
-      LIMIT $3
+      LIMIT :limit
     SQL
-
-    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, @start_at], [nil, @end_at], [nil, @limit]])
-
-    rows.map { |row| { key: row['name'] || 'web', human_key: row['name'] || I18n.t('admin.dashboard.website'), value: row['value'].to_s } }
   end
 end
diff --git a/app/lib/admin/metrics/dimension/tag_languages_dimension.rb b/app/lib/admin/metrics/dimension/tag_languages_dimension.rb
index e1349c229..cd077ff86 100644
--- a/app/lib/admin/metrics/dimension/tag_languages_dimension.rb
+++ b/app/lib/admin/metrics/dimension/tag_languages_dimension.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Dimension::TagLanguagesDimension < Admin::Metrics::Dimension::BaseDimension
+  include Admin::Metrics::Dimension::QueryHelper
   include LanguagesHelper
 
   def self.with_params?
@@ -14,20 +15,36 @@ class Admin::Metrics::Dimension::TagLanguagesDimension < Admin::Metrics::Dimensi
   protected
 
   def perform_query
-    sql = <<-SQL.squish
+    dimension_data_rows.map { |row| { key: row['language'], human_key: standard_locale_name(row['language']), value: row['value'].to_s } }
+  end
+
+  def sql_array
+    [sql_query_string, { tag_id: tag_id, earliest_status_id: earliest_status_id, latest_status_id: latest_status_id, limit: @limit }]
+  end
+
+  def sql_query_string
+    <<~SQL.squish
       SELECT COALESCE(statuses.language, 'und') AS language, count(*) AS value
       FROM statuses
       INNER JOIN statuses_tags ON statuses_tags.status_id = statuses.id
-      WHERE statuses_tags.tag_id = $1
-        AND statuses.id BETWEEN $2 AND $3
+      WHERE statuses_tags.tag_id = :tag_id
+        AND statuses.id BETWEEN :earliest_status_id AND :latest_status_id
       GROUP BY COALESCE(statuses.language, 'und')
       ORDER BY count(*) DESC
-      LIMIT $4
+      LIMIT :limit
     SQL
+  end
 
-    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, params[:id]], [nil, Mastodon::Snowflake.id_at(@start_at, with_random: false)], [nil, Mastodon::Snowflake.id_at(@end_at, with_random: false)], [nil, @limit]])
+  def tag_id
+    params[:id]
+  end
 
-    rows.map { |row| { key: row['language'], human_key: standard_locale_name(row['language']), value: row['value'].to_s } }
+  def earliest_status_id
+    Mastodon::Snowflake.id_at(@start_at, with_random: false)
+  end
+
+  def latest_status_id
+    Mastodon::Snowflake.id_at(@end_at, with_random: false)
   end
 
   def params
diff --git a/app/lib/admin/metrics/dimension/tag_servers_dimension.rb b/app/lib/admin/metrics/dimension/tag_servers_dimension.rb
index 7ddf3378c..fc5e49a96 100644
--- a/app/lib/admin/metrics/dimension/tag_servers_dimension.rb
+++ b/app/lib/admin/metrics/dimension/tag_servers_dimension.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Dimension::TagServersDimension < Admin::Metrics::Dimension::BaseDimension
+  include Admin::Metrics::Dimension::QueryHelper
+
   def self.with_params?
     true
   end
@@ -12,21 +14,37 @@ class Admin::Metrics::Dimension::TagServersDimension < Admin::Metrics::Dimension
   protected
 
   def perform_query
-    sql = <<-SQL.squish
+    dimension_data_rows.map { |row| { key: row['domain'] || Rails.configuration.x.local_domain, human_key: row['domain'] || Rails.configuration.x.local_domain, value: row['value'].to_s } }
+  end
+
+  def sql_array
+    [sql_query_string, { tag_id: tag_id, earliest_status_id: earliest_status_id, latest_status_id: latest_status_id, limit: @limit }]
+  end
+
+  def sql_query_string
+    <<-SQL.squish
       SELECT accounts.domain, count(*) AS value
       FROM statuses
       INNER JOIN accounts ON accounts.id = statuses.account_id
       INNER JOIN statuses_tags ON statuses_tags.status_id = statuses.id
-      WHERE statuses_tags.tag_id = $1
-        AND statuses.id BETWEEN $2 AND $3
+      WHERE statuses_tags.tag_id = :tag_id
+        AND statuses.id BETWEEN :earliest_status_id AND :latest_status_id
       GROUP BY accounts.domain
       ORDER BY count(*) DESC
-      LIMIT $4
+      LIMIT :limit
     SQL
+  end
 
-    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, params[:id]], [nil, Mastodon::Snowflake.id_at(@start_at, with_random: false)], [nil, Mastodon::Snowflake.id_at(@end_at, with_random: false)], [nil, @limit]])
+  def tag_id
+    params[:id]
+  end
 
-    rows.map { |row| { key: row['domain'] || Rails.configuration.x.local_domain, human_key: row['domain'] || Rails.configuration.x.local_domain, value: row['value'].to_s } }
+  def earliest_status_id
+    Mastodon::Snowflake.id_at(@start_at, with_random: false)
+  end
+
+  def latest_status_id
+    Mastodon::Snowflake.id_at(@end_at, with_random: false)
   end
 
   def params
diff --git a/app/lib/admin/metrics/measure/instance_accounts_measure.rb b/app/lib/admin/metrics/measure/instance_accounts_measure.rb
index 4c61a064a..3d081fdd9 100644
--- a/app/lib/admin/metrics/measure/instance_accounts_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_accounts_measure.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Measure::InstanceAccountsMeasure < Admin::Metrics::Measure::BaseMeasure
+  include Admin::Metrics::Measure::QueryHelper
+
   def self.with_params?
     true
   end
@@ -16,32 +18,34 @@ class Admin::Metrics::Measure::InstanceAccountsMeasure < Admin::Metrics::Measure
   protected
 
   def perform_total_query
-    Account.where(domain: params[:domain]).count
+    domain = params[:domain]
+    domain = Instance.by_domain_and_subdomains(params[:domain]).select(:domain) if params[:include_subdomains]
+    Account.where(domain: domain).count
   end
 
   def perform_previous_total_query
     nil
   end
 
-  def perform_data_query
-    sql = <<-SQL.squish
+  def sql_array
+    [sql_query_string, { start_at: @start_at, end_at: @end_at, domain: params[:domain] }]
+  end
+
+  def sql_query_string
+    <<~SQL.squish
       SELECT axis.*, (
         WITH new_accounts AS (
           SELECT accounts.id
           FROM accounts
           WHERE date_trunc('day', accounts.created_at)::date = axis.period
-            AND accounts.domain = $3::text
+            AND #{account_domain_sql(params[:include_subdomains])}
         )
         SELECT count(*) FROM new_accounts
       ) AS value
       FROM (
-        SELECT generate_series(date_trunc('day', $1::timestamp)::date, date_trunc('day', $2::timestamp)::date, interval '1 day') AS period
+        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
       ) AS axis
     SQL
-
-    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, @start_at], [nil, @end_at], [nil, params[:domain]]])
-
-    rows.map { |row| { date: row['period'], value: row['value'].to_s } }
   end
 
   def time_period
@@ -53,6 +57,6 @@ class Admin::Metrics::Measure::InstanceAccountsMeasure < Admin::Metrics::Measure
   end
 
   def params
-    @params.permit(:domain)
+    @params.permit(:domain, :include_subdomains)
   end
 end
diff --git a/app/lib/admin/metrics/measure/instance_followers_measure.rb b/app/lib/admin/metrics/measure/instance_followers_measure.rb
index caa60013b..378c6754d 100644
--- a/app/lib/admin/metrics/measure/instance_followers_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_followers_measure.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Measure::InstanceFollowersMeasure < Admin::Metrics::Measure::BaseMeasure
+  include Admin::Metrics::Measure::QueryHelper
+
   def self.with_params?
     true
   end
@@ -16,33 +18,35 @@ class Admin::Metrics::Measure::InstanceFollowersMeasure < Admin::Metrics::Measur
   protected
 
   def perform_total_query
-    Follow.joins(:account).merge(Account.where(domain: params[:domain])).count
+    domain = params[:domain]
+    domain = Instance.by_domain_and_subdomains(params[:domain]).select(:domain) if params[:include_subdomains]
+    Follow.joins(:account).merge(Account.where(domain: domain)).count
   end
 
   def perform_previous_total_query
     nil
   end
 
-  def perform_data_query
-    sql = <<-SQL.squish
+  def sql_array
+    [sql_query_string, { start_at: @start_at, end_at: @end_at, domain: params[:domain] }]
+  end
+
+  def sql_query_string
+    <<~SQL.squish
       SELECT axis.*, (
         WITH new_followers AS (
           SELECT follows.id
           FROM follows
           INNER JOIN accounts ON follows.account_id = accounts.id
           WHERE date_trunc('day', follows.created_at)::date = axis.period
-            AND accounts.domain = $3::text
+            AND #{account_domain_sql(params[:include_subdomains])}
         )
         SELECT count(*) FROM new_followers
       ) AS value
       FROM (
-        SELECT generate_series(date_trunc('day', $1::timestamp)::date, date_trunc('day', $2::timestamp)::date, interval '1 day') AS period
+        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
       ) AS axis
     SQL
-
-    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, @start_at], [nil, @end_at], [nil, params[:domain]]])
-
-    rows.map { |row| { date: row['period'], value: row['value'].to_s } }
   end
 
   def time_period
@@ -54,6 +58,6 @@ class Admin::Metrics::Measure::InstanceFollowersMeasure < Admin::Metrics::Measur
   end
 
   def params
-    @params.permit(:domain)
+    @params.permit(:domain, :include_subdomains)
   end
 end
diff --git a/app/lib/admin/metrics/measure/instance_follows_measure.rb b/app/lib/admin/metrics/measure/instance_follows_measure.rb
index b026c7e6d..e213348fb 100644
--- a/app/lib/admin/metrics/measure/instance_follows_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_follows_measure.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Measure::InstanceFollowsMeasure < Admin::Metrics::Measure::BaseMeasure
+  include Admin::Metrics::Measure::QueryHelper
+
   def self.with_params?
     true
   end
@@ -16,33 +18,35 @@ class Admin::Metrics::Measure::InstanceFollowsMeasure < Admin::Metrics::Measure:
   protected
 
   def perform_total_query
-    Follow.joins(:target_account).merge(Account.where(domain: params[:domain])).count
+    domain = params[:domain]
+    domain = Instance.by_domain_and_subdomains(params[:domain]).select(:domain) if params[:include_subdomains]
+    Follow.joins(:target_account).merge(Account.where(domain: domain)).count
   end
 
   def perform_previous_total_query
     nil
   end
 
-  def perform_data_query
-    sql = <<-SQL.squish
+  def sql_array
+    [sql_query_string, { start_at: @start_at, end_at: @end_at, domain: params[:domain] }]
+  end
+
+  def sql_query_string
+    <<~SQL.squish
       SELECT axis.*, (
         WITH new_follows AS (
           SELECT follows.id
           FROM follows
           INNER JOIN accounts ON follows.target_account_id = accounts.id
           WHERE date_trunc('day', follows.created_at)::date = axis.period
-            AND accounts.domain = $3::text
+            AND #{account_domain_sql(params[:include_subdomains])}
         )
         SELECT count(*) FROM new_follows
       ) AS value
       FROM (
-        SELECT generate_series(date_trunc('day', $1::timestamp)::date, date_trunc('day', $2::timestamp)::date, interval '1 day') AS period
+        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
       ) AS axis
     SQL
-
-    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, @start_at], [nil, @end_at], [nil, params[:domain]]])
-
-    rows.map { |row| { date: row['period'], value: row['value'].to_s } }
   end
 
   def time_period
@@ -54,6 +58,6 @@ class Admin::Metrics::Measure::InstanceFollowsMeasure < Admin::Metrics::Measure:
   end
 
   def params
-    @params.permit(:domain)
+    @params.permit(:domain, :include_subdomains)
   end
 end
diff --git a/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb b/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
index 2e2154c92..2d4b5f56b 100644
--- a/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure < Admin::Metrics::Measure::BaseMeasure
+  include Admin::Metrics::Measure::QueryHelper
   include ActionView::Helpers::NumberHelper
 
   def self.with_params?
@@ -26,33 +27,35 @@ class Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure < Admin::Metrics:
   protected
 
   def perform_total_query
-    MediaAttachment.joins(:account).merge(Account.where(domain: params[:domain])).sum('COALESCE(file_file_size, 0) + COALESCE(thumbnail_file_size, 0)')
+    domain = params[:domain]
+    domain = Instance.by_domain_and_subdomains(params[:domain]).select(:domain) if params[:include_subdomains]
+    MediaAttachment.joins(:account).merge(Account.where(domain: domain)).sum('COALESCE(file_file_size, 0) + COALESCE(thumbnail_file_size, 0)')
   end
 
   def perform_previous_total_query
     nil
   end
 
-  def perform_data_query
-    sql = <<-SQL.squish
+  def sql_array
+    [sql_query_string, { start_at: @start_at, end_at: @end_at, domain: params[:domain] }]
+  end
+
+  def sql_query_string
+    <<~SQL.squish
       SELECT axis.*, (
         WITH new_media_attachments AS (
           SELECT COALESCE(media_attachments.file_file_size, 0) + COALESCE(media_attachments.thumbnail_file_size, 0) AS size
           FROM media_attachments
           INNER JOIN accounts ON accounts.id = media_attachments.account_id
           WHERE date_trunc('day', media_attachments.created_at)::date = axis.period
-            AND accounts.domain = $3::text
+            AND #{account_domain_sql(params[:include_subdomains])}
         )
         SELECT SUM(size) FROM new_media_attachments
       ) AS value
       FROM (
-        SELECT generate_series(date_trunc('day', $1::timestamp)::date, date_trunc('day', $2::timestamp)::date, interval '1 day') AS period
+        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
       ) AS axis
     SQL
-
-    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, @start_at], [nil, @end_at], [nil, params[:domain]]])
-
-    rows.map { |row| { date: row['period'], value: row['value'].to_s } }
   end
 
   def time_period
@@ -64,6 +67,6 @@ class Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure < Admin::Metrics:
   end
 
   def params
-    @params.permit(:domain)
+    @params.permit(:domain, :include_subdomains)
   end
 end
diff --git a/app/lib/admin/metrics/measure/instance_reports_measure.rb b/app/lib/admin/metrics/measure/instance_reports_measure.rb
index 6b3f35067..9da3d53e3 100644
--- a/app/lib/admin/metrics/measure/instance_reports_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_reports_measure.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Measure::InstanceReportsMeasure < Admin::Metrics::Measure::BaseMeasure
+  include Admin::Metrics::Measure::QueryHelper
+
   def self.with_params?
     true
   end
@@ -16,33 +18,35 @@ class Admin::Metrics::Measure::InstanceReportsMeasure < Admin::Metrics::Measure:
   protected
 
   def perform_total_query
-    Report.where(target_account: Account.where(domain: params[:domain])).count
+    domain = params[:domain]
+    domain = Instance.by_domain_and_subdomains(params[:domain]).select(:domain) if params[:include_subdomains]
+    Report.where(target_account: Account.where(domain: domain)).count
   end
 
   def perform_previous_total_query
     nil
   end
 
-  def perform_data_query
-    sql = <<-SQL.squish
+  def sql_array
+    [sql_query_string, { start_at: @start_at, end_at: @end_at, domain: params[:domain] }]
+  end
+
+  def sql_query_string
+    <<~SQL.squish
       SELECT axis.*, (
         WITH new_reports AS (
           SELECT reports.id
           FROM reports
           INNER JOIN accounts ON accounts.id = reports.target_account_id
           WHERE date_trunc('day', reports.created_at)::date = axis.period
-            AND accounts.domain = $3::text
+            AND #{account_domain_sql(params[:include_subdomains])}
         )
         SELECT count(*) FROM new_reports
       ) AS value
       FROM (
-        SELECT generate_series(date_trunc('day', $1::timestamp)::date, date_trunc('day', $2::timestamp)::date, interval '1 day') AS period
+        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
       ) AS axis
     SQL
-
-    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, @start_at], [nil, @end_at], [nil, params[:domain]]])
-
-    rows.map { |row| { date: row['period'], value: row['value'].to_s } }
   end
 
   def time_period
@@ -54,6 +58,6 @@ class Admin::Metrics::Measure::InstanceReportsMeasure < Admin::Metrics::Measure:
   end
 
   def params
-    @params.permit(:domain)
+    @params.permit(:domain, :include_subdomains)
   end
 end
diff --git a/app/lib/admin/metrics/measure/instance_statuses_measure.rb b/app/lib/admin/metrics/measure/instance_statuses_measure.rb
index 86b10da6c..8c71c6614 100644
--- a/app/lib/admin/metrics/measure/instance_statuses_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_statuses_measure.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Measure::InstanceStatusesMeasure < Admin::Metrics::Measure::BaseMeasure
+  include Admin::Metrics::Measure::QueryHelper
+
   def self.with_params?
     true
   end
@@ -16,34 +18,44 @@ class Admin::Metrics::Measure::InstanceStatusesMeasure < Admin::Metrics::Measure
   protected
 
   def perform_total_query
-    Status.joins(:account).merge(Account.where(domain: params[:domain])).count
+    domain = params[:domain]
+    domain = Instance.by_domain_and_subdomains(params[:domain]).select(:domain) if params[:include_subdomains]
+    Status.joins(:account).merge(Account.where(domain: domain)).count
   end
 
   def perform_previous_total_query
     nil
   end
 
-  def perform_data_query
-    sql = <<-SQL.squish
+  def sql_array
+    [sql_query_string, { start_at: @start_at, end_at: @end_at, domain: params[:domain], earliest_status_id: earliest_status_id, latest_status_id: latest_status_id }]
+  end
+
+  def sql_query_string
+    <<~SQL.squish
       SELECT axis.*, (
         WITH new_statuses AS (
           SELECT statuses.id
           FROM statuses
           INNER JOIN accounts ON accounts.id = statuses.account_id
-          WHERE statuses.id BETWEEN $3 AND $4
-            AND accounts.domain = $5::text
+          WHERE statuses.id BETWEEN :earliest_status_id AND :latest_status_id
+            AND #{account_domain_sql(params[:include_subdomains])}
             AND date_trunc('day', statuses.created_at)::date = axis.period
         )
         SELECT count(*) FROM new_statuses
       ) AS value
       FROM (
-        SELECT generate_series(date_trunc('day', $1::timestamp)::date, date_trunc('day', $2::timestamp)::date, interval '1 day') AS period
+        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
       ) AS axis
     SQL
+  end
 
-    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, @start_at], [nil, @end_at], [nil, Mastodon::Snowflake.id_at(@start_at, with_random: false)], [nil, Mastodon::Snowflake.id_at(@end_at, with_random: false)], [nil, params[:domain]]])
+  def earliest_status_id
+    Mastodon::Snowflake.id_at(@start_at, with_random: false)
+  end
 
-    rows.map { |row| { date: row['period'], value: row['value'].to_s } }
+  def latest_status_id
+    Mastodon::Snowflake.id_at(@end_at, with_random: false)
   end
 
   def time_period
@@ -55,6 +67,6 @@ class Admin::Metrics::Measure::InstanceStatusesMeasure < Admin::Metrics::Measure
   end
 
   def params
-    @params.permit(:domain)
+    @params.permit(:domain, :include_subdomains)
   end
 end
diff --git a/app/lib/admin/metrics/measure/new_users_measure.rb b/app/lib/admin/metrics/measure/new_users_measure.rb
index 71191f1a2..6837c14c8 100644
--- a/app/lib/admin/metrics/measure/new_users_measure.rb
+++ b/app/lib/admin/metrics/measure/new_users_measure.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Measure::NewUsersMeasure < Admin::Metrics::Measure::BaseMeasure
+  include Admin::Metrics::Measure::QueryHelper
+
   def key
     'new_users'
   end
@@ -15,8 +17,12 @@ class Admin::Metrics::Measure::NewUsersMeasure < Admin::Metrics::Measure::BaseMe
     User.where(created_at: previous_time_period).count
   end
 
-  def perform_data_query
-    sql = <<-SQL.squish
+  def sql_array
+    [sql_query_string, { start_at: @start_at, end_at: @end_at }]
+  end
+
+  def sql_query_string
+    <<~SQL.squish
       SELECT axis.*, (
         WITH new_users AS (
           SELECT users.id
@@ -26,12 +32,8 @@ class Admin::Metrics::Measure::NewUsersMeasure < Admin::Metrics::Measure::BaseMe
         SELECT count(*) FROM new_users
       ) AS value
       FROM (
-        SELECT generate_series(date_trunc('day', $1::timestamp)::date, date_trunc('day', $2::timestamp)::date, interval '1 day') AS period
+        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
       ) AS axis
     SQL
-
-    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, @start_at], [nil, @end_at]])
-
-    rows.map { |row| { date: row['period'], value: row['value'].to_s } }
   end
 end
diff --git a/app/lib/admin/metrics/measure/opened_reports_measure.rb b/app/lib/admin/metrics/measure/opened_reports_measure.rb
index 4b80a0c8c..c395c4634 100644
--- a/app/lib/admin/metrics/measure/opened_reports_measure.rb
+++ b/app/lib/admin/metrics/measure/opened_reports_measure.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Measure::OpenedReportsMeasure < Admin::Metrics::Measure::BaseMeasure
+  include Admin::Metrics::Measure::QueryHelper
+
   def key
     'opened_reports'
   end
@@ -15,8 +17,12 @@ class Admin::Metrics::Measure::OpenedReportsMeasure < Admin::Metrics::Measure::B
     Report.where(created_at: previous_time_period).count
   end
 
-  def perform_data_query
-    sql = <<-SQL.squish
+  def sql_array
+    [sql_query_string, { start_at: @start_at, end_at: @end_at }]
+  end
+
+  def sql_query_string
+    <<~SQL.squish
       SELECT axis.*, (
         WITH new_reports AS (
           SELECT reports.id
@@ -26,12 +32,8 @@ class Admin::Metrics::Measure::OpenedReportsMeasure < Admin::Metrics::Measure::B
         SELECT count(*) FROM new_reports
       ) AS value
       FROM (
-        SELECT generate_series(date_trunc('day', $1::timestamp)::date, date_trunc('day', $2::timestamp)::date, interval '1 day') AS period
+        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
       ) AS axis
     SQL
-
-    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, @start_at], [nil, @end_at]])
-
-    rows.map { |row| { date: row['period'], value: row['value'].to_s } }
   end
 end
diff --git a/app/lib/admin/metrics/measure/query_helper.rb b/app/lib/admin/metrics/measure/query_helper.rb
new file mode 100644
index 000000000..969065f73
--- /dev/null
+++ b/app/lib/admin/metrics/measure/query_helper.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Admin::Metrics::Measure::QueryHelper
+  protected
+
+  def perform_data_query
+    measurement_data_rows.map { |row| { date: row['period'], value: row['value'].to_s } }
+  end
+
+  def measurement_data_rows
+    ActiveRecord::Base.connection.select_all(sanitized_sql_string)
+  end
+
+  def sanitized_sql_string
+    ActiveRecord::Base.sanitize_sql_array(sql_array)
+  end
+
+  def account_domain_sql(include_subdomains)
+    if include_subdomains
+      "accounts.domain IN (SELECT domain FROM instances WHERE reverse('.' || domain) LIKE reverse('.' || :domain::text))"
+    else
+      'accounts.domain = :domain::text'
+    end
+  end
+end
diff --git a/app/lib/admin/metrics/measure/resolved_reports_measure.rb b/app/lib/admin/metrics/measure/resolved_reports_measure.rb
index 4ab746c8f..780db75a1 100644
--- a/app/lib/admin/metrics/measure/resolved_reports_measure.rb
+++ b/app/lib/admin/metrics/measure/resolved_reports_measure.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Measure::ResolvedReportsMeasure < Admin::Metrics::Measure::BaseMeasure
+  include Admin::Metrics::Measure::QueryHelper
+
   def key
     'resolved_reports'
   end
@@ -15,8 +17,12 @@ class Admin::Metrics::Measure::ResolvedReportsMeasure < Admin::Metrics::Measure:
     Report.resolved.where(action_taken_at: previous_time_period).count
   end
 
-  def perform_data_query
-    sql = <<-SQL.squish
+  def sql_array
+    [sql_query_string, { start_at: @start_at, end_at: @end_at }]
+  end
+
+  def sql_query_string
+    <<~SQL.squish
       SELECT axis.*, (
         WITH resolved_reports AS (
           SELECT reports.id
@@ -26,12 +32,8 @@ class Admin::Metrics::Measure::ResolvedReportsMeasure < Admin::Metrics::Measure:
         SELECT count(*) FROM resolved_reports
       ) AS value
       FROM (
-        SELECT generate_series(date_trunc('day', $1::timestamp)::date, date_trunc('day', $2::timestamp)::date, interval '1 day') AS period
+        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, interval '1 day') AS period
       ) AS axis
     SQL
-
-    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, @start_at], [nil, @end_at]])
-
-    rows.map { |row| { date: row['period'], value: row['value'].to_s } }
   end
 end
diff --git a/app/lib/admin/metrics/measure/tag_servers_measure.rb b/app/lib/admin/metrics/measure/tag_servers_measure.rb
index 11f229602..e6378b802 100644
--- a/app/lib/admin/metrics/measure/tag_servers_measure.rb
+++ b/app/lib/admin/metrics/measure/tag_servers_measure.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Measure::TagServersMeasure < Admin::Metrics::Measure::BaseMeasure
+  include Admin::Metrics::Measure::QueryHelper
+
   def self.with_params?
     true
   end
@@ -19,25 +21,33 @@ class Admin::Metrics::Measure::TagServersMeasure < Admin::Metrics::Measure::Base
     tag.statuses.where('statuses.id BETWEEN ? AND ?', Mastodon::Snowflake.id_at(@start_at - length_of_period, with_random: false), Mastodon::Snowflake.id_at(@end_at - length_of_period, with_random: false)).joins(:account).count('distinct accounts.domain')
   end
 
-  def perform_data_query
-    sql = <<-SQL.squish
+  def sql_array
+    [sql_query_string, { start_at: @start_at, end_at: @end_at, tag_id: tag.id, earliest_status_id: earliest_status_id, latest_status_id: latest_status_id }]
+  end
+
+  def sql_query_string
+    <<~SQL.squish
       SELECT axis.*, (
         SELECT count(distinct accounts.domain) AS value
         FROM statuses
         INNER JOIN statuses_tags ON statuses.id = statuses_tags.status_id
         INNER JOIN accounts ON statuses.account_id = accounts.id
-        WHERE statuses_tags.tag_id = $1
-          AND statuses.id BETWEEN $2 AND $3
+        WHERE statuses_tags.tag_id = :tag_id
+          AND statuses.id BETWEEN :earliest_status_id AND :latest_status_id
           AND date_trunc('day', statuses.created_at)::date = axis.day
       )
       FROM (
-        SELECT generate_series(date_trunc('day', $4::timestamp)::date, date_trunc('day', $5::timestamp)::date, ('1 day')::interval) AS day
+        SELECT generate_series(date_trunc('day', :start_at::timestamp)::date, date_trunc('day', :end_at::timestamp)::date, ('1 day')::interval) AS day
       ) as axis
     SQL
+  end
 
-    rows = ActiveRecord::Base.connection.select_all(sql, nil, [[nil, params[:id].to_i], [nil, Mastodon::Snowflake.id_at(@start_at, with_random: false)], [nil, Mastodon::Snowflake.id_at(@end_at, with_random: false)], [nil, @start_at], [nil, @end_at]])
+  def earliest_status_id
+    Mastodon::Snowflake.id_at(@start_at, with_random: false)
+  end
 
-    rows.map { |row| { date: row['day'], value: row['value'].to_s } }
+  def latest_status_id
+    Mastodon::Snowflake.id_at(@end_at, with_random: false)
   end
 
   def tag
diff --git a/app/lib/emoji_formatter.rb b/app/lib/emoji_formatter.rb
index dd9a0e5d7..8c3856d89 100644
--- a/app/lib/emoji_formatter.rb
+++ b/app/lib/emoji_formatter.rb
@@ -12,6 +12,7 @@ class EmojiFormatter
   # @param [Hash] options
   # @option options [Boolean] :animate
   # @option options [String] :style
+  # @option options [String] :raw_shortcode
   def initialize(html, custom_emojis, options = {})
     raise ArgumentError unless html.html_safe?
 
@@ -43,7 +44,7 @@ class EmojiFormatter
           next unless (char_after.nil? || !DISALLOWED_BOUNDING_REGEX.match?(char_after)) && (emoji = emoji_map[shortcode])
 
           result << Nokogiri::XML::Text.new(text[last_index..shortname_start_index - 1], tree.document) if shortname_start_index.positive?
-          result << Nokogiri::HTML.fragment(image_for_emoji(shortcode, emoji))
+          result << Nokogiri::HTML.fragment(tag_for_emoji(shortcode, emoji))
 
           last_index = i + 1
         elsif text[i] == ':' && (i.zero? || !DISALLOWED_BOUNDING_REGEX.match?(text[i - 1]))
@@ -75,7 +76,9 @@ class EmojiFormatter
     end
   end
 
-  def image_for_emoji(shortcode, emoji)
+  def tag_for_emoji(shortcode, emoji)
+    return content_tag(:span, ":#{shortcode}:", translate: 'no') if raw_shortcode?
+
     original_url, static_url = emoji
 
     image_tag(
@@ -103,4 +106,8 @@ class EmojiFormatter
   def animate?
     @options[:animate] || @options.key?(:style)
   end
+
+  def raw_shortcode?
+    @options[:raw_shortcode]
+  end
 end
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 3cf6e21c3..6cca828a2 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -40,9 +40,9 @@ class FeedManager
   def filter?(timeline_type, status, receiver)
     case timeline_type
     when :home
-      filter_from_home?(status, receiver.id, build_crutches(receiver.id, [status]))
+      filter_from_home?(status, receiver.id, build_crutches(receiver.id, [status]), :home)
     when :list
-      filter_from_list?(status, receiver) || filter_from_home?(status, receiver.account_id, build_crutches(receiver.account_id, [status]))
+      filter_from_list?(status, receiver) || filter_from_home?(status, receiver.account_id, build_crutches(receiver.account_id, [status]), :list)
     when :mentions
       filter_from_mentions?(status, receiver.id)
     when :direct
@@ -401,10 +401,11 @@ class FeedManager
   # @param [Integer] receiver_id
   # @param [Hash] crutches
   # @return [Boolean]
-  def filter_from_home?(status, receiver_id, crutches)
+  def filter_from_home?(status, receiver_id, crutches, timeline_type = :home)
     return false if receiver_id == status.account_id
     return true  if status.reply? && (status.in_reply_to_id.nil? || status.in_reply_to_account_id.nil?)
-    return true  if crutches[:languages][status.account_id].present? && status.language.present? && !crutches[:languages][status.account_id].include?(status.language)
+    return true if timeline_type != :list && crutches[:exclusive_list_users][status.account_id].present?
+    return true if crutches[:languages][status.account_id].present? && status.language.present? && !crutches[:languages][status.account_id].include?(status.language)
 
     check_for_blocks = crutches[:active_mentions][status.id] || []
     check_for_blocks.push(status.account_id)
@@ -603,13 +604,16 @@ class FeedManager
       arr
     end
 
-    crutches[:following]       = Follow.where(account_id: receiver_id, target_account_id: statuses.filter_map(&:in_reply_to_account_id)).pluck(:target_account_id).index_with(true)
-    crutches[:languages]       = Follow.where(account_id: receiver_id, target_account_id: statuses.map(&:account_id)).pluck(:target_account_id, :languages).to_h
-    crutches[:hiding_reblogs]  = Follow.where(account_id: receiver_id, target_account_id: statuses.filter_map { |s| s.account_id if s.reblog? }, show_reblogs: false).pluck(:target_account_id).index_with(true)
-    crutches[:blocking]        = Block.where(account_id: receiver_id, target_account_id: check_for_blocks).pluck(:target_account_id).index_with(true)
-    crutches[:muting]          = Mute.where(account_id: receiver_id, target_account_id: check_for_blocks).pluck(:target_account_id).index_with(true)
-    crutches[:domain_blocking] = AccountDomainBlock.where(account_id: receiver_id, domain: statuses.flat_map { |s| [s.account.domain, s.reblog&.account&.domain] }.compact).pluck(:domain).index_with(true)
-    crutches[:blocked_by]      = Block.where(target_account_id: receiver_id, account_id: statuses.map { |s| [s.account_id, s.reblog&.account_id] }.flatten.compact).pluck(:account_id).index_with(true)
+    lists = List.where(account_id: receiver_id, exclusive: true)
+
+    crutches[:following]            = Follow.where(account_id: receiver_id, target_account_id: statuses.filter_map(&:in_reply_to_account_id)).pluck(:target_account_id).index_with(true)
+    crutches[:languages]            = Follow.where(account_id: receiver_id, target_account_id: statuses.map(&:account_id)).pluck(:target_account_id, :languages).to_h
+    crutches[:hiding_reblogs]       = Follow.where(account_id: receiver_id, target_account_id: statuses.filter_map { |s| s.account_id if s.reblog? }, show_reblogs: false).pluck(:target_account_id).index_with(true)
+    crutches[:blocking]             = Block.where(account_id: receiver_id, target_account_id: check_for_blocks).pluck(:target_account_id).index_with(true)
+    crutches[:muting]               = Mute.where(account_id: receiver_id, target_account_id: check_for_blocks).pluck(:target_account_id).index_with(true)
+    crutches[:domain_blocking]      = AccountDomainBlock.where(account_id: receiver_id, domain: statuses.flat_map { |s| [s.account.domain, s.reblog&.account&.domain] }.compact).pluck(:domain).index_with(true)
+    crutches[:blocked_by]           = Block.where(target_account_id: receiver_id, account_id: statuses.map { |s| [s.account_id, s.reblog&.account_id] }.flatten.compact).pluck(:account_id).index_with(true)
+    crutches[:exclusive_list_users] = ListAccount.where(list: lists, account_id: statuses.map(&:account_id)).pluck(:account_id).index_with(true)
 
     crutches
   end
diff --git a/app/lib/hash_object.rb b/app/lib/hash_object.rb
deleted file mode 100644
index 274c020ad..000000000
--- a/app/lib/hash_object.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-class HashObject
-  def initialize(hash)
-    hash.each do |k, v|
-      instance_variable_set("@#{k}", v)
-      self.class.send(:define_method, k, proc { instance_variable_get("@#{k}") })
-    end
-  end
-end
diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index dfed69285..f0aeec0b3 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -7,15 +7,15 @@ class LinkDetailsExtractor
   # Some publications wrap their JSON-LD data in their <script> tags
   # in commented-out CDATA blocks, they need to be removed before
   # attempting to parse JSON
-  CDATA_JUNK_PATTERN = %r{^[\s]*(
-    (/\*[\s]*<!\[CDATA\[[\s]*\*/) # Block comment style opening
+  CDATA_JUNK_PATTERN = %r{^\s*(
+    (/\*\s*<!\[CDATA\[\s*\*/) # Block comment style opening
     |
-    (//[\s]*<!\[CDATA\[) # Single-line comment style opening
+    (//\s*<!\[CDATA\[) # Single-line comment style opening
     |
-    (/\*[\s]*\]\]>[\s]*\*/) # Block comment style closing
+    (/\*\s*\]\]>\s*\*/) # Block comment style closing
     |
-    (//[\s]*\]\]>) # Single-line comment style closing
-  )[\s]*$}x
+    (//\s*\]\]>) # Single-line comment style closing
+  )\s*$}x
 
   class StructuredData
     SUPPORTED_TYPES = %w(
@@ -204,7 +204,7 @@ class LinkDetailsExtractor
   def host_to_url(str)
     return if str.blank?
 
-    str.start_with?(/https?:\/\//) ? str : "http://#{str}"
+    str.start_with?(%r{https?://}) ? str : "http://#{str}"
   end
 
   def valid_url_or_nil(str, same_origin_only: false)
diff --git a/app/lib/plain_text_formatter.rb b/app/lib/plain_text_formatter.rb
index 612166018..8eac730be 100644
--- a/app/lib/plain_text_formatter.rb
+++ b/app/lib/plain_text_formatter.rb
@@ -3,7 +3,7 @@
 class PlainTextFormatter
   include ActionView::Helpers::TextHelper
 
-  NEWLINE_TAGS_RE = /(<br \/>|<br>|<\/p>)+/
+  NEWLINE_TAGS_RE = %r{(<br />|<br>|</p>)+}
 
   attr_reader :text, :local
 
diff --git a/app/lib/tag_manager.rb b/app/lib/tag_manager.rb
index 7fbf4437d..ea096855f 100644
--- a/app/lib/tag_manager.rb
+++ b/app/lib/tag_manager.rb
@@ -7,18 +7,18 @@ class TagManager
   include RoutingHelper
 
   def web_domain?(domain)
-    domain.nil? || domain.gsub(/[\/]/, '').casecmp(Rails.configuration.x.web_domain).zero?
+    domain.nil? || domain.delete('/').casecmp(Rails.configuration.x.web_domain).zero?
   end
 
   def local_domain?(domain)
-    domain.nil? || domain.gsub(/[\/]/, '').casecmp(Rails.configuration.x.local_domain).zero?
+    domain.nil? || domain.delete('/').casecmp(Rails.configuration.x.local_domain).zero?
   end
 
   def normalize_domain(domain)
     return if domain.nil?
 
     uri = Addressable::URI.new
-    uri.host = domain.gsub(/[\/]/, '')
+    uri.host = domain.delete('/')
     uri.normalized_host
   end
 
diff --git a/app/lib/text_formatter.rb b/app/lib/text_formatter.rb
index b7bc8320a..243e89289 100644
--- a/app/lib/text_formatter.rb
+++ b/app/lib/text_formatter.rb
@@ -5,7 +5,7 @@ class TextFormatter
   include ERB::Util
   include RoutingHelper
 
-  URL_PREFIX_REGEX = /\A(https?:\/\/(www\.)?|xmpp:)/
+  URL_PREFIX_REGEX = %r{\A(https?://(www\.)?|xmpp:)}
 
   DEFAULT_REL = %w(nofollow noopener noreferrer).freeze
 
diff --git a/app/lib/translation_service/deepl.rb b/app/lib/translation_service/deepl.rb
index afcb7ecb2..925a1cf17 100644
--- a/app/lib/translation_service/deepl.rb
+++ b/app/lib/translation_service/deepl.rb
@@ -10,8 +10,8 @@ class TranslationService::DeepL < TranslationService
     @api_key = api_key
   end
 
-  def translate(text, source_language, target_language)
-    form = { text: text, source_lang: source_language&.upcase, target_lang: target_language, tag_handling: 'html' }
+  def translate(texts, source_language, target_language)
+    form = { text: texts, source_lang: source_language&.upcase, target_lang: target_language, tag_handling: 'html' }
     request(:post, '/v2/translate', form: form) do |res|
       transform_response(res.body_with_limit)
     end
@@ -67,12 +67,17 @@ class TranslationService::DeepL < TranslationService
     end
   end
 
-  def transform_response(str)
-    json = Oj.load(str, mode: :strict)
+  def transform_response(json)
+    data = Oj.load(json, mode: :strict)
+    raise UnexpectedResponseError unless data.is_a?(Hash)
 
-    raise UnexpectedResponseError unless json.is_a?(Hash)
-
-    Translation.new(text: json.dig('translations', 0, 'text'), detected_source_language: json.dig('translations', 0, 'detected_source_language')&.downcase, provider: 'DeepL.com')
+    data['translations'].map do |translation|
+      Translation.new(
+        text: translation['text'],
+        detected_source_language: translation['detected_source_language']&.downcase,
+        provider: 'DeepL.com'
+      )
+    end
   rescue Oj::ParseError
     raise UnexpectedResponseError
   end
diff --git a/app/lib/translation_service/libre_translate.rb b/app/lib/translation_service/libre_translate.rb
index 8bb194a9c..de43d7c88 100644
--- a/app/lib/translation_service/libre_translate.rb
+++ b/app/lib/translation_service/libre_translate.rb
@@ -8,8 +8,8 @@ class TranslationService::LibreTranslate < TranslationService
     @api_key  = api_key
   end
 
-  def translate(text, source_language, target_language)
-    body = Oj.dump(q: text, source: source_language.presence || 'auto', target: target_language, format: 'html', api_key: @api_key)
+  def translate(texts, source_language, target_language)
+    body = Oj.dump(q: texts, source: source_language.presence || 'auto', target: target_language, format: 'html', api_key: @api_key)
     request(:post, '/translate', body: body) do |res|
       transform_response(res.body_with_limit, source_language)
     end
@@ -44,12 +44,17 @@ class TranslationService::LibreTranslate < TranslationService
     end
   end
 
-  def transform_response(str, source_language)
-    json = Oj.load(str, mode: :strict)
+  def transform_response(json, source_language)
+    data = Oj.load(json, mode: :strict)
+    raise UnexpectedResponseError unless data.is_a?(Hash)
 
-    raise UnexpectedResponseError unless json.is_a?(Hash)
-
-    Translation.new(text: json['translatedText'], detected_source_language: source_language, provider: 'LibreTranslate')
+    data['translatedText'].map.with_index do |text, index|
+      Translation.new(
+        text: text,
+        detected_source_language: data.dig('detectedLanguage', index, 'language') || source_language,
+        provider: 'LibreTranslate'
+      )
+    end
   rescue Oj::ParseError
     raise UnexpectedResponseError
   end
diff --git a/app/lib/webfinger_resource.rb b/app/lib/webfinger_resource.rb
index 7e1a7196d..e28723ff8 100644
--- a/app/lib/webfinger_resource.rb
+++ b/app/lib/webfinger_resource.rb
@@ -13,7 +13,7 @@ class WebfingerResource
     case resource
     when /\Ahttps?/i
       username_from_url
-    when /\@/
+    when /@/
       username_from_acct
     else
       raise InvalidRequest
diff --git a/app/lib/webhooks/payload_renderer.rb b/app/lib/webhooks/payload_renderer.rb
new file mode 100644
index 000000000..3d2731f6d
--- /dev/null
+++ b/app/lib/webhooks/payload_renderer.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+class Webhooks::PayloadRenderer
+  class DocumentTraverser
+    INT_REGEX = /[0-9]+/
+
+    def initialize(document)
+      @document = document.with_indifferent_access
+    end
+
+    def get(path)
+      value  = @document.dig(*parse_path(path))
+      string = Oj.dump(value)
+
+      # We want to make sure people can use the variable inside
+      # other strings, so it can't be wrapped in quotes.
+      if value.is_a?(String)
+        string[1...-1]
+      else
+        string
+      end
+    end
+
+    private
+
+    def parse_path(path)
+      path.split('.').filter_map do |segment|
+        if segment.match(INT_REGEX)
+          segment.to_i
+        else
+          segment.presence
+        end
+      end
+    end
+  end
+
+  class TemplateParser < Parslet::Parser
+    rule(:dot) { str('.') }
+    rule(:digit) { match('[0-9]') }
+    rule(:property_name) { match('[a-z_]').repeat(1) }
+    rule(:array_index) { digit.repeat(1) }
+    rule(:segment) { (property_name | array_index) }
+    rule(:path) { property_name >> (dot >> segment).repeat }
+    rule(:variable) { (str('}}').absent? >> path).repeat.as(:variable) }
+    rule(:expression) { str('{{') >> variable >> str('}}') }
+    rule(:text) { (str('{{').absent? >> any).repeat(1) }
+    rule(:text_with_expressions) { (text.as(:text) | expression).repeat.as(:text) }
+    root(:text_with_expressions)
+  end
+
+  EXPRESSION_REGEXP = /
+    \{\{
+      [a-z_]+
+      (\.
+        ([a-z_]+|[0-9]+)
+      )*
+    \}\}
+  /iox
+
+  def initialize(json)
+    @document = DocumentTraverser.new(Oj.load(json))
+  end
+
+  def render(template)
+    template.gsub(EXPRESSION_REGEXP) { |match| @document.get(match[2...-2]) }
+  end
+end
diff --git a/app/models/account.rb b/app/models/account.rb
index 7f26f88be..02afc78ca 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -62,9 +62,9 @@ class Account < ApplicationRecord
     trust_level
   )
 
-  USERNAME_RE   = /[a-z0-9_]+([a-z0-9_\.-]+[a-z0-9_]+)?/i
-  MENTION_RE    = /(?<=^|[^\/[:word:]])@((#{USERNAME_RE})(?:@[[:word:]\.\-]+[[:word:]]+)?)/i
-  URL_PREFIX_RE = /\Ahttp(s?):\/\/[^\/]+/
+  USERNAME_RE   = /[a-z0-9_]+([a-z0-9_.-]+[a-z0-9_]+)?/i
+  MENTION_RE    = %r{(?<=^|[^/[:word:]])@((#{USERNAME_RE})(?:@[[:word:].-]+[[:word:]]+)?)}i
+  URL_PREFIX_RE = %r{\Ahttp(s?)://[^/]+}
   USERNAME_ONLY_RE = /\A#{USERNAME_RE}\z/i
 
   include Attachmentable
@@ -144,6 +144,7 @@ class Account < ApplicationRecord
            :locale,
            :shows_application?,
            :prefers_noindex?,
+           :time_zone,
            to: :user,
            prefix: true,
            allow_nil: true
diff --git a/app/models/account_conversation.rb b/app/models/account_conversation.rb
index be0787921..95faece1b 100644
--- a/app/models/account_conversation.rb
+++ b/app/models/account_conversation.rb
@@ -17,6 +17,8 @@
 class AccountConversation < ApplicationRecord
   include Redisable
 
+  attr_writer :participant_accounts
+
   before_validation :set_last_status
   after_commit :push_to_streaming_api
 
@@ -26,24 +28,40 @@ class AccountConversation < ApplicationRecord
 
   def participant_account_ids=(arr)
     self[:participant_account_ids] = arr.sort
+    @participant_accounts = nil
   end
 
   def participant_accounts
-    if participant_account_ids.empty?
-      [account]
-    else
-      participants = Account.where(id: participant_account_ids)
-      participants.empty? ? [account] : participants
+    @participant_accounts ||= begin
+      if participant_account_ids.empty?
+        [account]
+      else
+        participants = Account.where(id: participant_account_ids).to_a
+        participants.empty? ? [account] : participants
+      end
     end
   end
 
   class << self
-    def to_a_paginated_by_id(limit, options = {})
-      if options[:min_id]
-        paginate_by_min_id(limit, options[:min_id], options[:max_id]).reverse
-      else
-        paginate_by_max_id(limit, options[:max_id], options[:since_id]).to_a
+    def to_a_paginated_by_id(limit, min_id: nil, max_id: nil, since_id: nil, preload_participants: true)
+      array = begin
+        if min_id
+          paginate_by_min_id(limit, min_id, max_id).reverse
+        else
+          paginate_by_max_id(limit, max_id, since_id).to_a
+        end
       end
+
+      if preload_participants
+        participant_ids = array.flat_map(&:participant_account_ids)
+        accounts_by_id = Account.where(id: participant_ids).index_by(&:id)
+
+        array.each do |conversation|
+          conversation.participant_accounts = conversation.participant_account_ids.filter_map { |id| accounts_by_id[id] }
+        end
+      end
+
+      array
     end
 
     def paginate_by_min_id(limit, min_id = nil, max_id = nil)
diff --git a/app/models/bulk_import.rb b/app/models/bulk_import.rb
index af9a9670b..810e47184 100644
--- a/app/models/bulk_import.rb
+++ b/app/models/bulk_import.rb
@@ -30,6 +30,7 @@ class BulkImport < ApplicationRecord
     muting: 2,
     domain_blocking: 3,
     bookmarks: 4,
+    lists: 5,
   }
 
   enum state: {
diff --git a/app/models/domain_allow.rb b/app/models/domain_allow.rb
index 9e746b915..ce9597b4d 100644
--- a/app/models/domain_allow.rb
+++ b/app/models/domain_allow.rb
@@ -35,7 +35,7 @@ class DomainAllow < ApplicationRecord
     def rule_for(domain)
       return if domain.blank?
 
-      uri = Addressable::URI.new.tap { |u| u.host = domain.gsub(/[\/]/, '') }
+      uri = Addressable::URI.new.tap { |u| u.host = domain.delete('/') }
 
       find_by(domain: uri.normalized_host)
     end
diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb
index 06d35d8be..108dfe3d4 100644
--- a/app/models/domain_block.rb
+++ b/app/models/domain_block.rb
@@ -67,7 +67,7 @@ class DomainBlock < ApplicationRecord
     def rule_for(domain)
       return if domain.blank?
 
-      uri      = Addressable::URI.new.tap { |u| u.host = domain.strip.gsub(/[\/]/, '') }
+      uri      = Addressable::URI.new.tap { |u| u.host = domain.strip.delete('/') }
       segments = uri.normalized_host.split('.')
       variants = segments.map.with_index { |_, i| segments[i..-1].join('.') }
 
diff --git a/app/models/form/import.rb b/app/models/form/import.rb
index 750ef84be..2fc74715b 100644
--- a/app/models/form/import.rb
+++ b/app/models/form/import.rb
@@ -18,6 +18,7 @@ class Form::Import
     muting: ['Account address', 'Hide notifications'],
     domain_blocking: ['#domain'],
     bookmarks: ['#uri'],
+    lists: ['List name', 'Account address'],
   }.freeze
 
   KNOWN_FIRST_HEADERS = EXPECTED_HEADERS_BY_TYPE.values.map(&:first).uniq.freeze
@@ -30,6 +31,7 @@ class Form::Import
     'Hide notifications' => 'hide_notifications',
     '#domain' => 'domain',
     '#uri' => 'uri',
+    'List name' => 'list_name',
   }.freeze
 
   class EmptyFileError < StandardError; end
@@ -48,6 +50,7 @@ class Form::Import
     return :muting if data.original_filename&.start_with?('mutes') || data.original_filename&.start_with?('muted_accounts')
     return :domain_blocking if data.original_filename&.start_with?('domain_blocks') || data.original_filename&.start_with?('blocked_domains')
     return :bookmarks if data.original_filename&.start_with?('bookmarks')
+    return :lists if data.original_filename&.start_with?('lists')
   end
 
   # Whether the uploaded CSV file seems to correspond to a different import type than the one selected
@@ -76,14 +79,16 @@ class Form::Import
 
   private
 
-  def default_csv_header
+  def default_csv_headers
     case type.to_sym
     when :following, :blocking, :muting
-      'Account address'
+      ['Account address']
     when :domain_blocking
-      '#domain'
+      ['#domain']
     when :bookmarks
-      '#uri'
+      ['#uri']
+    when :lists
+      ['List name', 'Account address']
     end
   end
 
@@ -98,7 +103,7 @@ class Form::Import
         field&.split(',')&.map(&:strip)&.presence
       when 'Account address'
         field.strip.gsub(/\A@/, '')
-      when '#domain', '#uri'
+      when '#domain', '#uri', 'List name'
         field.strip
       else
         field
@@ -109,7 +114,7 @@ class Form::Import
     @csv_data.take(1) # Ensure the headers are read
     raise EmptyFileError if @csv_data.headers == true
 
-    @csv_data = CSV.open(data.path, encoding: 'UTF-8', skip_blanks: true, headers: [default_csv_header], converters: csv_converter) unless KNOWN_FIRST_HEADERS.include?(@csv_data.headers&.first)
+    @csv_data = CSV.open(data.path, encoding: 'UTF-8', skip_blanks: true, headers: default_csv_headers, converters: csv_converter) unless KNOWN_FIRST_HEADERS.include?(@csv_data.headers&.first)
     @csv_data
   end
 
@@ -133,7 +138,7 @@ class Form::Import
   def validate_data
     return if data.nil?
     return errors.add(:data, I18n.t('imports.errors.too_large')) if data.size > FILE_SIZE_LIMIT
-    return errors.add(:data, I18n.t('imports.errors.incompatible_type')) unless csv_data.headers.include?(default_csv_header)
+    return errors.add(:data, I18n.t('imports.errors.incompatible_type')) unless default_csv_headers.all? { |header| csv_data.headers.include?(header) }
 
     errors.add(:data, I18n.t('imports.errors.over_rows_processing_limit', count: ROWS_PROCESSING_LIMIT)) if csv_row_count > ROWS_PROCESSING_LIMIT
 
diff --git a/app/models/list.rb b/app/models/list.rb
index bd1bdbd24..7dc96f01b 100644
--- a/app/models/list.rb
+++ b/app/models/list.rb
@@ -10,6 +10,7 @@
 #  created_at     :datetime         not null
 #  updated_at     :datetime         not null
 #  replies_policy :integer          default("list"), not null
+#  exclusive      :boolean          default(FALSE)
 #
 
 class List < ApplicationRecord
diff --git a/app/models/report.rb b/app/models/report.rb
index e738281ad..674cc9a27 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -51,6 +51,7 @@ class Report < ApplicationRecord
   enum category: {
     other: 0,
     spam: 1_000,
+    legal: 1_500,
     violation: 2_000,
   }
 
diff --git a/app/models/site_upload.rb b/app/models/site_upload.rb
index e17668110..2335ffac5 100644
--- a/app/models/site_upload.rb
+++ b/app/models/site_upload.rb
@@ -43,7 +43,7 @@ class SiteUpload < ApplicationRecord
 
   has_attached_file :file, styles: ->(file) { STYLES[file.instance.var.to_sym] }, convert_options: { all: '-coalesce +profile "!icc,*" +set modify-date +set create-date' }, processors: [:lazy_thumbnail, :blurhash_transcoder, :type_corrector]
 
-  validates_attachment_content_type :file, content_type: /\Aimage\/.*\z/
+  validates_attachment_content_type :file, content_type: %r{\Aimage/.*\z}
   validates :file, presence: true
   validates :var, presence: true, uniqueness: true
 
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 9fb32cd06..7668f16ce 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -34,7 +34,7 @@ class Tag < ApplicationRecord
   HASHTAG_LAST_SEQUENCE = '([[:word:]_]*[[:alpha:]][[:word:]_]*)'
   HASHTAG_NAME_PAT = "#{HASHTAG_FIRST_SEQUENCE}|#{HASHTAG_LAST_SEQUENCE}"
 
-  HASHTAG_RE = /(?:^|[^\/\)\w])#(#{HASHTAG_NAME_PAT})/i
+  HASHTAG_RE = %r{(?:^|[^/)\w])#(#{HASHTAG_NAME_PAT})}i
   HASHTAG_NAME_RE = /\A(#{HASHTAG_NAME_PAT})\z/i
   HASHTAG_INVALID_CHARS_RE = /[^[:alnum:]#{HASHTAG_SEPARATORS}]/
 
diff --git a/app/models/translation.rb b/app/models/translation.rb
new file mode 100644
index 000000000..7f8469c86
--- /dev/null
+++ b/app/models/translation.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class Translation < ActiveModelSerializers::Model
+  attributes :status, :detected_source_language, :language, :provider,
+             :content, :spoiler_text, :poll_options, :media_attachments
+
+  class Option < ActiveModelSerializers::Model
+    attributes :title
+  end
+
+  class MediaAttachment < ActiveModelSerializers::Model
+    attributes :id, :description
+  end
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 7181cf8d6..e5ec2447c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -40,6 +40,7 @@
 #  sign_up_ip                :inet
 #  role_id                   :bigint(8)
 #  settings                  :text
+#  time_zone                 :string
 #
 
 class User < ApplicationRecord
@@ -99,6 +100,7 @@ class User < ApplicationRecord
   validates_with BlacklistedEmailValidator, if: -> { ENV['EMAIL_DOMAIN_LISTS_APPLY_AFTER_CONFIRMATION'] == 'true' || !confirmed? }
   validates_with EmailMxValidator, if: :validate_email_dns?
   validates :agreement, acceptance: { allow_nil: false, accept: [true, 'true', '1'] }, on: :create
+  validates :time_zone, inclusion: { in: ActiveSupport::TimeZone.all.map { |tz| tz.tzinfo.name } }, allow_blank: true
 
   # Honeypot/anti-spam fields
   attr_accessor :registration_form_time, :website, :confirm_password
diff --git a/app/models/webhook.rb b/app/models/webhook.rb
index c556bcc2b..c46fce743 100644
--- a/app/models/webhook.rb
+++ b/app/models/webhook.rb
@@ -11,6 +11,7 @@
 #  enabled    :boolean          default(TRUE), not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
+#  template   :text
 #
 
 class Webhook < ApplicationRecord
@@ -30,6 +31,7 @@ class Webhook < ApplicationRecord
   validates :events, presence: true
 
   validate :validate_events
+  validate :validate_template
 
   before_validation :strip_events
   before_validation :generate_secret
@@ -49,7 +51,18 @@ class Webhook < ApplicationRecord
   private
 
   def validate_events
-    errors.add(:events, :invalid) if events.any? { |e| !EVENTS.include?(e) }
+    errors.add(:events, :invalid) if events.any? { |e| EVENTS.exclude?(e) }
+  end
+
+  def validate_template
+    return if template.blank?
+
+    begin
+      parser = Webhooks::PayloadRenderer::TemplateParser.new
+      parser.parse(template)
+    rescue Parslet::ParseFailed
+      errors.add(:template, :invalid)
+    end
   end
 
   def strip_events
diff --git a/app/serializers/rest/list_serializer.rb b/app/serializers/rest/list_serializer.rb
index 3e87f7119..6a1b6ea3e 100644
--- a/app/serializers/rest/list_serializer.rb
+++ b/app/serializers/rest/list_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class REST::ListSerializer < ActiveModel::Serializer
-  attributes :id, :title, :replies_policy
+  attributes :id, :title, :replies_policy, :exclusive
 
   def id
     object.id.to_s
diff --git a/app/serializers/rest/translation_serializer.rb b/app/serializers/rest/translation_serializer.rb
index 05ededc95..40e2d28fb 100644
--- a/app/serializers/rest/translation_serializer.rb
+++ b/app/serializers/rest/translation_serializer.rb
@@ -1,9 +1,38 @@
 # frozen_string_literal: true
 
 class REST::TranslationSerializer < ActiveModel::Serializer
-  attributes :content, :detected_source_language, :provider
+  attributes :detected_source_language, :language, :provider, :spoiler_text, :content
 
-  def content
-    object.text
+  class PollSerializer < ActiveModel::Serializer
+    attribute :id
+    has_many :options
+
+    def id
+      object.status.preloadable_poll.id.to_s
+    end
+
+    def options
+      object.poll_options
+    end
+
+    class OptionSerializer < ActiveModel::Serializer
+      attributes :title
+    end
+  end
+
+  has_one :poll, serializer: PollSerializer
+
+  class MediaAttachmentSerializer < ActiveModel::Serializer
+    attributes :id, :description
+
+    def id
+      object.id.to_s
+    end
+  end
+
+  has_many :media_attachments, serializer: MediaAttachmentSerializer
+
+  def poll
+    object if object.status.preloadable_poll
   end
 end
diff --git a/app/services/app_sign_up_service.rb b/app/services/app_sign_up_service.rb
index 3833327bb..94547b61b 100644
--- a/app/services/app_sign_up_service.rb
+++ b/app/services/app_sign_up_service.rb
@@ -35,7 +35,7 @@ class AppSignUpService < BaseService
   end
 
   def user_params
-    @params.slice(:email, :password, :agreement, :locale)
+    @params.slice(:email, :password, :agreement, :locale, :time_zone)
   end
 
   def account_params
diff --git a/app/services/backup_service.rb b/app/services/backup_service.rb
index 5a99eb50c..48df348b0 100644
--- a/app/services/backup_service.rb
+++ b/app/services/backup_service.rb
@@ -77,8 +77,8 @@ class BackupService < BaseService
         path = m.file&.path
         next unless path
 
-        path = path.gsub(/\A.*\/system\//, '')
-        path = path.gsub(/\A\/+/, '')
+        path = path.gsub(%r{\A.*/system/}, '')
+        path = path.gsub(%r{\A/+}, '')
         download_to_zip(zipfile, m.file, path)
       end
 
diff --git a/app/services/bulk_import_row_service.rb b/app/services/bulk_import_row_service.rb
index 4046ef4ee..ef4c18e78 100644
--- a/app/services/bulk_import_row_service.rb
+++ b/app/services/bulk_import_row_service.rb
@@ -7,7 +7,7 @@ class BulkImportRowService
     @type    = row.bulk_import.type.to_sym
 
     case @type
-    when :following, :blocking, :muting
+    when :following, :blocking, :muting, :lists
       target_acct     = @data['acct']
       target_domain   = domain(target_acct)
       @target_account = stoplight_wrap_request(target_domain) { ResolveAccountService.new.call(target_acct, { check_delivery_availability: true }) }
@@ -33,6 +33,12 @@ class BulkImportRowService
       return false unless StatusPolicy.new(@account, @target_status).show?
 
       @account.bookmarks.find_or_create_by!(status: @target_status)
+    when :lists
+      list = @account.owned_lists.find_or_create_by!(title: @data['list_name'])
+
+      FollowService.new.call(@account, @target_account) unless @account.id == @target_account.id
+
+      list.accounts << @target_account
     end
 
     true
diff --git a/app/services/bulk_import_service.rb b/app/services/bulk_import_service.rb
index 2701b0c7e..5c14adc49 100644
--- a/app/services/bulk_import_service.rb
+++ b/app/services/bulk_import_service.rb
@@ -16,6 +16,8 @@ class BulkImportService < BaseService
       import_domain_blocks!
     when :bookmarks
       import_bookmarks!
+    when :lists
+      import_lists!
     end
 
     @import.update!(state: :finished, finished_at: Time.now.utc) if @import.processed_items == @import.total_items
@@ -157,4 +159,24 @@ class BulkImportService < BaseService
       [row.id]
     end
   end
+
+  def import_lists!
+    rows = @import.rows.to_a
+
+    if @import.overwrite?
+      included_lists = rows.map { |row| row.data['list_name'] }.uniq
+
+      @account.owned_lists.where.not(title: included_lists).destroy_all
+
+      # As list membership changes do not retroactively change timeline
+      # contents, simplify things by just clearing everything
+      @account.owned_lists.find_each do |list|
+        list.list_accounts.destroy_all
+      end
+    end
+
+    Import::RowWorker.push_bulk(rows) do |row|
+      [row.id]
+    end
+  end
 end
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index 9c56c862e..dccd86c1e 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -7,7 +7,7 @@ class FetchLinkCardService < BaseService
   URL_PATTERN = %r{
     (#{Twitter::TwitterText::Regex[:valid_url_preceding_chars]})                                                                #   $1 preceding chars
     (                                                                                                                           #   $2 URL
-      (https?:\/\/)                                                                                                             #   $3 Protocol (required)
+      (https?://)                                                                                                               #   $3 Protocol (required)
       (#{Twitter::TwitterText::Regex[:valid_domain]})                                                                           #   $4 Domain(s)
       (?::(#{Twitter::TwitterText::Regex[:valid_port_number]}))?                                                                #   $5 Port number (optional)
       (/#{Twitter::TwitterText::Regex[:valid_url_path]}*)?                                                                      #   $6 URL Path and anchor
diff --git a/app/services/fetch_oembed_service.rb b/app/services/fetch_oembed_service.rb
index f922df64c..1ae592238 100644
--- a/app/services/fetch_oembed_service.rb
+++ b/app/services/fetch_oembed_service.rb
@@ -2,7 +2,7 @@
 
 class FetchOEmbedService
   ENDPOINT_CACHE_EXPIRES_IN = 24.hours.freeze
-  URL_REGEX                 = /(=(http[s]?(%3A|:)(\/\/|%2F%2F)))([^&]*)/i
+  URL_REGEX                 = %r{(=(https?(%3A|:)(//|%2F%2F)))([^&]*)}i
 
   attr_reader :url, :options, :format, :endpoint_url
 
diff --git a/app/services/search_service.rb b/app/services/search_service.rb
index b1ce5453f..f475f8153 100644
--- a/app/services/search_service.rb
+++ b/app/services/search_service.rb
@@ -70,7 +70,7 @@ class SearchService < BaseService
   end
 
   def url_query?
-    @resolve && /\Ahttps?:\/\//.match?(@query)
+    @resolve && %r{\Ahttps?://}.match?(@query)
   end
 
   def url_resource_results
diff --git a/app/services/translate_status_service.rb b/app/services/translate_status_service.rb
index 796f13a0d..c2b40433e 100644
--- a/app/services/translate_status_service.rb
+++ b/app/services/translate_status_service.rb
@@ -3,16 +3,24 @@
 class TranslateStatusService < BaseService
   CACHE_TTL = 1.day.freeze
 
+  include ERB::Util
   include FormattingHelper
 
   def call(status, target_language)
     @status = status
-    @content = status_content_format(@status)
+    @source_texts = source_texts
     @target_language = target_language
 
     raise Mastodon::NotPermittedError unless permitted?
 
-    Rails.cache.fetch("translations/#{@status.language}/#{@target_language}/#{content_hash}", expires_in: CACHE_TTL) { translation_backend.translate(@content, @status.language, @target_language) }
+    status_translation = Rails.cache.fetch("v2:translations/#{@status.language}/#{@target_language}/#{content_hash}", expires_in: CACHE_TTL) do
+      translations = translation_backend.translate(@source_texts.values, @status.language, @target_language)
+      build_status_translation(translations)
+    end
+
+    status_translation.status = @status
+
+    status_translation
   end
 
   private
@@ -22,7 +30,7 @@ class TranslateStatusService < BaseService
   end
 
   def permitted?
-    return false unless @status.distributable? && @status.content.present? && TranslationService.configured?
+    return false unless @status.distributable? && TranslationService.configured?
 
     languages[@status.language]&.include?(@target_language)
   end
@@ -32,6 +40,73 @@ class TranslateStatusService < BaseService
   end
 
   def content_hash
-    Digest::SHA256.base64digest(@content)
+    Digest::SHA256.base64digest(@source_texts.transform_keys { |key| key.respond_to?(:id) ? "#{key.class}-#{key.id}" : key }.to_json)
+  end
+
+  def source_texts
+    texts = {}
+    texts[:content] = wrap_emoji_shortcodes(status_content_format(@status)) if @status.content.present?
+    texts[:spoiler_text] = wrap_emoji_shortcodes(html_escape(@status.spoiler_text)) if @status.spoiler_text.present?
+
+    @status.preloadable_poll&.loaded_options&.each do |option|
+      texts[option] = wrap_emoji_shortcodes(html_escape(option.title))
+    end
+
+    @status.media_attachments.each do |media_attachment|
+      texts[media_attachment] = html_escape(media_attachment.description)
+    end
+
+    texts
+  end
+
+  def build_status_translation(translations)
+    status_translation = Translation.new(
+      detected_source_language: translations.first&.detected_source_language,
+      language: @target_language,
+      provider: translations.first&.provider,
+      content: '',
+      spoiler_text: '',
+      poll_options: [],
+      media_attachments: []
+    )
+
+    @source_texts.keys.each_with_index do |source, index|
+      translation = translations[index]
+
+      case source
+      when :content
+        status_translation.content = unwrap_emoji_shortcodes(translation.text).to_html
+      when :spoiler_text
+        status_translation.spoiler_text = unwrap_emoji_shortcodes(translation.text).content
+      when Poll::Option
+        status_translation.poll_options << Translation::Option.new(
+          title: unwrap_emoji_shortcodes(translation.text).content
+        )
+      when MediaAttachment
+        status_translation.media_attachments << Translation::MediaAttachment.new(
+          id: source.id,
+          description: html_entities.decode(translation.text)
+        )
+      end
+    end
+
+    status_translation
+  end
+
+  def wrap_emoji_shortcodes(text)
+    EmojiFormatter.new(text, @status.emojis, { raw_shortcode: true }).to_s
+  end
+
+  def unwrap_emoji_shortcodes(html)
+    fragment = Nokogiri::HTML.fragment(html)
+    fragment.css('span[translate="no"]').each do |element|
+      element.remove_attribute('translate')
+      element.replace(element.children) if element.attributes.empty?
+    end
+    fragment
+  end
+
+  def html_entities
+    HTMLEntities.new
   end
 end
diff --git a/app/views/admin/domain_blocks/confirm_suspension.html.haml b/app/views/admin/domain_blocks/confirm_suspension.html.haml
new file mode 100644
index 000000000..e291d4ce2
--- /dev/null
+++ b/app/views/admin/domain_blocks/confirm_suspension.html.haml
@@ -0,0 +1,22 @@
+- content_for :page_title do
+  = t('.title', domain: Addressable::IDNA.to_unicode(@domain_block.domain))
+
+= simple_form_for @domain_block, url: admin_domain_blocks_path(@domain_block) do |f|
+
+  %p.hint= t('.preamble_html', domain: Addressable::IDNA.to_unicode(@domain_block.domain))
+  %ul.hint
+    %li= t('.stop_communication')
+    %li= t('.remove_all_data')
+    %li= t('.undo_relationships')
+    %li.negative-hint= t('.permanent_action')
+
+  - %i(domain severity reject_media reject_reports obfuscate private_comment public_comment).each do |key|
+    = f.hidden_field key
+
+  %hr.spacer
+
+  = react_admin_component :impact_report, domain: @domain_block.domain
+
+  .actions
+    = link_to t('.cancel'), admin_instances_path, class: 'button button-tertiary'
+    = f.button :submit, t('.confirm'), class: 'button negative', name: :confirm
diff --git a/app/views/admin/email_domain_blocks/_email_domain_block.html.haml b/app/views/admin/email_domain_blocks/_email_domain_block.html.haml
index c5a55bc27..7cb973c4b 100644
--- a/app/views/admin/email_domain_blocks/_email_domain_block.html.haml
+++ b/app/views/admin/email_domain_blocks/_email_domain_block.html.haml
@@ -9,6 +9,6 @@
 
       - if email_domain_block.parent.present?
         = t('admin.email_domain_blocks.resolved_through_html', domain: content_tag(:samp, email_domain_block.parent.domain))
-        •
+        ·
 
       = t('admin.email_domain_blocks.attempts_over_week', count: email_domain_block.history.reduce(0) { |sum, day| sum + day.accounts })
diff --git a/app/views/admin/export_domain_blocks/_domain_block.html.haml b/app/views/admin/export_domain_blocks/_domain_block.html.haml
index 5d4b6c4d0..cdce4fd28 100644
--- a/app/views/admin/export_domain_blocks/_domain_block.html.haml
+++ b/app/views/admin/export_domain_blocks/_domain_block.html.haml
@@ -17,11 +17,11 @@
 
       %br/
 
-      = f.object.policies.map { |policy| t(policy, scope: 'admin.instances.content_policies.policies') }.join(' • ')
+      = f.object.policies.map { |policy| t(policy, scope: 'admin.instances.content_policies.policies') }.join(' · ')
       - if f.object.public_comment.present?
-        •
+        ·
         = f.object.public_comment
       - if existing_relationships
-        •
+        ·
         = fa_icon 'warning fw'
         = t('admin.export_domain_blocks.import.existing_relationships_warning')
diff --git a/app/views/admin/instances/_instance.html.haml b/app/views/admin/instances/_instance.html.haml
index 93f9bd418..65cf789ce 100644
--- a/app/views/admin/instances/_instance.html.haml
+++ b/app/views/admin/instances/_instance.html.haml
@@ -6,7 +6,7 @@
 
       %small
         - if instance.domain_block
-          = instance.domain_block.policies.map { |policy| t(policy, scope: 'admin.instances.content_policies.policies') }.join(' • ')
+          = instance.domain_block.policies.map { |policy| t(policy, scope: 'admin.instances.content_policies.policies') }.join(' · ')
         - elsif instance.domain_allow
           = t('admin.accounts.whitelisted')
         - else
diff --git a/app/views/admin/instances/show.html.haml b/app/views/admin/instances/show.html.haml
index 00c1927df..1380b9a4d 100644
--- a/app/views/admin/instances/show.html.haml
+++ b/app/views/admin/instances/show.html.haml
@@ -55,7 +55,7 @@
             %td= @instance.domain_block.public_comment
           %tr
             %th= t('admin.instances.content_policies.policy')
-            %td= @instance.domain_block.policies.map { |policy| t(policy, scope: 'admin.instances.content_policies.policies') }.join(' • ')
+            %td= @instance.domain_block.policies.map { |policy| t(policy, scope: 'admin.instances.content_policies.policies') }.join(' · ')
 
     = link_to t('admin.domain_blocks.edit'), edit_admin_domain_block_path(@instance.domain_block), class: 'button'
     = link_to t('admin.domain_blocks.undo'), admin_domain_block_path(@instance.domain_block), class: 'button', data: { confirm: t('admin.accounts.are_you_sure'), method: :delete }
diff --git a/app/views/admin/ip_blocks/_ip_block.html.haml b/app/views/admin/ip_blocks/_ip_block.html.haml
index b8d3ac0e8..3dc6f8f8e 100644
--- a/app/views/admin/ip_blocks/_ip_block.html.haml
+++ b/app/views/admin/ip_blocks/_ip_block.html.haml
@@ -5,7 +5,7 @@
     .pending-account__header
       %samp= link_to "#{ip_block.ip}/#{ip_block.ip.prefix}", admin_accounts_path(ip: "#{ip_block.ip}/#{ip_block.ip.prefix}")
       - if ip_block.comment.present?
-        •
+        ·
         = ip_block.comment
       %br/
       = t("simple_form.labels.ip_block.severities.#{ip_block.severity}")
diff --git a/app/views/admin/roles/_role.html.haml b/app/views/admin/roles/_role.html.haml
index 798d8d8b4..d6c6b62c8 100644
--- a/app/views/admin/roles/_role.html.haml
+++ b/app/views/admin/roles/_role.html.haml
@@ -24,7 +24,7 @@
         = t('admin.roles.everyone_full_description_html')
       - else
         = link_to t('admin.roles.assigned_users', count: role.users.count), admin_accounts_path(role_ids: role.id)
-        •
+        ·
         %abbr{ title: role.permissions_as_keys.map { |privilege| I18n.t("admin.roles.privileges.#{privilege}") }.join(', ') }= t('admin.roles.permissions_count', count: role.permissions_as_keys.size)
     %div
       = table_link_to 'pencil', t('admin.accounts.edit'), edit_admin_role_path(role) if can?(:update, role)
diff --git a/app/views/admin/settings/content_retention/show.html.haml b/app/views/admin/settings/content_retention/show.html.haml
index b9467572a..5a6701614 100644
--- a/app/views/admin/settings/content_retention/show.html.haml
+++ b/app/views/admin/settings/content_retention/show.html.haml
@@ -12,7 +12,7 @@
 
   .fields-group
     = f.input :media_cache_retention_period, wrapper: :with_block_label, input_html: { pattern: '[0-9]+' }
-    = f.input :content_cache_retention_period, wrapper: :with_block_label, input_html: { pattern: '[0-9]+' }
+    = f.input :content_cache_retention_period, wrapper: :with_block_label, input_html: { pattern: '[0-9]+' }, hint: false, warning_hint: t('simple_form.hints.form_admin_settings.content_cache_retention_period')
     = f.input :backups_retention_period, wrapper: :with_block_label, input_html: { pattern: '[0-9]+' }
 
   .actions
diff --git a/app/views/admin/trends/links/_preview_card.html.haml b/app/views/admin/trends/links/_preview_card.html.haml
index 8812feb31..1ca348371 100644
--- a/app/views/admin/trends/links/_preview_card.html.haml
+++ b/app/views/admin/trends/links/_preview_card.html.haml
@@ -10,21 +10,21 @@
 
       - if preview_card.provider_name.present?
         = preview_card.provider_name
-        •
+        ·
 
       - if preview_card.language.present?
         = standard_locale_name(preview_card.language)
-        •
+        ·
 
       = t('admin.trends.links.shared_by_over_week', count: preview_card.history.reduce(0) { |sum, day| sum + day.accounts })
 
       - if preview_card.trend.allowed?
-        •
+        ·
         %abbr{ title: t('admin.trends.tags.current_score', score: preview_card.trend.score) }= t('admin.trends.tags.trending_rank', rank: preview_card.trend.rank)
 
         - if preview_card.decaying?
-          •
+          ·
           = t('admin.trends.tags.peaked_on_and_decaying', date: l(preview_card.max_score_at.to_date, format: :short))
       - elsif preview_card.requires_review?
-        •
+        ·
         = t('admin.trends.pending_review')
diff --git a/app/views/admin/trends/statuses/_status.html.haml b/app/views/admin/trends/statuses/_status.html.haml
index f35e13d12..98f2e7709 100644
--- a/app/views/admin/trends/statuses/_status.html.haml
+++ b/app/views/admin/trends/statuses/_status.html.haml
@@ -17,17 +17,17 @@
     = t('admin.trends.statuses.shared_by', count: status.reblogs_count + status.favourites_count, friendly_count: friendly_number_to_human(status.reblogs_count + status.favourites_count))
 
     - if status.account.domain.present?
-      •
+      ·
       = status.account.domain
     - if status.language.present?
-      •
+      ·
       = standard_locale_name(status.language)
     - if status.trendable? && !status.account.discoverable?
-      •
+      ·
       = t('admin.trends.statuses.not_discoverable')
     - if status.trend.allowed?
-      •
+      ·
       %abbr{ title: t('admin.trends.tags.current_score', score: status.trend.score) }= t('admin.trends.tags.trending_rank', rank: status.trend.rank)
     - elsif status.requires_review?
-      •
+      ·
       = t('admin.trends.pending_review')
diff --git a/app/views/admin/trends/tags/_tag.html.haml b/app/views/admin/trends/tags/_tag.html.haml
index a30666a08..3bbdd08db 100644
--- a/app/views/admin/trends/tags/_tag.html.haml
+++ b/app/views/admin/trends/tags/_tag.html.haml
@@ -13,12 +13,12 @@
       = t('admin.trends.tags.used_by_over_week', count: tag.history.reduce(0) { |sum, day| sum + day.accounts })
 
       - if tag.trendable? && (rank = Trends.tags.rank(tag.id))
-        •
+        ·
         %abbr{ title: t('admin.trends.tags.current_score', score: Trends.tags.score(tag.id)) }= t('admin.trends.tags.trending_rank', rank: rank + 1)
 
         - if tag.decaying?
-          •
+          ·
           = t('admin.trends.tags.peaked_on_and_decaying', date: l(tag.max_score_at.to_date, format: :short))
       - elsif tag.requires_review?
-        •
+        ·
         = t('admin.trends.pending_review')
diff --git a/app/views/admin/webhooks/_form.html.haml b/app/views/admin/webhooks/_form.html.haml
index c1e8f8979..8d019ff43 100644
--- a/app/views/admin/webhooks/_form.html.haml
+++ b/app/views/admin/webhooks/_form.html.haml
@@ -7,5 +7,8 @@
   .fields-group
     = f.input :events, collection: Webhook::EVENTS, wrapper: :with_block_label, include_blank: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
 
+  .fields-group
+    = f.input :template, wrapper: :with_block_label, input_html: { placeholder: '{ "content": "Hello {{object.username}}" }' }
+
   .actions
     = f.button :button, @webhook.new_record? ? t('admin.webhooks.add_new') : t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/webhooks/_webhook.html.haml b/app/views/admin/webhooks/_webhook.html.haml
index d94a41eb3..6b3e49eba 100644
--- a/app/views/admin/webhooks/_webhook.html.haml
+++ b/app/views/admin/webhooks/_webhook.html.haml
@@ -10,7 +10,7 @@
       - else
         %span.negative-hint= t('admin.webhooks.disabled')
 
-      •
+      ·
 
       %abbr{ title: webhook.events.join(', ') }= t('admin.webhooks.enabled_events', count: webhook.events.size)
 
diff --git a/app/views/admin/webhooks/show.html.haml b/app/views/admin/webhooks/show.html.haml
index cc450de26..5ac809efc 100644
--- a/app/views/admin/webhooks/show.html.haml
+++ b/app/views/admin/webhooks/show.html.haml
@@ -2,14 +2,14 @@
   = t('admin.webhooks.title')
 
 - content_for :heading do
-  %h2
-    %small
-      = fa_icon 'inbox'
-      = t('admin.webhooks.webhook')
-    = @webhook.url
-
-- content_for :heading_actions do
-  = link_to t('admin.webhooks.edit'), edit_admin_webhook_path, class: 'button' if can?(:update, @webhook)
+  .content__heading__row
+    %h2
+      %small
+        = fa_icon 'inbox'
+        = t('admin.webhooks.webhook')
+      = @webhook.url
+    .content__heading__actions
+      = link_to t('admin.webhooks.edit'), edit_admin_webhook_path, class: 'button' if can?(:update, @webhook)
 
 .table-wrapper
   %table.table.horizontal-table
diff --git a/app/views/admin_mailer/_new_trending_links.text.erb b/app/views/admin_mailer/_new_trending_links.text.erb
index 602e12793..85f3f8039 100644
--- a/app/views/admin_mailer/_new_trending_links.text.erb
+++ b/app/views/admin_mailer/_new_trending_links.text.erb
@@ -1,8 +1,8 @@
 <%= raw t('admin_mailer.new_trends.new_trending_links.title') %>
 
 <% @links.each do |link| %>
-- <%= link.title %> • <%= link.url %>
-  <%= standard_locale_name(link.language) %> • <%= raw t('admin.trends.links.usage_comparison', today: link.history.get(Time.now.utc).accounts, yesterday: link.history.get(Time.now.utc - 1.day).accounts) %> • <%= t('admin.trends.tags.current_score', score: link.trend.score.round(2)) %>
+- <%= link.title %> · <%= link.url %>
+  <%= standard_locale_name(link.language) %> · <%= raw t('admin.trends.links.usage_comparison', today: link.history.get(Time.now.utc).accounts, yesterday: link.history.get(Time.now.utc - 1.day).accounts) %> · <%= t('admin.trends.tags.current_score', score: link.trend.score.round(2)) %>
 <% end %>
 
 <%= raw t('application_mailer.view')%> <%= admin_trends_links_url %>
diff --git a/app/views/admin_mailer/_new_trending_statuses.text.erb b/app/views/admin_mailer/_new_trending_statuses.text.erb
index 1ed3ae857..eedbfff9d 100644
--- a/app/views/admin_mailer/_new_trending_statuses.text.erb
+++ b/app/views/admin_mailer/_new_trending_statuses.text.erb
@@ -2,7 +2,7 @@
 
 <% @statuses.each do |status| %>
 - <%= ActivityPub::TagManager.instance.url_for(status) %>
-  <%= standard_locale_name(status.language) %> • <%= raw t('admin.trends.tags.current_score', score: status.trend.score.round(2)) %>
+  <%= standard_locale_name(status.language) %> · <%= raw t('admin.trends.tags.current_score', score: status.trend.score.round(2)) %>
 <% end %>
 
 <%= raw t('application_mailer.view')%> <%= admin_trends_statuses_url %>
diff --git a/app/views/admin_mailer/_new_trending_tags.text.erb b/app/views/admin_mailer/_new_trending_tags.text.erb
index 363df369d..d528ab8eb 100644
--- a/app/views/admin_mailer/_new_trending_tags.text.erb
+++ b/app/views/admin_mailer/_new_trending_tags.text.erb
@@ -2,7 +2,7 @@
 
 <% @tags.each do |tag| %>
 - #<%= tag.display_name %>
-  <%= raw t('admin.trends.tags.usage_comparison', today: tag.history.get(Time.now.utc).accounts, yesterday: tag.history.get(Time.now.utc - 1.day).accounts) %> • <%= t('admin.trends.tags.current_score', score: Trends.tags.score(tag.id).round(2)) %>
+  <%= raw t('admin.trends.tags.usage_comparison', today: tag.history.get(Time.now.utc).accounts, yesterday: tag.history.get(Time.now.utc - 1.day).accounts) %> · <%= t('admin.trends.tags.current_score', score: Trends.tags.score(tag.id).round(2)) %>
 <% end %>
 
 <% if @lowest_trending_tag %>
diff --git a/app/views/application/_card.html.haml b/app/views/application/_card.html.haml
index 719856d49..1b3dd889c 100644
--- a/app/views/application/_card.html.haml
+++ b/app/views/application/_card.html.haml
@@ -1,9 +1,11 @@
 - account_url = local_assigns[:admin] ? admin_account_path(account.id) : ActivityPub::TagManager.instance.url_for(account)
+- compact ||= false
 
 .card.h-card
   = link_to account_url, target: '_blank', rel: 'noopener noreferrer' do
-    .card__img
-      = image_tag account.header.url, alt: ''
+    - unless compact
+      .card__img
+        = image_tag account.header.url, alt: ''
     .card__bar
       .avatar
         = image_tag account.avatar.url, alt: '', width: 48, height: 48, class: 'u-photo'
diff --git a/app/views/auth/registrations/rules.html.haml b/app/views/auth/registrations/rules.html.haml
index ab3fa864a..234f4a601 100644
--- a/app/views/auth/registrations/rules.html.haml
+++ b/app/views/auth/registrations/rules.html.haml
@@ -7,8 +7,14 @@
 .simple_form
   = render 'auth/shared/progress', stage: 'rules'
 
-  %h1.title= t('auth.rules.title')
-  %p.lead= t('auth.rules.preamble', domain: site_hostname)
+  - if @invite.present? && @invite.autofollow?
+    %h1.title= t('auth.rules.title_invited')
+    %p.lead.invited-by= t('auth.rules.invited_by', domain: site_hostname)
+    = render 'application/card', account: @invite.user.account, compact: true
+    %p.lead= t('auth.rules.preamble_invited', domain: site_hostname)
+  - else
+    %h1.title= t('auth.rules.title')
+    %p.lead= t('auth.rules.preamble', domain: site_hostname)
 
   %ol.rules-list
     - @rules.each do |rule|
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 7eda8f5a0..2267ec529 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -26,12 +26,12 @@
 
     %title= content_for?(:page_title) ? safe_join([yield(:page_title).chomp.html_safe, title], ' - ') : title
 
-    = javascript_pack_tag "locales", crossorigin: 'anonymous'
+    = javascript_pack_tag "common", crossorigin: 'anonymous'
     - if @theme
       - if @theme[:supported_locales].include? I18n.locale.to_s
-        = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", crossorigin: 'anonymous'
+        = preload_pack_asset "locales/#{@theme[:flavour]}/#{I18n.locale}-json.js"
       - elsif @theme[:supported_locales].include? 'en'
-        = javascript_pack_tag "locales/#{@theme[:flavour]}/en", crossorigin: 'anonymous'
+        = preload_pack_asset "locales/#{@theme[:flavour]}/en-json.js"
     = csrf_meta_tags unless skip_csrf_meta_tags?
     %meta{ name: 'style-nonce', content: request.content_security_policy_nonce }
 
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index 210ac101d..42f61a180 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -12,12 +12,12 @@
       %link{ rel: 'dns-prefetch', href: storage_host }/
 
     = render_initial_state
-    = javascript_pack_tag 'locales', crossorigin: 'anonymous'
+    = javascript_pack_tag 'common', crossorigin: 'anonymous'
     - if @theme
       - if @theme[:supported_locales].include? I18n.locale.to_s
-        = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", crossorigin: 'anonymous'
+        = preload_pack_asset "locales/#{@theme[:flavour]}/#{I18n.locale}-json.js"
       - elsif @theme[:supported_locales].include? 'en'
-        = javascript_pack_tag "locales/#{@theme[:flavour]}/en", crossorigin: 'anonymous'
+        = preload_pack_asset "locales/#{@theme[:flavour]}/en-json.js"
     = render partial: 'layouts/theme', object: @core
     = render partial: 'layouts/theme', object: @theme
 
diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml
index 55da5de3f..d3210c33f 100644
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@@ -5,7 +5,7 @@
     %meta{ charset: 'utf-8' }/
     %title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ')
     %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/
-    = javascript_pack_tag "locales", crossorigin: 'anonymous'
+    = javascript_pack_tag "common", crossorigin: 'anonymous'
     = render partial: 'layouts/theme', object: (@core || { pack: 'common' })
     = render partial: 'layouts/theme', object: (@theme || { pack: 'error', flavour: 'glitch', common: { pack: 'common', flavour: 'glitch', skin: 'default' } })
   %body.error
diff --git a/app/views/media/player.html.haml b/app/views/media/player.html.haml
index c907d5c60..d34e15538 100644
--- a/app/views/media/player.html.haml
+++ b/app/views/media/player.html.haml
@@ -1,11 +1,11 @@
 - content_for :header_tags do
   = render_initial_state
-  = javascript_pack_tag 'locales', crossorigin: 'anonymous'
+  = javascript_pack_tag 'common', crossorigin: 'anonymous'
   - if @theme
     - if @theme[:supported_locales].include? I18n.locale.to_s
-      = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", crossorigin: 'anonymous'
+      = preload_pack_asset "locales/#{@theme[:flavour]}/#{I18n.locale}-json.js"
     - elsif @theme[:supported_locales].include? 'en'
-      = javascript_pack_tag "locales/#{@theme[:flavour]}/en", crossorigin: 'anonymous'
+      = preload_pack_asset "locales/#{@theme[:flavour]}/en-json.js"
   = render partial: 'layouts/theme', object: @core
   = render partial: 'layouts/theme', object: @theme
 
diff --git a/app/views/notification_mailer/_status.html.haml b/app/views/notification_mailer/_status.html.haml
index fd65039ae..d8aa38b11 100644
--- a/app/views/notification_mailer/_status.html.haml
+++ b/app/views/notification_mailer/_status.html.haml
@@ -42,4 +42,4 @@
                                         = link_to a.remote_url, a.remote_url
 
                               %p.status-footer
-                                = link_to l(status.created_at), web_url("@#{status.account.pretty_acct}/#{status.id}")
+                                = link_to l(status.created_at.in_time_zone(time_zone)), web_url("@#{status.account.pretty_acct}/#{status.id}")
diff --git a/app/views/notification_mailer/favourite.html.haml b/app/views/notification_mailer/favourite.html.haml
index 4ec89172d..325f0aff5 100644
--- a/app/views/notification_mailer/favourite.html.haml
+++ b/app/views/notification_mailer/favourite.html.haml
@@ -22,7 +22,7 @@
                               %h1= t 'notification_mailer.favourite.title'
                               %p.lead= t('notification_mailer.favourite.body', name: @account.pretty_acct)
 
-= render 'status', status: @status
+= render 'status', status: @status, time_zone: @me.user_time_zone
 
 %table.email-table{ cellspacing: 0, cellpadding: 0 }
   %tbody
diff --git a/app/views/notification_mailer/mention.html.haml b/app/views/notification_mailer/mention.html.haml
index 4ae9bb7b0..e830644c3 100644
--- a/app/views/notification_mailer/mention.html.haml
+++ b/app/views/notification_mailer/mention.html.haml
@@ -22,7 +22,7 @@
                               %h1= t 'notification_mailer.mention.title'
                               %p.lead= t('notification_mailer.mention.body', name: @status.account.pretty_acct)
 
-= render 'status', status: @status
+= render 'status', status: @status, time_zone: @me.user_time_zone
 
 %table.email-table{ cellspacing: 0, cellpadding: 0 }
   %tbody
diff --git a/app/views/notification_mailer/reblog.html.haml b/app/views/notification_mailer/reblog.html.haml
index f805c79f0..e4f944123 100644
--- a/app/views/notification_mailer/reblog.html.haml
+++ b/app/views/notification_mailer/reblog.html.haml
@@ -22,7 +22,7 @@
                               %h1= t 'notification_mailer.reblog.title'
                               %p.lead= t('notification_mailer.reblog.body', name: @account.pretty_acct)
 
-= render 'status', status: @status
+= render 'status', status: @status, time_zone: @me.user_time_zone
 
 %table.email-table{ cellspacing: 0, cellpadding: 0 }
   %tbody
diff --git a/app/views/oauth/authorized_applications/index.html.haml b/app/views/oauth/authorized_applications/index.html.haml
index 55d8524db..689f05102 100644
--- a/app/views/oauth/authorized_applications/index.html.haml
+++ b/app/views/oauth/authorized_applications/index.html.haml
@@ -23,7 +23,7 @@
           - else
             = t('doorkeeper.authorized_applications.index.never_used')
 
-          •
+          ·
 
           = t('doorkeeper.authorized_applications.index.authorized_at', date: l(application.created_at.to_date))
 
diff --git a/app/views/settings/imports/index.html.haml b/app/views/settings/imports/index.html.haml
index 02c3f4eb3..5f7950b59 100644
--- a/app/views/settings/imports/index.html.haml
+++ b/app/views/settings/imports/index.html.haml
@@ -3,7 +3,7 @@
 
 = simple_form_for @import, url: settings_imports_path do |f|
   .field-group
-    = f.input :type, as: :grouped_select, collection: { constructive: %i(following bookmarks), destructive: %i(muting blocking domain_blocking) }, wrapper: :with_block_label, include_blank: false, label_method: ->(type) { I18n.t("imports.types.#{type}") }, group_label_method: ->(group) { I18n.t("imports.type_groups.#{group.first}") }, group_method: :last, hint: t('imports.preface')
+    = f.input :type, as: :grouped_select, collection: { constructive: %i(following bookmarks lists), destructive: %i(muting blocking domain_blocking) }, wrapper: :with_block_label, include_blank: false, label_method: ->(type) { I18n.t("imports.types.#{type}") }, group_label_method: ->(group) { I18n.t("imports.type_groups.#{group.first}") }, group_method: :last, hint: t('imports.preface')
 
   .fields-row
     .fields-group.fields-row__column.fields-row__column-6
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml
index 9751da546..8f40e21a4 100644
--- a/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@@ -6,9 +6,12 @@
 
 = simple_form_for current_user, url: settings_preferences_appearance_path, html: { method: :put, id: 'edit_user' } do |f|
   .fields-row
-    .fields-group
+    .fields-group.fields-row__column.fields-row__column-6
       = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| native_locale_name(locale) }, selected: I18n.locale, hint: false
 
+    .fields-group.fields-row__column.fields-row__column-6
+      = f.input :time_zone, wrapper: :with_label, collection: ActiveSupport::TimeZone.all.map { |tz| ["(GMT#{tz.formatted_offset}) #{tz.name}", tz.tzinfo.name] }, hint: false
+
   - unless I18n.locale == :en
     .flash-message.translation-prompt
       #{t 'appearance.localization.body'} #{content_tag(:a, t('appearance.localization.guide_link_text'), href: t('appearance.localization.guide_link'), target: '_blank', rel: 'noopener')}
diff --git a/app/views/user_mailer/appeal_approved.html.haml b/app/views/user_mailer/appeal_approved.html.haml
index 962cab2e2..d62789a06 100644
--- a/app/views/user_mailer/appeal_approved.html.haml
+++ b/app/views/user_mailer/appeal_approved.html.haml
@@ -36,7 +36,7 @@
                         %tbody
                           %tr
                             %td.column-cell.text-center
-                              %p= t 'user_mailer.appeal_approved.explanation', appeal_date: l(@appeal.created_at), strike_date: l(@appeal.strike.created_at)
+                              %p= t 'user_mailer.appeal_approved.explanation', appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone)), strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone))
 
 %table.email-table{ cellspacing: 0, cellpadding: 0 }
   %tbody
diff --git a/app/views/user_mailer/appeal_approved.text.erb b/app/views/user_mailer/appeal_approved.text.erb
index 290fa24c3..99596605a 100644
--- a/app/views/user_mailer/appeal_approved.text.erb
+++ b/app/views/user_mailer/appeal_approved.text.erb
@@ -2,6 +2,6 @@
 
 ===
 
-<%= t 'user_mailer.appeal_approved.explanation', appeal_date: l(@appeal.created_at), strike_date: l(@appeal.strike.created_at) %>
+<%= t 'user_mailer.appeal_approved.explanation', appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone)), strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone)) %>
 
 => <%= root_url %>
diff --git a/app/views/user_mailer/appeal_rejected.html.haml b/app/views/user_mailer/appeal_rejected.html.haml
index c316a73fb..ae60775b0 100644
--- a/app/views/user_mailer/appeal_rejected.html.haml
+++ b/app/views/user_mailer/appeal_rejected.html.haml
@@ -36,7 +36,7 @@
                         %tbody
                           %tr
                             %td.column-cell.text-center
-                              %p= t 'user_mailer.appeal_rejected.explanation', appeal_date: l(@appeal.created_at), strike_date: l(@appeal.strike.created_at)
+                              %p= t 'user_mailer.appeal_rejected.explanation', appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone)), strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone))
 
 %table.email-table{ cellspacing: 0, cellpadding: 0 }
   %tbody
diff --git a/app/views/user_mailer/appeal_rejected.text.erb b/app/views/user_mailer/appeal_rejected.text.erb
index f47a76818..3c9377718 100644
--- a/app/views/user_mailer/appeal_rejected.text.erb
+++ b/app/views/user_mailer/appeal_rejected.text.erb
@@ -2,6 +2,6 @@
 
 ===
 
-<%= t 'user_mailer.appeal_rejected.explanation', appeal_date: l(@appeal.created_at), strike_date: l(@appeal.strike.created_at) %>
+<%= t 'user_mailer.appeal_rejected.explanation', appeal_date: l(@appeal.created_at.in_time_zone(@resource.time_zone)), strike_date: l(@appeal.strike.created_at.in_time_zone(@resource.time_zone)) %>
 
 => <%= root_url %>
diff --git a/app/views/user_mailer/suspicious_sign_in.html.haml b/app/views/user_mailer/suspicious_sign_in.html.haml
index e4ad500c3..6ebba3fa5 100644
--- a/app/views/user_mailer/suspicious_sign_in.html.haml
+++ b/app/views/user_mailer/suspicious_sign_in.html.haml
@@ -47,7 +47,7 @@
                                 %strong= "#{t('sessions.browser')}:"
                                 %span{ title: @user_agent }= t 'sessions.description', browser: t("sessions.browsers.#{@detection.id}", default: @detection.id.to_s), platform: t("sessions.platforms.#{@detection.platform.id}", default: @detection.platform.id.to_s)
                                 %br/
-                                = l(@timestamp)
+                                = l(@timestamp.in_time_zone(@resource.time_zone))
 
 %table.email-table{ cellspacing: 0, cellpadding: 0 }
   %tbody
diff --git a/app/views/user_mailer/suspicious_sign_in.text.erb b/app/views/user_mailer/suspicious_sign_in.text.erb
index 7d2ca28e8..956071e77 100644
--- a/app/views/user_mailer/suspicious_sign_in.text.erb
+++ b/app/views/user_mailer/suspicious_sign_in.text.erb
@@ -8,7 +8,7 @@
 
 <%= t('sessions.ip') %>: <%= @remote_ip %>
 <%= t('sessions.browser') %>: <%= t('sessions.description', browser: t("sessions.browsers.#{@detection.id}", default: "#{@detection.id}"), platform: t("sessions.platforms.#{@detection.platform.id}", default: "#{@detection.platform.id}")) %>
-<%= l(@timestamp) %>
+<%= l(@timestamp.in_time_zone(@resource.time_zone)) %>
 
 <%= t 'user_mailer.suspicious_sign_in.further_actions_html', action: t('user_mailer.suspicious_sign_in.change_password') %>
 
diff --git a/app/views/user_mailer/warning.html.haml b/app/views/user_mailer/warning.html.haml
index b9422e950..9cb73b0fe 100644
--- a/app/views/user_mailer/warning.html.haml
+++ b/app/views/user_mailer/warning.html.haml
@@ -58,7 +58,7 @@
 
 - unless @statuses.empty?
   - @statuses.each_with_index do |status, i|
-    = render 'notification_mailer/status', status: status, i: i + 1, highlighted: true
+    = render 'notification_mailer/status', status: status, i: i + 1, highlighted: true, time_zone: @resource.time_zone
 
 %table.email-table{ cellspacing: 0, cellpadding: 0 }
   %tbody
diff --git a/app/workers/webhooks/delivery_worker.rb b/app/workers/webhooks/delivery_worker.rb
index f8ed669fb..3bbc8e225 100644
--- a/app/workers/webhooks/delivery_worker.rb
+++ b/app/workers/webhooks/delivery_worker.rb
@@ -8,7 +8,7 @@ class Webhooks::DeliveryWorker
 
   def perform(webhook_id, body)
     @webhook   = Webhook.find(webhook_id)
-    @body      = body
+    @body      = @webhook.template.blank? ? body : Webhooks::PayloadRenderer.new(body).render(@webhook.template)
     @response  = nil
 
     perform_request
diff --git a/babel.config.js b/babel.config.js
index 986d60549..0eb877cc3 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -22,7 +22,7 @@ module.exports = (api) => {
       ['@babel/env', envOptions],
     ],
     plugins: [
-      ['react-intl', { messagesDir: './build/messages' }],
+      ['formatjs'],
       'preval',
       '@babel/plugin-transform-optional-chaining',
       '@babel/plugin-transform-nullish-coalescing-operator',
diff --git a/config/formatjs-formatter.js b/config/formatjs-formatter.js
new file mode 100644
index 000000000..9be5dd7e2
--- /dev/null
+++ b/config/formatjs-formatter.js
@@ -0,0 +1,14 @@
+const path = require('path');
+
+const upstreamTranslations = require(path.join(__dirname, "../app/javascript/mastodon/locales/en.json"));
+const currentTranslations = require(path.join(__dirname, "../app/javascript/flavours/glitch/locales/en.json"));
+
+exports.format = (msgs) => {
+  const results = {};
+  for (const [id, msg] of Object.entries(msgs)) {
+    if (!upstreamTranslations[id]) {
+      results[id] = currentTranslations[id] || msg.defaultMessage;
+    }
+  }
+  return results;
+};
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index 5cc4e9380..da0b04af1 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -79,7 +79,7 @@ class Rack::Attack
   end
 
   throttle('throttle_api_media', limit: 30, period: 30.minutes) do |req|
-    req.authenticated_user_id if req.post? && req.path.match?(/\A\/api\/v\d+\/media\z/i)
+    req.authenticated_user_id if req.post? && req.path.match?(%r{\A/api/v\d+/media\z}i)
   end
 
   throttle('throttle_media_proxy', limit: 30, period: 10.minutes) do |req|
@@ -98,8 +98,8 @@ class Rack::Attack
     req.throttleable_remote_ip if req.paging_request? && req.unauthenticated?
   end
 
-  API_DELETE_REBLOG_REGEX = /\A\/api\/v1\/statuses\/[\d]+\/unreblog\z/
-  API_DELETE_STATUS_REGEX = /\A\/api\/v1\/statuses\/[\d]+\z/
+  API_DELETE_REBLOG_REGEX = %r{\A/api/v1/statuses/\d+/unreblog\z}
+  API_DELETE_STATUS_REGEX = %r{\A/api/v1/statuses/\d+\z}
 
   throttle('throttle_api_delete', limit: 30, period: 30.minutes) do |req|
     req.authenticated_user_id if (req.post? && req.path.match?(API_DELETE_REBLOG_REGEX)) || (req.delete? && req.path.match?(API_DELETE_STATUS_REGEX))
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index fff4f538e..01a38879f 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -19,6 +19,14 @@ module RecommendedComponent
   end
 end
 
+module WarningHintComponent
+  def warning_hint(_wrapper_options = nil)
+    @warning_hint ||= begin
+      options[:warning_hint].to_s.html_safe if options[:warning_hint].present?
+    end
+  end
+end
+
 module GlitchOnlyComponent
   def glitch_only(_wrapper_options = nil)
     return unless options[:glitch_only]
@@ -30,6 +38,7 @@ end
 
 SimpleForm.include_component(AppendComponent)
 SimpleForm.include_component(RecommendedComponent)
+SimpleForm.include_component(WarningHintComponent)
 SimpleForm.include_component(GlitchOnlyComponent)
 
 SimpleForm.setup do |config|
@@ -112,6 +121,7 @@ SimpleForm.setup do |config|
     b.use :html5
     b.use :label
     b.use :hint, wrap_with: { tag: :span, class: :hint }
+    b.use :warning_hint, wrap_with: { tag: :span, class: [:hint, 'warning-hint'] }
     b.use :input, wrap_with: { tag: :div, class: :label_input }
     b.use :error, wrap_with: { tag: :span, class: :error }
   end
diff --git a/config/initializers/statsd.rb b/config/initializers/statsd.rb
deleted file mode 100644
index 93ea1d1e4..000000000
--- a/config/initializers/statsd.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-if ENV['STATSD_ADDR'].present?
-  host, port = ENV['STATSD_ADDR'].split(':')
-
-  $statsd = ::Statsd.new(host, port)
-  $statsd.namespace = ENV.fetch('STATSD_NAMESPACE') { ['Mastodon', Rails.env].join('.') }
-
-  ::NSA.inform_statsd($statsd) do |informant|
-    informant.collect(:action_controller, :web)
-    informant.collect(:active_record, :db)
-    informant.collect(:active_support_cache, :cache)
-    informant.collect(:sidekiq, :sidekiq)
-  end
-end
diff --git a/config/initializers/strong_migrations.rb b/config/initializers/strong_migrations.rb
index 917d23b91..10b3805db 100644
--- a/config/initializers/strong_migrations.rb
+++ b/config/initializers/strong_migrations.rb
@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
 StrongMigrations.start_after = 2017_09_24_022025
+StrongMigrations.target_version = 10
diff --git a/config/initializers/twitter_regex.rb b/config/initializers/twitter_regex.rb
index 6a7723fd2..2e80cabcd 100644
--- a/config/initializers/twitter_regex.rb
+++ b/config/initializers/twitter_regex.rb
@@ -6,8 +6,8 @@ module Twitter::TwitterText
   end
 
   class Regex
-    REGEXEN[:valid_general_url_path_chars] = /[^\p{White_Space}<>\(\)\?]/iou
-    REGEXEN[:valid_url_path_ending_chars] = /[^\p{White_Space}\(\)\?!\*"'「」<>;:=\,\.\$%\[\]~&\|@]|(?:#{REGEXEN[:valid_url_balanced_parens]})/iou
+    REGEXEN[:valid_general_url_path_chars] = /[^\p{White_Space}<>()?]/iou
+    REGEXEN[:valid_url_path_ending_chars] = /[^\p{White_Space}()?!*"'「」<>;:=,.$%\[\]~&|@]|(?:#{REGEXEN[:valid_url_balanced_parens]})/iou
     REGEXEN[:valid_url_balanced_parens] = /
       \(
         (?:
@@ -25,20 +25,20 @@ module Twitter::TwitterText
       \)
     /iox
     UCHARS = '\u{A0}-\u{D7FF}\u{F900}-\u{FDCF}\u{FDF0}-\u{FFEF}\u{10000}-\u{1FFFD}\u{20000}-\u{2FFFD}\u{30000}-\u{3FFFD}\u{40000}-\u{4FFFD}\u{50000}-\u{5FFFD}\u{60000}-\u{6FFFD}\u{70000}-\u{7FFFD}\u{80000}-\u{8FFFD}\u{90000}-\u{9FFFD}\u{A0000}-\u{AFFFD}\u{B0000}-\u{BFFFD}\u{C0000}-\u{CFFFD}\u{D0000}-\u{DFFFD}\u{E1000}-\u{EFFFD}\u{E000}-\u{F8FF}\u{F0000}-\u{FFFFD}\u{100000}-\u{10FFFD}'
-    REGEXEN[:valid_url_query_chars] = /[a-z0-9!?\*'\(\);:&=\+\$\/%#\[\]\-_\.,~|@#{UCHARS}]/iou
-    REGEXEN[:valid_url_query_ending_chars] = /[a-z0-9_&=#\/\-#{UCHARS}]/iou
-    REGEXEN[:valid_url_path] = /(?:
+    REGEXEN[:valid_url_query_chars] = %r{[a-z0-9!?*'();:&=+$/%#\[\]\-_.,~|@\^#{UCHARS}]}iou
+    REGEXEN[:valid_url_query_ending_chars] = %r{[a-z0-9_&=#/\-#{UCHARS}]}iou
+    REGEXEN[:valid_url_path] = %r{(?:
       (?:
         #{REGEXEN[:valid_general_url_path_chars]}*
         (?:#{REGEXEN[:valid_url_balanced_parens]} #{REGEXEN[:valid_general_url_path_chars]}*)*
         #{REGEXEN[:valid_url_path_ending_chars]}
-      )|(?:#{REGEXEN[:valid_general_url_path_chars]}+\/)
-    )/iox
+      )|(?:#{REGEXEN[:valid_general_url_path_chars]}+/)
+    )}iox
     REGEXEN[:valid_url] = %r{
       (                                                                                     #   $1 total match
         (#{REGEXEN[:valid_url_preceding_chars]})                                            #   $2 Preceding character
         (                                                                                   #   $3 URL
-          ((?:https?|dat|dweb|ipfs|ipns|ssb|gopher|gemini):\/\/)?                           #   $4 Protocol (optional)
+          ((?:https?|dat|dweb|ipfs|ipns|ssb|gopher|gemini)://)?                             #   $4 Protocol (optional)
           (#{REGEXEN[:valid_domain]})                                                       #   $5 Domain(s)
           (?::(#{REGEXEN[:valid_port_number]}))?                                            #   $6 Port number (optional)
           (/#{REGEXEN[:valid_url_path]}*)?                                                  #   $7 URL Path and anchor
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 76198763a..2c292c42d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -382,6 +382,15 @@ en:
       undo: Disallow federation with domain
     domain_blocks:
       add_new: Add new domain block
+      confirm_suspension:
+        cancel: Cancel
+        confirm: Suspend
+        permanent_action: Undoing the suspension will not restore any data or relationship.
+        preamble_html: You are about to suspend <strong>%{domain}</strong> and its subdomains.
+        remove_all_data: This will remove all content, media, and profile data for this domain's accounts from your server.
+        stop_communication: Your server will stop communicating with these servers.
+        title: Confirm domain block for %{domain}
+        undo_relationships: This will undo any follow relationship between accounts of these servers and yours.
       created_msg: Domain block is now being processed
       destroyed_msg: Domain block has been undone
       domain: Domain
@@ -1022,8 +1031,11 @@ en:
     rules:
       accept: Accept
       back: Back
+      invited_by: 'You can join %{domain} thanks to the invitation you have received from:'
       preamble: These are set and enforced by the %{domain} moderators.
+      preamble_invited: Before you proceed, please consider the ground rules set by the moderators of %{domain}.
       title: Some ground rules.
+      title_invited: You've been invited.
     security: Security
     set_new_password: Set new password
     setup:
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index b646a15e2..330c8732f 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -78,7 +78,7 @@ en:
         backups_retention_period: Keep generated user archives for the specified number of days.
         bootstrap_timeline_accounts: These accounts will be pinned to the top of new users' follow recommendations.
         closed_registrations_message: Displayed when sign-ups are closed
-        content_cache_retention_period: Posts from other servers will be deleted after the specified number of days when set to a positive value. This may be irreversible.
+        content_cache_retention_period: All posts and boosts from other servers will be deleted after the specified number of days. Some posts may not be recoverable. All related bookmarks, favourites and boosts will also be lost and impossible to undo.
         custom_css: You can apply custom styles on the web version of Mastodon.
         mascot: Overrides the illustration in the advanced web interface.
         media_cache_retention_period: Downloaded media files will be deleted after the specified number of days when set to a positive value, and re-downloaded on demand.
@@ -131,6 +131,7 @@ en:
         position: Higher role decides conflict resolution in certain situations. Certain actions can only be performed on roles with a lower priority
       webhook:
         events: Select events to send
+        template: Compose your own JSON payload using variable interpolation. Leave blank for default JSON.
         url: Where events will be sent to
     labels:
       account:
@@ -296,6 +297,7 @@ en:
         usable: Allow posts to use this hashtag
       user:
         role: Role
+        time_zone: Time zone
       user_role:
         color: Badge color
         highlighted: Display role as badge on user profiles
@@ -304,6 +306,7 @@ en:
         position: Priority
       webhook:
         events: Enabled events
+        template: Payload template
         url: Endpoint URL
     'no': 'No'
     not_recommended: Not recommended
diff --git a/config/routes.rb b/config/routes.rb
index 3286d1610..ec5e34efd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -116,21 +116,21 @@ Rails.application.routes.draw do
 
   get '/:encoded_at(*path)', to: redirect("/@%{path}"), constraints: { encoded_at: /%40/ }
 
-  constraints(username: /[^@\/.]+/) do
+  constraints(username: %r{[^@/.]+}) do
     get '/@:username', to: 'accounts#show', as: :short_account
     get '/@:username/with_replies', to: 'accounts#show', as: :short_account_with_replies
     get '/@:username/media', to: 'accounts#show', as: :short_account_media
     get '/@:username/tagged/:tag', to: 'accounts#show', as: :short_account_tag
   end
 
-  constraints(account_username: /[^@\/.]+/) do
+  constraints(account_username: %r{[^@/.]+}) do
     get '/@:account_username/following', to: 'following_accounts#index'
     get '/@:account_username/followers', to: 'follower_accounts#index'
     get '/@:account_username/:id', to: 'statuses#show', as: :short_account_status
     get '/@:account_username/:id/embed', to: 'statuses#embed', as: :embed_short_account_status
   end
 
-  get '/@:username_with_domain/(*any)', to: 'home#index', constraints: { username_with_domain: /([^\/])+?/ }, format: false
+  get '/@:username_with_domain/(*any)', to: 'home#index', constraints: { username_with_domain: %r{([^/])+?} }, format: false
   get '/settings', to: redirect('/settings/profile')
 
   draw(:settings)
diff --git a/config/webpack/generateLocalePacks.js b/config/webpack/generateLocalePacks.js
deleted file mode 100644
index 2fd71a295..000000000
--- a/config/webpack/generateLocalePacks.js
+++ /dev/null
@@ -1,76 +0,0 @@
-// A message from upstream:
-// ========================
-// To avoid adding a lot of boilerplate, locale packs are
-// automatically generated here. These are written into the tmp/
-// directory and then used to generate locale_en.js, locale_fr.js, etc.
-
-// Glitch note:
-// ============
-// This code has been entirely rewritten to support glitch flavours.
-// However, the underlying process is exactly the same.
-
-const { existsSync, readdirSync, writeFileSync } = require('fs');
-const { join, resolve } = require('path');
-
-const { mkdirp } = require('mkdirp');
-const rimraf = require('rimraf');
-
-const { flavours } = require('./configuration');
-
-module.exports = Object.keys(flavours).reduce(function (map, entry) {
-  const flavour = flavours[entry];
-  if (!flavour.locales) {
-    return map;
-  }
-  const locales = readdirSync(flavour.locales).filter(filename => {
-    return /\.json$/.test(filename) &&
-      !/defaultMessages/.test(filename) &&
-      !/whitelist/.test(filename);
-  }).map(filename => filename.replace(/\.json$/, ''));
-
-  let inherited_locales_path = null;
-  if (flavour.inherit_locales && flavours[flavour.inherit_locales]?.locales) {
-    inherited_locales_path = flavours[flavour.inherit_locales]?.locales;
-  }
-
-  const outPath = resolve('tmp', 'locales', entry);
-
-  rimraf.sync(outPath);
-  mkdirp.sync(outPath);
-
-  locales.forEach(function (locale) {
-    const localePath = join(outPath, `${locale}.js`);
-    const baseLocale = locale.split('-')[0]; // e.g. 'zh-TW' -> 'zh'
-    const localeDataPath = [
-      // first try react-intl
-      `node_modules/react-intl/locale-data/${baseLocale}.js`,
-      // then check locales/locale-data
-      `app/javascript/mastodon/locales/locale-data/${baseLocale}.js`,
-      // fall back to English (this is what react-intl does anyway)
-      'node_modules/react-intl/locale-data/en.js',
-    ].filter(
-      filename => existsSync(filename),
-    ).map(
-      filename => filename.replace(/(?:node_modules|app\/javascript)\//, ''),
-    )[0];
-    const localeContent = `//
-// locales/${entry}/${locale}.js
-// automatically generated by generateLocalePacks.js
-//
-
-${inherited_locales_path ? `import inherited from '../../../${inherited_locales_path}/${locale}.json';` : ''}
-import messages from '../../../${flavour.locales}/${locale}.json';
-import localeData from '${localeDataPath}';
-import { setLocale } from 'locales';
-
-setLocale({
-  localeData,
-  ${inherited_locales_path ? 'messages: Object.assign({}, inherited, messages)' : 'messages'},
-});
-`;
-    writeFileSync(localePath, localeContent, 'utf8');
-    map[`locales/${entry}/${locale}`] = localePath;
-  });
-
-  return map;
-}, {});
diff --git a/config/webpack/shared.js b/config/webpack/shared.js
index 469ba42f9..768bd7bf3 100644
--- a/config/webpack/shared.js
+++ b/config/webpack/shared.js
@@ -7,7 +7,6 @@ const webpack = require('webpack');
 const AssetsManifestPlugin = require('webpack-assets-manifest');
 
 const { env, settings, core, flavours, output } = require('./configuration');
-const localePacks = require('./generateLocalePacks');
 const rules = require('./rules');
 
 function reducePacks (data, into = {}) {
@@ -48,8 +47,6 @@ function reducePacks (data, into = {}) {
 }
 
 const entries = Object.assign(
-  { locales: resolve('app', 'javascript', 'locales') },
-  localePacks,
   reducePacks(core),
   Object.values(flavours).reduce((map, data) => reducePacks(data, map), {}),
 );
@@ -69,7 +66,7 @@ module.exports = {
 
   optimization: {
     runtimeChunk: {
-      name: 'locales',
+      name: 'common',
     },
     splitChunks: {
       cacheGroups: {
diff --git a/config/webpack/translationRunner.js b/config/webpack/translationRunner.js
deleted file mode 100644
index efc39fc65..000000000
--- a/config/webpack/translationRunner.js
+++ /dev/null
@@ -1,124 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-// eslint-disable-next-line import/order
-const { default: manageTranslations, readMessageFiles } = require('react-intl-translations-manager');
-
-const RFC5646_REGEXP = /^[a-z]{2,3}(?:-(?:x|[A-Za-z]{2,4}))*$/;
-
-const rootDirectory = path.resolve(__dirname, '..', '..');
-const externalDefaultMessages = path.resolve(rootDirectory, 'app', 'javascript', 'mastodon', 'locales', 'defaultMessages.json');
-const translationsDirectory = path.resolve(rootDirectory, 'app', 'javascript', 'flavours', 'glitch', 'locales');
-const messagesDirectory = path.resolve(rootDirectory, 'build', 'messages');
-const availableLanguages = fs.readdirSync(translationsDirectory).reduce((languages, filename) => {
-  const basename = path.basename(filename, '.json');
-  if (RFC5646_REGEXP.test(basename)) {
-    languages.push(basename);
-  }
-  return languages;
-}, []);
-
-const testRFC5646 = language => {
-  if (!RFC5646_REGEXP.test(language)) {
-    throw new Error('Not RFC5646 name');
-  }
-};
-
-const testAvailability = language => {
-  if (!availableLanguages.includes(language)) {
-    throw new Error('Not an available language');
-  }
-};
-
-const validateLanguages = (languages, validators) => {
-  const invalidLanguages = languages.reduce((acc, language) => {
-    try {
-      validators.forEach(validator => validator(language));
-    } catch (error) {
-      acc.push({ language, error });
-    }
-    return acc;
-  }, []);
-
-  if (invalidLanguages.length > 0) {
-    console.error(`
-Error: Specified invalid LANGUAGES:
-${invalidLanguages.map(({ language, error }) => `* ${language}: ${error.message}`).join('\n')}
-
-Use yarn "manage:translations -- --help" for usage information
-`);
-    process.exit(1);
-  }
-};
-
-const usage = `Usage: yarn manage:translations [OPTIONS] [LANGUAGES]
-
-Manage JavaScript translation files in Mastodon. Generates and update translations in translationsDirectory: ${translationsDirectory}
-
-LANGUAGES
-The RFC5646 language tag for the language you want to test or fix. If you want to input multiple languages, separate them with space.
-
-Available languages:
-${availableLanguages.join(', ')}
-`;
-
-const { argv } = require('yargs')
-  .usage(usage)
-  .option('f', {
-    alias: 'force',
-    default: false,
-    describe: 'force using the provided languages. create files if not exists.',
-    type: 'boolean',
-  });
-
-// check if message directory exists
-if (!fs.existsSync(messagesDirectory)) {
-  console.error(`
-Error: messagesDirectory not exists
-(${messagesDirectory})
-Try to run "yarn build:development" first`);
-  process.exit(1);
-}
-
-// determine the languages list
-const languages = (argv._.length > 0) ? argv._ : availableLanguages;
-
-// validate languages
-validateLanguages(languages, [
-  testRFC5646,
-  !argv.force && testAvailability,
-].filter(Boolean));
-
-// Override `provideExtractedMessages` to ignore translation strings provided upstream already
-const provideExtractedMessages = () => {
-  const extractedMessages = readMessageFiles(messagesDirectory);
-  const originalExtractedMessages = JSON.parse(fs.readFileSync(externalDefaultMessages, 'utf8'));
-  const originalKeys = new Set();
-
-  originalExtractedMessages.forEach(file => {
-    file.descriptors.forEach(descriptor => {
-      originalKeys.add(descriptor.id);
-    });
-  });
-
-  extractedMessages.forEach(file => {
-    file.descriptors = file.descriptors.filter((descriptor) => !originalKeys.has(descriptor.id));
-  });
-
-  return extractedMessages.filter((file) => file.descriptors.length > 0);
-};
-
-// manage translations
-manageTranslations({
-  messagesDirectory,
-  translationsDirectory,
-  detectDuplicateIds: false,
-  singleMessagesFile: true,
-  languages,
-  jsonOptions: {
-    trailingNewline: true,
-  },
-  overrideCoreMethods: {
-    provideExtractedMessages,
-  },
-});
diff --git a/db/migrate/20230129023109_add_template_to_webhooks.rb b/db/migrate/20230129023109_add_template_to_webhooks.rb
new file mode 100644
index 000000000..73bdd73ff
--- /dev/null
+++ b/db/migrate/20230129023109_add_template_to_webhooks.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddTemplateToWebhooks < ActiveRecord::Migration[6.1]
+  def change
+    add_column :webhooks, :template, :text
+  end
+end
diff --git a/db/migrate/20230531153942_add_primary_key_to_accounts_tags_join_table.rb b/db/migrate/20230531153942_add_primary_key_to_accounts_tags_join_table.rb
new file mode 100644
index 000000000..0c3c17a36
--- /dev/null
+++ b/db/migrate/20230531153942_add_primary_key_to_accounts_tags_join_table.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class AddPrimaryKeyToAccountsTagsJoinTable < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def up
+    ActiveRecord::Base.transaction do
+      safety_assured do
+        execute 'ALTER TABLE accounts_tags ADD PRIMARY KEY USING INDEX index_accounts_tags_on_tag_id_and_account_id'
+
+        # Rename for consistency as the primary key's name is not represented in db/schema.rb
+        execute 'ALTER INDEX index_accounts_tags_on_tag_id_and_account_id RENAME TO accounts_tags_pkey'
+      end
+    end
+  end
+
+  def down
+    safety_assured do
+      # I have found no way to demote the primary key to an index, instead, re-create the index
+      execute 'CREATE UNIQUE INDEX CONCURRENTLY index_accounts_tags_on_tag_id_and_account_id ON accounts_tags (tag_id, account_id)'
+      execute 'ALTER TABLE accounts_tags DROP CONSTRAINT accounts_tags_pkey'
+    end
+  end
+end
diff --git a/db/migrate/20230531154811_add_primary_key_to_statuses_tags_join_table.rb b/db/migrate/20230531154811_add_primary_key_to_statuses_tags_join_table.rb
new file mode 100644
index 000000000..6581943da
--- /dev/null
+++ b/db/migrate/20230531154811_add_primary_key_to_statuses_tags_join_table.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class AddPrimaryKeyToStatusesTagsJoinTable < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def up
+    ActiveRecord::Base.transaction do
+      safety_assured do
+        execute 'ALTER TABLE statuses_tags ADD PRIMARY KEY USING INDEX index_statuses_tags_on_tag_id_and_status_id'
+
+        # Rename for consistency as the primary key's name is not represented in db/schema.rb
+        execute 'ALTER INDEX index_statuses_tags_on_tag_id_and_status_id RENAME TO statuses_tags_pkey'
+      end
+    end
+  end
+
+  def down
+    safety_assured do
+      # I have found no way to demote the primary key to an index, instead, re-create the index
+      execute 'CREATE UNIQUE INDEX CONCURRENTLY index_statuses_tags_on_tag_id_and_status_id ON statuses_tags (tag_id, status_id)'
+      execute 'ALTER TABLE statuses_tags DROP CONSTRAINT statuses_tags_pkey'
+    end
+  end
+end
diff --git a/db/migrate/20230605085710_add_exclusive_to_lists.rb b/db/migrate/20230605085710_add_exclusive_to_lists.rb
new file mode 100644
index 000000000..315c9d487
--- /dev/null
+++ b/db/migrate/20230605085710_add_exclusive_to_lists.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddExclusiveToLists < ActiveRecord::Migration[6.1]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    safety_assured { add_column_with_default :lists, :exclusive, :boolean, default: false, allow_null: false }
+  end
+
+  def down
+    remove_column :lists, :exclusive
+  end
+end
diff --git a/db/migrate/20230605085711_add_time_zone_to_users.rb b/db/migrate/20230605085711_add_time_zone_to_users.rb
new file mode 100644
index 000000000..fc6c0b091
--- /dev/null
+++ b/db/migrate/20230605085711_add_time_zone_to_users.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddTimeZoneToUsers < ActiveRecord::Migration[6.1]
+  def change
+    add_column :users, :time_zone, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 7cd760730..7540a59ba 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_05_24_194155) do
+ActiveRecord::Schema.define(version: 2023_06_05_085711) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -194,11 +194,10 @@ ActiveRecord::Schema.define(version: 2023_05_24_194155) do
     t.index ["url"], name: "index_accounts_on_url", opclass: :text_pattern_ops, where: "(url IS NOT NULL)"
   end
 
-  create_table "accounts_tags", id: false, force: :cascade do |t|
+  create_table "accounts_tags", primary_key: ["tag_id", "account_id"], force: :cascade do |t|
     t.bigint "account_id", null: false
     t.bigint "tag_id", null: false
     t.index ["account_id", "tag_id"], name: "index_accounts_tags_on_account_id_and_tag_id"
-    t.index ["tag_id", "account_id"], name: "index_accounts_tags_on_tag_id_and_account_id", unique: true
   end
 
   create_table "admin_action_logs", force: :cascade do |t|
@@ -568,6 +567,7 @@ ActiveRecord::Schema.define(version: 2023_05_24_194155) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.integer "replies_policy", default: 0, null: false
+    t.boolean "exclusive", default: false, null: false
     t.index ["account_id"], name: "index_lists_on_account_id"
   end
 
@@ -995,11 +995,10 @@ ActiveRecord::Schema.define(version: 2023_05_24_194155) do
     t.index ["uri"], name: "index_statuses_on_uri", unique: true, opclass: :text_pattern_ops, where: "(uri IS NOT NULL)"
   end
 
-  create_table "statuses_tags", id: false, force: :cascade do |t|
+  create_table "statuses_tags", primary_key: ["tag_id", "status_id"], force: :cascade do |t|
     t.bigint "status_id", null: false
     t.bigint "tag_id", null: false
     t.index ["status_id"], name: "index_statuses_tags_on_status_id"
-    t.index ["tag_id", "status_id"], name: "index_statuses_tags_on_tag_id_and_status_id", unique: true
   end
 
   create_table "system_keys", force: :cascade do |t|
@@ -1105,6 +1104,7 @@ ActiveRecord::Schema.define(version: 2023_05_24_194155) do
     t.boolean "skip_sign_in_token"
     t.bigint "role_id"
     t.text "settings"
+    t.string "time_zone"
     t.index ["account_id"], name: "index_users_on_account_id"
     t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
     t.index ["created_by_application_id"], name: "index_users_on_created_by_application_id", where: "(created_by_application_id IS NOT NULL)"
@@ -1153,6 +1153,7 @@ ActiveRecord::Schema.define(version: 2023_05_24_194155) do
     t.boolean "enabled", default: true, null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
+    t.text "template"
     t.index ["url"], name: "index_webhooks_on_url", unique: true
   end
 
diff --git a/jest.config.js b/jest.config.js
index 922b0f550..0b928b63a 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -14,7 +14,6 @@ const config = {
   collectCoverageFrom: [
     'app/javascript/mastodon/**/*.{js,jsx,ts,tsx}',
     '!app/javascript/mastodon/features/emoji/emoji_compressed.js',
-    '!app/javascript/mastodon/locales/locale-data/*.js',
     '!app/javascript/mastodon/service_worker/entry.js',
     '!app/javascript/mastodon/test_setup.js',
   ],
diff --git a/lib/linter/haml_middle_dot.rb b/lib/linter/haml_middle_dot.rb
new file mode 100644
index 000000000..3b2771152
--- /dev/null
+++ b/lib/linter/haml_middle_dot.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module HamlLint
+  # Bans the usage of “•” (bullet) in HTML/HAML in favor of “·” (middle dot) in anything that will end up as a text node. (including string literals in Ruby code)
+  class Linter::MiddleDot < Linter
+    include LinterRegistry
+
+    # rubocop:disable Style/MiddleDot
+    BULLET = '•'
+    # rubocop:enable Style/MiddleDot
+    MIDDLE_DOT = '·'
+    MESSAGE = "Use '#{MIDDLE_DOT}' (middle dot) instead of '#{BULLET}' (bullet)".freeze
+
+    def visit_plain(node)
+      return unless node.text.include?(BULLET)
+
+      record_lint(node, MESSAGE)
+    end
+
+    def visit_script(node)
+      return unless node.script.include?(BULLET)
+
+      record_lint(node, MESSAGE)
+    end
+  end
+end
diff --git a/lib/linter/rubocop_middle_dot.rb b/lib/linter/rubocop_middle_dot.rb
new file mode 100644
index 000000000..3a1d97c0c
--- /dev/null
+++ b/lib/linter/rubocop_middle_dot.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Style
+      # Bans the usage of “•” (bullet) in HTML/HAML in favor of “·” (middle dot) in string literals
+      class MiddleDot < Base
+        extend AutoCorrector
+        extend Util
+
+        # rubocop:disable Style/MiddleDot
+        BULLET = '•'
+        # rubocop:enable Style/MiddleDot
+        MIDDLE_DOT = '·'
+        MESSAGE = "Use '#{MIDDLE_DOT}' (middle dot) instead of '#{BULLET}' (bullet)".freeze
+
+        def on_str(node)
+          # Constants like __FILE__ are handled as strings,
+          # but don't respond to begin.
+          return unless node.loc.respond_to?(:begin) && node.loc.begin
+
+          return unless node.value.include?(BULLET)
+
+          add_offense(node, message: MESSAGE) do |corrector|
+            corrector.replace(node, node.source.gsub(BULLET, MIDDLE_DOT))
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/mastodon/cli/base.rb b/lib/mastodon/cli/base.rb
index f3c9fea92..32aff2fcc 100644
--- a/lib/mastodon/cli/base.rb
+++ b/lib/mastodon/cli/base.rb
@@ -4,16 +4,39 @@ require_relative '../../../config/boot'
 require_relative '../../../config/environment'
 
 require 'thor'
-require_relative 'helper'
+require_relative 'progress_helper'
 
 module Mastodon
   module CLI
     class Base < Thor
-      include CLI::Helper
+      include ProgressHelper
 
       def self.exit_on_failure?
         true
       end
+
+      private
+
+      def pastel
+        @pastel ||= Pastel.new
+      end
+
+      def dry_run?
+        options[:dry_run]
+      end
+
+      def dry_run_mode_suffix
+        dry_run? ? ' (DRY RUN)' : ''
+      end
+
+      def reset_connection_pools!
+        ActiveRecord::Base.establish_connection(
+          ActiveRecord::Base.configurations.configs_for(env_name: Rails.env).first.configuration_hash
+            .dup
+            .tap { |config| config['pool'] = options[:concurrency] + 1 }
+        )
+        RedisConfiguration.establish_pool(options[:concurrency])
+      end
     end
   end
 end
diff --git a/lib/mastodon/cli/helper.rb b/lib/mastodon/cli/progress_helper.rb
similarity index 80%
rename from lib/mastodon/cli/helper.rb
rename to lib/mastodon/cli/progress_helper.rb
index 78931b9a2..1fa2745c1 100644
--- a/lib/mastodon/cli/helper.rb
+++ b/lib/mastodon/cli/progress_helper.rb
@@ -9,23 +9,19 @@ HttpLog.configuration.logger = dev_null
 Paperclip.options[:log]      = false
 Chewy.logger                 = dev_null
 
-module Mastodon::CLI
-  module Helper
-    def dry_run?
-      options[:dry_run]
-    end
+require 'ruby-progressbar/outputs/null'
 
-    def dry_run_mode_suffix
-      dry_run? ? ' (DRY RUN)' : ''
-    end
+module Mastodon::CLI
+  module ProgressHelper
+    PROGRESS_FORMAT = '%c/%u |%b%i| %e'
 
     def create_progress_bar(total = nil)
-      ProgressBar.create(total: total, format: '%c/%u |%b%i| %e')
-    end
-
-    def reset_connection_pools!
-      ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[Rails.env].dup.tap { |config| config['pool'] = options[:concurrency] + 1 })
-      RedisConfiguration.establish_pool(options[:concurrency])
+      ProgressBar.create(
+        {
+          total: total,
+          format: PROGRESS_FORMAT,
+        }.merge(progress_output_options)
+      )
     end
 
     def parallelize_with_progress(scope)
@@ -82,8 +78,10 @@ module Mastodon::CLI
       [total.value, aggregate.value]
     end
 
-    def pastel
-      @pastel ||= Pastel.new
+    private
+
+    def progress_output_options
+      Rails.env.test? ? { output: ProgressBar::Outputs::Null } : {}
     end
   end
 end
diff --git a/lib/mastodon/cli/search.rb b/lib/mastodon/cli/search.rb
index 6f48dcb09..8d7b7202f 100644
--- a/lib/mastodon/cli/search.rb
+++ b/lib/mastodon/cli/search.rb
@@ -29,15 +29,7 @@ module Mastodon::CLI
       database will be imported into the indices, unless overridden with --no-import.
     LONG_DESC
     def deploy
-      if options[:concurrency] < 1
-        say('Cannot run with this concurrency setting, must be at least 1', :red)
-        exit(1)
-      end
-
-      if options[:batch_size] < 1
-        say('Cannot run with this batch_size setting, must be at least 1', :red)
-        exit(1)
-      end
+      verify_deploy_options!
 
       indices = if options[:only]
                   options[:only].map { |str| "#{str.camelize}Index".constantize }
@@ -98,5 +90,26 @@ module Mastodon::CLI
 
       say("Indexed #{added} records, de-indexed #{removed}", :green, true)
     end
+
+    private
+
+    def verify_deploy_options!
+      verify_deploy_concurrency!
+      verify_deploy_batch_size!
+    end
+
+    def verify_deploy_concurrency!
+      return unless options[:concurrency] < 1
+
+      say('Cannot run with this concurrency setting, must be at least 1', :red)
+      exit(1)
+    end
+
+    def verify_deploy_batch_size!
+      return unless options[:batch_size] < 1
+
+      say('Cannot run with this batch_size setting, must be at least 1', :red)
+      exit(1)
+    end
   end
 end
diff --git a/lib/mastodon/premailer_webpack_strategy.rb b/lib/mastodon/premailer_webpack_strategy.rb
index 5c297d4d0..45e87603f 100644
--- a/lib/mastodon/premailer_webpack_strategy.rb
+++ b/lib/mastodon/premailer_webpack_strategy.rb
@@ -16,7 +16,7 @@ module PremailerWebpackStrategy
             Rails.public_path.join(url).read
           end
 
-    css.gsub(/url\(\//, "url(#{asset_host}/")
+    css.gsub(%r{url\(/}, "url(#{asset_host}/")
   end
 
   module_function :load
diff --git a/lib/paperclip/color_extractor.rb b/lib/paperclip/color_extractor.rb
index 19529fb8a..d2f7e7c60 100644
--- a/lib/paperclip/color_extractor.rb
+++ b/lib/paperclip/color_extractor.rb
@@ -171,7 +171,7 @@ module Paperclip
     end
 
     def palette_from_histogram(result, quantity)
-      frequencies       = result.scan(/([0-9]+)\:/).flatten.map(&:to_f)
+      frequencies       = result.scan(/([0-9]+):/).flatten.map(&:to_f)
       hex_values        = result.scan(/\#([0-9A-Fa-f]{6,8})/).flatten
       total_frequencies = frequencies.sum.to_f
 
diff --git a/lib/tasks/emojis.rake b/lib/tasks/emojis.rake
index fbb2e8d4f..c24ea42e7 100644
--- a/lib/tasks/emojis.rake
+++ b/lib/tasks/emojis.rake
@@ -31,7 +31,7 @@ def gen_border(codepoint, color)
 end
 
 def codepoints_to_filename(codepoints)
-  codepoints.downcase.gsub(/\A[0]+/, '').tr(' ', '-')
+  codepoints.downcase.gsub(/\A0+/, '').tr(' ', '-')
 end
 
 def codepoints_to_unicode(codepoints)
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 6c0e66922..19a369079 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -21,7 +21,7 @@ namespace :mastodon do
       env['LOCAL_DOMAIN'] = prompt.ask('Domain name:') do |q|
         q.required true
         q.modify :strip
-        q.validate(/\A[a-z0-9\.\-]+\z/i)
+        q.validate(/\A[a-z0-9.-]+\z/i)
         q.messages[:valid?] = 'Invalid domain. If you intend to use unicode characters, enter punycode here'
       end
 
@@ -240,7 +240,7 @@ namespace :mastodon do
           end
 
           env['S3_PROTOCOL'] = env['S3_ENDPOINT'].start_with?('https') ? 'https' : 'http'
-          env['S3_HOSTNAME'] = env['S3_ENDPOINT'].gsub(/\Ahttps?:\/\//, '')
+          env['S3_HOSTNAME'] = env['S3_ENDPOINT'].gsub(%r{\Ahttps?://}, '')
 
           env['S3_BUCKET'] = prompt.ask('Minio bucket name:') do |q|
             q.required true
@@ -269,7 +269,7 @@ namespace :mastodon do
           end
 
           env['S3_PROTOCOL'] = env['S3_ENDPOINT'].start_with?('https') ? 'https' : 'http'
-          env['S3_HOSTNAME'] = env['S3_ENDPOINT'].gsub(/\Ahttps?:\/\//, '')
+          env['S3_HOSTNAME'] = env['S3_ENDPOINT'].gsub(%r{\Ahttps?://}, '')
 
           env['S3_BUCKET'] = prompt.ask('Storj DCS bucket name:') do |q|
             q.required true
@@ -573,7 +573,7 @@ def dotenv_escape(value)
 
   # As long as the value doesn't include single quotes, we can safely
   # rely on single quotes
-  return "'#{value}'" unless /[']/.match?(value)
+  return "'#{value}'" unless value.include?("'")
 
   # If the value contains the string '\n' or '\r' we simply can't use
   # a double-quoted string, because Dotenv will expand \n or \r no
diff --git a/package.json b/package.json
index 0e78ceeee..c42ec05fc 100644
--- a/package.json
+++ b/package.json
@@ -5,20 +5,27 @@
     "node": ">=16"
   },
   "scripts": {
-    "postversion": "git push --tags",
     "build:development": "cross-env RAILS_ENV=development NODE_ENV=development ./bin/webpack",
     "build:production": "cross-env RAILS_ENV=production NODE_ENV=production ./bin/webpack",
-    "manage:translations": "node ./config/webpack/translationRunner.js",
+    "fix:js": "yarn lint:js --fix",
+    "fix:json": "prettier --write \"**/*.json\"",
+    "fix:md": "prettier --write \"**/*.md\"",
+    "fix:sass": "stylelint --fix \"**/*.{css,scss}\" && prettier --write \"**/*.{css,scss}\"",
+    "fix:yml": "prettier --write \"**/*.{yaml,yml}\"",
+    "fix": "yarn fix:js && yarn fix:json && yarn fix:sass && yarn fix:yml",
+    "i18n:extract": "formatjs extract 'app/javascript/**/*.{js,jsx,ts,tsx}' '--ignore=**/*.d.ts' --out-file app/javascript/flavours/glitch/locales/en.json --format config/formatjs-formatter.js",
+    "jest": "cross-env NODE_ENV=test jest",
+    "lint:js": "eslint . --ext=.js,.jsx,.ts,.tsx --cache --report-unused-disable-directives",
+    "lint:json": "prettier --check \"**/*.json\"",
+    "lint:md": "prettier --check \"**/*.md\"",
+    "lint:sass": "stylelint \"**/*.{css,scss}\" && prettier --check \"**/*.{css,scss}\"",
+    "lint:yml": "prettier --check \"**/*.{yaml,yml}\"",
+    "lint": "yarn lint:js && yarn lint:json && yarn lint:sass && yarn lint:yml",
+    "postversion": "git push --tags",
+    "prepare": "husky install",
     "start": "node ./streaming/index.js",
-    "test": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:typecheck && ${npm_execpath} run test:jest",
-    "test:lint": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:lint:sass",
-    "test:lint:js": "eslint --ext=.js,.jsx,.ts,.tsx . --cache --report-unused-disable-directives",
-    "test:lint:sass": "stylelint \"**/*.{css,scss}\" && prettier --check \"**/*.{css,scss}\"",
-    "test:typecheck": "tsc --noEmit",
-    "test:jest": "cross-env NODE_ENV=test jest",
-    "format": "prettier --write .",
-    "format-check": "prettier --check .",
-    "prepare": "husky install"
+    "test": "yarn lint && yarn run typecheck && yarn jest",
+    "typecheck": "tsc --noEmit"
   },
   "repository": {
     "type": "git",
@@ -34,6 +41,7 @@
     "@babel/preset-react": "^7.22.3",
     "@babel/preset-typescript": "^7.21.5",
     "@babel/runtime": "^7.22.3",
+    "@formatjs/intl-pluralrules": "^5.2.2",
     "@gamestdio/websocket": "^0.3.2",
     "@github/webauthn-json": "^2.1.1",
     "@rails/ujs": "^6.1.7",
@@ -41,12 +49,13 @@
     "abortcontroller-polyfill": "^1.7.5",
     "atrament": "0.2.4",
     "arrow-key-navigation": "^1.2.0",
+    "async-mutex": "^0.4.0",
     "autoprefixer": "^10.4.14",
     "axios": "^1.4.0",
     "babel-loader": "^8.3.0",
+    "babel-plugin-formatjs": "^10.5.1",
     "babel-plugin-lodash": "^3.3.4",
     "babel-plugin-preval": "^5.1.0",
-    "babel-plugin-react-intl": "^6.2.0",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "blurhash": "^2.0.5",
     "classnames": "^2.3.2",
@@ -72,9 +81,7 @@
     "http-link-header": "^1.1.1",
     "immutable": "^4.3.0",
     "imports-loader": "^1.2.0",
-    "intl": "^1.2.5",
-    "intl-messageformat": "^2.2.0",
-    "intl-relativeformat": "^6.4.3",
+    "intl-messageformat": "^10.3.5",
     "js-yaml": "^4.1.0",
     "jsdom": "^22.1.0",
     "lodash": "^4.17.21",
@@ -96,7 +103,7 @@
     "react-hotkeys": "^1.1.4",
     "react-immutable-proptypes": "^2.2.0",
     "react-immutable-pure-component": "^2.2.2",
-    "react-intl": "^2.9.0",
+    "react-intl": "^6.4.2",
     "react-motion": "^0.5.2",
     "react-notification": "^6.8.5",
     "react-overlays": "^5.2.1",
@@ -133,15 +140,16 @@
     "webpack-cli": "^3.3.12",
     "webpack-merge": "^5.9.0",
     "wicg-inert": "^3.1.2",
-    "workbox-expiration": "^6.6.0",
-    "workbox-precaching": "^6.6.0",
-    "workbox-routing": "^6.6.0",
-    "workbox-strategies": "^6.6.0",
-    "workbox-webpack-plugin": "^6.6.0",
-    "workbox-window": "^6.6.0",
+    "workbox-expiration": "^7.0.0",
+    "workbox-precaching": "^7.0.0",
+    "workbox-routing": "^7.0.0",
+    "workbox-strategies": "^7.0.0",
+    "workbox-webpack-plugin": "^7.0.0",
+    "workbox-window": "^7.0.0",
     "ws": "^8.12.1"
   },
   "devDependencies": {
+    "@formatjs/cli": "^6.1.1",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^14.0.0",
     "@types/babel__core": "^7.20.1",
@@ -150,7 +158,7 @@
     "@types/express": "^4.17.17",
     "@types/http-link-header": "^1.0.3",
     "@types/intl": "^1.2.0",
-    "@types/jest": "^29.5.1",
+    "@types/jest": "^29.5.2",
     "@types/js-yaml": "^4.0.5",
     "@types/lodash": "^4.14.195",
     "@types/npmlog": "^4.1.4",
@@ -162,7 +170,6 @@
     "@types/react-dom": "^18.2.4",
     "@types/react-helmet": "^6.1.6",
     "@types/react-immutable-proptypes": "^2.1.0",
-    "@types/react-intl": "2.3.18",
     "@types/react-motion": "^0.0.34",
     "@types/react-overlays": "^3.1.0",
     "@types/react-router-dom": "^5.3.3",
@@ -185,7 +192,7 @@
     "eslint-import-resolver-typescript": "^3.5.5",
     "eslint-plugin-formatjs": "^4.10.1",
     "eslint-plugin-import": "~2.27.5",
-    "eslint-plugin-jsdoc": "^45.0.0",
+    "eslint-plugin-jsdoc": "^46.1.0",
     "eslint-plugin-jsx-a11y": "~6.7.1",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-promise": "~6.1.1",
@@ -196,7 +203,6 @@
     "jest-environment-jsdom": "^29.5.0",
     "lint-staged": "^13.2.2",
     "prettier": "^2.8.8",
-    "react-intl-translations-manager": "^5.0.3",
     "react-test-renderer": "^18.2.0",
     "stylelint": "^15.6.2",
     "stylelint-config-standard-scss": "^9.0.0",
diff --git a/spec/controllers/.rubocop.yml b/spec/controllers/.rubocop.yml
new file mode 100644
index 000000000..525479be8
--- /dev/null
+++ b/spec/controllers/.rubocop.yml
@@ -0,0 +1,6 @@
+inherit_from: ../../.rubocop.yml
+
+# Anonymous controllers in specs cannot access described_class
+# https://github.com/rubocop/rubocop-rspec/blob/master/lib/rubocop/cop/rspec/described_class.rb#L36-L39
+RSpec/DescribedClass:
+  SkipBlocks: true
diff --git a/spec/controllers/accounts_controller_spec.rb b/spec/controllers/accounts_controller_spec.rb
index 366756480..5a8585b06 100644
--- a/spec/controllers/accounts_controller_spec.rb
+++ b/spec/controllers/accounts_controller_spec.rb
@@ -99,7 +99,7 @@ RSpec.describe AccountsController do
         end
       end
 
-      context do
+      context 'with a normal account in an HTML request' do
         before do
           get :show, params: { username: account.username, format: format }
         end
@@ -173,7 +173,7 @@ RSpec.describe AccountsController do
         end
       end
 
-      context do
+      context 'with a normal account in a JSON request' do
         before do
           get :show, params: { username: account.username, format: format }
         end
@@ -314,7 +314,7 @@ RSpec.describe AccountsController do
         it_behaves_like 'cacheable response'
       end
 
-      context do
+      context 'with a normal account in an RSS request' do
         before do
           get :show, params: { username: account.username, format: format }
         end
diff --git a/spec/controllers/activitypub/collections_controller_spec.rb b/spec/controllers/activitypub/collections_controller_spec.rb
index 887847488..e2802cf56 100644
--- a/spec/controllers/activitypub/collections_controller_spec.rb
+++ b/spec/controllers/activitypub/collections_controller_spec.rb
@@ -88,7 +88,7 @@ RSpec.describe ActivityPub::CollectionsController do
       context 'with signature' do
         let(:remote_account) { Fabricate(:account, domain: 'example.com') }
 
-        context do
+        context 'when getting a featured resource' do
           before do
             get :show, params: { id: 'featured', account_username: account.username }
           end
diff --git a/spec/controllers/admin/account_actions_controller_spec.rb b/spec/controllers/admin/account_actions_controller_spec.rb
index 4eae51c7b..b8dae7993 100644
--- a/spec/controllers/admin/account_actions_controller_spec.rb
+++ b/spec/controllers/admin/account_actions_controller_spec.rb
@@ -20,4 +20,16 @@ describe Admin::AccountActionsController do
       expect(response).to have_http_status(:success)
     end
   end
+
+  describe 'POST #create' do
+    let(:account) { Fabricate(:account) }
+
+    it 'records the account action' do
+      expect do
+        post :create, params: { account_id: account.id, admin_account_action: { type: 'silence' } }
+      end.to change { account.strikes.count }.by(1)
+
+      expect(response).to redirect_to(admin_account_path(account.id))
+    end
+  end
 end
diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb
index 7d001c4cb..782e460a4 100644
--- a/spec/controllers/admin/accounts_controller_spec.rb
+++ b/spec/controllers/admin/accounts_controller_spec.rb
@@ -309,4 +309,128 @@ RSpec.describe Admin::AccountsController do
       end
     end
   end
+
+  describe 'POST #unsensitive' do
+    subject { post :unsensitive, params: { id: account.id } }
+
+    let(:current_user) { Fabricate(:user, role: role) }
+    let(:account) { Fabricate(:account, sensitized_at: 1.year.ago) }
+
+    context 'when user is admin' do
+      let(:role) { UserRole.find_by(name: 'Admin') }
+
+      it 'marks accounts not sensitized' do
+        subject
+
+        expect(account.reload).to_not be_sensitized
+        expect(response).to redirect_to admin_account_path(account.id)
+      end
+    end
+
+    context 'when user is not admin' do
+      let(:role) { UserRole.everyone }
+
+      it 'fails to change account' do
+        subject
+
+        expect(response).to have_http_status 403
+      end
+    end
+  end
+
+  describe 'POST #unsilence' do
+    subject { post :unsilence, params: { id: account.id } }
+
+    let(:current_user) { Fabricate(:user, role: role) }
+    let(:account) { Fabricate(:account, silenced_at: 1.year.ago) }
+
+    context 'when user is admin' do
+      let(:role) { UserRole.find_by(name: 'Admin') }
+
+      it 'marks accounts not silenced' do
+        subject
+
+        expect(account.reload).to_not be_silenced
+        expect(response).to redirect_to admin_account_path(account.id)
+      end
+    end
+
+    context 'when user is not admin' do
+      let(:role) { UserRole.everyone }
+
+      it 'fails to change account' do
+        subject
+
+        expect(response).to have_http_status 403
+      end
+    end
+  end
+
+  describe 'POST #unsuspend' do
+    subject { post :unsuspend, params: { id: account.id } }
+
+    let(:current_user) { Fabricate(:user, role: role) }
+    let(:account) { Fabricate(:account) }
+
+    before do
+      account.suspend!
+    end
+
+    context 'when user is admin' do
+      let(:role) { UserRole.find_by(name: 'Admin') }
+
+      it 'marks accounts not suspended' do
+        subject
+
+        expect(account.reload).to_not be_suspended
+        expect(response).to redirect_to admin_account_path(account.id)
+      end
+    end
+
+    context 'when user is not admin' do
+      let(:role) { UserRole.everyone }
+
+      it 'fails to change account' do
+        subject
+
+        expect(response).to have_http_status 403
+      end
+    end
+  end
+
+  describe 'POST #destroy' do
+    subject { post :destroy, params: { id: account.id } }
+
+    let(:current_user) { Fabricate(:user, role: role) }
+    let(:account) { Fabricate(:account) }
+
+    before do
+      account.suspend!
+    end
+
+    context 'when user is admin' do
+      let(:role) { UserRole.find_by(name: 'Admin') }
+
+      before do
+        allow(Admin::AccountDeletionWorker).to receive(:perform_async).with(account.id)
+      end
+
+      it 'destroys the account' do
+        subject
+
+        expect(Admin::AccountDeletionWorker).to have_received(:perform_async).with(account.id)
+        expect(response).to redirect_to admin_account_path(account.id)
+      end
+    end
+
+    context 'when user is not admin' do
+      let(:role) { UserRole.everyone }
+
+      it 'fails to change account' do
+        subject
+
+        expect(response).to have_http_status 403
+      end
+    end
+  end
 end
diff --git a/spec/controllers/admin/announcements_controller_spec.rb b/spec/controllers/admin/announcements_controller_spec.rb
index a8905160f..c2d3135d9 100644
--- a/spec/controllers/admin/announcements_controller_spec.rb
+++ b/spec/controllers/admin/announcements_controller_spec.rb
@@ -73,4 +73,30 @@ describe Admin::AnnouncementsController do
       expect(flash.notice).to match(I18n.t('admin.announcements.destroyed_msg'))
     end
   end
+
+  describe 'POST #publish' do
+    subject { post :publish, params: { id: announcement.id } }
+
+    let(:announcement) { Fabricate(:announcement, published_at: nil) }
+
+    it 'marks announcement published' do
+      subject
+
+      expect(announcement.reload).to be_published
+      expect(response).to redirect_to admin_announcements_path
+    end
+  end
+
+  describe 'POST #unpublish' do
+    subject { post :unpublish, params: { id: announcement.id } }
+
+    let(:announcement) { Fabricate(:announcement, published_at: 4.days.ago) }
+
+    it 'marks announcement as not published' do
+      subject
+
+      expect(announcement.reload).to_not be_published
+      expect(response).to redirect_to admin_announcements_path
+    end
+  end
 end
diff --git a/spec/controllers/admin/domain_blocks_controller_spec.rb b/spec/controllers/admin/domain_blocks_controller_spec.rb
index 6aed172ac..d499aa64c 100644
--- a/spec/controllers/admin/domain_blocks_controller_spec.rb
+++ b/spec/controllers/admin/domain_blocks_controller_spec.rb
@@ -40,42 +40,135 @@ RSpec.describe Admin::DomainBlocksController do
   end
 
   describe 'POST #create' do
-    it 'blocks the domain when succeeded to save' do
+    before do
       allow(DomainBlockWorker).to receive(:perform_async).and_return(true)
-
-      post :create, params: { domain_block: { domain: 'example.com', severity: 'silence' } }
-
-      expect(DomainBlockWorker).to have_received(:perform_async)
-      expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.created_msg')
-      expect(response).to redirect_to(admin_instances_path(limited: '1'))
     end
 
-    it 'renders new when failed to save' do
-      Fabricate(:domain_block, domain: 'example.com', severity: 'suspend')
-      allow(DomainBlockWorker).to receive(:perform_async).and_return(true)
+    context 'with "silence" severity and no conflict' do
+      before do
+        post :create, params: { domain_block: { domain: 'example.com', severity: 'silence' } }
+      end
 
-      post :create, params: { domain_block: { domain: 'example.com', severity: 'silence' } }
+      it 'records a block' do
+        expect(DomainBlock.exists?(domain: 'example.com', severity: 'silence')).to be true
+      end
 
-      expect(DomainBlockWorker).to_not have_received(:perform_async)
-      expect(response).to render_template :new
+      it 'calls DomainBlockWorker' do
+        expect(DomainBlockWorker).to have_received(:perform_async)
+      end
+
+      it 'redirects with a success message' do
+        expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.created_msg')
+        expect(response).to redirect_to(admin_instances_path(limited: '1'))
+      end
     end
 
-    it 'allows upgrading a block' do
-      Fabricate(:domain_block, domain: 'example.com', severity: 'silence')
-      allow(DomainBlockWorker).to receive(:perform_async).and_return(true)
+    context 'when the new domain block conflicts with an existing one' do
+      before do
+        Fabricate(:domain_block, domain: 'example.com', severity: 'suspend')
+        post :create, params: { domain_block: { domain: 'example.com', severity: 'silence' } }
+      end
 
-      post :create, params: { domain_block: { domain: 'example.com', severity: 'silence', reject_media: true, reject_reports: true } }
+      it 'does not record a block' do
+        expect(DomainBlock.exists?(domain: 'example.com', severity: 'silence')).to be false
+      end
 
-      expect(DomainBlockWorker).to have_received(:perform_async)
-      expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.created_msg')
-      expect(response).to redirect_to(admin_instances_path(limited: '1'))
+      it 'does not call DomainBlockWorker' do
+        expect(DomainBlockWorker).to_not have_received(:perform_async)
+      end
+
+      it 'renders new' do
+        expect(response).to render_template :new
+      end
+    end
+
+    context 'with "suspend" severity and no conflict' do
+      context 'without a confirmation' do
+        before do
+          post :create, params: { domain_block: { domain: 'example.com', severity: 'suspend', reject_media: true, reject_reports: true } }
+        end
+
+        it 'does not record a block' do
+          expect(DomainBlock.exists?(domain: 'example.com', severity: 'suspend')).to be false
+        end
+
+        it 'does not call DomainBlockWorker' do
+          expect(DomainBlockWorker).to_not have_received(:perform_async)
+        end
+
+        it 'renders confirm_suspension' do
+          expect(response).to render_template :confirm_suspension
+        end
+      end
+
+      context 'with a confirmation' do
+        before do
+          post :create, params: { :domain_block => { domain: 'example.com', severity: 'suspend', reject_media: true, reject_reports: true }, 'confirm' => '' }
+        end
+
+        it 'records a block' do
+          expect(DomainBlock.exists?(domain: 'example.com', severity: 'suspend')).to be true
+        end
+
+        it 'calls DomainBlockWorker' do
+          expect(DomainBlockWorker).to have_received(:perform_async)
+        end
+
+        it 'redirects with a success message' do
+          expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.created_msg')
+          expect(response).to redirect_to(admin_instances_path(limited: '1'))
+        end
+      end
+    end
+
+    context 'when upgrading an existing block' do
+      before do
+        Fabricate(:domain_block, domain: 'example.com', severity: 'silence')
+      end
+
+      context 'without a confirmation' do
+        before do
+          post :create, params: { domain_block: { domain: 'example.com', severity: 'suspend', reject_media: true, reject_reports: true } }
+        end
+
+        it 'does not record a block' do
+          expect(DomainBlock.exists?(domain: 'example.com', severity: 'suspend')).to be false
+        end
+
+        it 'does not call DomainBlockWorker' do
+          expect(DomainBlockWorker).to_not have_received(:perform_async)
+        end
+
+        it 'renders confirm_suspension' do
+          expect(response).to render_template :confirm_suspension
+        end
+      end
+
+      context 'with a confirmation' do
+        before do
+          post :create, params: { :domain_block => { domain: 'example.com', severity: 'suspend', reject_media: true, reject_reports: true }, 'confirm' => '' }
+        end
+
+        it 'updates the record' do
+          expect(DomainBlock.exists?(domain: 'example.com', severity: 'suspend')).to be true
+        end
+
+        it 'calls DomainBlockWorker' do
+          expect(DomainBlockWorker).to have_received(:perform_async)
+        end
+
+        it 'redirects with a success message' do
+          expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.created_msg')
+          expect(response).to redirect_to(admin_instances_path(limited: '1'))
+        end
+      end
     end
   end
 
   describe 'PUT #update' do
     let!(:remote_account) { Fabricate(:account, domain: 'example.com') }
     let(:subject) do
-      post :update, params: { id: domain_block.id, domain_block: { domain: 'example.com', severity: new_severity } }
+      post :update, params: { :id => domain_block.id, :domain_block => { domain: 'example.com', severity: new_severity }, 'confirm' => '' }
     end
     let(:domain_block) { Fabricate(:domain_block, domain: 'example.com', severity: original_severity) }
 
diff --git a/spec/controllers/admin/relays_controller_spec.rb b/spec/controllers/admin/relays_controller_spec.rb
index 261f302c0..ca351c39b 100644
--- a/spec/controllers/admin/relays_controller_spec.rb
+++ b/spec/controllers/admin/relays_controller_spec.rb
@@ -56,4 +56,45 @@ describe Admin::RelaysController do
       end
     end
   end
+
+  describe 'DELETE #destroy' do
+    let(:relay) { Fabricate(:relay) }
+
+    it 'deletes an existing relay' do
+      delete :destroy, params: { id: relay.id }
+
+      expect { relay.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect(response).to redirect_to(admin_relays_path)
+    end
+  end
+
+  describe 'POST #enable' do
+    let(:relay) { Fabricate(:relay, state: :idle) }
+
+    before do
+      stub_request(:post, /example.com/).to_return(status: 200)
+    end
+
+    it 'updates a relay from idle to pending' do
+      post :enable, params: { id: relay.id }
+
+      expect(relay.reload).to be_pending
+      expect(response).to redirect_to(admin_relays_path)
+    end
+  end
+
+  describe 'POST #disable' do
+    let(:relay) { Fabricate(:relay, state: :pending) }
+
+    before do
+      stub_request(:post, /example.com/).to_return(status: 200)
+    end
+
+    it 'updates a relay from pending to idle' do
+      post :disable, params: { id: relay.id }
+
+      expect(relay.reload).to be_idle
+      expect(response).to redirect_to(admin_relays_path)
+    end
+  end
 end
diff --git a/spec/controllers/admin/statuses_controller_spec.rb b/spec/controllers/admin/statuses_controller_spec.rb
index 872aed999..7171c0e88 100644
--- a/spec/controllers/admin/statuses_controller_spec.rb
+++ b/spec/controllers/admin/statuses_controller_spec.rb
@@ -20,7 +20,7 @@ describe Admin::StatusesController do
   end
 
   describe 'GET #index' do
-    context do
+    context 'with a valid account' do
       before do
         get :index, params: { account_id: account.id }
       end
@@ -41,6 +41,16 @@ describe Admin::StatusesController do
     end
   end
 
+  describe 'GET #show' do
+    before do
+      get :show, params: { account_id: account.id, id: status.id }
+    end
+
+    it 'returns http success' do
+      expect(response).to have_http_status(200)
+    end
+  end
+
   describe 'POST #batch' do
     before do
       post :batch, params: { :account_id => account.id, action => '', :admin_status_batch_action => { status_ids: status_ids } }
diff --git a/spec/controllers/admin/users/roles_controller_spec.rb b/spec/controllers/admin/users/roles_controller_spec.rb
index fe2cee01b..97f69a0b0 100644
--- a/spec/controllers/admin/users/roles_controller_spec.rb
+++ b/spec/controllers/admin/users/roles_controller_spec.rb
@@ -40,7 +40,7 @@ describe Admin::Users::RolesController do
       put :update, params: { user_id: user.id, user: { role_id: selected_role.id } }
     end
 
-    context do
+    context 'with manage roles permissions' do
       let(:permissions) { UserRole::FLAGS[:manage_roles] }
       let(:position) { 1 }
 
diff --git a/spec/controllers/admin/warning_presets_controller_spec.rb b/spec/controllers/admin/warning_presets_controller_spec.rb
index 6b48fc28b..b32a58e99 100644
--- a/spec/controllers/admin/warning_presets_controller_spec.rb
+++ b/spec/controllers/admin/warning_presets_controller_spec.rb
@@ -18,4 +18,68 @@ describe Admin::WarningPresetsController do
       expect(response).to have_http_status(:success)
     end
   end
+
+  describe 'GET #edit' do
+    let(:account_warning_preset) { Fabricate(:account_warning_preset) }
+
+    it 'returns http success and renders edit' do
+      get :edit, params: { id: account_warning_preset.id }
+
+      expect(response).to have_http_status(:success)
+      expect(response).to render_template(:edit)
+    end
+  end
+
+  describe 'POST #create' do
+    context 'with valid data' do
+      it 'creates a new account_warning_preset and redirects' do
+        expect do
+          post :create, params: { account_warning_preset: { text: 'The account_warning_preset text.' } }
+        end.to change(AccountWarningPreset, :count).by(1)
+
+        expect(response).to redirect_to(admin_warning_presets_path)
+      end
+    end
+
+    context 'with invalid data' do
+      it 'does creates a new account_warning_preset and renders index' do
+        expect do
+          post :create, params: { account_warning_preset: { text: '' } }
+        end.to_not change(AccountWarningPreset, :count)
+
+        expect(response).to render_template(:index)
+      end
+    end
+  end
+
+  describe 'PUT #update' do
+    let(:account_warning_preset) { Fabricate(:account_warning_preset, text: 'Original text') }
+
+    context 'with valid data' do
+      it 'updates the account_warning_preset and redirects' do
+        put :update, params: { id: account_warning_preset.id, account_warning_preset: { text: 'Updated text.' } }
+
+        expect(response).to redirect_to(admin_warning_presets_path)
+      end
+    end
+
+    context 'with invalid data' do
+      it 'does not update the account_warning_preset and renders index' do
+        put :update, params: { id: account_warning_preset.id, account_warning_preset: { text: '' } }
+
+        expect(response).to render_template(:edit)
+      end
+    end
+  end
+
+  describe 'DELETE #destroy' do
+    let!(:account_warning_preset) { Fabricate(:account_warning_preset) }
+
+    it 'destroys the account_warning_preset and redirects' do
+      delete :destroy, params: { id: account_warning_preset.id }
+
+      expect { account_warning_preset.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect(response).to redirect_to(admin_warning_presets_path)
+    end
+  end
 end
diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb
index 1cca69de7..992fb0e89 100644
--- a/spec/controllers/api/v1/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts_controller_spec.rb
@@ -73,7 +73,7 @@ RSpec.describe Api::V1::AccountsController do
     let(:scopes) { 'write:follows' }
     let(:other_account) { Fabricate(:account, username: 'bob', locked: locked) }
 
-    context do
+    context 'when posting to an other account' do
       before do
         post :follow, params: { id: other_account.id }
       end
diff --git a/spec/controllers/api/v1/admin/account_actions_controller_spec.rb b/spec/controllers/api/v1/admin/account_actions_controller_spec.rb
index 1c976455e..0f39a80b1 100644
--- a/spec/controllers/api/v1/admin/account_actions_controller_spec.rb
+++ b/spec/controllers/api/v1/admin/account_actions_controller_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Api::V1::Admin::AccountActionsController do
   end
 
   describe 'POST #create' do
-    context do
+    context 'with type of disable' do
       before do
         post :create, params: { account_id: account.id, type: 'disable' }
       end
diff --git a/spec/controllers/api/v1/admin/domain_allows_controller_spec.rb b/spec/controllers/api/v1/admin/domain_allows_controller_spec.rb
index ca63ea5a7..69aeb6451 100644
--- a/spec/controllers/api/v1/admin/domain_allows_controller_spec.rb
+++ b/spec/controllers/api/v1/admin/domain_allows_controller_spec.rb
@@ -96,7 +96,7 @@ RSpec.describe Api::V1::Admin::DomainAllowsController do
   describe 'POST #create' do
     let!(:domain_allow) { Fabricate(:domain_allow, domain: 'example.com') }
 
-    context do
+    context 'with a valid domain' do
       before do
         post :create, params: { domain: 'foo.bar.com' }
       end
diff --git a/spec/controllers/api/v1/statuses/translations_controller_spec.rb b/spec/controllers/api/v1/statuses/translations_controller_spec.rb
index 8495779bf..989e94750 100644
--- a/spec/controllers/api/v1/statuses/translations_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/translations_controller_spec.rb
@@ -19,7 +19,7 @@ describe Api::V1::Statuses::TranslationsController do
 
       before do
         translation = TranslationService::Translation.new(text: 'Hello')
-        service = instance_double(TranslationService::DeepL, translate: translation)
+        service = instance_double(TranslationService::DeepL, translate: [translation])
         allow(TranslationService).to receive(:configured?).and_return(true)
         allow(TranslationService).to receive(:configured).and_return(service)
         Rails.cache.write('translation_service/languages', { 'es' => ['en'] })
diff --git a/spec/controllers/api/v1/statuses_controller_spec.rb b/spec/controllers/api/v1/statuses_controller_spec.rb
index ab6f80a61..c2bdba9ac 100644
--- a/spec/controllers/api/v1/statuses_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses_controller_spec.rb
@@ -120,7 +120,7 @@ RSpec.describe Api::V1::StatusesController do
     describe 'POST #create' do
       let(:scopes) { 'write:statuses' }
 
-      context do
+      context 'with a basic status body' do
         before do
           post :create, params: { status: 'Hello world' }
         end
diff --git a/spec/controllers/auth/registrations_controller_spec.rb b/spec/controllers/auth/registrations_controller_spec.rb
index b52d7c6ce..ec82cd07b 100644
--- a/spec/controllers/auth/registrations_controller_spec.rb
+++ b/spec/controllers/auth/registrations_controller_spec.rb
@@ -79,7 +79,7 @@ RSpec.describe Auth::RegistrationsController do
       request.env['devise.mapping'] = Devise.mappings[:user]
     end
 
-    context do
+    context 'with open registrations' do
       around do |example|
         registrations_mode = Setting.registrations_mode
         example.run
@@ -111,7 +111,7 @@ RSpec.describe Auth::RegistrationsController do
       end
     end
 
-    context do
+    context 'when an accept language is present in headers' do
       subject do
         Setting.registrations_mode = 'open'
         request.headers['Accept-Language'] = accept_language
diff --git a/spec/fabricators/account_domain_block_fabricator.rb b/spec/fabricators/account_domain_block_fabricator.rb
index ff85e17f3..83df509da 100644
--- a/spec/fabricators/account_domain_block_fabricator.rb
+++ b/spec/fabricators/account_domain_block_fabricator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 Fabricator(:account_domain_block) do
-  account
+  account { Fabricate.build(:account) }
   domain 'example.com'
 end
diff --git a/spec/fabricators/account_moderation_note_fabricator.rb b/spec/fabricators/account_moderation_note_fabricator.rb
index 341a24dea..05a687bf4 100644
--- a/spec/fabricators/account_moderation_note_fabricator.rb
+++ b/spec/fabricators/account_moderation_note_fabricator.rb
@@ -2,6 +2,6 @@
 
 Fabricator(:account_moderation_note) do
   content 'MyText'
-  account
-  target_account { Fabricate(:account) }
+  account { Fabricate.build(:account) }
+  target_account { Fabricate.build(:account) }
 end
diff --git a/spec/fabricators/account_note_fabricator.rb b/spec/fabricators/account_note_fabricator.rb
index bb4ed8b24..241362c14 100644
--- a/spec/fabricators/account_note_fabricator.rb
+++ b/spec/fabricators/account_note_fabricator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Fabricator(:account_note) do
-  account
-  target_account { Fabricate(:account) }
+  account { Fabricate.build(:account) }
+  target_account { Fabricate.build(:account) }
   comment        'User note text'
 end
diff --git a/spec/fabricators/account_stat_fabricator.rb b/spec/fabricators/account_stat_fabricator.rb
index e6085c5f2..20272fb22 100644
--- a/spec/fabricators/account_stat_fabricator.rb
+++ b/spec/fabricators/account_stat_fabricator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Fabricator(:account_stat) do
-  account
+  account { Fabricate.build(:account) }
   statuses_count  '123'
   following_count '456'
   followers_count '789'
diff --git a/spec/fabricators/account_statuses_cleanup_policy_fabricator.rb b/spec/fabricators/account_statuses_cleanup_policy_fabricator.rb
index 0e756ddba..fcf7a5347 100644
--- a/spec/fabricators/account_statuses_cleanup_policy_fabricator.rb
+++ b/spec/fabricators/account_statuses_cleanup_policy_fabricator.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 Fabricator(:account_statuses_cleanup_policy) do
-  account
+  account { Fabricate.build(:account) }
 end
diff --git a/spec/fabricators/account_warning_fabricator.rb b/spec/fabricators/account_warning_fabricator.rb
index e5059e37f..70005a927 100644
--- a/spec/fabricators/account_warning_fabricator.rb
+++ b/spec/fabricators/account_warning_fabricator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Fabricator(:account_warning) do
-  account
+  account { Fabricate.build(:account) }
   target_account(fabricator: :account)
   text { Faker::Lorem.paragraph }
   action 'suspend'
diff --git a/spec/fabricators/admin_action_log_fabricator.rb b/spec/fabricators/admin_action_log_fabricator.rb
index a259644bd..3acedbffd 100644
--- a/spec/fabricators/admin_action_log_fabricator.rb
+++ b/spec/fabricators/admin_action_log_fabricator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Fabricator('Admin::ActionLog') do
-  account
+  account { Fabricate.build(:account) }
   action  'MyString'
   target  nil
 end
diff --git a/spec/fabricators/backup_fabricator.rb b/spec/fabricators/backup_fabricator.rb
index c73ae54be..58e37c987 100644
--- a/spec/fabricators/backup_fabricator.rb
+++ b/spec/fabricators/backup_fabricator.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 Fabricator(:backup) do
-  user
+  user { Fabricate.build(:user) }
 end
diff --git a/spec/fabricators/block_fabricator.rb b/spec/fabricators/block_fabricator.rb
index c2e9e9628..c4087e46d 100644
--- a/spec/fabricators/block_fabricator.rb
+++ b/spec/fabricators/block_fabricator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 Fabricator(:block) do
-  account
-  target_account { Fabricate(:account) }
+  account { Fabricate.build(:account) }
+  target_account { Fabricate.build(:account) }
 end
diff --git a/spec/fabricators/bookmark_fabricator.rb b/spec/fabricators/bookmark_fabricator.rb
index e21046fc2..994ac6e68 100644
--- a/spec/fabricators/bookmark_fabricator.rb
+++ b/spec/fabricators/bookmark_fabricator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 Fabricator(:bookmark) do
-  account
-  status
+  account { Fabricate.build(:account) }
+  status { Fabricate.build(:status) }
 end
diff --git a/spec/fabricators/bulk_import_fabricator.rb b/spec/fabricators/bulk_import_fabricator.rb
index 673b7960d..d30758dfe 100644
--- a/spec/fabricators/bulk_import_fabricator.rb
+++ b/spec/fabricators/bulk_import_fabricator.rb
@@ -8,5 +8,5 @@ Fabricator(:bulk_import) do
   imported_items  1
   finished_at     '2022-11-18 14:55:07'
   overwrite       false
-  account
+  account { Fabricate.build(:account) }
 end
diff --git a/spec/fabricators/bulk_import_row_fabricator.rb b/spec/fabricators/bulk_import_row_fabricator.rb
index f8358e734..10a4bf160 100644
--- a/spec/fabricators/bulk_import_row_fabricator.rb
+++ b/spec/fabricators/bulk_import_row_fabricator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 Fabricator(:bulk_import_row) do
-  bulk_import
+  bulk_import { Fabricate.build(:bulk_import) }
   data ''
 end
diff --git a/spec/fabricators/canonical_email_block_fabricator.rb b/spec/fabricators/canonical_email_block_fabricator.rb
index 3a018059f..1ef53ff4a 100644
--- a/spec/fabricators/canonical_email_block_fabricator.rb
+++ b/spec/fabricators/canonical_email_block_fabricator.rb
@@ -2,5 +2,5 @@
 
 Fabricator(:canonical_email_block) do
   email { sequence(:email) { |i| "#{i}#{Faker::Internet.email}" } }
-  reference_account { Fabricate(:account) }
+  reference_account { Fabricate.build(:account) }
 end
diff --git a/spec/fabricators/custom_filter_fabricator.rb b/spec/fabricators/custom_filter_fabricator.rb
index 5fee4f01a..766cc3b11 100644
--- a/spec/fabricators/custom_filter_fabricator.rb
+++ b/spec/fabricators/custom_filter_fabricator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Fabricator(:custom_filter) do
-  account
+  account { Fabricate.build(:account) }
   expires_at nil
   phrase     'discourse'
   context    %w(home notifications)
diff --git a/spec/fabricators/custom_filter_keyword_fabricator.rb b/spec/fabricators/custom_filter_keyword_fabricator.rb
index f1fb440dc..aa4bf8473 100644
--- a/spec/fabricators/custom_filter_keyword_fabricator.rb
+++ b/spec/fabricators/custom_filter_keyword_fabricator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 Fabricator(:custom_filter_keyword) do
-  custom_filter
+  custom_filter { Fabricate.build(:custom_filter) }
   keyword 'discourse'
 end
diff --git a/spec/fabricators/custom_filter_status_fabricator.rb b/spec/fabricators/custom_filter_status_fabricator.rb
index 3ef1d0ec8..f66f62e56 100644
--- a/spec/fabricators/custom_filter_status_fabricator.rb
+++ b/spec/fabricators/custom_filter_status_fabricator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 Fabricator(:custom_filter_status) do
-  custom_filter
-  status
+  custom_filter { Fabricate.build(:custom_filter) }
+  status { Fabricate.build(:status) }
 end
diff --git a/spec/fabricators/device_fabricator.rb b/spec/fabricators/device_fabricator.rb
index 26c71b4fd..37a2e8977 100644
--- a/spec/fabricators/device_fabricator.rb
+++ b/spec/fabricators/device_fabricator.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 Fabricator(:device) do
-  access_token
-  account
+  access_token { Fabricate.build(:access_token) }
+  account { Fabricate.build(:account) }
   device_id        { Faker::Number.number(digits: 5) }
   name             { Faker::App.name }
   fingerprint_key  { Base64.strict_encode64(Ed25519::SigningKey.generate.verify_key.to_bytes) }
diff --git a/spec/fabricators/encrypted_message_fabricator.rb b/spec/fabricators/encrypted_message_fabricator.rb
index 43b310514..349b659c2 100644
--- a/spec/fabricators/encrypted_message_fabricator.rb
+++ b/spec/fabricators/encrypted_message_fabricator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Fabricator(:encrypted_message) do
-  device
-  from_account { Fabricate(:account) }
+  device { Fabricate.build(:device) }
+  from_account { Fabricate.build(:account) }
   from_device_id { Faker::Number.number(digits: 5) }
 end
diff --git a/spec/fabricators/favourite_fabricator.rb b/spec/fabricators/favourite_fabricator.rb
index 005947e6f..639416987 100644
--- a/spec/fabricators/favourite_fabricator.rb
+++ b/spec/fabricators/favourite_fabricator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 Fabricator(:favourite) do
-  account
-  status
+  account { Fabricate.build(:account) }
+  status { Fabricate.build(:status) }
 end
diff --git a/spec/fabricators/featured_tag_fabricator.rb b/spec/fabricators/featured_tag_fabricator.rb
index 838364056..0803dc43a 100644
--- a/spec/fabricators/featured_tag_fabricator.rb
+++ b/spec/fabricators/featured_tag_fabricator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Fabricator(:featured_tag) do
-  account
-  tag
+  account { Fabricate.build(:account) }
+  tag { Fabricate.build(:tag) }
   name { sequence(:name) { |i| "Tag#{i}" } }
 end
diff --git a/spec/fabricators/follow_fabricator.rb b/spec/fabricators/follow_fabricator.rb
index 41b5305d5..29886b430 100644
--- a/spec/fabricators/follow_fabricator.rb
+++ b/spec/fabricators/follow_fabricator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 Fabricator(:follow) do
-  account
-  target_account { Fabricate(:account) }
+  account { Fabricate.build(:account) }
+  target_account { Fabricate.build(:account) }
 end
diff --git a/spec/fabricators/follow_request_fabricator.rb b/spec/fabricators/follow_request_fabricator.rb
index 86b82611f..6b2d658a3 100644
--- a/spec/fabricators/follow_request_fabricator.rb
+++ b/spec/fabricators/follow_request_fabricator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 Fabricator(:follow_request) do
-  account
-  target_account { Fabricate(:account, locked: true) }
+  account { Fabricate.build(:account) }
+  target_account { Fabricate.build(:account, locked: true) }
 end
diff --git a/spec/fabricators/identity_fabricator.rb b/spec/fabricators/identity_fabricator.rb
index 58072c0d6..83655ee83 100644
--- a/spec/fabricators/identity_fabricator.rb
+++ b/spec/fabricators/identity_fabricator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Fabricator(:identity) do
-  user
+  user { Fabricate.build(:user) }
   provider 'MyString'
   uid      'MyString'
 end
diff --git a/spec/fabricators/invite_fabricator.rb b/spec/fabricators/invite_fabricator.rb
index 4f47d6ce2..8fdf5f918 100644
--- a/spec/fabricators/invite_fabricator.rb
+++ b/spec/fabricators/invite_fabricator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Fabricator(:invite) do
-  user
+  user { Fabricate.build(:user) }
   expires_at nil
   max_uses   nil
   uses       0
diff --git a/spec/fabricators/list_fabricator.rb b/spec/fabricators/list_fabricator.rb
index 47af752b8..d2bdc1012 100644
--- a/spec/fabricators/list_fabricator.rb
+++ b/spec/fabricators/list_fabricator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 Fabricator(:list) do
-  account
+  account { Fabricate.build(:account) }
   title 'MyString'
 end
diff --git a/spec/fabricators/login_activity_fabricator.rb b/spec/fabricators/login_activity_fabricator.rb
index 2b30658ff..3309a303d 100644
--- a/spec/fabricators/login_activity_fabricator.rb
+++ b/spec/fabricators/login_activity_fabricator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Fabricator(:login_activity) do
-  user
+  user { Fabricate.build(:user) }
   authentication_method 'password'
   success               true
   failure_reason        nil
diff --git a/spec/fabricators/marker_fabricator.rb b/spec/fabricators/marker_fabricator.rb
index 561c2553a..641db6b9e 100644
--- a/spec/fabricators/marker_fabricator.rb
+++ b/spec/fabricators/marker_fabricator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Fabricator(:marker) do
-  user
+  user { Fabricate.build(:user) }
   timeline     'home'
   last_read_id 0
   lock_version 0
diff --git a/spec/fabricators/media_attachment_fabricator.rb b/spec/fabricators/media_attachment_fabricator.rb
index 4a081dccb..062d3cbfe 100644
--- a/spec/fabricators/media_attachment_fabricator.rb
+++ b/spec/fabricators/media_attachment_fabricator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Fabricator(:media_attachment) do
-  account
+  account { Fabricate.build(:account) }
 
   file do |attrs|
     case attrs[:type]
diff --git a/spec/fabricators/mention_fabricator.rb b/spec/fabricators/mention_fabricator.rb
index 5a8392827..ee8160aeb 100644
--- a/spec/fabricators/mention_fabricator.rb
+++ b/spec/fabricators/mention_fabricator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 Fabricator(:mention) do
-  account
-  status
+  account { Fabricate.build(:account) }
+  status { Fabricate.build(:status) }
 end
diff --git a/spec/fabricators/mute_fabricator.rb b/spec/fabricators/mute_fabricator.rb
index 242ae2b08..a70d3ff26 100644
--- a/spec/fabricators/mute_fabricator.rb
+++ b/spec/fabricators/mute_fabricator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 Fabricator(:mute) do
-  account
-  target_account { Fabricate(:account) }
+  account { Fabricate.build(:account) }
+  target_account { Fabricate.build(:account) }
 end
diff --git a/spec/fabricators/notification_fabricator.rb b/spec/fabricators/notification_fabricator.rb
index 1e0c80987..fdfd7673e 100644
--- a/spec/fabricators/notification_fabricator.rb
+++ b/spec/fabricators/notification_fabricator.rb
@@ -2,5 +2,5 @@
 
 Fabricator(:notification) do
   activity fabricator: :status
-  account
+  account { Fabricate.build(:account) }
 end
diff --git a/spec/fabricators/one_time_key_fabricator.rb b/spec/fabricators/one_time_key_fabricator.rb
index cfb365cab..505282e05 100644
--- a/spec/fabricators/one_time_key_fabricator.rb
+++ b/spec/fabricators/one_time_key_fabricator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Fabricator(:one_time_key) do
-  device
+  device { Fabricate.build(:device) }
   key_id { Faker::Alphanumeric.alphanumeric(number: 10) }
   key { Base64.strict_encode64(Ed25519::SigningKey.generate.verify_key.to_bytes) }
 
diff --git a/spec/fabricators/poll_fabricator.rb b/spec/fabricators/poll_fabricator.rb
index 19c3b1d16..0203609ce 100644
--- a/spec/fabricators/poll_fabricator.rb
+++ b/spec/fabricators/poll_fabricator.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 Fabricator(:poll) do
-  account
-  status
+  account { Fabricate.build(:account) }
+  status { Fabricate.build(:status) }
   expires_at  { 7.days.from_now }
   options     %w(Foo Bar)
   multiple    false
diff --git a/spec/fabricators/poll_vote_fabricator.rb b/spec/fabricators/poll_vote_fabricator.rb
index 9099ae96f..47813cdb7 100644
--- a/spec/fabricators/poll_vote_fabricator.rb
+++ b/spec/fabricators/poll_vote_fabricator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Fabricator(:poll_vote) do
-  account
+  account { Fabricate.build(:account) }
   poll
   choice 0
 end
diff --git a/spec/fabricators/report_fabricator.rb b/spec/fabricators/report_fabricator.rb
index 7124773ad..ed890230a 100644
--- a/spec/fabricators/report_fabricator.rb
+++ b/spec/fabricators/report_fabricator.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 Fabricator(:report) do
-  account
-  target_account  { Fabricate(:account) }
+  account { Fabricate.build(:account) }
+  target_account  { Fabricate.build(:account) }
   comment         'You nasty'
   action_taken_at nil
 end
diff --git a/spec/fabricators/report_note_fabricator.rb b/spec/fabricators/report_note_fabricator.rb
index f257fe2b7..080fad51a 100644
--- a/spec/fabricators/report_note_fabricator.rb
+++ b/spec/fabricators/report_note_fabricator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Fabricator(:report_note) do
-  report
-  account { Fabricate(:account) }
+  report { Fabricate.build(:report) }
+  account { Fabricate.build(:account) }
   content 'Test Content'
 end
diff --git a/spec/fabricators/scheduled_status_fabricator.rb b/spec/fabricators/scheduled_status_fabricator.rb
index e517f258a..eed275ab9 100644
--- a/spec/fabricators/scheduled_status_fabricator.rb
+++ b/spec/fabricators/scheduled_status_fabricator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 Fabricator(:scheduled_status) do
-  account
+  account { Fabricate.build(:account) }
   scheduled_at { 20.hours.from_now }
 end
diff --git a/spec/fabricators/session_activation_fabricator.rb b/spec/fabricators/session_activation_fabricator.rb
index b28d5e41d..4b5244cec 100644
--- a/spec/fabricators/session_activation_fabricator.rb
+++ b/spec/fabricators/session_activation_fabricator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 Fabricator(:session_activation) do
-  user
+  user { Fabricate.build(:user) }
   session_id 'MyString'
 end
diff --git a/spec/fabricators/status_fabricator.rb b/spec/fabricators/status_fabricator.rb
index 17ac9ccd8..32a2cbf6a 100644
--- a/spec/fabricators/status_fabricator.rb
+++ b/spec/fabricators/status_fabricator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Fabricator(:status) do
-  account
+  account { Fabricate.build(:account) }
   text 'Lorem ipsum dolor sit amet'
 
   after_build do |status|
diff --git a/spec/fabricators/status_pin_fabricator.rb b/spec/fabricators/status_pin_fabricator.rb
index 9ad0ac9de..ceaaa34a7 100644
--- a/spec/fabricators/status_pin_fabricator.rb
+++ b/spec/fabricators/status_pin_fabricator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 Fabricator(:status_pin) do
-  account
-  status { |attrs| Fabricate(:status, account: attrs[:account], visibility: :public) }
+  account { Fabricate.build(:account) }
+  status { |attrs| Fabricate.build(:status, account: attrs[:account], visibility: :public) }
 end
diff --git a/spec/fabricators/tag_follow_fabricator.rb b/spec/fabricators/tag_follow_fabricator.rb
index cbe5b0989..014435d60 100644
--- a/spec/fabricators/tag_follow_fabricator.rb
+++ b/spec/fabricators/tag_follow_fabricator.rb
@@ -2,5 +2,5 @@
 
 Fabricator(:tag_follow) do
   tag
-  account
+  account { Fabricate.build(:account) }
 end
diff --git a/spec/features/admin/domain_blocks_spec.rb b/spec/features/admin/domain_blocks_spec.rb
new file mode 100644
index 000000000..3cf60a48a
--- /dev/null
+++ b/spec/features/admin/domain_blocks_spec.rb
@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'blocking domains through the moderation interface' do
+  before do
+    sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), scope: :user
+  end
+
+  context 'when silencing a new domain' do
+    it 'adds a new domain block' do
+      visit new_admin_domain_block_path
+
+      fill_in 'domain_block_domain', with: 'example.com'
+      select I18n.t('admin.domain_blocks.new.severity.silence'), from: 'domain_block_severity'
+      click_on I18n.t('admin.domain_blocks.new.create')
+
+      expect(DomainBlock.exists?(domain: 'example.com', severity: 'silence')).to be true
+    end
+  end
+
+  context 'when suspending a new domain' do
+    it 'presents a confirmation screen before suspending the domain' do
+      visit new_admin_domain_block_path
+
+      fill_in 'domain_block_domain', with: 'example.com'
+      select I18n.t('admin.domain_blocks.new.severity.suspend'), from: 'domain_block_severity'
+      click_on I18n.t('admin.domain_blocks.new.create')
+
+      # It presents a confirmation screen
+      expect(page).to have_title(I18n.t('admin.domain_blocks.confirm_suspension.title', domain: 'example.com'))
+
+      # Confirming creates a block
+      click_on I18n.t('admin.domain_blocks.confirm_suspension.confirm')
+
+      expect(DomainBlock.exists?(domain: 'example.com', severity: 'suspend')).to be true
+    end
+  end
+
+  context 'when suspending a domain that is already silenced' do
+    it 'presents a confirmation screen before suspending the domain' do
+      domain_block = Fabricate(:domain_block, domain: 'example.com', severity: 'silence')
+
+      visit new_admin_domain_block_path
+
+      fill_in 'domain_block_domain', with: 'example.com'
+      select I18n.t('admin.domain_blocks.new.severity.suspend'), from: 'domain_block_severity'
+      click_on I18n.t('admin.domain_blocks.new.create')
+
+      # It presents a confirmation screen
+      expect(page).to have_title(I18n.t('admin.domain_blocks.confirm_suspension.title', domain: 'example.com'))
+
+      # Confirming updates the block
+      click_on I18n.t('admin.domain_blocks.confirm_suspension.confirm')
+
+      expect(domain_block.reload.severity).to eq 'silence'
+    end
+  end
+
+  context 'when editing a domain block' do
+    it 'presents a confirmation screen before suspending the domain' do
+      domain_block = Fabricate(:domain_block, domain: 'example.com', severity: 'silence')
+
+      visit edit_admin_domain_block_path(domain_block)
+
+      select I18n.t('admin.domain_blocks.new.severity.suspend'), from: 'domain_block_severity'
+      click_on I18n.t('generic.save_changes')
+
+      # It presents a confirmation screen
+      expect(page).to have_title(I18n.t('admin.domain_blocks.confirm_suspension.title', domain: 'example.com'))
+
+      # Confirming updates the block
+      click_on I18n.t('admin.domain_blocks.confirm_suspension.confirm')
+
+      expect(domain_block.reload.severity).to eq 'silence'
+    end
+  end
+end
diff --git a/spec/features/log_in_spec.rb b/spec/features/log_in_spec.rb
index 934575ea6..c64e19d2b 100644
--- a/spec/features/log_in_spec.rb
+++ b/spec/features/log_in_spec.rb
@@ -32,7 +32,7 @@ describe 'Log in' do
     expect(subject).to have_css('.flash-message', text: failure_message('invalid'))
   end
 
-  context do
+  context 'when confirmed at is nil' do
     let(:confirmed_at) { nil }
 
     it 'A unconfirmed user is able to log in' do
diff --git a/spec/fixtures/files/lists.csv b/spec/fixtures/files/lists.csv
new file mode 100644
index 000000000..3155ed6d5
--- /dev/null
+++ b/spec/fixtures/files/lists.csv
@@ -0,0 +1,3 @@
+Mastodon project,gargron@example.com
+Mastodon project,mastodon@example.com
+test,foo@example.com
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 8bfca078d..5cdc45a39 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -209,6 +209,18 @@ describe ApplicationHelper do
       end
     end
 
+    context 'when S3 alias includes a path component' do
+      around do |example|
+        ClimateControl.modify S3_ALIAS_HOST: 's3.alias/path' do
+          example.run
+        end
+      end
+
+      it 'returns a correct URL' do
+        expect(helper.storage_host).to eq('https://s3.alias/path')
+      end
+    end
+
     context 'when S3 cloudfront is present' do
       around do |example|
         ClimateControl.modify S3_CLOUDFRONT_HOST: 's3.cloudfront' do
@@ -220,12 +232,6 @@ describe ApplicationHelper do
         expect(helper.storage_host).to eq('https://s3.cloudfront')
       end
     end
-
-    context 'when neither env value is present' do
-      it 'returns false' do
-        expect(helper.storage_host).to eq('https:')
-      end
-    end
   end
 
   describe 'storage_host?' do
diff --git a/spec/helpers/react_component_helper_spec.rb b/spec/helpers/react_component_helper_spec.rb
index 3f133bff9..28208b619 100644
--- a/spec/helpers/react_component_helper_spec.rb
+++ b/spec/helpers/react_component_helper_spec.rb
@@ -33,7 +33,7 @@ describe ReactComponentHelper do
 
     it 'returns a tag with data attributes' do
       expect(parsed_html.div['data-admin-component']).to eq('Name')
-      expect(parsed_html.div['data-props']).to eq('{"locale":"en","one":"two"}')
+      expect(parsed_html.div['data-props']).to eq('{"one":"two"}')
     end
   end
 
diff --git a/spec/lib/activitypub/activity/undo_spec.rb b/spec/lib/activitypub/activity/undo_spec.rb
index b4cbc7196..58e71fc4e 100644
--- a/spec/lib/activitypub/activity/undo_spec.rb
+++ b/spec/lib/activitypub/activity/undo_spec.rb
@@ -31,7 +31,7 @@ RSpec.describe ActivityPub::Activity::Undo do
         }
       end
 
-      context do
+      context 'when not atomUri' do
         before do
           Fabricate(:status, reblog: status, account: sender, uri: 'bar')
         end
diff --git a/spec/lib/admin/metrics/dimension/instance_accounts_dimension_spec.rb b/spec/lib/admin/metrics/dimension/instance_accounts_dimension_spec.rb
new file mode 100644
index 000000000..106717f97
--- /dev/null
+++ b/spec/lib/admin/metrics/dimension/instance_accounts_dimension_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Dimension::InstanceAccountsDimension do
+  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+
+  let(:start_at) { 2.days.ago }
+  let(:end_at) { Time.now.utc }
+  let(:limit) { 10 }
+  let(:params) { ActionController::Parameters.new }
+
+  describe '#data' do
+    it 'runs data query without error' do
+      expect { dimension.data }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/dimension/instance_languages_dimension_spec.rb b/spec/lib/admin/metrics/dimension/instance_languages_dimension_spec.rb
new file mode 100644
index 000000000..f9f6430ca
--- /dev/null
+++ b/spec/lib/admin/metrics/dimension/instance_languages_dimension_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Dimension::InstanceLanguagesDimension do
+  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+
+  let(:start_at) { 2.days.ago }
+  let(:end_at) { Time.now.utc }
+  let(:limit) { 10 }
+  let(:params) { ActionController::Parameters.new }
+
+  describe '#data' do
+    it 'runs data query without error' do
+      expect { dimension.data }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/dimension/languages_dimension_spec.rb b/spec/lib/admin/metrics/dimension/languages_dimension_spec.rb
new file mode 100644
index 000000000..1722c4c61
--- /dev/null
+++ b/spec/lib/admin/metrics/dimension/languages_dimension_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Dimension::LanguagesDimension do
+  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+
+  let(:start_at) { 2.days.ago }
+  let(:end_at) { Time.now.utc }
+  let(:limit) { 10 }
+  let(:params) { ActionController::Parameters.new }
+
+  describe '#data' do
+    it 'runs data query without error' do
+      expect { dimension.data }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/dimension/servers_dimension_spec.rb b/spec/lib/admin/metrics/dimension/servers_dimension_spec.rb
new file mode 100644
index 000000000..7e2bb9ac0
--- /dev/null
+++ b/spec/lib/admin/metrics/dimension/servers_dimension_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Dimension::ServersDimension do
+  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+
+  let(:start_at) { 2.days.ago }
+  let(:end_at) { Time.now.utc }
+  let(:limit) { 10 }
+  let(:params) { ActionController::Parameters.new }
+
+  describe '#data' do
+    it 'runs data query without error' do
+      expect { dimension.data }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/dimension/software_versions_dimension_spec.rb b/spec/lib/admin/metrics/dimension/software_versions_dimension_spec.rb
new file mode 100644
index 000000000..ee1491733
--- /dev/null
+++ b/spec/lib/admin/metrics/dimension/software_versions_dimension_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Dimension::SoftwareVersionsDimension do
+  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+
+  let(:start_at) { 2.days.ago }
+  let(:end_at) { Time.now.utc }
+  let(:limit) { 10 }
+  let(:params) { ActionController::Parameters.new }
+
+  describe '#data' do
+    it 'runs data query without error' do
+      expect { dimension.data }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/dimension/sources_dimension_spec.rb b/spec/lib/admin/metrics/dimension/sources_dimension_spec.rb
new file mode 100644
index 000000000..d6b581a9b
--- /dev/null
+++ b/spec/lib/admin/metrics/dimension/sources_dimension_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Dimension::SourcesDimension do
+  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+
+  let(:start_at) { 2.days.ago }
+  let(:end_at) { Time.now.utc }
+  let(:limit) { 10 }
+  let(:params) { ActionController::Parameters.new }
+
+  describe '#data' do
+    it 'runs data query without error' do
+      expect { dimension.data }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/dimension/space_usage_dimension_spec.rb b/spec/lib/admin/metrics/dimension/space_usage_dimension_spec.rb
new file mode 100644
index 000000000..65d04cfed
--- /dev/null
+++ b/spec/lib/admin/metrics/dimension/space_usage_dimension_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Dimension::SpaceUsageDimension do
+  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+
+  let(:start_at) { 2.days.ago }
+  let(:end_at) { Time.now.utc }
+  let(:limit) { 10 }
+  let(:params) { ActionController::Parameters.new }
+
+  describe '#data' do
+    it 'runs data query without error' do
+      expect { dimension.data }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/dimension/tag_languages_dimension_spec.rb b/spec/lib/admin/metrics/dimension/tag_languages_dimension_spec.rb
new file mode 100644
index 000000000..721d24fa1
--- /dev/null
+++ b/spec/lib/admin/metrics/dimension/tag_languages_dimension_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Dimension::TagLanguagesDimension do
+  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+
+  let(:start_at) { 2.days.ago }
+  let(:end_at) { Time.now.utc }
+  let(:limit) { 10 }
+  let(:params) { ActionController::Parameters.new }
+
+  describe '#data' do
+    it 'runs data query without error' do
+      expect { dimension.data }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/dimension/tag_servers_dimension_spec.rb b/spec/lib/admin/metrics/dimension/tag_servers_dimension_spec.rb
new file mode 100644
index 000000000..305471681
--- /dev/null
+++ b/spec/lib/admin/metrics/dimension/tag_servers_dimension_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Dimension::TagServersDimension do
+  subject(:dimension) { described_class.new(start_at, end_at, limit, params) }
+
+  let(:start_at) { 2.days.ago }
+  let(:end_at) { Time.now.utc }
+  let(:limit) { 10 }
+  let(:params) { ActionController::Parameters.new }
+
+  describe '#data' do
+    it 'runs data query without error' do
+      expect { dimension.data }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/measure/active_users_measure_spec.rb b/spec/lib/admin/metrics/measure/active_users_measure_spec.rb
new file mode 100644
index 000000000..55164ed88
--- /dev/null
+++ b/spec/lib/admin/metrics/measure/active_users_measure_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Measure::ActiveUsersMeasure do
+  subject(:measure) { described_class.new(start_at, end_at, params) }
+
+  let(:start_at) { 2.days.ago }
+  let(:end_at)   { Time.now.utc }
+  let(:params) { ActionController::Parameters.new }
+
+  describe '#data' do
+    it 'runs data query without error' do
+      expect { measure.data }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/measure/instance_accounts_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_accounts_measure_spec.rb
new file mode 100644
index 000000000..8e414963f
--- /dev/null
+++ b/spec/lib/admin/metrics/measure/instance_accounts_measure_spec.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Measure::InstanceAccountsMeasure do
+  subject(:measure) { described_class.new(start_at, end_at, params) }
+
+  let(:domain) { 'example.com' }
+
+  let(:start_at) { 2.days.ago }
+  let(:end_at)   { Time.now.utc }
+
+  let(:params) { ActionController::Parameters.new(domain: domain) }
+
+  before do
+    Fabricate(:account, domain: domain, created_at: 1.year.ago)
+    Fabricate(:account, domain: domain, created_at: 1.month.ago)
+    Fabricate(:account, domain: domain)
+
+    Fabricate(:account, domain: "foo.#{domain}", created_at: 1.year.ago)
+    Fabricate(:account, domain: "foo.#{domain}")
+    Fabricate(:account, domain: "bar.#{domain}")
+  end
+
+  describe 'total' do
+    context 'without include_subdomains' do
+      it 'returns the expected number of accounts' do
+        expect(measure.total).to eq 3
+      end
+    end
+
+    context 'with include_subdomains' do
+      let(:params) { ActionController::Parameters.new(domain: domain, include_subdomains: 'true') }
+
+      it 'returns the expected number of accounts' do
+        expect(measure.total).to eq 6
+      end
+    end
+  end
+
+  describe '#data' do
+    it 'runs data query without error' do
+      expect { measure.data }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/measure/instance_followers_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_followers_measure_spec.rb
new file mode 100644
index 000000000..c627e6ced
--- /dev/null
+++ b/spec/lib/admin/metrics/measure/instance_followers_measure_spec.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Measure::InstanceFollowersMeasure do
+  subject(:measure) { described_class.new(start_at, end_at, params) }
+
+  let(:domain) { 'example.com' }
+
+  let(:start_at) { 2.days.ago }
+  let(:end_at)   { Time.now.utc }
+
+  let(:params) { ActionController::Parameters.new(domain: domain) }
+
+  before do
+    local_account = Fabricate(:account)
+
+    Fabricate(:account, domain: domain).follow!(local_account)
+    Fabricate(:account, domain: domain).follow!(local_account)
+    Fabricate(:account, domain: domain)
+
+    Fabricate(:account, domain: "foo.#{domain}").follow!(local_account)
+    Fabricate(:account, domain: "foo.#{domain}").follow!(local_account)
+    Fabricate(:account, domain: "bar.#{domain}")
+  end
+
+  describe 'total' do
+    context 'without include_subdomains' do
+      it 'returns the expected number of accounts' do
+        expect(measure.total).to eq 2
+      end
+    end
+
+    context 'with include_subdomains' do
+      let(:params) { ActionController::Parameters.new(domain: domain, include_subdomains: 'true') }
+
+      it 'returns the expected number of accounts' do
+        expect(measure.total).to eq 4
+      end
+    end
+  end
+
+  describe '#data' do
+    it 'runs data query without error' do
+      expect { measure.data }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/measure/instance_follows_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_follows_measure_spec.rb
new file mode 100644
index 000000000..42f33dfc3
--- /dev/null
+++ b/spec/lib/admin/metrics/measure/instance_follows_measure_spec.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Measure::InstanceFollowsMeasure do
+  subject(:measure) { described_class.new(start_at, end_at, params) }
+
+  let(:domain) { 'example.com' }
+
+  let(:start_at) { 2.days.ago }
+  let(:end_at)   { Time.now.utc }
+
+  let(:params) { ActionController::Parameters.new(domain: domain) }
+
+  before do
+    local_account = Fabricate(:account)
+
+    local_account.follow!(Fabricate(:account, domain: domain))
+    local_account.follow!(Fabricate(:account, domain: domain))
+    Fabricate(:account, domain: domain)
+
+    local_account.follow!(Fabricate(:account, domain: "foo.#{domain}"))
+    local_account.follow!(Fabricate(:account, domain: "foo.#{domain}"))
+    Fabricate(:account, domain: "bar.#{domain}")
+  end
+
+  describe 'total' do
+    context 'without include_subdomains' do
+      it 'returns the expected number of accounts' do
+        expect(measure.total).to eq 2
+      end
+    end
+
+    context 'with include_subdomains' do
+      let(:params) { ActionController::Parameters.new(domain: domain, include_subdomains: 'true') }
+
+      it 'returns the expected number of accounts' do
+        expect(measure.total).to eq 4
+      end
+    end
+  end
+
+  describe '#data' do
+    it 'runs data query without error' do
+      expect { measure.data }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/measure/instance_media_attachments_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_media_attachments_measure_spec.rb
new file mode 100644
index 000000000..c103307f9
--- /dev/null
+++ b/spec/lib/admin/metrics/measure/instance_media_attachments_measure_spec.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure do
+  subject(:measure) { described_class.new(start_at, end_at, params) }
+
+  let(:domain) { 'example.com' }
+
+  let(:start_at) { 2.days.ago }
+  let(:end_at)   { Time.now.utc }
+
+  let(:params) { ActionController::Parameters.new(domain: domain) }
+
+  let(:remote_account) { Fabricate(:account, domain: domain) }
+  let(:remote_account_on_subdomain) { Fabricate(:account, domain: "foo.#{domain}") }
+
+  before do
+    remote_account.media_attachments.create!(file: attachment_fixture('attachment.jpg'))
+    remote_account_on_subdomain.media_attachments.create!(file: attachment_fixture('attachment.jpg'))
+  end
+
+  describe 'total' do
+    context 'without include_subdomains' do
+      it 'returns the expected number of accounts' do
+        expected_total = remote_account.media_attachments.sum(:file_file_size) + remote_account.media_attachments.sum(:thumbnail_file_size)
+        expect(measure.total).to eq expected_total
+      end
+    end
+
+    context 'with include_subdomains' do
+      let(:params) { ActionController::Parameters.new(domain: domain, include_subdomains: 'true') }
+
+      it 'returns the expected number of accounts' do
+        expected_total = [remote_account, remote_account_on_subdomain].sum do |account|
+          account.media_attachments.sum(:file_file_size) + account.media_attachments.sum(:thumbnail_file_size)
+        end
+
+        expect(measure.total).to eq expected_total
+      end
+    end
+  end
+
+  describe '#data' do
+    it 'runs data query without error' do
+      expect { measure.data }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/measure/instance_reports_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_reports_measure_spec.rb
new file mode 100644
index 000000000..62fcf84ac
--- /dev/null
+++ b/spec/lib/admin/metrics/measure/instance_reports_measure_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Measure::InstanceReportsMeasure do
+  subject(:measure) { described_class.new(start_at, end_at, params) }
+
+  let(:domain) { 'example.com' }
+
+  let(:start_at) { 2.days.ago }
+  let(:end_at)   { Time.now.utc }
+
+  let(:params) { ActionController::Parameters.new(domain: domain) }
+
+  before do
+    Fabricate(:report, target_account: Fabricate(:account, domain: domain))
+    Fabricate(:report, target_account: Fabricate(:account, domain: domain))
+
+    Fabricate(:report, target_account: Fabricate(:account, domain: "foo.#{domain}"))
+    Fabricate(:report, target_account: Fabricate(:account, domain: "foo.#{domain}"))
+    Fabricate(:report, target_account: Fabricate(:account, domain: "bar.#{domain}"))
+  end
+
+  describe 'total' do
+    context 'without include_subdomains' do
+      it 'returns the expected number of accounts' do
+        expect(measure.total).to eq 2
+      end
+    end
+
+    context 'with include_subdomains' do
+      let(:params) { ActionController::Parameters.new(domain: domain, include_subdomains: 'true') }
+
+      it 'returns the expected number of accounts' do
+        expect(measure.total).to eq 5
+      end
+    end
+  end
+
+  describe '#data' do
+    it 'runs data query without error' do
+      expect { measure.data }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/measure/instance_statuses_measure_spec.rb b/spec/lib/admin/metrics/measure/instance_statuses_measure_spec.rb
new file mode 100644
index 000000000..df4cfe207
--- /dev/null
+++ b/spec/lib/admin/metrics/measure/instance_statuses_measure_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Measure::InstanceStatusesMeasure do
+  subject(:measure) { described_class.new(start_at, end_at, params) }
+
+  let(:domain) { 'example.com' }
+
+  let(:start_at) { 2.days.ago }
+  let(:end_at)   { Time.now.utc }
+
+  let(:params) { ActionController::Parameters.new(domain: domain) }
+
+  before do
+    Fabricate(:status, account: Fabricate(:account, domain: domain))
+    Fabricate(:status, account: Fabricate(:account, domain: domain))
+
+    Fabricate(:status, account: Fabricate(:account, domain: "foo.#{domain}"))
+    Fabricate(:status, account: Fabricate(:account, domain: "foo.#{domain}"))
+    Fabricate(:status, account: Fabricate(:account, domain: "bar.#{domain}"))
+  end
+
+  describe 'total' do
+    context 'without include_subdomains' do
+      it 'returns the expected number of accounts' do
+        expect(measure.total).to eq 2
+      end
+    end
+
+    context 'with include_subdomains' do
+      let(:params) { ActionController::Parameters.new(domain: domain, include_subdomains: 'true') }
+
+      it 'returns the expected number of accounts' do
+        expect(measure.total).to eq 5
+      end
+    end
+  end
+
+  describe '#data' do
+    it 'runs data query without error' do
+      expect { measure.data }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/measure/interactions_measure_spec.rb b/spec/lib/admin/metrics/measure/interactions_measure_spec.rb
new file mode 100644
index 000000000..e98c83059
--- /dev/null
+++ b/spec/lib/admin/metrics/measure/interactions_measure_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Measure::InteractionsMeasure do
+  subject(:measure) { described_class.new(start_at, end_at, params) }
+
+  let(:start_at) { 2.days.ago }
+  let(:end_at)   { Time.now.utc }
+  let(:params) { ActionController::Parameters.new }
+
+  describe '#data' do
+    it 'runs data query without error' do
+      expect { measure.data }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/measure/new_users_measure_spec.rb b/spec/lib/admin/metrics/measure/new_users_measure_spec.rb
new file mode 100644
index 000000000..fe82f8219
--- /dev/null
+++ b/spec/lib/admin/metrics/measure/new_users_measure_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Measure::NewUsersMeasure do
+  subject(:measure) { described_class.new(start_at, end_at, params) }
+
+  let(:start_at) { 2.days.ago }
+  let(:end_at)   { Time.now.utc }
+  let(:params) { ActionController::Parameters.new }
+
+  describe '#data' do
+    it 'runs data query without error' do
+      expect { measure.data }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/measure/opened_reports_measure_spec.rb b/spec/lib/admin/metrics/measure/opened_reports_measure_spec.rb
new file mode 100644
index 000000000..deed64ae8
--- /dev/null
+++ b/spec/lib/admin/metrics/measure/opened_reports_measure_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Measure::OpenedReportsMeasure do
+  subject(:measure) { described_class.new(start_at, end_at, params) }
+
+  let(:start_at) { 2.days.ago }
+  let(:end_at)   { Time.now.utc }
+  let(:params) { ActionController::Parameters.new }
+
+  describe '#data' do
+    it 'runs data query without error' do
+      expect { measure.data }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/measure/resolved_reports_measure_spec.rb b/spec/lib/admin/metrics/measure/resolved_reports_measure_spec.rb
new file mode 100644
index 000000000..cb98df2dc
--- /dev/null
+++ b/spec/lib/admin/metrics/measure/resolved_reports_measure_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Measure::ResolvedReportsMeasure do
+  subject(:measure) { described_class.new(start_at, end_at, params) }
+
+  let(:start_at) { 2.days.ago }
+  let(:end_at)   { Time.now.utc }
+  let(:params) { ActionController::Parameters.new }
+
+  describe '#data' do
+    it 'runs data query without error' do
+      expect { measure.data }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/measure/tag_accounts_measure_spec.rb b/spec/lib/admin/metrics/measure/tag_accounts_measure_spec.rb
new file mode 100644
index 000000000..938b67afa
--- /dev/null
+++ b/spec/lib/admin/metrics/measure/tag_accounts_measure_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Measure::TagAccountsMeasure do
+  subject(:measure) { described_class.new(start_at, end_at, params) }
+
+  let!(:tag) { Fabricate(:tag) }
+
+  let(:start_at) { 2.days.ago }
+  let(:end_at)   { Time.now.utc }
+  let(:params) { ActionController::Parameters.new(id: tag.id) }
+
+  describe '#data' do
+    it 'runs data query without error' do
+      expect { measure.data }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/measure/tag_servers_measure_spec.rb b/spec/lib/admin/metrics/measure/tag_servers_measure_spec.rb
new file mode 100644
index 000000000..e09a2b04e
--- /dev/null
+++ b/spec/lib/admin/metrics/measure/tag_servers_measure_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Measure::TagServersMeasure do
+  subject(:measure) { described_class.new(start_at, end_at, params) }
+
+  let!(:tag) { Fabricate(:tag) }
+
+  let(:start_at) { 2.days.ago }
+  let(:end_at)   { Time.now.utc }
+  let(:params) { ActionController::Parameters.new(id: tag.id) }
+
+  describe '#data' do
+    it 'runs data query without error' do
+      expect { measure.data }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/admin/metrics/measure/tag_uses_measure_spec.rb b/spec/lib/admin/metrics/measure/tag_uses_measure_spec.rb
new file mode 100644
index 000000000..869e93744
--- /dev/null
+++ b/spec/lib/admin/metrics/measure/tag_uses_measure_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::Metrics::Measure::TagUsesMeasure do
+  subject(:measure) { described_class.new(start_at, end_at, params) }
+
+  let!(:tag) { Fabricate(:tag) }
+
+  let(:start_at) { 2.days.ago }
+  let(:end_at)   { Time.now.utc }
+  let(:params) { ActionController::Parameters.new(id: tag.id) }
+
+  describe '#data' do
+    it 'runs data query without error' do
+      expect { measure.data }.to_not raise_error
+    end
+  end
+end
diff --git a/spec/lib/entity_cache_spec.rb b/spec/lib/entity_cache_spec.rb
index 6d9afa474..5818de711 100644
--- a/spec/lib/entity_cache_spec.rb
+++ b/spec/lib/entity_cache_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe EntityCache do
   let(:remote_account) { Fabricate(:account, domain: 'remote.test', username: 'bob', url: 'https://remote.test/') }
 
   describe '#emoji' do
-    subject { EntityCache.instance.emoji(shortcodes, domain) }
+    subject { described_class.instance.emoji(shortcodes, domain) }
 
     context 'when called with an empty list of shortcodes' do
       let(:shortcodes) { [] }
diff --git a/spec/lib/extractor_spec.rb b/spec/lib/extractor_spec.rb
index 560617ed7..b6c910171 100644
--- a/spec/lib/extractor_spec.rb
+++ b/spec/lib/extractor_spec.rb
@@ -6,19 +6,19 @@ describe Extractor do
   describe 'extract_mentions_or_lists_with_indices' do
     it 'returns an empty array if the given string does not have at signs' do
       text = 'a string without at signs'
-      extracted = Extractor.extract_mentions_or_lists_with_indices(text)
+      extracted = described_class.extract_mentions_or_lists_with_indices(text)
       expect(extracted).to eq []
     end
 
     it 'does not extract mentions which ends with particular characters' do
       text = '@screen_name@'
-      extracted = Extractor.extract_mentions_or_lists_with_indices(text)
+      extracted = described_class.extract_mentions_or_lists_with_indices(text)
       expect(extracted).to eq []
     end
 
     it 'returns mentions as an array' do
       text = '@screen_name'
-      extracted = Extractor.extract_mentions_or_lists_with_indices(text)
+      extracted = described_class.extract_mentions_or_lists_with_indices(text)
       expect(extracted).to eq [
         { screen_name: 'screen_name', indices: [0, 12] },
       ]
@@ -26,7 +26,7 @@ describe Extractor do
 
     it 'yields mentions if a block is given' do
       text = '@screen_name'
-      Extractor.extract_mentions_or_lists_with_indices(text) do |screen_name, start_position, end_position|
+      described_class.extract_mentions_or_lists_with_indices(text) do |screen_name, start_position, end_position|
         expect(screen_name).to eq 'screen_name'
         expect(start_position).to eq 0
         expect(end_position).to eq 12
@@ -37,31 +37,31 @@ describe Extractor do
   describe 'extract_hashtags_with_indices' do
     it 'returns an empty array if it does not have #' do
       text = 'a string without hash sign'
-      extracted = Extractor.extract_hashtags_with_indices(text)
+      extracted = described_class.extract_hashtags_with_indices(text)
       expect(extracted).to eq []
     end
 
     it 'does not exclude normal hash text before ://' do
       text = '#hashtag://'
-      extracted = Extractor.extract_hashtags_with_indices(text)
+      extracted = described_class.extract_hashtags_with_indices(text)
       expect(extracted).to eq [{ hashtag: 'hashtag', indices: [0, 8] }]
     end
 
     it 'excludes http://' do
       text = '#hashtaghttp://'
-      extracted = Extractor.extract_hashtags_with_indices(text)
+      extracted = described_class.extract_hashtags_with_indices(text)
       expect(extracted).to eq [{ hashtag: 'hashtag', indices: [0, 8] }]
     end
 
     it 'excludes https://' do
       text = '#hashtaghttps://'
-      extracted = Extractor.extract_hashtags_with_indices(text)
+      extracted = described_class.extract_hashtags_with_indices(text)
       expect(extracted).to eq [{ hashtag: 'hashtag', indices: [0, 8] }]
     end
 
     it 'yields hashtags if a block is given' do
       text = '#hashtag'
-      Extractor.extract_hashtags_with_indices(text) do |hashtag, start_position, end_position|
+      described_class.extract_hashtags_with_indices(text) do |hashtag, start_position, end_position|
         expect(hashtag).to eq 'hashtag'
         expect(start_position).to eq 0
         expect(end_position).to eq 8
@@ -72,7 +72,7 @@ describe Extractor do
   describe 'extract_cashtags_with_indices' do
     it 'returns []' do
       text = '$cashtag'
-      extracted = Extractor.extract_cashtags_with_indices(text)
+      extracted = described_class.extract_cashtags_with_indices(text)
       expect(extracted).to eq []
     end
   end
diff --git a/spec/lib/feed_manager_spec.rb b/spec/lib/feed_manager_spec.rb
index ccaa10dee..ad180052c 100644
--- a/spec/lib/feed_manager_spec.rb
+++ b/spec/lib/feed_manager_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe FeedManager do
   end
 
   describe '#key' do
-    subject { FeedManager.instance.key(:home, 1) }
+    subject { described_class.instance.key(:home, 1) }
 
     it 'returns a string' do
       expect(subject).to be_a String
@@ -26,31 +26,32 @@ RSpec.describe FeedManager do
     let(:alice) { Fabricate(:account, username: 'alice') }
     let(:bob)   { Fabricate(:account, username: 'bob', domain: 'example.com') }
     let(:jeff)  { Fabricate(:account, username: 'jeff') }
+    let(:list) { Fabricate(:list, account: alice) }
 
     context 'with home feed' do
       it 'returns false for followee\'s status' do
         status = Fabricate(:status, text: 'Hello world', account: alice)
         bob.follow!(alice)
-        expect(FeedManager.instance.filter?(:home, status, bob)).to be false
+        expect(described_class.instance.filter?(:home, status, bob)).to be false
       end
 
       it 'returns false for reblog by followee' do
         status = Fabricate(:status, text: 'Hello world', account: jeff)
         reblog = Fabricate(:status, reblog: status, account: alice)
         bob.follow!(alice)
-        expect(FeedManager.instance.filter?(:home, reblog, bob)).to be false
+        expect(described_class.instance.filter?(:home, reblog, bob)).to be false
       end
 
       it 'returns true for post from account who blocked me' do
         status = Fabricate(:status, text: 'Hello, World', account: alice)
         alice.block!(bob)
-        expect(FeedManager.instance.filter?(:home, status, bob)).to be true
+        expect(described_class.instance.filter?(:home, status, bob)).to be true
       end
 
       it 'returns true for post from blocked account' do
         status = Fabricate(:status, text: 'Hello, World', account: alice)
         bob.block!(alice)
-        expect(FeedManager.instance.filter?(:home, status, bob)).to be true
+        expect(described_class.instance.filter?(:home, status, bob)).to be true
       end
 
       it 'returns true for reblog by followee of blocked account' do
@@ -58,7 +59,7 @@ RSpec.describe FeedManager do
         reblog = Fabricate(:status, reblog: status, account: alice)
         bob.follow!(alice)
         bob.block!(jeff)
-        expect(FeedManager.instance.filter?(:home, reblog, bob)).to be true
+        expect(described_class.instance.filter?(:home, reblog, bob)).to be true
       end
 
       it 'returns true for reblog by followee of muted account' do
@@ -66,7 +67,7 @@ RSpec.describe FeedManager do
         reblog = Fabricate(:status, reblog: status, account: alice)
         bob.follow!(alice)
         bob.mute!(jeff)
-        expect(FeedManager.instance.filter?(:home, reblog, bob)).to be true
+        expect(described_class.instance.filter?(:home, reblog, bob)).to be true
       end
 
       it 'returns true for reblog by followee of someone who is blocking recipient' do
@@ -74,14 +75,14 @@ RSpec.describe FeedManager do
         reblog = Fabricate(:status, reblog: status, account: alice)
         bob.follow!(alice)
         jeff.block!(bob)
-        expect(FeedManager.instance.filter?(:home, reblog, bob)).to be true
+        expect(described_class.instance.filter?(:home, reblog, bob)).to be true
       end
 
       it 'returns true for reblog from account with reblogs disabled' do
         status = Fabricate(:status, text: 'Hello world', account: jeff)
         reblog = Fabricate(:status, reblog: status, account: alice)
         bob.follow!(alice, reblogs: false)
-        expect(FeedManager.instance.filter?(:home, reblog, bob)).to be true
+        expect(described_class.instance.filter?(:home, reblog, bob)).to be true
       end
 
       it 'returns false for reply by followee to another followee' do
@@ -89,56 +90,56 @@ RSpec.describe FeedManager do
         reply  = Fabricate(:status, text: 'Nay', thread: status, account: alice)
         bob.follow!(alice)
         bob.follow!(jeff)
-        expect(FeedManager.instance.filter?(:home, reply, bob)).to be false
+        expect(described_class.instance.filter?(:home, reply, bob)).to be false
       end
 
       it 'returns false for reply by followee to recipient' do
         status = Fabricate(:status, text: 'Hello world', account: bob)
         reply  = Fabricate(:status, text: 'Nay', thread: status, account: alice)
         bob.follow!(alice)
-        expect(FeedManager.instance.filter?(:home, reply, bob)).to be false
+        expect(described_class.instance.filter?(:home, reply, bob)).to be false
       end
 
       it 'returns false for reply by followee to self' do
         status = Fabricate(:status, text: 'Hello world', account: alice)
         reply  = Fabricate(:status, text: 'Nay', thread: status, account: alice)
         bob.follow!(alice)
-        expect(FeedManager.instance.filter?(:home, reply, bob)).to be false
+        expect(described_class.instance.filter?(:home, reply, bob)).to be false
       end
 
       it 'returns true for reply by followee to non-followed account' do
         status = Fabricate(:status, text: 'Hello world', account: jeff)
         reply  = Fabricate(:status, text: 'Nay', thread: status, account: alice)
         bob.follow!(alice)
-        expect(FeedManager.instance.filter?(:home, reply, bob)).to be true
+        expect(described_class.instance.filter?(:home, reply, bob)).to be true
       end
 
       it 'returns true for the second reply by followee to a non-federated status' do
         reply        = Fabricate(:status, text: 'Reply 1', reply: true, account: alice)
         second_reply = Fabricate(:status, text: 'Reply 2', thread: reply, account: alice)
         bob.follow!(alice)
-        expect(FeedManager.instance.filter?(:home, second_reply, bob)).to be true
+        expect(described_class.instance.filter?(:home, second_reply, bob)).to be true
       end
 
       it 'returns false for status by followee mentioning another account' do
         bob.follow!(alice)
         jeff.follow!(alice)
         status = PostStatusService.new.call(alice, text: 'Hey @jeff')
-        expect(FeedManager.instance.filter?(:home, status, bob)).to be false
+        expect(described_class.instance.filter?(:home, status, bob)).to be false
       end
 
       it 'returns true for status by followee mentioning blocked account' do
         bob.block!(jeff)
         bob.follow!(alice)
         status = PostStatusService.new.call(alice, text: 'Hey @jeff')
-        expect(FeedManager.instance.filter?(:home, status, bob)).to be true
+        expect(described_class.instance.filter?(:home, status, bob)).to be true
       end
 
       it 'returns true for status by followee mentioning muted account' do
         bob.mute!(jeff)
         bob.follow!(alice)
         status = PostStatusService.new.call(alice, text: 'Hey @jeff')
-        expect(FeedManager.instance.filter?(:home, status, bob)).to be true
+        expect(described_class.instance.filter?(:home, status, bob)).to be true
       end
 
       it 'returns true for reblog of a personally blocked domain' do
@@ -146,19 +147,55 @@ RSpec.describe FeedManager do
         alice.follow!(jeff)
         status = Fabricate(:status, text: 'Hello world', account: bob)
         reblog = Fabricate(:status, reblog: status, account: jeff)
-        expect(FeedManager.instance.filter?(:home, reblog, alice)).to be true
+        expect(described_class.instance.filter?(:home, reblog, alice)).to be true
       end
 
       it 'returns true for German post when follow is set to English only' do
         alice.follow!(bob, languages: %w(en))
         status = Fabricate(:status, text: 'Hallo Welt', account: bob, language: 'de')
-        expect(FeedManager.instance.filter?(:home, status, alice)).to be true
+        expect(described_class.instance.filter?(:home, status, alice)).to be true
       end
 
       it 'returns false for German post when follow is set to German' do
         alice.follow!(bob, languages: %w(de))
         status = Fabricate(:status, text: 'Hallo Welt', account: bob, language: 'de')
-        expect(FeedManager.instance.filter?(:home, status, alice)).to be false
+        expect(described_class.instance.filter?(:home, status, alice)).to be false
+      end
+
+      it 'returns true for post from followee on exclusive list' do
+        list.exclusive = true
+        alice.follow!(bob)
+        list.accounts << bob
+        allow(List).to receive(:where).and_return(list)
+        status = Fabricate(:status, text: 'I post a lot', account: bob)
+        expect(described_class.instance.filter?(:home, status, alice)).to be true
+      end
+
+      it 'returns true for reblog from followee on exclusive list' do
+        list.exclusive = true
+        alice.follow!(jeff)
+        list.accounts << jeff
+        allow(List).to receive(:where).and_return(list)
+        status = Fabricate(:status, text: 'I post a lot', account: bob)
+        reblog = Fabricate(:status, reblog: status, account: jeff)
+        expect(described_class.instance.filter?(:home, reblog, alice)).to be true
+      end
+
+      it 'returns false for post from followee on non-exclusive list' do
+        list.exclusive = false
+        alice.follow!(bob)
+        list.accounts << bob
+        status = Fabricate(:status, text: 'I post a lot', account: bob)
+        expect(described_class.instance.filter?(:home, status, alice)).to be false
+      end
+
+      it 'returns false for reblog from followee on non-exclusive list' do
+        list.exclusive = false
+        alice.follow!(jeff)
+        list.accounts << jeff
+        status = Fabricate(:status, text: 'I post a lot', account: bob)
+        reblog = Fabricate(:status, reblog: status, account: jeff)
+        expect(described_class.instance.filter?(:home, reblog, alice)).to be false
       end
     end
 
@@ -166,27 +203,27 @@ RSpec.describe FeedManager do
       it 'returns true for status that mentions blocked account' do
         bob.block!(jeff)
         status = PostStatusService.new.call(alice, text: 'Hey @jeff')
-        expect(FeedManager.instance.filter?(:mentions, status, bob)).to be true
+        expect(described_class.instance.filter?(:mentions, status, bob)).to be true
       end
 
       it 'returns true for status that replies to a blocked account' do
         status = Fabricate(:status, text: 'Hello world', account: jeff)
         reply  = Fabricate(:status, text: 'Nay', thread: status, account: alice)
         bob.block!(jeff)
-        expect(FeedManager.instance.filter?(:mentions, reply, bob)).to be true
+        expect(described_class.instance.filter?(:mentions, reply, bob)).to be true
       end
 
       it 'returns true for status by silenced account who recipient is not following' do
         status = Fabricate(:status, text: 'Hello world', account: alice)
         alice.silence!
-        expect(FeedManager.instance.filter?(:mentions, status, bob)).to be true
+        expect(described_class.instance.filter?(:mentions, status, bob)).to be true
       end
 
       it 'returns false for status by followed silenced account' do
         status = Fabricate(:status, text: 'Hello world', account: alice)
         alice.silence!
         bob.follow!(alice)
-        expect(FeedManager.instance.filter?(:mentions, status, bob)).to be false
+        expect(described_class.instance.filter?(:mentions, status, bob)).to be false
       end
     end
   end
@@ -198,7 +235,7 @@ RSpec.describe FeedManager do
       members = Array.new(FeedManager::MAX_ITEMS) { |count| [count, count] }
       redis.zadd("feed:home:#{account.id}", members)
 
-      FeedManager.instance.push_to_home(account, status)
+      described_class.instance.push_to_home(account, status)
 
       expect(redis.zcard("feed:home:#{account.id}")).to eq FeedManager::MAX_ITEMS
     end
@@ -209,7 +246,7 @@ RSpec.describe FeedManager do
         reblogged = Fabricate(:status)
         reblog = Fabricate(:status, reblog: reblogged)
 
-        expect(FeedManager.instance.push_to_home(account, reblog)).to be true
+        expect(described_class.instance.push_to_home(account, reblog)).to be true
       end
 
       it 'does not save a new reblog of a recent status' do
@@ -217,9 +254,9 @@ RSpec.describe FeedManager do
         reblogged = Fabricate(:status)
         reblog = Fabricate(:status, reblog: reblogged)
 
-        FeedManager.instance.push_to_home(account, reblogged)
+        described_class.instance.push_to_home(account, reblogged)
 
-        expect(FeedManager.instance.push_to_home(account, reblog)).to be false
+        expect(described_class.instance.push_to_home(account, reblog)).to be false
       end
 
       it 'saves a new reblog of an old status' do
@@ -227,14 +264,14 @@ RSpec.describe FeedManager do
         reblogged = Fabricate(:status)
         reblog = Fabricate(:status, reblog: reblogged)
 
-        FeedManager.instance.push_to_home(account, reblogged)
+        described_class.instance.push_to_home(account, reblogged)
 
         # Fill the feed with intervening statuses
         FeedManager::REBLOG_FALLOFF.times do
-          FeedManager.instance.push_to_home(account, Fabricate(:status))
+          described_class.instance.push_to_home(account, Fabricate(:status))
         end
 
-        expect(FeedManager.instance.push_to_home(account, reblog)).to be true
+        expect(described_class.instance.push_to_home(account, reblog)).to be true
       end
 
       it 'does not save a new reblog of a recently-reblogged status' do
@@ -243,10 +280,10 @@ RSpec.describe FeedManager do
         reblogs = Array.new(2) { Fabricate(:status, reblog: reblogged) }
 
         # The first reblog will be accepted
-        FeedManager.instance.push_to_home(account, reblogs.first)
+        described_class.instance.push_to_home(account, reblogs.first)
 
         # The second reblog should be ignored
-        expect(FeedManager.instance.push_to_home(account, reblogs.last)).to be false
+        expect(described_class.instance.push_to_home(account, reblogs.last)).to be false
       end
 
       it 'saves a new reblog of a recently-reblogged status when previous reblog has been deleted' do
@@ -255,15 +292,15 @@ RSpec.describe FeedManager do
         old_reblog = Fabricate(:status, reblog: reblogged)
 
         # The first reblog should be accepted
-        expect(FeedManager.instance.push_to_home(account, old_reblog)).to be true
+        expect(described_class.instance.push_to_home(account, old_reblog)).to be true
 
         # The first reblog should be successfully removed
-        expect(FeedManager.instance.unpush_from_home(account, old_reblog)).to be true
+        expect(described_class.instance.unpush_from_home(account, old_reblog)).to be true
 
         reblog = Fabricate(:status, reblog: reblogged)
 
         # The second reblog should be accepted
-        expect(FeedManager.instance.push_to_home(account, reblog)).to be true
+        expect(described_class.instance.push_to_home(account, reblog)).to be true
       end
 
       it 'does not save a new reblog of a multiply-reblogged-then-unreblogged status' do
@@ -272,14 +309,14 @@ RSpec.describe FeedManager do
         reblogs = Array.new(3) { Fabricate(:status, reblog: reblogged) }
 
         # Accept the reblogs
-        FeedManager.instance.push_to_home(account, reblogs[0])
-        FeedManager.instance.push_to_home(account, reblogs[1])
+        described_class.instance.push_to_home(account, reblogs[0])
+        described_class.instance.push_to_home(account, reblogs[1])
 
         # Unreblog the first one
-        FeedManager.instance.unpush_from_home(account, reblogs[0])
+        described_class.instance.unpush_from_home(account, reblogs[0])
 
         # The last reblog should still be ignored
-        expect(FeedManager.instance.push_to_home(account, reblogs.last)).to be false
+        expect(described_class.instance.push_to_home(account, reblogs.last)).to be false
       end
 
       it 'saves a new reblog of a long-ago-reblogged status' do
@@ -288,15 +325,15 @@ RSpec.describe FeedManager do
         reblogs = Array.new(2) { Fabricate(:status, reblog: reblogged) }
 
         # The first reblog will be accepted
-        FeedManager.instance.push_to_home(account, reblogs.first)
+        described_class.instance.push_to_home(account, reblogs.first)
 
         # Fill the feed with intervening statuses
         FeedManager::REBLOG_FALLOFF.times do
-          FeedManager.instance.push_to_home(account, Fabricate(:status))
+          described_class.instance.push_to_home(account, Fabricate(:status))
         end
 
         # The second reblog should also be accepted
-        expect(FeedManager.instance.push_to_home(account, reblogs.last)).to be true
+        expect(described_class.instance.push_to_home(account, reblogs.last)).to be true
       end
     end
 
@@ -304,9 +341,9 @@ RSpec.describe FeedManager do
       account = Fabricate(:account)
       reblog = Fabricate(:status)
       status = Fabricate(:status, reblog: reblog)
-      FeedManager.instance.push_to_home(account, status)
+      described_class.instance.push_to_home(account, status)
 
-      expect(FeedManager.instance.push_to_home(account, reblog)).to be false
+      expect(described_class.instance.push_to_home(account, reblog)).to be false
     end
   end
 
@@ -329,9 +366,9 @@ RSpec.describe FeedManager do
     it "does not push when the given status's reblog is already inserted" do
       reblog = Fabricate(:status)
       status = Fabricate(:status, reblog: reblog)
-      FeedManager.instance.push_to_list(list, status)
+      described_class.instance.push_to_list(list, status)
 
-      expect(FeedManager.instance.push_to_list(list, reblog)).to be false
+      expect(described_class.instance.push_to_list(list, reblog)).to be false
     end
 
     context 'when replies policy is set to no replies' do
@@ -341,19 +378,19 @@ RSpec.describe FeedManager do
 
       it 'pushes statuses that are not replies' do
         status = Fabricate(:status, text: 'Hello world', account: bob)
-        expect(FeedManager.instance.push_to_list(list, status)).to be true
+        expect(described_class.instance.push_to_list(list, status)).to be true
       end
 
       it 'pushes statuses that are replies to list owner' do
         status = Fabricate(:status, text: 'Hello world', account: owner)
         reply  = Fabricate(:status, text: 'Nay', thread: status, account: bob)
-        expect(FeedManager.instance.push_to_list(list, reply)).to be true
+        expect(described_class.instance.push_to_list(list, reply)).to be true
       end
 
       it 'does not push replies to another member of the list' do
         status = Fabricate(:status, text: 'Hello world', account: alice)
         reply  = Fabricate(:status, text: 'Nay', thread: status, account: bob)
-        expect(FeedManager.instance.push_to_list(list, reply)).to be false
+        expect(described_class.instance.push_to_list(list, reply)).to be false
       end
     end
 
@@ -364,25 +401,25 @@ RSpec.describe FeedManager do
 
       it 'pushes statuses that are not replies' do
         status = Fabricate(:status, text: 'Hello world', account: bob)
-        expect(FeedManager.instance.push_to_list(list, status)).to be true
+        expect(described_class.instance.push_to_list(list, status)).to be true
       end
 
       it 'pushes statuses that are replies to list owner' do
         status = Fabricate(:status, text: 'Hello world', account: owner)
         reply  = Fabricate(:status, text: 'Nay', thread: status, account: bob)
-        expect(FeedManager.instance.push_to_list(list, reply)).to be true
+        expect(described_class.instance.push_to_list(list, reply)).to be true
       end
 
       it 'pushes replies to another member of the list' do
         status = Fabricate(:status, text: 'Hello world', account: alice)
         reply  = Fabricate(:status, text: 'Nay', thread: status, account: bob)
-        expect(FeedManager.instance.push_to_list(list, reply)).to be true
+        expect(described_class.instance.push_to_list(list, reply)).to be true
       end
 
       it 'does not push replies to someone not a member of the list' do
         status = Fabricate(:status, text: 'Hello world', account: eve)
         reply  = Fabricate(:status, text: 'Nay', thread: status, account: bob)
-        expect(FeedManager.instance.push_to_list(list, reply)).to be false
+        expect(described_class.instance.push_to_list(list, reply)).to be false
       end
     end
 
@@ -393,25 +430,25 @@ RSpec.describe FeedManager do
 
       it 'pushes statuses that are not replies' do
         status = Fabricate(:status, text: 'Hello world', account: bob)
-        expect(FeedManager.instance.push_to_list(list, status)).to be true
+        expect(described_class.instance.push_to_list(list, status)).to be true
       end
 
       it 'pushes statuses that are replies to list owner' do
         status = Fabricate(:status, text: 'Hello world', account: owner)
         reply  = Fabricate(:status, text: 'Nay', thread: status, account: bob)
-        expect(FeedManager.instance.push_to_list(list, reply)).to be true
+        expect(described_class.instance.push_to_list(list, reply)).to be true
       end
 
       it 'pushes replies to another member of the list' do
         status = Fabricate(:status, text: 'Hello world', account: alice)
         reply  = Fabricate(:status, text: 'Nay', thread: status, account: bob)
-        expect(FeedManager.instance.push_to_list(list, reply)).to be true
+        expect(described_class.instance.push_to_list(list, reply)).to be true
       end
 
       it 'pushes replies to someone not a member of the list' do
         status = Fabricate(:status, text: 'Hello world', account: eve)
         reply  = Fabricate(:status, text: 'Nay', thread: status, account: bob)
-        expect(FeedManager.instance.push_to_list(list, reply)).to be true
+        expect(described_class.instance.push_to_list(list, reply)).to be true
       end
     end
   end
@@ -421,9 +458,9 @@ RSpec.describe FeedManager do
       account = Fabricate(:account, id: 0)
       reblog = Fabricate(:status)
       status = Fabricate(:status, reblog: reblog)
-      FeedManager.instance.push_to_home(account, status)
+      described_class.instance.push_to_home(account, status)
 
-      FeedManager.instance.merge_into_home(account, reblog.account)
+      described_class.instance.merge_into_home(account, reblog.account)
 
       expect(redis.zscore('feed:home:0', reblog.id)).to be_nil
     end
@@ -436,14 +473,14 @@ RSpec.describe FeedManager do
       reblogged = Fabricate(:status)
       status    = Fabricate(:status, reblog: reblogged)
 
-      FeedManager.instance.push_to_home(receiver, reblogged)
-      FeedManager::REBLOG_FALLOFF.times { FeedManager.instance.push_to_home(receiver, Fabricate(:status)) }
-      FeedManager.instance.push_to_home(receiver, status)
+      described_class.instance.push_to_home(receiver, reblogged)
+      FeedManager::REBLOG_FALLOFF.times { described_class.instance.push_to_home(receiver, Fabricate(:status)) }
+      described_class.instance.push_to_home(receiver, status)
 
       # The reblogging status should show up under normal conditions.
       expect(redis.zrange("feed:home:#{receiver.id}", 0, -1)).to include(status.id.to_s)
 
-      FeedManager.instance.unpush_from_home(receiver, status)
+      described_class.instance.unpush_from_home(receiver, status)
 
       # Restore original status
       expect(redis.zrange("feed:home:#{receiver.id}", 0, -1)).to_not include(status.id.to_s)
@@ -454,12 +491,12 @@ RSpec.describe FeedManager do
       reblogged = Fabricate(:status)
       status    = Fabricate(:status, reblog: reblogged)
 
-      FeedManager.instance.push_to_home(receiver, status)
+      described_class.instance.push_to_home(receiver, status)
 
       # The reblogging status should show up under normal conditions.
       expect(redis.zrange("feed:home:#{receiver.id}", 0, -1)).to eq [status.id.to_s]
 
-      FeedManager.instance.unpush_from_home(receiver, status)
+      described_class.instance.unpush_from_home(receiver, status)
 
       expect(redis.zrange("feed:home:#{receiver.id}", 0, -1)).to be_empty
     end
@@ -469,14 +506,14 @@ RSpec.describe FeedManager do
       reblogs   = Array.new(3) { Fabricate(:status, reblog: reblogged) }
 
       reblogs.each do |reblog|
-        FeedManager.instance.push_to_home(receiver, reblog)
+        described_class.instance.push_to_home(receiver, reblog)
       end
 
       # The reblogging status should show up under normal conditions.
       expect(redis.zrange("feed:home:#{receiver.id}", 0, -1)).to eq [reblogs.first.id.to_s]
 
       reblogs[0...-1].each do |reblog|
-        FeedManager.instance.unpush_from_home(receiver, reblog)
+        described_class.instance.unpush_from_home(receiver, reblog)
       end
 
       expect(redis.zrange("feed:home:#{receiver.id}", 0, -1)).to eq [reblogs.last.id.to_s]
@@ -485,10 +522,10 @@ RSpec.describe FeedManager do
     it 'sends push updates' do
       status = Fabricate(:status)
 
-      FeedManager.instance.push_to_home(receiver, status)
+      described_class.instance.push_to_home(receiver, status)
 
       allow(redis).to receive_messages(publish: nil)
-      FeedManager.instance.unpush_from_home(receiver, status)
+      described_class.instance.unpush_from_home(receiver, status)
 
       deletion = Oj.dump(event: :delete, payload: status.id.to_s)
       expect(redis).to have_received(:publish).with("timeline:#{receiver.id}", deletion)
@@ -514,7 +551,7 @@ RSpec.describe FeedManager do
     end
 
     it 'correctly cleans the home timeline' do
-      FeedManager.instance.clear_from_home(account, target_account)
+      described_class.instance.clear_from_home(account, target_account)
 
       expect(redis.zrange("feed:home:#{account.id}", 0, -1)).to eq [status_1.id.to_s, status_7.id.to_s]
     end
diff --git a/spec/lib/hash_object_spec.rb b/spec/lib/hash_object_spec.rb
deleted file mode 100644
index ce1806520..000000000
--- a/spec/lib/hash_object_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe HashObject do
-  it 'has methods corresponding to hash properties' do
-    expect(HashObject.new(key: 'value').key).to eq 'value'
-  end
-end
diff --git a/spec/lib/mastodon/cli/accounts_spec.rb b/spec/lib/mastodon/cli/accounts_spec.rb
index 8eee6f538..a263d673d 100644
--- a/spec/lib/mastodon/cli/accounts_spec.rb
+++ b/spec/lib/mastodon/cli/accounts_spec.rb
@@ -662,4 +662,703 @@ describe Mastodon::CLI::Accounts do
       end
     end
   end
+
+  describe '#refresh' do
+    context 'with --all option' do
+      let!(:local_account)              { Fabricate(:account, domain: nil) }
+      let!(:remote_account_example_com) { Fabricate(:account, domain: 'example.com') }
+      let!(:account_example_net)        { Fabricate(:account, domain: 'example.net') }
+      let(:scope)                       { Account.remote }
+
+      before do
+        allow(cli).to receive(:parallelize_with_progress).and_yield(remote_account_example_com)
+                                                         .and_yield(account_example_net)
+                                                         .and_return([2, nil])
+        cli.options = { all: true }
+      end
+
+      it 'refreshes the avatar for all remote accounts' do
+        allow(remote_account_example_com).to receive(:reset_avatar!)
+        allow(account_example_net).to receive(:reset_avatar!)
+
+        cli.refresh
+
+        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
+        expect(remote_account_example_com).to have_received(:reset_avatar!).once
+        expect(account_example_net).to have_received(:reset_avatar!).once
+      end
+
+      it 'does not refresh avatar for local accounts' do
+        allow(local_account).to receive(:reset_avatar!)
+
+        cli.refresh
+
+        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
+        expect(local_account).to_not have_received(:reset_avatar!)
+      end
+
+      it 'refreshes the header for all remote accounts' do
+        allow(remote_account_example_com).to receive(:reset_header!)
+        allow(account_example_net).to receive(:reset_header!)
+
+        cli.refresh
+
+        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
+        expect(remote_account_example_com).to have_received(:reset_header!).once
+        expect(account_example_net).to have_received(:reset_header!).once
+      end
+
+      it 'does not refresh the header for local accounts' do
+        allow(local_account).to receive(:reset_header!)
+
+        cli.refresh
+
+        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
+        expect(local_account).to_not have_received(:reset_header!)
+      end
+
+      it 'displays a successful message' do
+        expect { cli.refresh }.to output(
+          a_string_including('Refreshed 2 accounts')
+        ).to_stdout
+      end
+
+      context 'with --dry-run option' do
+        before do
+          cli.options = { all: true, dry_run: true }
+        end
+
+        it 'does not refresh the avatar for any account' do
+          allow(local_account).to receive(:reset_avatar!)
+          allow(remote_account_example_com).to receive(:reset_avatar!)
+          allow(account_example_net).to receive(:reset_avatar!)
+
+          cli.refresh
+
+          expect(cli).to have_received(:parallelize_with_progress).with(scope).once
+          expect(local_account).to_not have_received(:reset_avatar!)
+          expect(remote_account_example_com).to_not have_received(:reset_avatar!)
+          expect(account_example_net).to_not have_received(:reset_avatar!)
+        end
+
+        it 'does not refresh the header for any account' do
+          allow(local_account).to receive(:reset_header!)
+          allow(remote_account_example_com).to receive(:reset_header!)
+          allow(account_example_net).to receive(:reset_header!)
+
+          cli.refresh
+
+          expect(cli).to have_received(:parallelize_with_progress).with(scope).once
+          expect(local_account).to_not have_received(:reset_header!)
+          expect(remote_account_example_com).to_not have_received(:reset_header!)
+          expect(account_example_net).to_not have_received(:reset_header!)
+        end
+
+        it 'displays a successful message with (DRY RUN)' do
+          expect { cli.refresh }.to output(
+            a_string_including('Refreshed 2 accounts (DRY RUN)')
+          ).to_stdout
+        end
+      end
+    end
+
+    context 'with a list of accts' do
+      let!(:account_example_com_a) { Fabricate(:account, domain: 'example.com') }
+      let!(:account_example_com_b) { Fabricate(:account, domain: 'example.com') }
+      let!(:account_example_net)   { Fabricate(:account, domain: 'example.net') }
+      let(:arguments)              { [account_example_com_a.acct, account_example_com_b.acct] }
+
+      before do
+        allow(Account).to receive(:find_remote).with(account_example_com_a.username, account_example_com_a.domain).and_return(account_example_com_a)
+        allow(Account).to receive(:find_remote).with(account_example_com_b.username, account_example_com_b.domain).and_return(account_example_com_b)
+        allow(Account).to receive(:find_remote).with(account_example_net.username, account_example_net.domain).and_return(account_example_net)
+      end
+
+      it 'resets the avatar for the specified accounts' do
+        allow(account_example_com_a).to receive(:reset_avatar!)
+        allow(account_example_com_b).to receive(:reset_avatar!)
+
+        cli.refresh(*arguments)
+
+        expect(account_example_com_a).to have_received(:reset_avatar!).once
+        expect(account_example_com_b).to have_received(:reset_avatar!).once
+      end
+
+      it 'does not reset the avatar for unspecified accounts' do
+        allow(account_example_net).to receive(:reset_avatar!)
+
+        cli.refresh(*arguments)
+
+        expect(account_example_net).to_not have_received(:reset_avatar!)
+      end
+
+      it 'resets the header for the specified accounts' do
+        allow(account_example_com_a).to receive(:reset_header!)
+        allow(account_example_com_b).to receive(:reset_header!)
+
+        cli.refresh(*arguments)
+
+        expect(account_example_com_a).to have_received(:reset_header!).once
+        expect(account_example_com_b).to have_received(:reset_header!).once
+      end
+
+      it 'does not reset the header for unspecified accounts' do
+        allow(account_example_net).to receive(:reset_header!)
+
+        cli.refresh(*arguments)
+
+        expect(account_example_net).to_not have_received(:reset_header!)
+      end
+
+      context 'when an UnexpectedResponseError is raised' do
+        it 'displays a failure message' do
+          allow(account_example_com_a).to receive(:reset_avatar!).and_raise(Mastodon::UnexpectedResponseError)
+
+          expect { cli.refresh(*arguments) }
+            .to output(
+              a_string_including("Account failed: #{account_example_com_a.username}@#{account_example_com_a.domain}")
+            ).to_stdout
+        end
+      end
+
+      context 'when a specified account is not found' do
+        it 'exits with an error message' do
+          allow(Account).to receive(:find_remote).with(account_example_com_b.username, account_example_com_b.domain).and_return(nil)
+
+          expect { cli.refresh(*arguments) }.to output(
+            a_string_including('No such account')
+          ).to_stdout
+            .and raise_error(SystemExit)
+        end
+      end
+
+      context 'with --dry-run option' do
+        before do
+          cli.options = { dry_run: true }
+        end
+
+        it 'does not refresh the avatar for any account' do
+          allow(account_example_com_a).to receive(:reset_avatar!)
+          allow(account_example_com_b).to receive(:reset_avatar!)
+
+          cli.refresh(*arguments)
+
+          expect(account_example_com_a).to_not have_received(:reset_avatar!)
+          expect(account_example_com_b).to_not have_received(:reset_avatar!)
+        end
+
+        it 'does not refresh the header for any account' do
+          allow(account_example_com_a).to receive(:reset_header!)
+          allow(account_example_com_b).to receive(:reset_header!)
+
+          cli.refresh(*arguments)
+
+          expect(account_example_com_a).to_not have_received(:reset_header!)
+          expect(account_example_com_b).to_not have_received(:reset_header!)
+        end
+      end
+    end
+
+    context 'with --domain option' do
+      let!(:account_example_com_a) { Fabricate(:account, domain: 'example.com') }
+      let!(:account_example_com_b) { Fabricate(:account, domain: 'example.com') }
+      let!(:account_example_net)   { Fabricate(:account, domain: 'example.net') }
+      let(:domain)                 { 'example.com' }
+      let(:scope)                  { Account.remote.where(domain: domain) }
+
+      before do
+        allow(cli).to receive(:parallelize_with_progress).and_yield(account_example_com_a)
+                                                         .and_yield(account_example_com_b)
+                                                         .and_return([2, nil])
+
+        cli.options = { domain: domain }
+      end
+
+      it 'refreshes the avatar for all accounts on specified domain' do
+        allow(account_example_com_a).to receive(:reset_avatar!)
+        allow(account_example_com_b).to receive(:reset_avatar!)
+
+        cli.refresh
+
+        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
+        expect(account_example_com_a).to have_received(:reset_avatar!).once
+        expect(account_example_com_b).to have_received(:reset_avatar!).once
+      end
+
+      it 'does not refresh the avatar for accounts outside specified domain' do
+        allow(account_example_net).to receive(:reset_avatar!)
+
+        cli.refresh
+
+        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
+        expect(account_example_net).to_not have_received(:reset_avatar!)
+      end
+
+      it 'refreshes the header for all accounts on specified domain' do
+        allow(account_example_com_a).to receive(:reset_header!)
+        allow(account_example_com_b).to receive(:reset_header!)
+
+        cli.refresh
+
+        expect(cli).to have_received(:parallelize_with_progress).with(scope)
+        expect(account_example_com_a).to have_received(:reset_header!).once
+        expect(account_example_com_b).to have_received(:reset_header!).once
+      end
+
+      it 'does not refresh the header for accounts outside specified domain' do
+        allow(account_example_net).to receive(:reset_header!)
+
+        cli.refresh
+
+        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
+        expect(account_example_net).to_not have_received(:reset_header!)
+      end
+    end
+
+    context 'when neither a list of accts nor options are provided' do
+      it 'exits with an error message' do
+        expect { cli.refresh }.to output(
+          a_string_including('No account(s) given')
+        ).to_stdout
+          .and raise_error(SystemExit)
+      end
+    end
+  end
+
+  describe '#rotate' do
+    context 'when neither username nor --all option are given' do
+      it 'exits with an error message' do
+        expect { cli.rotate }.to output(
+          a_string_including('No account(s) given')
+        ).to_stdout
+          .and raise_error(SystemExit)
+      end
+    end
+
+    context 'when a username is given' do
+      let(:account) { Fabricate(:account) }
+
+      it 'correctly rotates keys for the specified account' do
+        old_private_key = account.private_key
+        old_public_key = account.public_key
+
+        cli.rotate(account.username)
+        account.reload
+
+        expect(account.private_key).to_not eq(old_private_key)
+        expect(account.public_key).to_not eq(old_public_key)
+      end
+
+      it 'broadcasts the new keys for the specified account' do
+        allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_in)
+
+        cli.rotate(account.username)
+
+        expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_in).with(anything, account.id, anything).once
+      end
+
+      context 'when the given username is not found' do
+        it 'exits with an error message when the specified username is not found' do
+          expect { cli.rotate('non_existent_username') }.to output(
+            a_string_including('No such account')
+          ).to_stdout
+            .and raise_error(SystemExit)
+        end
+      end
+    end
+
+    context 'when --all option is provided' do
+      let(:accounts) { Fabricate.times(3, :account) }
+      let(:options)  { { all: true } }
+
+      before do
+        allow(Account).to receive(:local).and_return(Account.where(id: accounts.map(&:id)))
+        cli.options = { all: true }
+      end
+
+      it 'correctly rotates keys for all local accounts' do
+        old_private_keys = accounts.map(&:private_key)
+        old_public_keys = accounts.map(&:public_key)
+
+        cli.rotate
+        accounts.each(&:reload)
+
+        expect(accounts.map(&:private_key)).to_not eq(old_private_keys)
+        expect(accounts.map(&:public_key)).to_not eq(old_public_keys)
+      end
+
+      it 'broadcasts the new keys for each account' do
+        allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_in)
+
+        cli.rotate
+
+        accounts.each do |account|
+          expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_in).with(anything, account.id, anything).once
+        end
+      end
+    end
+  end
+
+  describe '#merge' do
+    shared_examples 'an account not found' do |acct|
+      it 'exits with an error message indicating that there is no such account' do
+        expect { cli.invoke(:merge, arguments) }.to output(
+          a_string_including("No such account (#{acct})")
+        ).to_stdout
+          .and raise_error(SystemExit)
+      end
+    end
+
+    context 'when "from_account" is not found' do
+      let(:to_account) { Fabricate(:account, domain: 'example.com') }
+      let(:arguments)  { ['non_existent_username@domain.com', "#{to_account.username}@#{to_account.domain}"] }
+
+      it_behaves_like 'an account not found', 'non_existent_username@domain.com'
+    end
+
+    context 'when "from_account" is a local account' do
+      let(:from_account) { Fabricate(:account, domain: nil, username: 'bob') }
+      let(:to_account)   { Fabricate(:account, domain: 'example.com') }
+      let(:arguments)    { [from_account.username, "#{to_account.username}@#{to_account.domain}"] }
+
+      it_behaves_like 'an account not found', 'bob'
+    end
+
+    context 'when "to_account" is not found' do
+      let(:from_account) { Fabricate(:account, domain: 'example.com') }
+      let(:arguments)    { ["#{from_account.username}@#{from_account.domain}", 'non_existent_username'] }
+
+      it_behaves_like 'an account not found', 'non_existent_username'
+    end
+
+    context 'when "to_account" is local' do
+      let(:from_account) { Fabricate(:account, domain: 'example.com') }
+      let(:to_account)   { Fabricate(:account, domain: nil, username: 'bob') }
+      let(:arguments) do
+        ["#{from_account.username}@#{from_account.domain}", "#{to_account.username}@#{to_account.domain}"]
+      end
+
+      it_behaves_like 'an account not found', 'bob@'
+    end
+
+    context 'when "from_account" and "to_account" public keys do not match' do
+      let(:from_account) { instance_double(Account, username: 'bob', domain: 'example1.com', local?: false, public_key: 'from_account') }
+      let(:to_account)   { instance_double(Account, username: 'bob', domain: 'example2.com', local?: false, public_key: 'to_account') }
+      let(:arguments) do
+        ["#{from_account.username}@#{from_account.domain}", "#{to_account.username}@#{to_account.domain}"]
+      end
+
+      before do
+        allow(Account).to receive(:find_remote).with(from_account.username, from_account.domain).and_return(from_account)
+        allow(Account).to receive(:find_remote).with(to_account.username, to_account.domain).and_return(to_account)
+      end
+
+      it 'exits with an error message indicating that the accounts do not have the same pub key' do
+        expect { cli.invoke(:merge, arguments) }.to output(
+          a_string_including("Accounts don't have the same public key, might not be duplicates!\nOverride with --force")
+        ).to_stdout
+          .and raise_error(SystemExit)
+      end
+
+      context 'with --force option' do
+        let(:options) { { force: true } }
+
+        before do
+          allow(to_account).to receive(:merge_with!)
+          allow(from_account).to receive(:destroy)
+        end
+
+        it 'merges "from_account" into "to_account"' do
+          cli.invoke(:merge, arguments, options)
+
+          expect(to_account).to have_received(:merge_with!).with(from_account).once
+        end
+
+        it 'deletes "from_account"' do
+          cli.invoke(:merge, arguments, options)
+
+          expect(from_account).to have_received(:destroy).once
+        end
+      end
+    end
+
+    context 'when "from_account" and "to_account" public keys match' do
+      let(:from_account) { instance_double(Account, username: 'bob', domain: 'example1.com', local?: false, public_key: 'pub_key') }
+      let(:to_account)   { instance_double(Account, username: 'bob', domain: 'example2.com', local?: false, public_key: 'pub_key') }
+      let(:arguments) do
+        ["#{from_account.username}@#{from_account.domain}", "#{to_account.username}@#{to_account.domain}"]
+      end
+
+      before do
+        allow(Account).to receive(:find_remote).with(from_account.username, from_account.domain).and_return(from_account)
+        allow(Account).to receive(:find_remote).with(to_account.username, to_account.domain).and_return(to_account)
+        allow(to_account).to receive(:merge_with!)
+        allow(from_account).to receive(:destroy)
+      end
+
+      it 'merges "from_account" into "to_account"' do
+        cli.invoke(:merge, arguments)
+
+        expect(to_account).to have_received(:merge_with!).with(from_account).once
+      end
+
+      it 'deletes "from_account"' do
+        cli.invoke(:merge, arguments)
+
+        expect(from_account).to have_received(:destroy)
+      end
+    end
+  end
+
+  describe '#cull' do
+    let(:delete_account_service) { instance_double(DeleteAccountService, call: nil) }
+    let!(:tom)                   { Fabricate(:account, updated_at: 30.days.ago, username: 'tom', uri: 'https://example.com/users/tom', domain: 'example.com') }
+    let!(:bob)                   { Fabricate(:account, updated_at: 30.days.ago, last_webfingered_at: nil, username: 'bob', uri: 'https://example.org/users/bob', domain: 'example.org') }
+    let!(:gon)                   { Fabricate(:account, updated_at: 15.days.ago, last_webfingered_at: 15.days.ago, username: 'gon', uri: 'https://example.net/users/gon', domain: 'example.net') }
+    let!(:ana)                   { Fabricate(:account, username: 'ana', uri: 'https://example.com/users/ana', domain: 'example.com') }
+    let!(:tales)                 { Fabricate(:account, updated_at: 10.days.ago, last_webfingered_at: nil, username: 'tales', uri: 'https://example.net/users/tales', domain: 'example.net') }
+
+    before do
+      allow(DeleteAccountService).to receive(:new).and_return(delete_account_service)
+    end
+
+    context 'when no domain is specified' do
+      let(:scope) { Account.remote.where(protocol: :activitypub).partitioned }
+
+      before do
+        allow(cli).to receive(:parallelize_with_progress).and_yield(tom)
+                                                         .and_yield(bob)
+                                                         .and_yield(gon)
+                                                         .and_yield(ana)
+                                                         .and_yield(tales)
+                                                         .and_return([5, 3])
+        stub_request(:head, 'https://example.org/users/bob').to_return(status: 404)
+        stub_request(:head, 'https://example.net/users/gon').to_return(status: 410)
+        stub_request(:head, 'https://example.net/users/tales').to_return(status: 200)
+      end
+
+      it 'deletes all inactive remote accounts that longer exist in the origin server' do
+        cli.cull
+
+        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
+        expect(delete_account_service).to have_received(:call).with(bob, reserve_username: false).once
+        expect(delete_account_service).to have_received(:call).with(gon, reserve_username: false).once
+      end
+
+      it 'does not delete any active remote account that still exists in the origin server' do
+        cli.cull
+
+        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
+        expect(delete_account_service).to_not have_received(:call).with(tom, reserve_username: false)
+        expect(delete_account_service).to_not have_received(:call).with(ana, reserve_username: false)
+        expect(delete_account_service).to_not have_received(:call).with(tales, reserve_username: false)
+      end
+
+      it 'touches inactive remote accounts that have not been deleted' do
+        allow(tales).to receive(:touch)
+
+        cli.cull
+
+        expect(tales).to have_received(:touch).once
+      end
+
+      it 'displays the summary correctly' do
+        expect { cli.cull }.to output(
+          a_string_including('Visited 5 accounts, removed 3')
+        ).to_stdout
+      end
+    end
+
+    context 'when a domain is specified' do
+      let(:domain) { 'example.net' }
+      let(:scope)  { Account.remote.where(protocol: :activitypub, domain: domain).partitioned }
+
+      before do
+        allow(cli).to receive(:parallelize_with_progress).and_yield(gon)
+                                                         .and_yield(tales)
+                                                         .and_return([2, 2])
+        stub_request(:head, 'https://example.net/users/gon').to_return(status: 410)
+        stub_request(:head, 'https://example.net/users/tales').to_return(status: 404)
+      end
+
+      it 'deletes inactive remote accounts that longer exist in the specified domain' do
+        cli.cull(domain)
+
+        expect(cli).to have_received(:parallelize_with_progress).with(scope).once
+        expect(delete_account_service).to have_received(:call).with(gon, reserve_username: false).once
+        expect(delete_account_service).to have_received(:call).with(tales, reserve_username: false).once
+      end
+
+      it 'displays the summary correctly' do
+        expect { cli.cull }.to output(
+          a_string_including('Visited 2 accounts, removed 2')
+        ).to_stdout
+      end
+    end
+
+    context 'when a domain is unavailable' do
+      shared_examples 'an unavailable domain' do
+        before do
+          allow(cli).to receive(:parallelize_with_progress).and_yield(tales).and_return([1, 0])
+        end
+
+        it 'skips accounts from the unavailable domain' do
+          cli.cull
+
+          expect(delete_account_service).to_not have_received(:call).with(tales, reserve_username: false)
+        end
+
+        it 'displays the summary correctly' do
+          expect { cli.cull }.to output(
+            a_string_including("Visited 1 accounts, removed 0\nThe following domains were not available during the check:\n    example.net")
+          ).to_stdout
+        end
+      end
+
+      context 'when a connection timeout occurs' do
+        before do
+          stub_request(:head, 'https://example.net/users/tales').to_timeout
+        end
+
+        it_behaves_like 'an unavailable domain'
+      end
+
+      context 'when a connection error occurs' do
+        before do
+          stub_request(:head, 'https://example.net/users/tales').to_raise(HTTP::ConnectionError)
+        end
+
+        it_behaves_like 'an unavailable domain'
+      end
+
+      context 'when an ssl error occurs' do
+        before do
+          stub_request(:head, 'https://example.net/users/tales').to_raise(OpenSSL::SSL::SSLError)
+        end
+
+        it_behaves_like 'an unavailable domain'
+      end
+
+      context 'when a private network address error occurs' do
+        before do
+          stub_request(:head, 'https://example.net/users/tales').to_raise(Mastodon::PrivateNetworkAddressError)
+        end
+
+        it_behaves_like 'an unavailable domain'
+      end
+    end
+  end
+
+  describe '#reset_relationships' do
+    let(:target_account) { Fabricate(:account) }
+    let(:arguments)      { [target_account.username] }
+
+    context 'when no option is given' do
+      it 'exits with an error message indicating that at least one option is required' do
+        expect { cli.invoke(:reset_relationships, arguments) }.to output(
+          a_string_including('Please specify either --follows or --followers, or both')
+        ).to_stdout
+          .and raise_error(SystemExit)
+      end
+    end
+
+    context 'when the given username is not found' do
+      let(:arguments) { ['non_existent_username'] }
+
+      it 'exits with an error message indicating that there is no such account' do
+        expect { cli.invoke(:reset_relationships, arguments, follows: true) }.to output(
+          a_string_including('No such account')
+        ).to_stdout
+          .and raise_error(SystemExit)
+      end
+    end
+
+    context 'when the given username is found' do
+      let(:total_relationships) { 10 }
+      let!(:accounts)           { Fabricate.times(total_relationships, :account) }
+
+      context 'with --follows option' do
+        let(:options) { { follows: true } }
+
+        before do
+          accounts.each { |account| target_account.follow!(account) }
+        end
+
+        it 'resets all "following" relationships from the target account' do
+          cli.invoke(:reset_relationships, arguments, options)
+
+          expect(target_account.reload.following).to be_empty
+        end
+
+        it 'calls BootstrapTimelineWorker once to rebuild the timeline' do
+          allow(BootstrapTimelineWorker).to receive(:perform_async)
+
+          cli.invoke(:reset_relationships, arguments, options)
+
+          expect(BootstrapTimelineWorker).to have_received(:perform_async).with(target_account.id).once
+        end
+
+        it 'displays a successful message' do
+          expect { cli.invoke(:reset_relationships, arguments, options) }.to output(
+            a_string_including("Processed #{total_relationships} relationships")
+          ).to_stdout
+        end
+      end
+
+      context 'with --followers option' do
+        let(:options) { { followers: true } }
+
+        before do
+          accounts.each { |account| account.follow!(target_account) }
+        end
+
+        it 'resets all "followers" relationships from the target account' do
+          cli.invoke(:reset_relationships, arguments, options)
+
+          expect(target_account.reload.followers).to be_empty
+        end
+
+        it 'displays a successful message' do
+          expect { cli.invoke(:reset_relationships, arguments, options) }.to output(
+            a_string_including("Processed #{total_relationships} relationships")
+          ).to_stdout
+        end
+      end
+
+      context 'with --follows and --followers options' do
+        let(:options) { { followers: true, follows: true } }
+
+        before do
+          accounts.first(6).each { |account| account.follow!(target_account) }
+          accounts.last(4).each  { |account| target_account.follow!(account) }
+        end
+
+        it 'resets all "followers" relationships from the target account' do
+          cli.invoke(:reset_relationships, arguments, options)
+
+          expect(target_account.reload.followers).to be_empty
+        end
+
+        it 'resets all "following" relationships from the target account' do
+          cli.invoke(:reset_relationships, arguments, options)
+
+          expect(target_account.reload.following).to be_empty
+        end
+
+        it 'calls BootstrapTimelineWorker once to rebuild the timeline' do
+          allow(BootstrapTimelineWorker).to receive(:perform_async)
+
+          cli.invoke(:reset_relationships, arguments, options)
+
+          expect(BootstrapTimelineWorker).to have_received(:perform_async).with(target_account.id).once
+        end
+
+        it 'displays a successful message' do
+          expect { cli.invoke(:reset_relationships, arguments, options) }.to output(
+            a_string_including("Processed #{total_relationships} relationships")
+          ).to_stdout
+        end
+      end
+    end
+  end
 end
diff --git a/spec/lib/mastodon/cli/canonical_email_blocks_spec.rb b/spec/lib/mastodon/cli/canonical_email_blocks_spec.rb
index fb481e8a8..eb57a3cd1 100644
--- a/spec/lib/mastodon/cli/canonical_email_blocks_spec.rb
+++ b/spec/lib/mastodon/cli/canonical_email_blocks_spec.rb
@@ -4,9 +4,57 @@ require 'rails_helper'
 require 'mastodon/cli/canonical_email_blocks'
 
 describe Mastodon::CLI::CanonicalEmailBlocks do
+  let(:cli) { described_class.new }
+
   describe '.exit_on_failure?' do
     it 'returns true' do
       expect(described_class.exit_on_failure?).to be true
     end
   end
+
+  describe '#find' do
+    let(:arguments) { ['user@example.com'] }
+
+    context 'when a block is present' do
+      before { Fabricate(:canonical_email_block, email: 'user@example.com') }
+
+      it 'announces the presence of the block' do
+        expect { cli.invoke(:find, arguments) }.to output(
+          a_string_including('user@example.com is blocked')
+        ).to_stdout
+      end
+    end
+
+    context 'when a block is not present' do
+      it 'announces the absence of the block' do
+        expect { cli.invoke(:find, arguments) }.to output(
+          a_string_including('user@example.com is not blocked')
+        ).to_stdout
+      end
+    end
+  end
+
+  describe '#remove' do
+    let(:arguments) { ['user@example.com'] }
+
+    context 'when a block is present' do
+      before { Fabricate(:canonical_email_block, email: 'user@example.com') }
+
+      it 'removes the block' do
+        expect { cli.invoke(:remove, arguments) }.to output(
+          a_string_including('Unblocked user@example.com')
+        ).to_stdout
+
+        expect(CanonicalEmailBlock.matching_email('user@example.com')).to be_empty
+      end
+    end
+
+    context 'when a block is not present' do
+      it 'announces the absence of the block' do
+        expect { cli.invoke(:remove, arguments) }.to output(
+          a_string_including('user@example.com is not blocked')
+        ).to_stdout
+      end
+    end
+  end
 end
diff --git a/spec/lib/ostatus/tag_manager_spec.rb b/spec/lib/ostatus/tag_manager_spec.rb
index fb9740ce3..0e20f26c7 100644
--- a/spec/lib/ostatus/tag_manager_spec.rb
+++ b/spec/lib/ostatus/tag_manager_spec.rb
@@ -5,40 +5,40 @@ require 'rails_helper'
 describe OStatus::TagManager do
   describe '#unique_tag' do
     it 'returns a unique tag' do
-      expect(OStatus::TagManager.instance.unique_tag(Time.utc(2000), 12, 'Status')).to eq 'tag:cb6e6126.ngrok.io,2000-01-01:objectId=12:objectType=Status'
+      expect(described_class.instance.unique_tag(Time.utc(2000), 12, 'Status')).to eq 'tag:cb6e6126.ngrok.io,2000-01-01:objectId=12:objectType=Status'
     end
   end
 
   describe '#unique_tag_to_local_id' do
     it 'returns the ID part' do
-      expect(OStatus::TagManager.instance.unique_tag_to_local_id('tag:cb6e6126.ngrok.io,2000-01-01:objectId=12:objectType=Status', 'Status')).to eql '12'
+      expect(described_class.instance.unique_tag_to_local_id('tag:cb6e6126.ngrok.io,2000-01-01:objectId=12:objectType=Status', 'Status')).to eql '12'
     end
 
     it 'returns nil if it is not local id' do
-      expect(OStatus::TagManager.instance.unique_tag_to_local_id('tag:remote,2000-01-01:objectId=12:objectType=Status', 'Status')).to be_nil
+      expect(described_class.instance.unique_tag_to_local_id('tag:remote,2000-01-01:objectId=12:objectType=Status', 'Status')).to be_nil
     end
 
     it 'returns nil if it is not expected type' do
-      expect(OStatus::TagManager.instance.unique_tag_to_local_id('tag:cb6e6126.ngrok.io,2000-01-01:objectId=12:objectType=Block', 'Status')).to be_nil
+      expect(described_class.instance.unique_tag_to_local_id('tag:cb6e6126.ngrok.io,2000-01-01:objectId=12:objectType=Block', 'Status')).to be_nil
     end
 
     it 'returns nil if it does not have object ID' do
-      expect(OStatus::TagManager.instance.unique_tag_to_local_id('tag:cb6e6126.ngrok.io,2000-01-01:objectType=Status', 'Status')).to be_nil
+      expect(described_class.instance.unique_tag_to_local_id('tag:cb6e6126.ngrok.io,2000-01-01:objectType=Status', 'Status')).to be_nil
     end
   end
 
   describe '#local_id?' do
     it 'returns true for a local ID' do
-      expect(OStatus::TagManager.instance.local_id?('tag:cb6e6126.ngrok.io;objectId=12:objectType=Status')).to be true
+      expect(described_class.instance.local_id?('tag:cb6e6126.ngrok.io;objectId=12:objectType=Status')).to be true
     end
 
     it 'returns false for a foreign ID' do
-      expect(OStatus::TagManager.instance.local_id?('tag:foreign.tld;objectId=12:objectType=Status')).to be false
+      expect(described_class.instance.local_id?('tag:foreign.tld;objectId=12:objectType=Status')).to be false
     end
   end
 
   describe '#uri_for' do
-    subject { OStatus::TagManager.instance.uri_for(target) }
+    subject { described_class.instance.uri_for(target) }
 
     context 'with comment object' do
       let(:target) { Fabricate(:status, created_at: '2000-01-01T00:00:00Z', reply: true) }
diff --git a/spec/lib/request_spec.rb b/spec/lib/request_spec.rb
index 25fe9ed37..e88631e47 100644
--- a/spec/lib/request_spec.rb
+++ b/spec/lib/request_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
 require 'securerandom'
 
 describe Request do
-  subject { Request.new(:get, 'http://example.com') }
+  subject { described_class.new(:get, 'http://example.com') }
 
   describe '#headers' do
     it 'returns user agent' do
diff --git a/spec/lib/status_reach_finder_spec.rb b/spec/lib/status_reach_finder_spec.rb
index c53ac2799..7181717dc 100644
--- a/spec/lib/status_reach_finder_spec.rb
+++ b/spec/lib/status_reach_finder_spec.rb
@@ -71,10 +71,8 @@ describe StatusReachFinder do
           bob.statuses.create!(thread: status, text: 'Hoge')
         end
 
-        context do
-          it 'includes the inbox of the replier' do
-            expect(subject.inboxes).to include 'https://foo.bar/inbox'
-          end
+        it 'includes the inbox of the replier' do
+          expect(subject.inboxes).to include 'https://foo.bar/inbox'
         end
 
         context 'when status is not public' do
@@ -90,10 +88,8 @@ describe StatusReachFinder do
         let(:bob) { Fabricate(:account, username: 'bob', domain: 'foo.bar', protocol: :activitypub, inbox_url: 'https://foo.bar/inbox') }
         let(:parent_status) { Fabricate(:status, account: bob) }
 
-        context do
-          it 'includes the inbox of the replied-to account' do
-            expect(subject.inboxes).to include 'https://foo.bar/inbox'
-          end
+        it 'includes the inbox of the replied-to account' do
+          expect(subject.inboxes).to include 'https://foo.bar/inbox'
         end
 
         context 'when status is not public and replied-to account is not mentioned' do
diff --git a/spec/lib/tag_manager_spec.rb b/spec/lib/tag_manager_spec.rb
index 8de290541..38203a55f 100644
--- a/spec/lib/tag_manager_spec.rb
+++ b/spec/lib/tag_manager_spec.rb
@@ -16,15 +16,15 @@ RSpec.describe TagManager do
     end
 
     it 'returns true for nil' do
-      expect(TagManager.instance.local_domain?(nil)).to be true
+      expect(described_class.instance.local_domain?(nil)).to be true
     end
 
     it 'returns true if the slash-stripped string equals to local domain' do
-      expect(TagManager.instance.local_domain?('DoMaIn.Example.com/')).to be true
+      expect(described_class.instance.local_domain?('DoMaIn.Example.com/')).to be true
     end
 
     it 'returns false for irrelevant string' do
-      expect(TagManager.instance.local_domain?('DoMaIn.Example.com!')).to be false
+      expect(described_class.instance.local_domain?('DoMaIn.Example.com!')).to be false
     end
   end
 
@@ -41,25 +41,25 @@ RSpec.describe TagManager do
     end
 
     it 'returns true for nil' do
-      expect(TagManager.instance.web_domain?(nil)).to be true
+      expect(described_class.instance.web_domain?(nil)).to be true
     end
 
     it 'returns true if the slash-stripped string equals to web domain' do
-      expect(TagManager.instance.web_domain?('DoMaIn.Example.com/')).to be true
+      expect(described_class.instance.web_domain?('DoMaIn.Example.com/')).to be true
     end
 
     it 'returns false for string with irrelevant characters' do
-      expect(TagManager.instance.web_domain?('DoMaIn.Example.com!')).to be false
+      expect(described_class.instance.web_domain?('DoMaIn.Example.com!')).to be false
     end
   end
 
   describe '#normalize_domain' do
     it 'returns nil if the given parameter is nil' do
-      expect(TagManager.instance.normalize_domain(nil)).to be_nil
+      expect(described_class.instance.normalize_domain(nil)).to be_nil
     end
 
     it 'returns normalized domain' do
-      expect(TagManager.instance.normalize_domain('DoMaIn.Example.com/')).to eq 'domain.example.com'
+      expect(described_class.instance.normalize_domain('DoMaIn.Example.com/')).to eq 'domain.example.com'
     end
   end
 
@@ -72,17 +72,17 @@ RSpec.describe TagManager do
 
     it 'returns true if the normalized string with port is local URL' do
       Rails.configuration.x.web_domain = 'domain.example.com:42'
-      expect(TagManager.instance.local_url?('https://DoMaIn.Example.com:42/')).to be true
+      expect(described_class.instance.local_url?('https://DoMaIn.Example.com:42/')).to be true
     end
 
     it 'returns true if the normalized string without port is local URL' do
       Rails.configuration.x.web_domain = 'domain.example.com'
-      expect(TagManager.instance.local_url?('https://DoMaIn.Example.com/')).to be true
+      expect(described_class.instance.local_url?('https://DoMaIn.Example.com/')).to be true
     end
 
     it 'returns false for string with irrelevant characters' do
       Rails.configuration.x.web_domain = 'domain.example.com'
-      expect(TagManager.instance.local_url?('https://domain.example.net/')).to be false
+      expect(described_class.instance.local_url?('https://domain.example.net/')).to be false
     end
   end
 end
diff --git a/spec/lib/translation_service/deepl_spec.rb b/spec/lib/translation_service/deepl_spec.rb
index 2363f8f13..5a1d0f094 100644
--- a/spec/lib/translation_service/deepl_spec.rb
+++ b/spec/lib/translation_service/deepl_spec.rb
@@ -22,7 +22,10 @@ RSpec.describe TranslationService::DeepL do
         .with(body: 'text=Hasta+la+vista&source_lang=ES&target_lang=en&tag_handling=html')
         .to_return(body: '{"translations":[{"detected_source_language":"ES","text":"See you soon"}]}')
 
-      translation = service.translate('Hasta la vista', 'es', 'en')
+      translations = service.translate(['Hasta la vista'], 'es', 'en')
+      expect(translations.size).to eq 1
+
+      translation = translations.first
       expect(translation.detected_source_language).to eq 'es'
       expect(translation.provider).to eq 'DeepL.com'
       expect(translation.text).to eq 'See you soon'
@@ -31,12 +34,27 @@ RSpec.describe TranslationService::DeepL do
     it 'returns translation with auto-detected source language' do
       stub_request(:post, 'https://api.deepl.com/v2/translate')
         .with(body: 'text=Guten+Tag&source_lang&target_lang=en&tag_handling=html')
-        .to_return(body: '{"translations":[{"detected_source_language":"DE","text":"Good Morning"}]}')
+        .to_return(body: '{"translations":[{"detected_source_language":"DE","text":"Good morning"}]}')
 
-      translation = service.translate('Guten Tag', nil, 'en')
+      translations = service.translate(['Guten Tag'], nil, 'en')
+      expect(translations.size).to eq 1
+
+      translation = translations.first
       expect(translation.detected_source_language).to eq 'de'
       expect(translation.provider).to eq 'DeepL.com'
-      expect(translation.text).to eq 'Good Morning'
+      expect(translation.text).to eq 'Good morning'
+    end
+
+    it 'returns translation of multiple texts' do
+      stub_request(:post, 'https://api.deepl.com/v2/translate')
+        .with(body: 'text=Guten+Morgen&text=Gute+Nacht&source_lang=DE&target_lang=en&tag_handling=html')
+        .to_return(body: '{"translations":[{"detected_source_language":"DE","text":"Good morning"},{"detected_source_language":"DE","text":"Good night"}]}')
+
+      translations = service.translate(['Guten Morgen', 'Gute Nacht'], 'de', 'en')
+      expect(translations.size).to eq 2
+
+      expect(translations.first.text).to eq 'Good morning'
+      expect(translations.last.text).to eq 'Good night'
     end
   end
 
diff --git a/spec/lib/translation_service/libre_translate_spec.rb b/spec/lib/translation_service/libre_translate_spec.rb
index fbd726a7e..90966a8eb 100644
--- a/spec/lib/translation_service/libre_translate_spec.rb
+++ b/spec/lib/translation_service/libre_translate_spec.rb
@@ -31,24 +31,42 @@ RSpec.describe TranslationService::LibreTranslate do
   describe '#translate' do
     it 'returns translation with specified source language' do
       stub_request(:post, 'https://libretranslate.example.com/translate')
-        .with(body: '{"q":"Hasta la vista","source":"es","target":"en","format":"html","api_key":"my-api-key"}')
-        .to_return(body: '{"translatedText": "See you"}')
+        .with(body: '{"q":["Hasta la vista"],"source":"es","target":"en","format":"html","api_key":"my-api-key"}')
+        .to_return(body: '{"translatedText": ["See you"]}')
 
-      translation = service.translate('Hasta la vista', 'es', 'en')
-      expect(translation.detected_source_language).to eq 'es'
+      translations = service.translate(['Hasta la vista'], 'es', 'en')
+      expect(translations.size).to eq 1
+
+      translation = translations.first
+      expect(translation.detected_source_language).to be 'es'
       expect(translation.provider).to eq 'LibreTranslate'
       expect(translation.text).to eq 'See you'
     end
 
     it 'returns translation with auto-detected source language' do
       stub_request(:post, 'https://libretranslate.example.com/translate')
-        .with(body: '{"q":"Guten Morgen","source":"auto","target":"en","format":"html","api_key":"my-api-key"}')
-        .to_return(body: '{"detectedLanguage":{"confidence":92,"language":"de"},"translatedText":"Good morning"}')
+        .with(body: '{"q":["Guten Morgen"],"source":"auto","target":"en","format":"html","api_key":"my-api-key"}')
+        .to_return(body: '{"detectedLanguage": [{"confidence": 92, "language": "de"}], "translatedText": ["Good morning"]}')
 
-      translation = service.translate('Guten Morgen', nil, 'en')
-      expect(translation.detected_source_language).to be_nil
+      translations = service.translate(['Guten Morgen'], nil, 'en')
+      expect(translations.size).to eq 1
+
+      translation = translations.first
+      expect(translation.detected_source_language).to eq 'de'
       expect(translation.provider).to eq 'LibreTranslate'
       expect(translation.text).to eq 'Good morning'
     end
+
+    it 'returns translation of multiple texts' do
+      stub_request(:post, 'https://libretranslate.example.com/translate')
+        .with(body: '{"q":["Guten Morgen","Gute Nacht"],"source":"de","target":"en","format":"html","api_key":"my-api-key"}')
+        .to_return(body: '{"translatedText": ["Good morning", "Good night"]}')
+
+      translations = service.translate(['Guten Morgen', 'Gute Nacht'], 'de', 'en')
+      expect(translations.size).to eq 2
+
+      expect(translations.first.text).to eq 'Good morning'
+      expect(translations.last.text).to eq 'Good night'
+    end
   end
 end
diff --git a/spec/lib/webfinger_resource_spec.rb b/spec/lib/webfinger_resource_spec.rb
index 8ec6dd205..2cad04fcc 100644
--- a/spec/lib/webfinger_resource_spec.rb
+++ b/spec/lib/webfinger_resource_spec.rb
@@ -17,7 +17,7 @@ describe WebfingerResource do
         resource = 'https://example.com/users/alice/other'
 
         expect do
-          WebfingerResource.new(resource).username
+          described_class.new(resource).username
         end.to raise_error(ActiveRecord::RecordNotFound)
       end
 
@@ -32,7 +32,7 @@ describe WebfingerResource do
         expect(Rails.application.routes).to receive(:recognize_path).with(resource).and_return(recognized).at_least(:once)
 
         expect do
-          WebfingerResource.new(resource).username
+          described_class.new(resource).username
         end.to raise_error(ActiveRecord::RecordNotFound)
       end
 
@@ -40,28 +40,28 @@ describe WebfingerResource do
         resource = 'website for http://example.com/users/alice/other'
 
         expect do
-          WebfingerResource.new(resource).username
+          described_class.new(resource).username
         end.to raise_error(WebfingerResource::InvalidRequest)
       end
 
       it 'finds the username in a valid https route' do
         resource = 'https://example.com/users/alice'
 
-        result = WebfingerResource.new(resource).username
+        result = described_class.new(resource).username
         expect(result).to eq 'alice'
       end
 
       it 'finds the username in a mixed case http route' do
         resource = 'HTTp://exAMPLe.com/users/alice'
 
-        result = WebfingerResource.new(resource).username
+        result = described_class.new(resource).username
         expect(result).to eq 'alice'
       end
 
       it 'finds the username in a valid http route' do
         resource = 'http://example.com/users/alice'
 
-        result = WebfingerResource.new(resource).username
+        result = described_class.new(resource).username
         expect(result).to eq 'alice'
       end
     end
@@ -71,7 +71,7 @@ describe WebfingerResource do
         resource = 'user@remote-host.com'
 
         expect do
-          WebfingerResource.new(resource).username
+          described_class.new(resource).username
         end.to raise_error(ActiveRecord::RecordNotFound)
       end
 
@@ -79,7 +79,7 @@ describe WebfingerResource do
         Rails.configuration.x.local_domain = 'example.com'
         resource = 'alice@example.com'
 
-        result = WebfingerResource.new(resource).username
+        result = described_class.new(resource).username
         expect(result).to eq 'alice'
       end
 
@@ -87,7 +87,7 @@ describe WebfingerResource do
         Rails.configuration.x.web_domain = 'example.com'
         resource = 'alice@example.com'
 
-        result = WebfingerResource.new(resource).username
+        result = described_class.new(resource).username
         expect(result).to eq 'alice'
       end
     end
@@ -97,7 +97,7 @@ describe WebfingerResource do
         resource = 'acct:user@remote-host.com'
 
         expect do
-          WebfingerResource.new(resource).username
+          described_class.new(resource).username
         end.to raise_error(ActiveRecord::RecordNotFound)
       end
 
@@ -105,7 +105,7 @@ describe WebfingerResource do
         resource = 'acct:user@remote-host@remote-hostess.remote.local@remote'
 
         expect do
-          WebfingerResource.new(resource).username
+          described_class.new(resource).username
         end.to raise_error(ActiveRecord::RecordNotFound)
       end
 
@@ -113,7 +113,7 @@ describe WebfingerResource do
         Rails.configuration.x.local_domain = 'example.com'
         resource = 'acct:alice@example.com'
 
-        result = WebfingerResource.new(resource).username
+        result = described_class.new(resource).username
         expect(result).to eq 'alice'
       end
 
@@ -121,7 +121,7 @@ describe WebfingerResource do
         Rails.configuration.x.web_domain = 'example.com'
         resource = 'acct:alice@example.com'
 
-        result = WebfingerResource.new(resource).username
+        result = described_class.new(resource).username
         expect(result).to eq 'alice'
       end
     end
@@ -131,7 +131,7 @@ describe WebfingerResource do
         resource = 'df/:dfkj'
 
         expect do
-          WebfingerResource.new(resource).username
+          described_class.new(resource).username
         end.to raise_error(WebfingerResource::InvalidRequest)
       end
     end
diff --git a/spec/lib/webhooks/payload_renderer_spec.rb b/spec/lib/webhooks/payload_renderer_spec.rb
new file mode 100644
index 000000000..074847c74
--- /dev/null
+++ b/spec/lib/webhooks/payload_renderer_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Webhooks::PayloadRenderer do
+  subject(:renderer) { described_class.new(json) }
+
+  let(:event)   { Webhooks::EventPresenter.new(type, object) }
+  let(:payload) { ActiveModelSerializers::SerializableResource.new(event, serializer: REST::Admin::WebhookEventSerializer, scope: nil, scope_name: :current_user).as_json }
+  let(:json)    { Oj.dump(payload) }
+
+  describe '#render' do
+    context 'when event is account.approved' do
+      let(:type)   { 'account.approved' }
+      let(:object) { Fabricate(:account, display_name: 'Foo"') }
+
+      it 'renders event-related variables into template' do
+        expect(renderer.render('foo={{event}}')).to eq 'foo=account.approved'
+      end
+
+      it 'renders event-specific variables into template' do
+        expect(renderer.render('foo={{object.username}}')).to eq "foo=#{object.username}"
+      end
+
+      it 'escapes values for use in JSON' do
+        expect(renderer.render('foo={{object.account.display_name}}')).to eq 'foo=Foo\\"'
+      end
+    end
+  end
+end
diff --git a/spec/mailers/notification_mailer_spec.rb b/spec/mailers/notification_mailer_spec.rb
index 73c751def..bf364b625 100644
--- a/spec/mailers/notification_mailer_spec.rb
+++ b/spec/mailers/notification_mailer_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe NotificationMailer do
 
   describe 'mention' do
     let(:mention) { Mention.create!(account: receiver.account, status: foreign_status) }
-    let(:mail) { NotificationMailer.mention(receiver.account, Notification.create!(account: receiver.account, activity: mention)) }
+    let(:mail) { described_class.mention(receiver.account, Notification.create!(account: receiver.account, activity: mention)) }
 
     include_examples 'localized subject', 'notification_mailer.mention.subject', name: 'bob'
 
@@ -40,7 +40,7 @@ RSpec.describe NotificationMailer do
 
   describe 'follow' do
     let(:follow) { sender.follow!(receiver.account) }
-    let(:mail) { NotificationMailer.follow(receiver.account, Notification.create!(account: receiver.account, activity: follow)) }
+    let(:mail) { described_class.follow(receiver.account, Notification.create!(account: receiver.account, activity: follow)) }
 
     include_examples 'localized subject', 'notification_mailer.follow.subject', name: 'bob'
 
@@ -56,7 +56,7 @@ RSpec.describe NotificationMailer do
 
   describe 'favourite' do
     let(:favourite) { Favourite.create!(account: sender, status: own_status) }
-    let(:mail) { NotificationMailer.favourite(own_status.account, Notification.create!(account: receiver.account, activity: favourite)) }
+    let(:mail) { described_class.favourite(own_status.account, Notification.create!(account: receiver.account, activity: favourite)) }
 
     include_examples 'localized subject', 'notification_mailer.favourite.subject', name: 'bob'
 
@@ -73,7 +73,7 @@ RSpec.describe NotificationMailer do
 
   describe 'reblog' do
     let(:reblog) { Status.create!(account: sender, reblog: own_status) }
-    let(:mail) { NotificationMailer.reblog(own_status.account, Notification.create!(account: receiver.account, activity: reblog)) }
+    let(:mail) { described_class.reblog(own_status.account, Notification.create!(account: receiver.account, activity: reblog)) }
 
     include_examples 'localized subject', 'notification_mailer.reblog.subject', name: 'bob'
 
@@ -90,7 +90,7 @@ RSpec.describe NotificationMailer do
 
   describe 'follow_request' do
     let(:follow_request) { Fabricate(:follow_request, account: sender, target_account: receiver.account) }
-    let(:mail) { NotificationMailer.follow_request(receiver.account, Notification.create!(account: receiver.account, activity: follow_request)) }
+    let(:mail) { described_class.follow_request(receiver.account, Notification.create!(account: receiver.account, activity: follow_request)) }
 
     include_examples 'localized subject', 'notification_mailer.follow_request.subject', name: 'bob'
 
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index a4f6c145a..702aa1c35 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -19,7 +19,7 @@ describe UserMailer do
   end
 
   describe 'confirmation_instructions' do
-    let(:mail) { UserMailer.confirmation_instructions(receiver, 'spec') }
+    let(:mail) { described_class.confirmation_instructions(receiver, 'spec') }
 
     it 'renders confirmation instructions' do
       receiver.update!(locale: nil)
@@ -34,7 +34,7 @@ describe UserMailer do
   end
 
   describe 'reconfirmation_instructions' do
-    let(:mail) { UserMailer.confirmation_instructions(receiver, 'spec') }
+    let(:mail) { described_class.confirmation_instructions(receiver, 'spec') }
 
     it 'renders reconfirmation instructions' do
       receiver.update!(email: 'new-email@example.com', locale: nil)
@@ -48,7 +48,7 @@ describe UserMailer do
   end
 
   describe 'reset_password_instructions' do
-    let(:mail) { UserMailer.reset_password_instructions(receiver, 'spec') }
+    let(:mail) { described_class.reset_password_instructions(receiver, 'spec') }
 
     it 'renders reset password instructions' do
       receiver.update!(locale: nil)
@@ -61,7 +61,7 @@ describe UserMailer do
   end
 
   describe 'password_change' do
-    let(:mail) { UserMailer.password_change(receiver) }
+    let(:mail) { described_class.password_change(receiver) }
 
     it 'renders password change notification' do
       receiver.update!(locale: nil)
@@ -73,7 +73,7 @@ describe UserMailer do
   end
 
   describe 'email_changed' do
-    let(:mail) { UserMailer.email_changed(receiver) }
+    let(:mail) { described_class.email_changed(receiver) }
 
     it 'renders email change notification' do
       receiver.update!(locale: nil)
@@ -86,7 +86,7 @@ describe UserMailer do
 
   describe 'warning' do
     let(:strike) { Fabricate(:account_warning, target_account: receiver.account, text: 'dont worry its just the testsuite', action: 'suspend') }
-    let(:mail)   { UserMailer.warning(receiver, strike) }
+    let(:mail)   { described_class.warning(receiver, strike) }
 
     it 'renders warning notification' do
       receiver.update!(locale: nil)
@@ -97,7 +97,7 @@ describe UserMailer do
 
   describe 'webauthn_credential_deleted' do
     let(:credential) { Fabricate(:webauthn_credential, user_id: receiver.id) }
-    let(:mail) { UserMailer.webauthn_credential_deleted(receiver, credential) }
+    let(:mail) { described_class.webauthn_credential_deleted(receiver, credential) }
 
     it 'renders webauthn credential deleted notification' do
       receiver.update!(locale: nil)
@@ -112,7 +112,7 @@ describe UserMailer do
     let(:ip) { '192.168.0.1' }
     let(:agent) { 'NCSA_Mosaic/2.0 (Windows 3.1)' }
     let(:timestamp) { Time.now.utc }
-    let(:mail) { UserMailer.suspicious_sign_in(receiver, ip, agent, timestamp) }
+    let(:mail) { described_class.suspicious_sign_in(receiver, ip, agent, timestamp) }
 
     it 'renders suspicious sign in notification' do
       receiver.update!(locale: nil)
@@ -125,7 +125,7 @@ describe UserMailer do
 
   describe 'appeal_approved' do
     let(:appeal) { Fabricate(:appeal, account: receiver.account, approved_at: Time.now.utc) }
-    let(:mail) { UserMailer.appeal_approved(receiver, appeal) }
+    let(:mail) { described_class.appeal_approved(receiver, appeal) }
 
     it 'renders appeal_approved notification' do
       expect(mail.subject).to eq I18n.t('user_mailer.appeal_approved.subject', date: I18n.l(appeal.created_at))
@@ -135,7 +135,7 @@ describe UserMailer do
 
   describe 'appeal_rejected' do
     let(:appeal) { Fabricate(:appeal, account: receiver.account, rejected_at: Time.now.utc) }
-    let(:mail) { UserMailer.appeal_rejected(receiver, appeal) }
+    let(:mail) { described_class.appeal_rejected(receiver, appeal) }
 
     it 'renders appeal_rejected notification' do
       expect(mail.subject).to eq I18n.t('user_mailer.appeal_rejected.subject', date: I18n.l(appeal.created_at))
diff --git a/spec/models/account_conversation_spec.rb b/spec/models/account_conversation_spec.rb
index a16aa500c..4e8727ca3 100644
--- a/spec/models/account_conversation_spec.rb
+++ b/spec/models/account_conversation_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe AccountConversation do
       status = Fabricate(:status, account: alice, visibility: :direct)
       status.mentions.create(account: bob)
 
-      conversation = AccountConversation.add_status(alice, status)
+      conversation = described_class.add_status(alice, status)
 
       expect(conversation.participant_accounts).to include(bob)
       expect(conversation.last_status).to eq status
@@ -21,12 +21,12 @@ RSpec.describe AccountConversation do
 
     it 'appends to old record when there is a match' do
       last_status  = Fabricate(:status, account: alice, visibility: :direct)
-      conversation = AccountConversation.create!(account: alice, conversation: last_status.conversation, participant_account_ids: [bob.id], status_ids: [last_status.id])
+      conversation = described_class.create!(account: alice, conversation: last_status.conversation, participant_account_ids: [bob.id], status_ids: [last_status.id])
 
       status = Fabricate(:status, account: bob, visibility: :direct, thread: last_status)
       status.mentions.create(account: alice)
 
-      new_conversation = AccountConversation.add_status(alice, status)
+      new_conversation = described_class.add_status(alice, status)
 
       expect(new_conversation.id).to eq conversation.id
       expect(new_conversation.participant_accounts).to include(bob)
@@ -36,13 +36,13 @@ RSpec.describe AccountConversation do
 
     it 'creates new record when new participants are added' do
       last_status  = Fabricate(:status, account: alice, visibility: :direct)
-      conversation = AccountConversation.create!(account: alice, conversation: last_status.conversation, participant_account_ids: [bob.id], status_ids: [last_status.id])
+      conversation = described_class.create!(account: alice, conversation: last_status.conversation, participant_account_ids: [bob.id], status_ids: [last_status.id])
 
       status = Fabricate(:status, account: bob, visibility: :direct, thread: last_status)
       status.mentions.create(account: alice)
       status.mentions.create(account: mark)
 
-      new_conversation = AccountConversation.add_status(alice, status)
+      new_conversation = described_class.add_status(alice, status)
 
       expect(new_conversation.id).to_not eq conversation.id
       expect(new_conversation.participant_accounts).to include(bob, mark)
@@ -55,7 +55,7 @@ RSpec.describe AccountConversation do
     it 'updates last status to a previous value' do
       last_status  = Fabricate(:status, account: alice, visibility: :direct)
       status       = Fabricate(:status, account: alice, visibility: :direct)
-      conversation = AccountConversation.create!(account: alice, conversation: last_status.conversation, participant_account_ids: [bob.id], status_ids: [status.id, last_status.id])
+      conversation = described_class.create!(account: alice, conversation: last_status.conversation, participant_account_ids: [bob.id], status_ids: [status.id, last_status.id])
       last_status.mentions.create(account: bob)
       last_status.destroy!
       conversation.reload
@@ -65,10 +65,10 @@ RSpec.describe AccountConversation do
 
     it 'removes the record if no other statuses are referenced' do
       last_status  = Fabricate(:status, account: alice, visibility: :direct)
-      conversation = AccountConversation.create!(account: alice, conversation: last_status.conversation, participant_account_ids: [bob.id], status_ids: [last_status.id])
+      conversation = described_class.create!(account: alice, conversation: last_status.conversation, participant_account_ids: [bob.id], status_ids: [last_status.id])
       last_status.mentions.create(account: bob)
       last_status.destroy!
-      expect(AccountConversation.where(id: conversation.id).count).to eq 0
+      expect(described_class.where(id: conversation.id).count).to eq 0
     end
   end
 end
diff --git a/spec/models/account_domain_block_spec.rb b/spec/models/account_domain_block_spec.rb
index f3246d04c..10bd57936 100644
--- a/spec/models/account_domain_block_spec.rb
+++ b/spec/models/account_domain_block_spec.rb
@@ -7,14 +7,14 @@ RSpec.describe AccountDomainBlock do
     account = Fabricate(:account)
     Rails.cache.write("exclude_domains_for:#{account.id}", 'a.domain.already.blocked')
 
-    AccountDomainBlock.create!(account: account, domain: 'a.domain.blocked.later')
+    described_class.create!(account: account, domain: 'a.domain.blocked.later')
 
     expect(Rails.cache.exist?("exclude_domains_for:#{account.id}")).to be false
   end
 
   it 'removes blocking cache after destruction' do
     account = Fabricate(:account)
-    block = AccountDomainBlock.create!(account: account, domain: 'domain')
+    block = described_class.create!(account: account, domain: 'domain')
     Rails.cache.write("exclude_domains_for:#{account.id}", 'domain')
 
     block.destroy!
diff --git a/spec/models/account_migration_spec.rb b/spec/models/account_migration_spec.rb
index 519b9a97a..d76edddd5 100644
--- a/spec/models/account_migration_spec.rb
+++ b/spec/models/account_migration_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe AccountMigration do
     let(:source_account) { Fabricate(:account) }
     let(:target_acct)    { target_account.acct }
 
-    let(:subject) { AccountMigration.new(account: source_account, acct: target_acct) }
+    let(:subject) { described_class.new(account: source_account, acct: target_acct) }
 
     context 'with valid properties' do
       let(:target_account) { Fabricate(:account, username: 'target', domain: 'remote.org') }
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 6e9c608ab..7cd914774 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe Account do
-  context do
+  context 'with an account record' do
     subject { Fabricate(:account) }
 
     let(:bob) { Fabricate(:account, username: 'bob') }
@@ -362,7 +362,7 @@ RSpec.describe Account do
         suspended: true
       )
 
-      results = Account.search_for('username')
+      results = described_class.search_for('username')
       expect(results).to eq []
     end
 
@@ -375,7 +375,7 @@ RSpec.describe Account do
 
       match.user.update(approved: false)
 
-      results = Account.search_for('username')
+      results = described_class.search_for('username')
       expect(results).to eq []
     end
 
@@ -388,7 +388,7 @@ RSpec.describe Account do
 
       match.user.update(confirmed_at: nil)
 
-      results = Account.search_for('username')
+      results = described_class.search_for('username')
       expect(results).to eq []
     end
 
@@ -400,7 +400,7 @@ RSpec.describe Account do
         domain: 'example.com'
       )
 
-      results = Account.search_for('A?l\i:c e')
+      results = described_class.search_for('A?l\i:c e')
       expect(results).to eq [match]
     end
 
@@ -412,7 +412,7 @@ RSpec.describe Account do
         domain: 'example.com'
       )
 
-      results = Account.search_for('display')
+      results = described_class.search_for('display')
       expect(results).to eq [match]
     end
 
@@ -424,7 +424,7 @@ RSpec.describe Account do
         domain: 'example.com'
       )
 
-      results = Account.search_for('username')
+      results = described_class.search_for('username')
       expect(results).to eq [match]
     end
 
@@ -436,19 +436,19 @@ RSpec.describe Account do
         domain: 'example.com'
       )
 
-      results = Account.search_for('example')
+      results = described_class.search_for('example')
       expect(results).to eq [match]
     end
 
     it 'limits by 10 by default' do
       11.times.each { Fabricate(:account, display_name: 'Display Name') }
-      results = Account.search_for('display')
+      results = described_class.search_for('display')
       expect(results.size).to eq 10
     end
 
     it 'accepts arbitrary limits' do
       2.times.each { Fabricate(:account, display_name: 'Display Name') }
-      results = Account.search_for('display', limit: 1)
+      results = described_class.search_for('display', limit: 1)
       expect(results.size).to eq 1
     end
 
@@ -458,7 +458,7 @@ RSpec.describe Account do
         { display_name: 'Display Name', username: 'username', domain: 'example.com' },
       ].map(&method(:Fabricate).curry(2).call(:account))
 
-      results = Account.search_for('username')
+      results = described_class.search_for('username')
       expect(results).to eq matches
     end
   end
@@ -476,7 +476,7 @@ RSpec.describe Account do
         )
         account.follow!(match)
 
-        results = Account.advanced_search_for('A?l\i:c e', account, limit: 10, following: true)
+        results = described_class.advanced_search_for('A?l\i:c e', account, limit: 10, following: true)
         expect(results).to eq [match]
       end
 
@@ -488,7 +488,7 @@ RSpec.describe Account do
           domain: 'example.com'
         )
 
-        results = Account.advanced_search_for('A?l\i:c e', account, limit: 10, following: true)
+        results = described_class.advanced_search_for('A?l\i:c e', account, limit: 10, following: true)
         expect(results).to eq []
       end
 
@@ -501,7 +501,7 @@ RSpec.describe Account do
           suspended: true
         )
 
-        results = Account.advanced_search_for('username', account, limit: 10, following: true)
+        results = described_class.advanced_search_for('username', account, limit: 10, following: true)
         expect(results).to eq []
       end
 
@@ -514,7 +514,7 @@ RSpec.describe Account do
 
         match.user.update(approved: false)
 
-        results = Account.advanced_search_for('username', account, limit: 10, following: true)
+        results = described_class.advanced_search_for('username', account, limit: 10, following: true)
         expect(results).to eq []
       end
 
@@ -527,7 +527,7 @@ RSpec.describe Account do
 
         match.user.update(confirmed_at: nil)
 
-        results = Account.advanced_search_for('username', account, limit: 10, following: true)
+        results = described_class.advanced_search_for('username', account, limit: 10, following: true)
         expect(results).to eq []
       end
     end
@@ -541,7 +541,7 @@ RSpec.describe Account do
         suspended: true
       )
 
-      results = Account.advanced_search_for('username', account)
+      results = described_class.advanced_search_for('username', account)
       expect(results).to eq []
     end
 
@@ -554,7 +554,7 @@ RSpec.describe Account do
 
       match.user.update(approved: false)
 
-      results = Account.advanced_search_for('username', account)
+      results = described_class.advanced_search_for('username', account)
       expect(results).to eq []
     end
 
@@ -567,7 +567,7 @@ RSpec.describe Account do
 
       match.user.update(confirmed_at: nil)
 
-      results = Account.advanced_search_for('username', account)
+      results = described_class.advanced_search_for('username', account)
       expect(results).to eq []
     end
 
@@ -579,19 +579,19 @@ RSpec.describe Account do
         domain: 'example.com'
       )
 
-      results = Account.advanced_search_for('A?l\i:c e', account)
+      results = described_class.advanced_search_for('A?l\i:c e', account)
       expect(results).to eq [match]
     end
 
     it 'limits by 10 by default' do
       11.times { Fabricate(:account, display_name: 'Display Name') }
-      results = Account.advanced_search_for('display', account)
+      results = described_class.advanced_search_for('display', account)
       expect(results.size).to eq 10
     end
 
     it 'accepts arbitrary limits' do
       2.times { Fabricate(:account, display_name: 'Display Name') }
-      results = Account.advanced_search_for('display', account, limit: 1)
+      results = described_class.advanced_search_for('display', account, limit: 1)
       expect(results.size).to eq 1
     end
 
@@ -600,7 +600,7 @@ RSpec.describe Account do
       followed_match = Fabricate(:account, username: 'Matcher')
       Fabricate(:follow, account: account, target_account: followed_match)
 
-      results = Account.advanced_search_for('match', account)
+      results = described_class.advanced_search_for('match', account)
       expect(results).to eq [followed_match, match]
       expect(results.first.rank).to be > results.last.rank
     end
@@ -639,31 +639,31 @@ RSpec.describe Account do
 
   describe '.following_map' do
     it 'returns an hash' do
-      expect(Account.following_map([], 1)).to be_a Hash
+      expect(described_class.following_map([], 1)).to be_a Hash
     end
   end
 
   describe '.followed_by_map' do
     it 'returns an hash' do
-      expect(Account.followed_by_map([], 1)).to be_a Hash
+      expect(described_class.followed_by_map([], 1)).to be_a Hash
     end
   end
 
   describe '.blocking_map' do
     it 'returns an hash' do
-      expect(Account.blocking_map([], 1)).to be_a Hash
+      expect(described_class.blocking_map([], 1)).to be_a Hash
     end
   end
 
   describe '.requested_map' do
     it 'returns an hash' do
-      expect(Account.requested_map([], 1)).to be_a Hash
+      expect(described_class.requested_map([], 1)).to be_a Hash
     end
   end
 
   describe '.requested_by_map' do
     it 'returns an hash' do
-      expect(Account.requested_by_map([], 1)).to be_a Hash
+      expect(described_class.requested_by_map([], 1)).to be_a Hash
     end
   end
 
@@ -834,7 +834,7 @@ RSpec.describe Account do
           { username: 'b', domain: 'b' },
         ].map(&method(:Fabricate).curry(2).call(:account))
 
-        expect(Account.where('id > 0').alphabetic).to eq matches
+        expect(described_class.where('id > 0').alphabetic).to eq matches
       end
     end
 
@@ -843,7 +843,7 @@ RSpec.describe Account do
         match = Fabricate(:account, display_name: 'pattern and suffix')
         Fabricate(:account, display_name: 'prefix and pattern')
 
-        expect(Account.matches_display_name('pattern')).to eq [match]
+        expect(described_class.matches_display_name('pattern')).to eq [match]
       end
     end
 
@@ -852,24 +852,24 @@ RSpec.describe Account do
         match = Fabricate(:account, username: 'pattern_and_suffix')
         Fabricate(:account, username: 'prefix_and_pattern')
 
-        expect(Account.matches_username('pattern')).to eq [match]
+        expect(described_class.matches_username('pattern')).to eq [match]
       end
     end
 
     describe 'by_domain_and_subdomains' do
       it 'returns exact domain matches' do
         account = Fabricate(:account, domain: 'example.com')
-        expect(Account.by_domain_and_subdomains('example.com')).to eq [account]
+        expect(described_class.by_domain_and_subdomains('example.com')).to eq [account]
       end
 
       it 'returns subdomains' do
         account = Fabricate(:account, domain: 'foo.example.com')
-        expect(Account.by_domain_and_subdomains('example.com')).to eq [account]
+        expect(described_class.by_domain_and_subdomains('example.com')).to eq [account]
       end
 
       it 'does not return partially matching domains' do
         account = Fabricate(:account, domain: 'grexample.com')
-        expect(Account.by_domain_and_subdomains('example.com')).to_not eq [account]
+        expect(described_class.by_domain_and_subdomains('example.com')).to_not eq [account]
       end
     end
 
@@ -877,7 +877,7 @@ RSpec.describe Account do
       it 'returns an array of accounts who have a domain' do
         account_1 = Fabricate(:account, domain: nil)
         account_2 = Fabricate(:account, domain: 'example.com')
-        expect(Account.remote).to contain_exactly(account_2)
+        expect(described_class.remote).to contain_exactly(account_2)
       end
     end
 
@@ -885,7 +885,7 @@ RSpec.describe Account do
       it 'returns an array of accounts who do not have a domain' do
         account_1 = Fabricate(:account, domain: nil)
         account_2 = Fabricate(:account, domain: 'example.com')
-        expect(Account.where('id > 0').local).to contain_exactly(account_1)
+        expect(described_class.where('id > 0').local).to contain_exactly(account_1)
       end
     end
 
@@ -896,14 +896,14 @@ RSpec.describe Account do
           matches[index] = Fabricate(:account, domain: matches[index])
         end
 
-        expect(Account.where('id > 0').partitioned).to match_array(matches)
+        expect(described_class.where('id > 0').partitioned).to match_array(matches)
       end
     end
 
     describe 'recent' do
       it 'returns a relation of accounts sorted by recent creation' do
         matches = Array.new(2) { Fabricate(:account) }
-        expect(Account.where('id > 0').recent).to match_array(matches)
+        expect(described_class.where('id > 0').recent).to match_array(matches)
       end
     end
 
@@ -911,7 +911,7 @@ RSpec.describe Account do
       it 'returns an array of accounts who are silenced' do
         account_1 = Fabricate(:account, silenced: true)
         account_2 = Fabricate(:account, silenced: false)
-        expect(Account.silenced).to contain_exactly(account_1)
+        expect(described_class.silenced).to contain_exactly(account_1)
       end
     end
 
@@ -919,7 +919,7 @@ RSpec.describe Account do
       it 'returns an array of accounts who are suspended' do
         account_1 = Fabricate(:account, suspended: true)
         account_2 = Fabricate(:account, suspended: false)
-        expect(Account.suspended).to contain_exactly(account_1)
+        expect(described_class.suspended).to contain_exactly(account_1)
       end
     end
 
@@ -941,18 +941,18 @@ RSpec.describe Account do
       end
 
       it 'returns every usable non-suspended account' do
-        expect(Account.searchable).to contain_exactly(silenced_local, silenced_remote, local_account, remote_account)
+        expect(described_class.searchable).to contain_exactly(silenced_local, silenced_remote, local_account, remote_account)
       end
 
       it 'does not mess with previously-applied scopes' do
-        expect(Account.where.not(id: remote_account.id).searchable).to contain_exactly(silenced_local, silenced_remote, local_account)
+        expect(described_class.where.not(id: remote_account.id).searchable).to contain_exactly(silenced_local, silenced_remote, local_account)
       end
     end
   end
 
   context 'when is local' do
     it 'generates keys' do
-      account = Account.create!(domain: nil, username: Faker::Internet.user_name(separators: ['_']))
+      account = described_class.create!(domain: nil, username: Faker::Internet.user_name(separators: ['_']))
       expect(account.keypair).to be_private
       expect(account.keypair).to be_public
     end
@@ -961,12 +961,12 @@ RSpec.describe Account do
   context 'when is remote' do
     it 'does not generate keys' do
       key = OpenSSL::PKey::RSA.new(1024).public_key
-      account = Account.create!(domain: 'remote', username: Faker::Internet.user_name(separators: ['_']), public_key: key.to_pem)
+      account = described_class.create!(domain: 'remote', username: Faker::Internet.user_name(separators: ['_']), public_key: key.to_pem)
       expect(account.keypair.params).to eq key.params
     end
 
     it 'normalizes domain' do
-      account = Account.create!(domain: 'にゃん', username: Faker::Internet.user_name(separators: ['_']))
+      account = described_class.create!(domain: 'にゃん', username: Faker::Internet.user_name(separators: ['_']))
       expect(account.domain).to eq 'xn--r9j5b5b'
     end
   end
@@ -986,7 +986,7 @@ RSpec.describe Account do
       threads = Array.new(increment_by) do
         Thread.new do
           true while wait_for_start
-          Account.find(subject.id).increment_count!(:followers_count)
+          described_class.find(subject.id).increment_count!(:followers_count)
         end
       end
 
diff --git a/spec/models/block_spec.rb b/spec/models/block_spec.rb
index de3410fd5..8249503c5 100644
--- a/spec/models/block_spec.rb
+++ b/spec/models/block_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe Block do
     Rails.cache.write("exclude_account_ids_for:#{account.id}", [])
     Rails.cache.write("exclude_account_ids_for:#{target_account.id}", [])
 
-    Block.create!(account: account, target_account: target_account)
+    described_class.create!(account: account, target_account: target_account)
 
     expect(Rails.cache.exist?("exclude_account_ids_for:#{account.id}")).to be false
     expect(Rails.cache.exist?("exclude_account_ids_for:#{target_account.id}")).to be false
@@ -32,7 +32,7 @@ RSpec.describe Block do
   it 'removes blocking cache after destruction' do
     account = Fabricate(:account)
     target_account = Fabricate(:account)
-    block = Block.create!(account: account, target_account: target_account)
+    block = described_class.create!(account: account, target_account: target_account)
     Rails.cache.write("exclude_account_ids_for:#{account.id}", [target_account.id])
     Rails.cache.write("exclude_account_ids_for:#{target_account.id}", [account.id])
 
diff --git a/spec/models/domain_block_spec.rb b/spec/models/domain_block_spec.rb
index f10f47027..67f53fa78 100644
--- a/spec/models/domain_block_spec.rb
+++ b/spec/models/domain_block_spec.rb
@@ -21,74 +21,92 @@ RSpec.describe DomainBlock do
   describe '.blocked?' do
     it 'returns true if the domain is suspended' do
       Fabricate(:domain_block, domain: 'example.com', severity: :suspend)
-      expect(DomainBlock.blocked?('example.com')).to be true
+      expect(described_class.blocked?('example.com')).to be true
     end
 
     it 'returns false even if the domain is silenced' do
       Fabricate(:domain_block, domain: 'example.com', severity: :silence)
-      expect(DomainBlock.blocked?('example.com')).to be false
+      expect(described_class.blocked?('example.com')).to be false
     end
 
     it 'returns false if the domain is not suspended nor silenced' do
-      expect(DomainBlock.blocked?('example.com')).to be false
+      expect(described_class.blocked?('example.com')).to be false
     end
   end
 
   describe '.rule_for' do
     it 'returns rule matching a blocked domain' do
       block = Fabricate(:domain_block, domain: 'example.com')
-      expect(DomainBlock.rule_for('example.com')).to eq block
+      expect(described_class.rule_for('example.com')).to eq block
     end
 
     it 'returns a rule matching a subdomain of a blocked domain' do
       block = Fabricate(:domain_block, domain: 'example.com')
-      expect(DomainBlock.rule_for('sub.example.com')).to eq block
+      expect(described_class.rule_for('sub.example.com')).to eq block
     end
 
     it 'returns a rule matching a blocked subdomain' do
       block = Fabricate(:domain_block, domain: 'sub.example.com')
-      expect(DomainBlock.rule_for('sub.example.com')).to eq block
+      expect(described_class.rule_for('sub.example.com')).to eq block
     end
 
     it 'returns a rule matching a blocked TLD' do
       block = Fabricate(:domain_block, domain: 'google')
-      expect(DomainBlock.rule_for('google')).to eq block
+      expect(described_class.rule_for('google')).to eq block
     end
 
     it 'returns a rule matching a subdomain of a blocked TLD' do
       block = Fabricate(:domain_block, domain: 'google')
-      expect(DomainBlock.rule_for('maps.google')).to eq block
+      expect(described_class.rule_for('maps.google')).to eq block
     end
   end
 
   describe '#stricter_than?' do
     it 'returns true if the new block has suspend severity while the old has lower severity' do
-      suspend = DomainBlock.new(domain: 'domain', severity: :suspend)
-      silence = DomainBlock.new(domain: 'domain', severity: :silence)
-      noop = DomainBlock.new(domain: 'domain', severity: :noop)
+      suspend = described_class.new(domain: 'domain', severity: :suspend)
+      silence = described_class.new(domain: 'domain', severity: :silence)
+      noop = described_class.new(domain: 'domain', severity: :noop)
       expect(suspend.stricter_than?(silence)).to be true
       expect(suspend.stricter_than?(noop)).to be true
     end
 
     it 'returns false if the new block has lower severity than the old one' do
-      suspend = DomainBlock.new(domain: 'domain', severity: :suspend)
-      silence = DomainBlock.new(domain: 'domain', severity: :silence)
-      noop = DomainBlock.new(domain: 'domain', severity: :noop)
+      suspend = described_class.new(domain: 'domain', severity: :suspend)
+      silence = described_class.new(domain: 'domain', severity: :silence)
+      noop = described_class.new(domain: 'domain', severity: :noop)
       expect(silence.stricter_than?(suspend)).to be false
       expect(noop.stricter_than?(suspend)).to be false
       expect(noop.stricter_than?(silence)).to be false
     end
 
     it 'returns false if the new block does is less strict regarding reports' do
-      older = DomainBlock.new(domain: 'domain', severity: :silence, reject_reports: true)
-      newer = DomainBlock.new(domain: 'domain', severity: :silence, reject_reports: false)
+      older = described_class.new(domain: 'domain', severity: :silence, reject_reports: true)
+      newer = described_class.new(domain: 'domain', severity: :silence, reject_reports: false)
       expect(newer.stricter_than?(older)).to be false
     end
 
     it 'returns false if the new block does is less strict regarding media' do
-      older = DomainBlock.new(domain: 'domain', severity: :silence, reject_media: true)
-      newer = DomainBlock.new(domain: 'domain', severity: :silence, reject_media: false)
+      older = described_class.new(domain: 'domain', severity: :silence, reject_media: true)
+      newer = described_class.new(domain: 'domain', severity: :silence, reject_media: false)
       expect(newer.stricter_than?(older)).to be false
     end
   end
+
+  describe '#public_domain' do
+    context 'with a domain block that is obfuscated' do
+      let(:domain_block) { Fabricate(:domain_block, domain: 'hostname.example.com', obfuscate: true) }
+
+      it 'garbles the domain' do
+        expect(domain_block.public_domain).to eq 'hostna**.******e.com'
+      end
+    end
+
+    context 'with a domain block that is not obfuscated' do
+      let(:domain_block) { Fabricate(:domain_block, domain: 'example.com', obfuscate: false) }
+
+      it 'returns the domain value' do
+        expect(domain_block.public_domain).to eq 'example.com'
+      end
+    end
+  end
 end
diff --git a/spec/models/email_domain_block_spec.rb b/spec/models/email_domain_block_spec.rb
index a7232eb6b..5874c5e53 100644
--- a/spec/models/email_domain_block_spec.rb
+++ b/spec/models/email_domain_block_spec.rb
@@ -9,21 +9,21 @@ RSpec.describe EmailDomainBlock do
     context 'when given an e-mail address' do
       let(:input) { "foo@#{domain}" }
 
-      context do
+      context 'with a top level domain' do
         let(:domain) { 'example.com' }
 
         it 'returns true if the domain is blocked' do
           Fabricate(:email_domain_block, domain: 'example.com')
-          expect(EmailDomainBlock.block?(input)).to be true
+          expect(described_class.block?(input)).to be true
         end
 
         it 'returns false if the domain is not blocked' do
           Fabricate(:email_domain_block, domain: 'other-example.com')
-          expect(EmailDomainBlock.block?(input)).to be false
+          expect(described_class.block?(input)).to be false
         end
       end
 
-      context do
+      context 'with a subdomain' do
         let(:domain) { 'mail.example.com' }
 
         it 'returns true if it is a subdomain of a blocked domain' do
@@ -38,7 +38,7 @@ RSpec.describe EmailDomainBlock do
 
       it 'returns true if the domain is blocked' do
         Fabricate(:email_domain_block, domain: 'mail.foo.com')
-        expect(EmailDomainBlock.block?(input)).to be true
+        expect(described_class.block?(input)).to be true
       end
     end
   end
diff --git a/spec/models/export_spec.rb b/spec/models/export_spec.rb
index a863678a3..75468898d 100644
--- a/spec/models/export_spec.rb
+++ b/spec/models/export_spec.rb
@@ -12,7 +12,7 @@ describe Export do
     it 'returns a csv of the blocked accounts' do
       target_accounts.each { |target_account| account.block!(target_account) }
 
-      export = Export.new(account).to_blocked_accounts_csv
+      export = described_class.new(account).to_blocked_accounts_csv
       results = export.strip.split
 
       expect(results.size).to eq 2
@@ -22,7 +22,7 @@ describe Export do
     it 'returns a csv of the muted accounts' do
       target_accounts.each { |target_account| account.mute!(target_account) }
 
-      export = Export.new(account).to_muted_accounts_csv
+      export = described_class.new(account).to_muted_accounts_csv
       results = export.strip.split("\n")
 
       expect(results.size).to eq 3
@@ -33,7 +33,7 @@ describe Export do
     it 'returns a csv of the following accounts' do
       target_accounts.each { |target_account| account.follow!(target_account) }
 
-      export = Export.new(account).to_following_accounts_csv
+      export = described_class.new(account).to_following_accounts_csv
       results = export.strip.split("\n")
 
       expect(results.size).to eq 3
@@ -45,24 +45,24 @@ describe Export do
   describe 'total_storage' do
     it 'returns the total size of the media attachments' do
       media_attachment = Fabricate(:media_attachment, account: account)
-      expect(Export.new(account).total_storage).to eq media_attachment.file_file_size || 0
+      expect(described_class.new(account).total_storage).to eq media_attachment.file_file_size || 0
     end
   end
 
   describe 'total_follows' do
     it 'returns the total number of the followed accounts' do
       target_accounts.each { |target_account| account.follow!(target_account) }
-      expect(Export.new(account.reload).total_follows).to eq 2
+      expect(described_class.new(account.reload).total_follows).to eq 2
     end
 
     it 'returns the total number of the blocked accounts' do
       target_accounts.each { |target_account| account.block!(target_account) }
-      expect(Export.new(account.reload).total_blocks).to eq 2
+      expect(described_class.new(account.reload).total_blocks).to eq 2
     end
 
     it 'returns the total number of the muted accounts' do
       target_accounts.each { |target_account| account.mute!(target_account) }
-      expect(Export.new(account.reload).total_mutes).to eq 2
+      expect(described_class.new(account.reload).total_mutes).to eq 2
     end
   end
 end
diff --git a/spec/models/favourite_spec.rb b/spec/models/favourite_spec.rb
index 9e69570a0..ef7fbdefc 100644
--- a/spec/models/favourite_spec.rb
+++ b/spec/models/favourite_spec.rb
@@ -10,12 +10,12 @@ RSpec.describe Favourite do
     let(:status) { Fabricate(:status, reblog: reblog) }
 
     it 'invalidates if the reblogged status is already a favourite' do
-      Favourite.create!(account: account, status: reblog)
-      expect(Favourite.new(account: account, status: status).valid?).to be false
+      described_class.create!(account: account, status: reblog)
+      expect(described_class.new(account: account, status: status).valid?).to be false
     end
 
     it 'replaces status with the reblogged one if it is a reblog' do
-      favourite = Favourite.create!(account: account, status: status)
+      favourite = described_class.create!(account: account, status: status)
       expect(favourite.status).to eq reblog
     end
   end
@@ -24,7 +24,7 @@ RSpec.describe Favourite do
     let(:status) { Fabricate(:status, reblog: nil) }
 
     it 'saves with the specified status' do
-      favourite = Favourite.create!(account: account, status: status)
+      favourite = described_class.create!(account: account, status: status)
       expect(favourite.status).to eq status
     end
   end
diff --git a/spec/models/follow_spec.rb b/spec/models/follow_spec.rb
index 79c0048f9..c7743183c 100644
--- a/spec/models/follow_spec.rb
+++ b/spec/models/follow_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Follow do
   let(:bob)   { Fabricate(:account, username: 'bob') }
 
   describe 'validations' do
-    subject { Follow.new(account: alice, target_account: bob, rate_limit: true) }
+    subject { described_class.new(account: alice, target_account: bob, rate_limit: true) }
 
     it 'is invalid without an account' do
       follow = Fabricate.build(:follow, account: nil)
@@ -38,10 +38,10 @@ RSpec.describe Follow do
 
   describe 'recent' do
     it 'sorts so that more recent follows comes earlier' do
-      follow0 = Follow.create!(account: alice, target_account: bob)
-      follow1 = Follow.create!(account: bob, target_account: alice)
+      follow0 = described_class.create!(account: alice, target_account: bob)
+      follow1 = described_class.create!(account: bob, target_account: alice)
 
-      a = Follow.recent.to_a
+      a = described_class.recent.to_a
 
       expect(a.size).to eq 2
       expect(a[0]).to eq follow1
diff --git a/spec/models/form/import_spec.rb b/spec/models/form/import_spec.rb
index e1fea4205..52cf1c96e 100644
--- a/spec/models/form/import_spec.rb
+++ b/spec/models/form/import_spec.rb
@@ -86,6 +86,7 @@ RSpec.describe Form::Import do
     it_behaves_like 'too many CSV rows', 'muting', 'imports.txt', 1
     it_behaves_like 'too many CSV rows', 'domain_blocking', 'domain_blocks.csv', 2
     it_behaves_like 'too many CSV rows', 'bookmarks', 'bookmark-imports.txt', 3
+    it_behaves_like 'too many CSV rows', 'lists', 'lists.csv', 2
 
     # Importing list of addresses with no headers into various types
     it_behaves_like 'valid import', 'following', 'imports.txt'
@@ -98,6 +99,9 @@ RSpec.describe Form::Import do
     # Importing bookmarks list with no headers into expected type
     it_behaves_like 'valid import', 'bookmarks', 'bookmark-imports.txt'
 
+    # Importing lists with no headers into expected type
+    it_behaves_like 'valid import', 'lists', 'lists.csv'
+
     # Importing followed accounts with headers into various compatible types
     it_behaves_like 'valid import', 'following', 'following_accounts.csv'
     it_behaves_like 'valid import', 'blocking', 'following_accounts.csv'
@@ -273,6 +277,12 @@ RSpec.describe Form::Import do
       { 'acct' => 'user@test.com', 'hide_notifications' => false },
     ]
 
+    it_behaves_like 'on successful import', 'lists', 'merge', 'lists.csv', [
+      { 'acct' => 'gargron@example.com', 'list_name' => 'Mastodon project' },
+      { 'acct' => 'mastodon@example.com', 'list_name' => 'Mastodon project' },
+      { 'acct' => 'foo@example.com', 'list_name' => 'test' },
+    ]
+
     # Based on the bug report 20571 where UTF-8 encoded domains were rejecting import of their users
     #
     # https://github.com/mastodon/mastodon/issues/20571
diff --git a/spec/models/identity_spec.rb b/spec/models/identity_spec.rb
index 59155781c..2fca1e1c1 100644
--- a/spec/models/identity_spec.rb
+++ b/spec/models/identity_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Identity do
     end
 
     it 'returns an instance of Identity' do
-      expect(described_class.find_for_oauth(auth)).to be_instance_of Identity
+      expect(described_class.find_for_oauth(auth)).to be_instance_of described_class
     end
   end
 end
diff --git a/spec/models/import_spec.rb b/spec/models/import_spec.rb
index 1dae40a73..3605f0b9b 100644
--- a/spec/models/import_spec.rb
+++ b/spec/models/import_spec.rb
@@ -9,17 +9,17 @@ RSpec.describe Import do
 
   describe 'validations' do
     it 'has a valid parameters' do
-      import = Import.create(account: account, type: type, data: data)
+      import = described_class.create(account: account, type: type, data: data)
       expect(import).to be_valid
     end
 
     it 'is invalid without an type' do
-      import = Import.create(account: account, data: data)
+      import = described_class.create(account: account, data: data)
       expect(import).to model_have_error_on_field(:type)
     end
 
     it 'is invalid without a data' do
-      import = Import.create(account: account, type: type)
+      import = described_class.create(account: account, type: type)
       expect(import).to model_have_error_on_field(:data)
     end
   end
diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb
index becc74824..2dfc6cf92 100644
--- a/spec/models/media_attachment_spec.rb
+++ b/spec/models/media_attachment_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe MediaAttachment do
+RSpec.describe MediaAttachment, paperclip_processing: true do
   describe 'local?' do
     subject { media_attachment.local? }
 
@@ -85,7 +85,7 @@ RSpec.describe MediaAttachment do
   end
 
   describe 'animated gif conversion' do
-    let(:media) { MediaAttachment.create(account: Fabricate(:account), file: attachment_fixture('avatar.gif')) }
+    let(:media) { described_class.create(account: Fabricate(:account), file: attachment_fixture('avatar.gif')) }
 
     it 'sets type to gifv' do
       expect(media.type).to eq 'gifv'
@@ -109,7 +109,7 @@ RSpec.describe MediaAttachment do
 
     fixtures.each do |fixture|
       context fixture[:filename] do
-        let(:media) { MediaAttachment.create(account: Fabricate(:account), file: attachment_fixture(fixture[:filename])) }
+        let(:media) { described_class.create(account: Fabricate(:account), file: attachment_fixture(fixture[:filename])) }
 
         it 'sets type to image' do
           expect(media.type).to eq 'image'
@@ -129,7 +129,7 @@ RSpec.describe MediaAttachment do
   end
 
   describe 'ogg with cover art' do
-    let(:media) { MediaAttachment.create(account: Fabricate(:account), file: attachment_fixture('boop.ogg')) }
+    let(:media) { described_class.create(account: Fabricate(:account), file: attachment_fixture('boop.ogg')) }
 
     it 'detects it as an audio file' do
       expect(media.type).to eq 'audio'
@@ -153,7 +153,7 @@ RSpec.describe MediaAttachment do
   end
 
   describe 'jpeg' do
-    let(:media) { MediaAttachment.create(account: Fabricate(:account), file: attachment_fixture('attachment.jpg')) }
+    let(:media) { described_class.create(account: Fabricate(:account), file: attachment_fixture('attachment.jpg')) }
 
     it 'sets meta for different style' do
       expect(media.file.meta['original']['width']).to eq 600
@@ -171,7 +171,7 @@ RSpec.describe MediaAttachment do
 
   describe 'base64-encoded jpeg' do
     let(:base64_attachment) { "data:image/jpeg;base64,#{Base64.encode64(attachment_fixture('attachment.jpg').read)}" }
-    let(:media) { MediaAttachment.create(account: Fabricate(:account), file: base64_attachment) }
+    let(:media) { described_class.create(account: Fabricate(:account), file: base64_attachment) }
 
     it 'saves media attachment' do
       expect(media.persisted?).to be true
@@ -184,7 +184,7 @@ RSpec.describe MediaAttachment do
   end
 
   it 'is invalid without file' do
-    media = MediaAttachment.new(account: Fabricate(:account))
+    media = described_class.new(account: Fabricate(:account))
     expect(media.valid?).to be false
   end
 
@@ -192,26 +192,26 @@ RSpec.describe MediaAttachment do
     it 'rejects video files that are too large' do
       stub_const 'MediaAttachment::IMAGE_LIMIT', 100.megabytes
       stub_const 'MediaAttachment::VIDEO_LIMIT', 1.kilobyte
-      expect { MediaAttachment.create!(account: Fabricate(:account), file: attachment_fixture('attachment.webm')) }.to raise_error(ActiveRecord::RecordInvalid)
+      expect { described_class.create!(account: Fabricate(:account), file: attachment_fixture('attachment.webm')) }.to raise_error(ActiveRecord::RecordInvalid)
     end
 
     it 'accepts video files that are small enough' do
       stub_const 'MediaAttachment::IMAGE_LIMIT', 1.kilobyte
       stub_const 'MediaAttachment::VIDEO_LIMIT', 100.megabytes
-      media = MediaAttachment.create!(account: Fabricate(:account), file: attachment_fixture('attachment.webm'))
+      media = described_class.create!(account: Fabricate(:account), file: attachment_fixture('attachment.webm'))
       expect(media.valid?).to be true
     end
 
     it 'rejects image files that are too large' do
       stub_const 'MediaAttachment::IMAGE_LIMIT', 1.kilobyte
       stub_const 'MediaAttachment::VIDEO_LIMIT', 100.megabytes
-      expect { MediaAttachment.create!(account: Fabricate(:account), file: attachment_fixture('attachment.jpg')) }.to raise_error(ActiveRecord::RecordInvalid)
+      expect { described_class.create!(account: Fabricate(:account), file: attachment_fixture('attachment.jpg')) }.to raise_error(ActiveRecord::RecordInvalid)
     end
 
     it 'accepts image files that are small enough' do
       stub_const 'MediaAttachment::IMAGE_LIMIT', 100.megabytes
       stub_const 'MediaAttachment::VIDEO_LIMIT', 1.kilobyte
-      media = MediaAttachment.create!(account: Fabricate(:account), file: attachment_fixture('attachment.jpg'))
+      media = described_class.create!(account: Fabricate(:account), file: attachment_fixture('attachment.jpg'))
       expect(media.valid?).to be true
     end
   end
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index 795491546..0dd9264e0 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -38,22 +38,22 @@ RSpec.describe Notification do
 
   describe '#type' do
     it 'returns :reblog for a Status' do
-      notification = Notification.new(activity: Status.new)
+      notification = described_class.new(activity: Status.new)
       expect(notification.type).to eq :reblog
     end
 
     it 'returns :mention for a Mention' do
-      notification = Notification.new(activity: Mention.new)
+      notification = described_class.new(activity: Mention.new)
       expect(notification.type).to eq :mention
     end
 
     it 'returns :favourite for a Favourite' do
-      notification = Notification.new(activity: Favourite.new)
+      notification = described_class.new(activity: Favourite.new)
       expect(notification.type).to eq :favourite
     end
 
     it 'returns :follow for a Follow' do
-      notification = Notification.new(activity: Follow.new)
+      notification = described_class.new(activity: Follow.new)
       expect(notification.type).to eq :follow
     end
   end
diff --git a/spec/models/relationship_filter_spec.rb b/spec/models/relationship_filter_spec.rb
index 7c0f37a06..b3e855c12 100644
--- a/spec/models/relationship_filter_spec.rb
+++ b/spec/models/relationship_filter_spec.rb
@@ -8,7 +8,7 @@ describe RelationshipFilter do
   describe '#results' do
     context 'when default params are used' do
       let(:subject) do
-        RelationshipFilter.new(account, 'order' => 'active').results
+        described_class.new(account, 'order' => 'active').results
       end
 
       before do
diff --git a/spec/models/report_filter_spec.rb b/spec/models/report_filter_spec.rb
index 8269c4579..4b0852f08 100644
--- a/spec/models/report_filter_spec.rb
+++ b/spec/models/report_filter_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
 describe ReportFilter do
   describe 'with empty params' do
     it 'defaults to unresolved reports list' do
-      filter = ReportFilter.new({})
+      filter = described_class.new({})
 
       expect(filter.results).to eq Report.unresolved
     end
@@ -13,7 +13,7 @@ describe ReportFilter do
 
   describe 'with invalid params' do
     it 'raises with key error' do
-      filter = ReportFilter.new(wrong: true)
+      filter = described_class.new(wrong: true)
 
       expect { filter.results }.to raise_error(/wrong/)
     end
@@ -21,7 +21,7 @@ describe ReportFilter do
 
   describe 'with valid params' do
     it 'combines filters on Report' do
-      filter = ReportFilter.new(account_id: '123', resolved: true, target_account_id: '456')
+      filter = described_class.new(account_id: '123', resolved: true, target_account_id: '456')
 
       allow(Report).to receive(:where).and_return(Report.none)
       allow(Report).to receive(:resolved).and_return(Report.none)
diff --git a/spec/models/session_activation_spec.rb b/spec/models/session_activation_spec.rb
index 51c6aa5cb..052a06e5c 100644
--- a/spec/models/session_activation_spec.rb
+++ b/spec/models/session_activation_spec.rb
@@ -80,7 +80,7 @@ RSpec.describe SessionActivation do
     end
 
     it 'returns an instance of SessionActivation' do
-      expect(described_class.activate(**options)).to be_a SessionActivation
+      expect(described_class.activate(**options)).to be_a described_class
     end
   end
 
diff --git a/spec/models/setting_spec.rb b/spec/models/setting_spec.rb
index accce10f8..bba585cec 100644
--- a/spec/models/setting_spec.rb
+++ b/spec/models/setting_spec.rb
@@ -146,7 +146,7 @@ RSpec.describe Setting do
         it 'includes Setting with value of default_value' do
           setting = described_class.all_as_records[key]
 
-          expect(setting).to be_a Setting
+          expect(setting).to be_a described_class
           expect(setting).to have_attributes(var: key)
           expect(setting).to have_attributes(value: 'default_value')
         end
diff --git a/spec/models/site_upload_spec.rb b/spec/models/site_upload_spec.rb
index d4a929311..9689bce9e 100644
--- a/spec/models/site_upload_spec.rb
+++ b/spec/models/site_upload_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
 
 RSpec.describe SiteUpload do
   describe '#cache_key' do
-    let(:site_upload) { SiteUpload.new(var: 'var') }
+    let(:site_upload) { described_class.new(var: 'var') }
 
     it 'returns cache_key' do
       expect(site_upload.cache_key).to eq 'site_uploads/var'
diff --git a/spec/models/status_pin_spec.rb b/spec/models/status_pin_spec.rb
index 52ce0847c..660b2e92a 100644
--- a/spec/models/status_pin_spec.rb
+++ b/spec/models/status_pin_spec.rb
@@ -8,14 +8,14 @@ RSpec.describe StatusPin do
       account = Fabricate(:account)
       status  = Fabricate(:status, account: account)
 
-      expect(StatusPin.new(account: account, status: status).save).to be true
+      expect(described_class.new(account: account, status: status).save).to be true
     end
 
     it 'does not allow pins of statuses by someone else' do
       account = Fabricate(:account)
       status  = Fabricate(:status)
 
-      expect(StatusPin.new(account: account, status: status).save).to be false
+      expect(described_class.new(account: account, status: status).save).to be false
     end
 
     it 'does not allow pins of reblogs' do
@@ -23,21 +23,21 @@ RSpec.describe StatusPin do
       status  = Fabricate(:status, account: account)
       reblog  = Fabricate(:status, reblog: status)
 
-      expect(StatusPin.new(account: account, status: reblog).save).to be false
+      expect(described_class.new(account: account, status: reblog).save).to be false
     end
 
     it 'does allow pins of direct statuses' do
       account = Fabricate(:account)
       status  = Fabricate(:status, account: account, visibility: :private)
 
-      expect(StatusPin.new(account: account, status: status).save).to be true
+      expect(described_class.new(account: account, status: status).save).to be true
     end
 
     it 'does not allow pins of direct statuses' do
       account = Fabricate(:account)
       status  = Fabricate(:status, account: account, visibility: :direct)
 
-      expect(StatusPin.new(account: account, status: status).save).to be false
+      expect(described_class.new(account: account, status: status).save).to be false
     end
 
     max_pins = 5
@@ -50,10 +50,10 @@ RSpec.describe StatusPin do
       end
 
       max_pins.times do |i|
-        expect(StatusPin.new(account: account, status: status[i]).save).to be true
+        expect(described_class.new(account: account, status: status[i]).save).to be true
       end
 
-      expect(StatusPin.new(account: account, status: status[max_pins]).save).to be false
+      expect(described_class.new(account: account, status: status[max_pins]).save).to be false
     end
 
     it 'allows pins above the max for remote accounts' do
@@ -65,10 +65,10 @@ RSpec.describe StatusPin do
       end
 
       max_pins.times do |i|
-        expect(StatusPin.new(account: account, status: status[i]).save).to be true
+        expect(described_class.new(account: account, status: status[i]).save).to be true
       end
 
-      expect(StatusPin.new(account: account, status: status[max_pins]).save).to be true
+      expect(described_class.new(account: account, status: status[max_pins]).save).to be true
     end
   end
 end
diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb
index 3b612ded1..a1c750ba0 100644
--- a/spec/models/status_spec.rb
+++ b/spec/models/status_spec.rb
@@ -160,7 +160,7 @@ RSpec.describe Status do
       reblog = Fabricate(:status, account: bob, reblog: subject)
       expect(subject.reblogs_count).to eq 1
       expect { subject.destroy }.to_not raise_error
-      expect(Status.find_by(id: reblog.id)).to be_nil
+      expect(described_class.find_by(id: reblog.id)).to be_nil
     end
   end
 
@@ -206,7 +206,7 @@ RSpec.describe Status do
   end
 
   describe 'on create' do
-    subject { Status.new }
+    subject { described_class.new }
 
     let(:local_account) { Fabricate(:account, username: 'local', domain: nil) }
     let(:remote_account) { Fabricate(:account, username: 'remote', domain: 'example.com') }
@@ -243,7 +243,7 @@ RSpec.describe Status do
   end
 
   describe '.mutes_map' do
-    subject { Status.mutes_map([status.conversation.id], account) }
+    subject { described_class.mutes_map([status.conversation.id], account) }
 
     let(:status)  { Fabricate(:status) }
     let(:account) { Fabricate(:account) }
@@ -259,7 +259,7 @@ RSpec.describe Status do
   end
 
   describe '.favourites_map' do
-    subject { Status.favourites_map([status], account) }
+    subject { described_class.favourites_map([status], account) }
 
     let(:status)  { Fabricate(:status) }
     let(:account) { Fabricate(:account) }
@@ -275,7 +275,7 @@ RSpec.describe Status do
   end
 
   describe '.reblogs_map' do
-    subject { Status.reblogs_map([status], account) }
+    subject { described_class.reblogs_map([status], account) }
 
     let(:status)  { Fabricate(:status) }
     let(:account) { Fabricate(:account) }
@@ -291,7 +291,7 @@ RSpec.describe Status do
   end
 
   describe '.as_direct_timeline' do
-    subject(:results) { Status.as_direct_timeline(account) }
+    subject(:results) { described_class.as_direct_timeline(account) }
 
     let(:account) { Fabricate(:account) }
     let(:followed) { Fabricate(:account) }
@@ -329,13 +329,13 @@ RSpec.describe Status do
 
     it 'includes direct statuses mentioning recipient from followed' do
       Fabricate(:mention, account: account, status: followed_direct_status)
-      results2 = Status.as_direct_timeline(account)
+      results2 = described_class.as_direct_timeline(account)
       expect(results2).to include(followed_direct_status)
     end
 
     it 'includes direct statuses mentioning recipient from non-followed' do
       Fabricate(:mention, account: account, status: not_followed_direct_status)
-      results2 = Status.as_direct_timeline(account)
+      results2 = described_class.as_direct_timeline(account)
       expect(results2).to include(not_followed_direct_status)
     end
   end
@@ -352,17 +352,17 @@ RSpec.describe Status do
 
     context 'when given one tag' do
       it 'returns the expected statuses' do
-        expect(Status.tagged_with([tag1.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status1.id, status5.id)
-        expect(Status.tagged_with([tag2.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status2.id, status5.id)
-        expect(Status.tagged_with([tag3.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status3.id, status5.id)
+        expect(described_class.tagged_with([tag1.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status1.id, status5.id)
+        expect(described_class.tagged_with([tag2.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status2.id, status5.id)
+        expect(described_class.tagged_with([tag3.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status3.id, status5.id)
       end
     end
 
     context 'when given multiple tags' do
       it 'returns the expected statuses' do
-        expect(Status.tagged_with([tag1.id, tag2.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status1.id, status2.id, status5.id)
-        expect(Status.tagged_with([tag1.id, tag3.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status1.id, status3.id, status5.id)
-        expect(Status.tagged_with([tag2.id, tag3.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status2.id, status3.id, status5.id)
+        expect(described_class.tagged_with([tag1.id, tag2.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status1.id, status2.id, status5.id)
+        expect(described_class.tagged_with([tag1.id, tag3.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status1.id, status3.id, status5.id)
+        expect(described_class.tagged_with([tag2.id, tag3.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status2.id, status3.id, status5.id)
       end
     end
   end
@@ -379,17 +379,17 @@ RSpec.describe Status do
 
     context 'when given one tag' do
       it 'returns the expected statuses' do
-        expect(Status.tagged_with_all([tag1.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status1.id, status5.id)
-        expect(Status.tagged_with_all([tag2.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status2.id, status5.id)
-        expect(Status.tagged_with_all([tag3.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status3.id)
+        expect(described_class.tagged_with_all([tag1.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status1.id, status5.id)
+        expect(described_class.tagged_with_all([tag2.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status2.id, status5.id)
+        expect(described_class.tagged_with_all([tag3.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status3.id)
       end
     end
 
     context 'when given multiple tags' do
       it 'returns the expected statuses' do
-        expect(Status.tagged_with_all([tag1.id, tag2.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status5.id)
-        expect(Status.tagged_with_all([tag1.id, tag3.id]).reorder(:id).pluck(:id).uniq).to eq []
-        expect(Status.tagged_with_all([tag2.id, tag3.id]).reorder(:id).pluck(:id).uniq).to eq []
+        expect(described_class.tagged_with_all([tag1.id, tag2.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status5.id)
+        expect(described_class.tagged_with_all([tag1.id, tag3.id]).reorder(:id).pluck(:id).uniq).to eq []
+        expect(described_class.tagged_with_all([tag2.id, tag3.id]).reorder(:id).pluck(:id).uniq).to eq []
       end
     end
   end
@@ -406,17 +406,17 @@ RSpec.describe Status do
 
     context 'when given one tag' do
       it 'returns the expected statuses' do
-        expect(Status.tagged_with_none([tag1.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status2.id, status3.id, status4.id)
-        expect(Status.tagged_with_none([tag2.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status1.id, status3.id, status4.id)
-        expect(Status.tagged_with_none([tag3.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status1.id, status2.id, status4.id)
+        expect(described_class.tagged_with_none([tag1.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status2.id, status3.id, status4.id)
+        expect(described_class.tagged_with_none([tag2.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status1.id, status3.id, status4.id)
+        expect(described_class.tagged_with_none([tag3.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status1.id, status2.id, status4.id)
       end
     end
 
     context 'when given multiple tags' do
       it 'returns the expected statuses' do
-        expect(Status.tagged_with_none([tag1.id, tag2.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status3.id, status4.id)
-        expect(Status.tagged_with_none([tag1.id, tag3.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status2.id, status4.id)
-        expect(Status.tagged_with_none([tag2.id, tag3.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status1.id, status4.id)
+        expect(described_class.tagged_with_none([tag1.id, tag2.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status3.id, status4.id)
+        expect(described_class.tagged_with_none([tag1.id, tag3.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status2.id, status4.id)
+        expect(described_class.tagged_with_none([tag2.id, tag3.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status1.id, status4.id)
       end
     end
   end
@@ -431,21 +431,21 @@ RSpec.describe Status do
     end
 
     it 'creates new conversation for stand-alone status' do
-      expect(Status.create(account: alice, text: 'First').conversation_id).to_not be_nil
+      expect(described_class.create(account: alice, text: 'First').conversation_id).to_not be_nil
     end
 
     it 'keeps conversation of parent node' do
       parent = Fabricate(:status, text: 'First')
-      expect(Status.create(account: alice, thread: parent, text: 'Response').conversation_id).to eq parent.conversation_id
+      expect(described_class.create(account: alice, thread: parent, text: 'Response').conversation_id).to eq parent.conversation_id
     end
 
     it 'sets `local` to true for status by local account' do
-      expect(Status.create(account: alice, text: 'foo').local).to be true
+      expect(described_class.create(account: alice, text: 'foo').local).to be true
     end
 
     it 'sets `local` to false for status by remote account' do
       alice.update(domain: 'example.com')
-      expect(Status.create(account: alice, text: 'foo').local).to be false
+      expect(described_class.create(account: alice, text: 'foo').local).to be false
     end
   end
 
@@ -459,7 +459,7 @@ RSpec.describe Status do
 
   describe 'after_create' do
     it 'saves ActivityPub uri as uri for local status' do
-      status = Status.create(account: alice, text: 'foo')
+      status = described_class.create(account: alice, text: 'foo')
       status.reload
       expect(status.uri).to start_with('https://')
     end
diff --git a/spec/models/trends/statuses_spec.rb b/spec/models/trends/statuses_spec.rb
index 29a20a595..cea5dc5e0 100644
--- a/spec/models/trends/statuses_spec.rb
+++ b/spec/models/trends/statuses_spec.rb
@@ -81,7 +81,7 @@ RSpec.describe Trends::Statuses do
       4.times { reblog(status3, today) }
     end
 
-    context do
+    context 'when status trends are refreshed' do
       before do
         subject.refresh(today)
       end
diff --git a/spec/models/trends/tags_spec.rb b/spec/models/trends/tags_spec.rb
index 09ac918d0..79cdee346 100644
--- a/spec/models/trends/tags_spec.rb
+++ b/spec/models/trends/tags_spec.rb
@@ -44,7 +44,7 @@ RSpec.describe Trends::Tags do
       4.times  { |i| subject.add(tag2, i, today) }
     end
 
-    context do
+    context 'when tag trends are refreshed' do
       before do
         subject.refresh(yesterday + 12.hours)
         subject.refresh(at_time)
diff --git a/spec/models/user_role_spec.rb b/spec/models/user_role_spec.rb
index 16bb4358e..27b967414 100644
--- a/spec/models/user_role_spec.rb
+++ b/spec/models/user_role_spec.rb
@@ -118,10 +118,8 @@ RSpec.describe UserRole do
       end
     end
 
-    context do
-      it 'returns permissions combined with the everyone role' do
-        expect(subject.computed_permissions).to eq described_class.everyone.permissions
-      end
+    it 'returns permissions combined with the everyone role' do
+      expect(subject.computed_permissions).to eq described_class.everyone.permissions
     end
   end
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index d3e0ac63a..bb61c02a6 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -57,7 +57,7 @@ RSpec.describe User do
       it 'returns an array of recent users ordered by id' do
         user_1 = Fabricate(:user)
         user_2 = Fabricate(:user)
-        expect(User.recent).to eq [user_2, user_1]
+        expect(described_class.recent).to eq [user_2, user_1]
       end
     end
 
@@ -65,7 +65,7 @@ RSpec.describe User do
       it 'returns an array of users who are confirmed' do
         user_1 = Fabricate(:user, confirmed_at: nil)
         user_2 = Fabricate(:user, confirmed_at: Time.zone.now)
-        expect(User.confirmed).to contain_exactly(user_2)
+        expect(described_class.confirmed).to contain_exactly(user_2)
       end
     end
 
@@ -74,7 +74,7 @@ RSpec.describe User do
         specified = Fabricate(:user, current_sign_in_at: 15.days.ago)
         Fabricate(:user, current_sign_in_at: 6.days.ago)
 
-        expect(User.inactive).to contain_exactly(specified)
+        expect(described_class.inactive).to contain_exactly(specified)
       end
     end
 
@@ -83,7 +83,7 @@ RSpec.describe User do
         specified = Fabricate(:user, email: 'specified@spec')
         Fabricate(:user, email: 'unspecified@spec')
 
-        expect(User.matches_email('specified')).to contain_exactly(specified)
+        expect(described_class.matches_email('specified')).to contain_exactly(specified)
       end
     end
 
@@ -96,7 +96,7 @@ RSpec.describe User do
         Fabricate(:session_activation, user: user2, ip: '2160:8888::24', session_id: '3')
         Fabricate(:session_activation, user: user2, ip: '2160:8888::25', session_id: '4')
 
-        expect(User.matches_ip('2160:2160::/32')).to contain_exactly(user1)
+        expect(described_class.matches_ip('2160:2160::/32')).to contain_exactly(user1)
       end
     end
   end
@@ -113,19 +113,19 @@ RSpec.describe User do
     end
 
     it 'allows a non-blacklisted user to be created' do
-      user = User.new(email: 'foo@example.com', account: account, password: password, agreement: true)
+      user = described_class.new(email: 'foo@example.com', account: account, password: password, agreement: true)
 
       expect(user).to be_valid
     end
 
     it 'does not allow a blacklisted user to be created' do
-      user = User.new(email: 'foo@mvrht.com', account: account, password: password, agreement: true)
+      user = described_class.new(email: 'foo@mvrht.com', account: account, password: password, agreement: true)
 
       expect(user).to_not be_valid
     end
 
     it 'does not allow a subdomain blacklisted user to be created' do
-      user = User.new(email: 'foo@mvrht.com.topdomain.tld', account: account, password: password, agreement: true)
+      user = described_class.new(email: 'foo@mvrht.com.topdomain.tld', account: account, password: password, agreement: true)
 
       expect(user).to_not be_valid
     end
@@ -349,21 +349,21 @@ RSpec.describe User do
     end
 
     it 'does not allow a user to be created unless they are whitelisted' do
-      user = User.new(email: 'foo@example.com', account: account, password: password, agreement: true)
+      user = described_class.new(email: 'foo@example.com', account: account, password: password, agreement: true)
       expect(user).to_not be_valid
     end
 
     it 'allows a user to be created if they are whitelisted' do
-      user = User.new(email: 'foo@mastodon.space', account: account, password: password, agreement: true)
+      user = described_class.new(email: 'foo@mastodon.space', account: account, password: password, agreement: true)
       expect(user).to be_valid
     end
 
     it 'does not allow a user with a whitelisted top domain as subdomain in their email address to be created' do
-      user = User.new(email: 'foo@mastodon.space.userdomain.com', account: account, password: password, agreement: true)
+      user = described_class.new(email: 'foo@mastodon.space.userdomain.com', account: account, password: password, agreement: true)
       expect(user).to_not be_valid
     end
 
-    context do
+    context 'with a blacklisted subdomain' do
       around do |example|
         old_blacklist = Rails.configuration.x.email_blacklist
         example.run
@@ -373,7 +373,7 @@ RSpec.describe User do
       it 'does not allow a user to be created with a specific blacklisted subdomain even if the top domain is whitelisted' do
         Rails.configuration.x.email_domains_blacklist = 'blacklisted.mastodon.space'
 
-        user = User.new(email: 'foo@blacklisted.mastodon.space', account: account, password: password)
+        user = described_class.new(email: 'foo@blacklisted.mastodon.space', account: account, password: password)
         expect(user).to_not be_valid
       end
     end
@@ -527,19 +527,19 @@ RSpec.describe User do
   end
 
   describe '.those_who_can' do
-    let!(:moderator_user) { Fabricate(:user, role: UserRole.find_by(name: 'Moderator')) }
+    before { Fabricate(:user, role: UserRole.find_by(name: 'Moderator')) }
 
     context 'when there are not any user roles' do
       before { UserRole.destroy_all }
 
       it 'returns an empty list' do
-        expect(User.those_who_can(:manage_blocks)).to eq([])
+        expect(described_class.those_who_can(:manage_blocks)).to eq([])
       end
     end
 
     context 'when there are not users with the needed role' do
       it 'returns an empty list' do
-        expect(User.those_who_can(:manage_blocks)).to eq([])
+        expect(described_class.those_who_can(:manage_blocks)).to eq([])
       end
     end
 
@@ -547,7 +547,7 @@ RSpec.describe User do
       let!(:admin_user) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')) }
 
       it 'returns the users with the role' do
-        expect(User.those_who_can(:manage_blocks)).to eq([admin_user])
+        expect(described_class.those_who_can(:manage_blocks)).to eq([admin_user])
       end
     end
   end
diff --git a/spec/policies/account_moderation_note_policy_spec.rb b/spec/policies/account_moderation_note_policy_spec.rb
index 03d18250b..90abdfea7 100644
--- a/spec/policies/account_moderation_note_policy_spec.rb
+++ b/spec/policies/account_moderation_note_policy_spec.rb
@@ -11,13 +11,13 @@ RSpec.describe AccountModerationNotePolicy do
   permissions :create? do
     context 'when staff' do
       it 'grants to create' do
-        expect(subject).to permit(admin, AccountModerationNotePolicy)
+        expect(subject).to permit(admin, described_class)
       end
     end
 
     context 'when not staff' do
       it 'denies to create' do
-        expect(subject).to_not permit(john, AccountModerationNotePolicy)
+        expect(subject).to_not permit(john, described_class)
       end
     end
   end
diff --git a/spec/presenters/account_relationships_presenter_spec.rb b/spec/presenters/account_relationships_presenter_spec.rb
index d59060bd5..5c2ba54e0 100644
--- a/spec/presenters/account_relationships_presenter_spec.rb
+++ b/spec/presenters/account_relationships_presenter_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe AccountRelationshipsPresenter do
       allow(Account).to receive(:domain_blocking_map).with(account_ids, current_account_id).and_return(default_map)
     end
 
-    let(:presenter)          { AccountRelationshipsPresenter.new(account_ids, current_account_id, **options) }
+    let(:presenter)          { described_class.new(account_ids, current_account_id, **options) }
     let(:current_account_id) { Fabricate(:account).id }
     let(:account_ids)        { [Fabricate(:account).id] }
     let(:default_map)        { { 1 => true } }
diff --git a/spec/presenters/status_relationships_presenter_spec.rb b/spec/presenters/status_relationships_presenter_spec.rb
index a62fa004a..7746c8cd7 100644
--- a/spec/presenters/status_relationships_presenter_spec.rb
+++ b/spec/presenters/status_relationships_presenter_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe StatusRelationshipsPresenter do
       allow(Status).to receive(:pins_map).with(anything, current_account_id).and_return(default_map)
     end
 
-    let(:presenter)          { StatusRelationshipsPresenter.new(statuses, current_account_id, **options) }
+    let(:presenter)          { described_class.new(statuses, current_account_id, **options) }
     let(:current_account_id) { Fabricate(:account).id }
     let(:statuses)           { [Fabricate(:status)] }
     let(:status_ids)         { statuses.map(&:id) + statuses.filter_map(&:reblog_of_id) }
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index d7e2b5c18..f4113d565 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -94,6 +94,12 @@ RSpec.configure do |config|
     stub_jsonld_contexts!
   end
 
+  config.before(:each) do |example|
+    unless example.metadata[:paperclip_processing]
+      allow_any_instance_of(Paperclip::Attachment).to receive(:post_process).and_return(true) # rubocop:disable RSpec/AnyInstance
+    end
+  end
+
   config.after :each do
     Rails.cache.clear
     redis.del(redis.keys)
diff --git a/spec/controllers/api/v1/admin/email_domain_blocks_controller_spec.rb b/spec/requests/api/v1/admin/email_domain_blocks_spec.rb
similarity index 52%
rename from spec/controllers/api/v1/admin/email_domain_blocks_controller_spec.rb
rename to spec/requests/api/v1/admin/email_domain_blocks_spec.rb
index 3643eb0f3..a24f22be2 100644
--- a/spec/controllers/api/v1/admin/email_domain_blocks_controller_spec.rb
+++ b/spec/requests/api/v1/admin/email_domain_blocks_spec.rb
@@ -2,23 +2,20 @@
 
 require 'rails_helper'
 
-describe Api::V1::Admin::EmailDomainBlocksController do
-  render_views
-
+RSpec.describe 'Email Domain Blocks' do
   let(:role)    { UserRole.find_by(name: 'Admin') }
   let(:user)    { Fabricate(:user, role: role) }
   let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
   let(:account) { Fabricate(:account) }
   let(:scopes)  { 'admin:read:email_domain_blocks admin:write:email_domain_blocks' }
-
-  before do
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
 
   shared_examples 'forbidden for wrong scope' do |wrong_scope|
     let(:scopes) { wrong_scope }
 
     it 'returns http forbidden' do
+      subject
+
       expect(response).to have_http_status(403)
     end
   end
@@ -27,65 +24,54 @@ describe Api::V1::Admin::EmailDomainBlocksController do
     let(:role) { UserRole.find_by(name: wrong_role) }
 
     it 'returns http forbidden' do
+      subject
+
       expect(response).to have_http_status(403)
     end
   end
 
-  describe 'GET #index' do
-    context 'with wrong scope' do
-      before do
-        get :index
-      end
-
-      it_behaves_like 'forbidden for wrong scope', 'read:statuses'
+  describe 'GET /api/v1/admin/email_domain_blocks' do
+    subject do
+      get '/api/v1/admin/email_domain_blocks', headers: headers, params: params
     end
 
-    context 'with wrong role' do
-      before do
-        get :index
-      end
+    let(:params) { {} }
 
-      it_behaves_like 'forbidden for wrong role', ''
-      it_behaves_like 'forbidden for wrong role', 'Moderator'
-    end
+    it_behaves_like 'forbidden for wrong scope', 'read:statuses'
+    it_behaves_like 'forbidden for wrong role', ''
+    it_behaves_like 'forbidden for wrong role', 'Moderator'
 
     it 'returns http success' do
-      get :index
+      subject
 
       expect(response).to have_http_status(200)
     end
 
     context 'when there is no email domain block' do
       it 'returns an empty list' do
-        get :index
+        subject
 
-        json = body_as_json
-
-        expect(json).to be_empty
+        expect(body_as_json).to be_empty
       end
     end
 
     context 'when there are email domain blocks' do
-      let!(:email_domain_blocks) { Fabricate.times(5, :email_domain_block) }
+      let!(:email_domain_blocks)  { Fabricate.times(5, :email_domain_block) }
       let(:blocked_email_domains) { email_domain_blocks.pluck(:domain) }
 
       it 'return the correct blocked email domains' do
-        get :index
+        subject
 
-        json = body_as_json
-
-        expect(json.pluck(:domain)).to match_array(blocked_email_domains)
+        expect(body_as_json.pluck(:domain)).to match_array(blocked_email_domains)
       end
 
       context 'with limit param' do
         let(:params) { { limit: 2 } }
 
         it 'returns only the requested number of email domain blocks' do
-          get :index, params: params
+          subject
 
-          json = body_as_json
-
-          expect(json.size).to eq(params[:limit])
+          expect(body_as_json.size).to eq(params[:limit])
         end
       end
 
@@ -93,12 +79,11 @@ describe Api::V1::Admin::EmailDomainBlocksController do
         let(:params) { { since_id: email_domain_blocks[1].id } }
 
         it 'returns only the email domain blocks after since_id' do
-          get :index, params: params
+          subject
 
           email_domain_blocks_ids = email_domain_blocks.pluck(:id).map(&:to_s)
-          json = body_as_json
 
-          expect(json.pluck(:id)).to match_array(email_domain_blocks_ids[2..])
+          expect(body_as_json.pluck(:id)).to match_array(email_domain_blocks_ids[2..])
         end
       end
 
@@ -106,102 +91,78 @@ describe Api::V1::Admin::EmailDomainBlocksController do
         let(:params) { { max_id: email_domain_blocks[3].id } }
 
         it 'returns only the email domain blocks before max_id' do
-          get :index, params: params
+          subject
 
           email_domain_blocks_ids = email_domain_blocks.pluck(:id).map(&:to_s)
-          json = body_as_json
 
-          expect(json.pluck(:id)).to match_array(email_domain_blocks_ids[..2])
+          expect(body_as_json.pluck(:id)).to match_array(email_domain_blocks_ids[..2])
         end
       end
     end
   end
 
-  describe 'GET #show' do
+  describe 'GET /api/v1/admin/email_domain_blocks/:id' do
+    subject do
+      get "/api/v1/admin/email_domain_blocks/#{email_domain_block.id}", headers: headers
+    end
+
     let!(:email_domain_block) { Fabricate(:email_domain_block) }
-    let(:params) { { id: email_domain_block.id } }
 
-    context 'with wrong scope' do
-      before do
-        get :show, params: params
-      end
-
-      it_behaves_like 'forbidden for wrong scope', 'read:statuses'
-    end
-
-    context 'with wrong role' do
-      before do
-        get :show, params: params
-      end
-
-      it_behaves_like 'forbidden for wrong role', ''
-      it_behaves_like 'forbidden for wrong role', 'Moderator'
-    end
+    it_behaves_like 'forbidden for wrong scope', 'read:statuses'
+    it_behaves_like 'forbidden for wrong role', ''
+    it_behaves_like 'forbidden for wrong role', 'Moderator'
 
     context 'when email domain block exists' do
       it 'returns http success' do
-        get :show, params: params
+        subject
 
         expect(response).to have_http_status(200)
       end
 
       it 'returns the correct blocked domain' do
-        get :show, params: params
+        subject
 
-        json = body_as_json
-
-        expect(json[:domain]).to eq(email_domain_block.domain)
+        expect(body_as_json[:domain]).to eq(email_domain_block.domain)
       end
     end
 
     context 'when email domain block does not exist' do
       it 'returns http not found' do
-        get :show, params: { id: 0 }
+        get '/api/v1/admin/email_domain_blocks/-1', headers: headers
 
         expect(response).to have_http_status(404)
       end
     end
   end
 
-  describe 'POST #create' do
+  describe 'POST /api/v1/admin/email_domain_blocks' do
+    subject do
+      post '/api/v1/admin/email_domain_blocks', headers: headers, params: params
+    end
+
     let(:params) { { domain: 'example.com' } }
 
-    context 'with wrong scope' do
-      before do
-        post :create, params: params
-      end
-
-      it_behaves_like 'forbidden for wrong scope', 'read:statuses'
-    end
-
-    context 'with wrong role' do
-      before do
-        post :create, params: params
-      end
-
-      it_behaves_like 'forbidden for wrong role', ''
-      it_behaves_like 'forbidden for wrong role', 'Moderator'
-    end
+    it_behaves_like 'forbidden for wrong scope', 'read:statuses'
+    it_behaves_like 'forbidden for wrong role', ''
+    it_behaves_like 'forbidden for wrong role', 'Moderator'
 
     it 'returns http success' do
-      post :create, params: params
+      subject
 
       expect(response).to have_http_status(200)
     end
 
     it 'returns the correct blocked email domain' do
-      post :create, params: params
+      subject
 
-      json = body_as_json
-
-      expect(json[:domain]).to eq(params[:domain])
+      expect(body_as_json[:domain]).to eq(params[:domain])
     end
 
     context 'when domain param is not provided' do
       let(:params) { { domain: '' } }
 
       it 'returns http unprocessable entity' do
-        post :create, params: params
+        subject
 
         expect(response).to have_http_status(422)
       end
@@ -211,7 +172,7 @@ describe Api::V1::Admin::EmailDomainBlocksController do
       let(:params) { { domain: 'do\uD800.com' } }
 
       it 'returns http unprocessable entity' do
-        post :create, params: params
+        subject
 
         expect(response).to have_http_status(422)
       end
@@ -223,59 +184,45 @@ describe Api::V1::Admin::EmailDomainBlocksController do
       end
 
       it 'returns http unprocessable entity' do
-        post :create, params: params
+        subject
 
         expect(response).to have_http_status(422)
       end
     end
   end
 
-  describe 'DELETE #destroy' do
+  describe 'DELETE /api/v1/admin/email_domain_blocks' do
+    subject do
+      delete "/api/v1/admin/email_domain_blocks/#{email_domain_block.id}", headers: headers
+    end
+
     let!(:email_domain_block) { Fabricate(:email_domain_block) }
-    let(:params) { { id: email_domain_block.id } }
 
-    context 'with wrong scope' do
-      before do
-        delete :destroy, params: params
-      end
-
-      it_behaves_like 'forbidden for wrong scope', 'read:statuses'
-    end
-
-    context 'with wrong role' do
-      before do
-        delete :destroy, params: params
-      end
-
-      it_behaves_like 'forbidden for wrong role', ''
-      it_behaves_like 'forbidden for wrong role', 'Moderator'
-    end
+    it_behaves_like 'forbidden for wrong scope', 'read:statuses'
+    it_behaves_like 'forbidden for wrong role', ''
+    it_behaves_like 'forbidden for wrong role', 'Moderator'
 
     it 'returns http success' do
-      delete :destroy, params: params
+      subject
 
       expect(response).to have_http_status(200)
     end
 
     it 'returns an empty body' do
-      delete :destroy, params: params
+      subject
 
-      json = body_as_json
-
-      expect(json).to be_empty
+      expect(body_as_json).to be_empty
     end
 
     it 'deletes email domain block' do
-      delete :destroy, params: params
+      subject
 
-      email_domain_block = EmailDomainBlock.find_by(id: params[:id])
-
-      expect(email_domain_block).to be_nil
+      expect(EmailDomainBlock.find_by(id: email_domain_block.id)).to be_nil
     end
 
     context 'when email domain block does not exist' do
       it 'returns http not found' do
-        delete :destroy, params: { id: 0 }
+        delete '/api/v1/admin/email_domain_blocks/-1', headers: headers
 
         expect(response).to have_http_status(404)
       end
diff --git a/spec/serializers/activitypub/note_serializer_spec.rb b/spec/serializers/activitypub/note_serializer_spec.rb
index 7ea47baef..68f537891 100644
--- a/spec/serializers/activitypub/note_serializer_spec.rb
+++ b/spec/serializers/activitypub/note_serializer_spec.rb
@@ -15,7 +15,7 @@ describe ActivityPub::NoteSerializer do
   let!(:reply5)  { Fabricate(:status, account: account, thread: parent, visibility: :direct) }
 
   before(:each) do
-    @serialization = ActiveModelSerializers::SerializableResource.new(parent, serializer: ActivityPub::NoteSerializer, adapter: ActivityPub::Adapter)
+    @serialization = ActiveModelSerializers::SerializableResource.new(parent, serializer: described_class, adapter: ActivityPub::Adapter)
   end
 
   it 'has a Note type' do
diff --git a/spec/serializers/activitypub/update_poll_serializer_spec.rb b/spec/serializers/activitypub/update_poll_serializer_spec.rb
index 4360808b5..14c24c70c 100644
--- a/spec/serializers/activitypub/update_poll_serializer_spec.rb
+++ b/spec/serializers/activitypub/update_poll_serializer_spec.rb
@@ -10,7 +10,7 @@ describe ActivityPub::UpdatePollSerializer do
   let!(:status) { Fabricate(:status, account: account, poll: poll) }
 
   before(:each) do
-    @serialization = ActiveModelSerializers::SerializableResource.new(status, serializer: ActivityPub::UpdatePollSerializer, adapter: ActivityPub::Adapter)
+    @serialization = ActiveModelSerializers::SerializableResource.new(status, serializer: described_class, adapter: ActivityPub::Adapter)
   end
 
   it 'has a Update type' do
diff --git a/spec/serializers/rest/account_serializer_spec.rb b/spec/serializers/rest/account_serializer_spec.rb
index 528639943..e399e88f3 100644
--- a/spec/serializers/rest/account_serializer_spec.rb
+++ b/spec/serializers/rest/account_serializer_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe REST::AccountSerializer do
-  subject { JSON.parse(ActiveModelSerializers::SerializableResource.new(account, serializer: REST::AccountSerializer).to_json) }
+  subject { JSON.parse(ActiveModelSerializers::SerializableResource.new(account, serializer: described_class).to_json) }
 
   let(:role)    { Fabricate(:user_role, name: 'Role', highlighted: true) }
   let(:user)    { Fabricate(:user, role: role) }
diff --git a/spec/services/activitypub/fetch_remote_account_service_spec.rb b/spec/services/activitypub/fetch_remote_account_service_spec.rb
index 868bc2a58..ac7484d96 100644
--- a/spec/services/activitypub/fetch_remote_account_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_account_service_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe ActivityPub::FetchRemoteAccountService, type: :service do
-  subject { ActivityPub::FetchRemoteAccountService.new }
+  subject { described_class.new }
 
   let!(:actor) do
     {
diff --git a/spec/services/activitypub/fetch_remote_actor_service_spec.rb b/spec/services/activitypub/fetch_remote_actor_service_spec.rb
index a72c6941e..93d31b69d 100644
--- a/spec/services/activitypub/fetch_remote_actor_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_actor_service_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe ActivityPub::FetchRemoteActorService, type: :service do
-  subject { ActivityPub::FetchRemoteActorService.new }
+  subject { described_class.new }
 
   let!(:actor) do
     {
diff --git a/spec/services/activitypub/fetch_remote_key_service_spec.rb b/spec/services/activitypub/fetch_remote_key_service_spec.rb
index 0ec0c2736..cd8f29ddd 100644
--- a/spec/services/activitypub/fetch_remote_key_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_key_service_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe ActivityPub::FetchRemoteKeyService, type: :service do
-  subject { ActivityPub::FetchRemoteKeyService.new }
+  subject { described_class.new }
 
   let(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice' }] } }
 
diff --git a/spec/services/after_block_domain_from_account_service_spec.rb b/spec/services/after_block_domain_from_account_service_spec.rb
index b75f92372..9bfaa3580 100644
--- a/spec/services/after_block_domain_from_account_service_spec.rb
+++ b/spec/services/after_block_domain_from_account_service_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe AfterBlockDomainFromAccountService, type: :service do
-  subject { AfterBlockDomainFromAccountService.new }
+  subject { described_class.new }
 
   let!(:wolf) { Fabricate(:account, username: 'wolf', domain: 'evil.org', inbox_url: 'https://evil.org/inbox', protocol: :activitypub) }
   let!(:alice) { Fabricate(:account, username: 'alice') }
diff --git a/spec/services/authorize_follow_service_spec.rb b/spec/services/authorize_follow_service_spec.rb
index 63d9e2a0f..d07645ab6 100644
--- a/spec/services/authorize_follow_service_spec.rb
+++ b/spec/services/authorize_follow_service_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe AuthorizeFollowService, type: :service do
-  subject { AuthorizeFollowService.new }
+  subject { described_class.new }
 
   let(:sender) { Fabricate(:account, username: 'alice') }
 
diff --git a/spec/services/batched_remove_status_service_spec.rb b/spec/services/batched_remove_status_service_spec.rb
index 9bedf3744..c0cd01315 100644
--- a/spec/services/batched_remove_status_service_spec.rb
+++ b/spec/services/batched_remove_status_service_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe BatchedRemoveStatusService, type: :service do
-  subject { BatchedRemoveStatusService.new }
+  subject { described_class.new }
 
   let!(:alice)  { Fabricate(:account) }
   let!(:bob)    { Fabricate(:account, username: 'bob', domain: 'example.com') }
diff --git a/spec/services/block_domain_service_spec.rb b/spec/services/block_domain_service_spec.rb
index 0ab97b8ce..93722a15b 100644
--- a/spec/services/block_domain_service_spec.rb
+++ b/spec/services/block_domain_service_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe BlockDomainService, type: :service do
-  subject { BlockDomainService.new }
+  subject { described_class.new }
 
   let!(:bad_account) { Fabricate(:account, username: 'badguy666', domain: 'evil.org') }
   let!(:bad_status1) { Fabricate(:status, account: bad_account, text: 'You suck') }
diff --git a/spec/services/block_service_spec.rb b/spec/services/block_service_spec.rb
index 75f07f5ad..5f7c2e8da 100644
--- a/spec/services/block_service_spec.rb
+++ b/spec/services/block_service_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe BlockService, type: :service do
-  subject { BlockService.new }
+  subject { described_class.new }
 
   let(:sender) { Fabricate(:account, username: 'alice') }
 
diff --git a/spec/services/bootstrap_timeline_service_spec.rb b/spec/services/bootstrap_timeline_service_spec.rb
index 670ac652f..5a15ba741 100644
--- a/spec/services/bootstrap_timeline_service_spec.rb
+++ b/spec/services/bootstrap_timeline_service_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe BootstrapTimelineService, type: :service do
-  subject { BootstrapTimelineService.new }
+  subject { described_class.new }
 
   context 'when the new user has registered from an invite' do
     let(:service)    { double }
diff --git a/spec/services/bulk_import_row_service_spec.rb b/spec/services/bulk_import_row_service_spec.rb
index 5bbe6b004..5e09845b5 100644
--- a/spec/services/bulk_import_row_service_spec.rb
+++ b/spec/services/bulk_import_row_service_spec.rb
@@ -91,5 +91,77 @@ RSpec.describe BulkImportRowService do
         end
       end
     end
+
+    context 'when importing a list row' do
+      let(:import_type) { 'lists' }
+      let(:target_account) { Fabricate(:account) }
+      let(:data) do
+        { 'acct' => target_account.acct, 'list_name' => 'my list' }
+      end
+
+      shared_examples 'common behavior' do
+        context 'when the target account is already followed' do
+          before do
+            account.follow!(target_account)
+          end
+
+          it 'returns true' do
+            expect(subject.call(import_row)).to be true
+          end
+
+          it 'adds the target account to the list' do
+            expect { subject.call(import_row) }.to change { ListAccount.joins(:list).exists?(account_id: target_account.id, list: { title: 'my list' }) }.from(false).to(true)
+          end
+        end
+
+        context 'when the user already requested to follow the target account' do
+          before do
+            account.request_follow!(target_account)
+          end
+
+          it 'returns true' do
+            expect(subject.call(import_row)).to be true
+          end
+
+          it 'adds the target account to the list' do
+            expect { subject.call(import_row) }.to change { ListAccount.joins(:list).exists?(account_id: target_account.id, list: { title: 'my list' }) }.from(false).to(true)
+          end
+        end
+
+        context 'when the target account is neither followed nor requested' do
+          it 'returns true' do
+            expect(subject.call(import_row)).to be true
+          end
+
+          it 'adds the target account to the list' do
+            expect { subject.call(import_row) }.to change { ListAccount.joins(:list).exists?(account_id: target_account.id, list: { title: 'my list' }) }.from(false).to(true)
+          end
+        end
+
+        context 'when the target account is the user themself' do
+          let(:target_account) { account }
+
+          it 'returns true' do
+            expect(subject.call(import_row)).to be true
+          end
+
+          it 'adds the target account to the list' do
+            expect { subject.call(import_row) }.to change { ListAccount.joins(:list).exists?(account_id: target_account.id, list: { title: 'my list' }) }.from(false).to(true)
+          end
+        end
+      end
+
+      context 'when the list does not exist yet' do
+        include_examples 'common behavior'
+      end
+
+      context 'when the list exists' do
+        before do
+          Fabricate(:list, account: account, title: 'my list')
+        end
+
+        include_examples 'common behavior'
+      end
+    end
   end
 end
diff --git a/spec/services/clear_domain_media_service_spec.rb b/spec/services/clear_domain_media_service_spec.rb
index 987507579..2a00409a4 100644
--- a/spec/services/clear_domain_media_service_spec.rb
+++ b/spec/services/clear_domain_media_service_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe ClearDomainMediaService, type: :service do
-  subject { ClearDomainMediaService.new }
+  subject { described_class.new }
 
   let!(:bad_account) { Fabricate(:account, username: 'badguy666', domain: 'evil.org') }
   let!(:bad_status1) { Fabricate(:status, account: bad_account, text: 'You suck') }
diff --git a/spec/services/favourite_service_spec.rb b/spec/services/favourite_service_spec.rb
index 613ae203e..782c235c4 100644
--- a/spec/services/favourite_service_spec.rb
+++ b/spec/services/favourite_service_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe FavouriteService, type: :service do
-  subject { FavouriteService.new }
+  subject { described_class.new }
 
   let(:sender) { Fabricate(:account, username: 'alice') }
 
diff --git a/spec/services/fetch_link_card_service_spec.rb b/spec/services/fetch_link_card_service_spec.rb
index 7016ecd3f..133d66441 100644
--- a/spec/services/fetch_link_card_service_spec.rb
+++ b/spec/services/fetch_link_card_service_spec.rb
@@ -12,6 +12,7 @@ RSpec.describe FetchLinkCardService, type: :service do
     stub_request(:get, 'http://example.com/koi8-r').to_return(request_fixture('koi8-r.txt'))
     stub_request(:get, 'http://example.com/日本語').to_return(request_fixture('sjis.txt'))
     stub_request(:get, 'https://github.com/qbi/WannaCry').to_return(status: 404)
+    stub_request(:get, 'http://example.com/test?data=file.gpx%5E1').to_return(status: 200)
     stub_request(:get, 'http://example.com/test-').to_return(request_fixture('idn.txt'))
     stub_request(:get, 'http://example.com/windows-1251').to_return(request_fixture('windows-1251.txt'))
 
@@ -19,7 +20,7 @@ RSpec.describe FetchLinkCardService, type: :service do
   end
 
   context 'with a local status' do
-    context do
+    context 'with an IDN url' do
       let(:status) { Fabricate(:status, text: 'Check out http://example.中国') }
 
       it 'works with IDN URLs' do
@@ -27,7 +28,7 @@ RSpec.describe FetchLinkCardService, type: :service do
       end
     end
 
-    context do
+    context 'with an SJIS url' do
       let(:status) { Fabricate(:status, text: 'Check out http://example.com/sjis') }
 
       it 'works with SJIS' do
@@ -36,7 +37,7 @@ RSpec.describe FetchLinkCardService, type: :service do
       end
     end
 
-    context do
+    context 'with invalid SJIS url' do
       let(:status) { Fabricate(:status, text: 'Check out http://example.com/sjis_with_wrong_charset') }
 
       it 'works with SJIS even with wrong charset header' do
@@ -45,7 +46,7 @@ RSpec.describe FetchLinkCardService, type: :service do
       end
     end
 
-    context do
+    context 'with an koi8-r url' do
       let(:status) { Fabricate(:status, text: 'Check out http://example.com/koi8-r') }
 
       it 'works with koi8-r' do
@@ -54,7 +55,7 @@ RSpec.describe FetchLinkCardService, type: :service do
       end
     end
 
-    context do
+    context 'with a windows-1251 url' do
       let(:status) { Fabricate(:status, text: 'Check out http://example.com/windows-1251') }
 
       it 'works with windows-1251' do
@@ -63,7 +64,7 @@ RSpec.describe FetchLinkCardService, type: :service do
       end
     end
 
-    context do
+    context 'with a japanese path url' do
       let(:status) { Fabricate(:status, text: 'テストhttp://example.com/日本語') }
 
       it 'works with Japanese path string' do
@@ -72,7 +73,7 @@ RSpec.describe FetchLinkCardService, type: :service do
       end
     end
 
-    context do
+    context 'with a hyphen-suffixed url' do
       let(:status) { Fabricate(:status, text: 'test http://example.com/test-') }
 
       it 'works with a URL ending with a hyphen' do
@@ -80,13 +81,22 @@ RSpec.describe FetchLinkCardService, type: :service do
       end
     end
 
-    context do
+    context 'with an isolated url' do
       let(:status) { Fabricate(:status, text: 'testhttp://example.com/sjis') }
 
       it 'does not fetch URLs with not isolated from their surroundings' do
         expect(a_request(:get, 'http://example.com/sjis')).to_not have_been_made
       end
     end
+
+    context 'with a url that has a caret' do
+      let(:status) { Fabricate(:status, text: 'test http://example.com/test?data=file.gpx^1') }
+
+      it 'does fetch URLs with a caret in search params' do
+        expect(a_request(:get, 'http://example.com/test?data=file.gpx')).to_not have_been_made
+        expect(a_request(:get, 'http://example.com/test?data=file.gpx%5E1')).to have_been_made.once
+      end
+    end
   end
 
   context 'with a remote status' do
diff --git a/spec/services/follow_service_spec.rb b/spec/services/follow_service_spec.rb
index c9521e3c8..c2ad0d717 100644
--- a/spec/services/follow_service_spec.rb
+++ b/spec/services/follow_service_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe FollowService, type: :service do
-  subject { FollowService.new }
+  subject { described_class.new }
 
   let(:sender) { Fabricate(:account, username: 'alice') }
 
diff --git a/spec/services/import_service_spec.rb b/spec/services/import_service_spec.rb
index 7f8e5855f..32ba4409c 100644
--- a/spec/services/import_service_spec.rb
+++ b/spec/services/import_service_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe ImportService, type: :service do
   end
 
   context 'when importing old-style list of muted users' do
-    subject { ImportService.new }
+    subject { described_class.new }
 
     let(:csv) { attachment_fixture('mute-imports.txt') }
 
@@ -52,7 +52,7 @@ RSpec.describe ImportService, type: :service do
   end
 
   context 'when importing new-style list of muted users' do
-    subject { ImportService.new }
+    subject { described_class.new }
 
     let(:csv) { attachment_fixture('new-mute-imports.txt') }
 
@@ -93,7 +93,7 @@ RSpec.describe ImportService, type: :service do
   end
 
   context 'when importing old-style list of followed users' do
-    subject { ImportService.new }
+    subject { described_class.new }
 
     let(:csv) { attachment_fixture('mute-imports.txt') }
 
@@ -135,7 +135,7 @@ RSpec.describe ImportService, type: :service do
   end
 
   context 'when importing new-style list of followed users' do
-    subject { ImportService.new }
+    subject { described_class.new }
 
     let(:csv) { attachment_fixture('new-following-imports.txt') }
 
@@ -182,7 +182,7 @@ RSpec.describe ImportService, type: :service do
   #
   # https://github.com/mastodon/mastodon/issues/20571
   context 'with a utf-8 encoded domains' do
-    subject { ImportService.new }
+    subject { described_class.new }
 
     let!(:nare) { Fabricate(:account, username: 'nare', domain: 'թութ.հայ', locked: false, protocol: :activitypub, inbox_url: 'https://թութ.հայ/inbox') }
     let(:csv) { attachment_fixture('utf8-followers.txt') }
@@ -201,7 +201,7 @@ RSpec.describe ImportService, type: :service do
   end
 
   context 'when importing bookmarks' do
-    subject { ImportService.new }
+    subject { described_class.new }
 
     let(:csv) { attachment_fixture('bookmark-imports.txt') }
     let(:local_account)  { Fabricate(:account, username: 'foo', domain: '') }
diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb
index 8c99431fa..8fcb58658 100644
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@ -127,7 +127,7 @@ RSpec.describe NotifyService, type: :service do
     end
   end
 
-  context do
+  context 'with muted and blocked users' do
     let(:asshole)  { Fabricate(:account, username: 'asshole') }
     let(:reply_to) { Fabricate(:status, account: asshole) }
     let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, thread: reply_to)) }
@@ -144,7 +144,7 @@ RSpec.describe NotifyService, type: :service do
     end
   end
 
-  context do
+  context 'with sender as recipient' do
     let(:sender) { recipient }
 
     it 'does not notify when recipient is the sender' do
diff --git a/spec/services/post_status_service_spec.rb b/spec/services/post_status_service_spec.rb
index f57712271..76ef5391f 100644
--- a/spec/services/post_status_service_spec.rb
+++ b/spec/services/post_status_service_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe PostStatusService, type: :service do
-  subject { PostStatusService.new }
+  subject { described_class.new }
 
   it 'creates a new status' do
     account = Fabricate(:account)
diff --git a/spec/services/precompute_feed_service_spec.rb b/spec/services/precompute_feed_service_spec.rb
index 18ba00244..54e0d94ee 100644
--- a/spec/services/precompute_feed_service_spec.rb
+++ b/spec/services/precompute_feed_service_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe PrecomputeFeedService, type: :service do
-  subject { PrecomputeFeedService.new }
+  subject { described_class.new }
 
   describe 'call' do
     let(:account) { Fabricate(:account) }
diff --git a/spec/services/process_mentions_service_spec.rb b/spec/services/process_mentions_service_spec.rb
index 399800b2a..0db73c41f 100644
--- a/spec/services/process_mentions_service_spec.rb
+++ b/spec/services/process_mentions_service_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe ProcessMentionsService, type: :service do
-  subject { ProcessMentionsService.new }
+  subject { described_class.new }
 
   let(:account) { Fabricate(:account, username: 'alice') }
 
@@ -37,7 +37,7 @@ RSpec.describe ProcessMentionsService, type: :service do
     let(:status) { Fabricate(:status, account: account, text: "Hello @#{remote_user.acct}", visibility: :public) }
 
     context 'with ActivityPub' do
-      context do
+      context 'with a valid remote user' do
         let!(:remote_user) { Fabricate(:account, username: 'remote_user', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
 
         before do
diff --git a/spec/services/purge_domain_service_spec.rb b/spec/services/purge_domain_service_spec.rb
index 310affa5e..89ab4d8d9 100644
--- a/spec/services/purge_domain_service_spec.rb
+++ b/spec/services/purge_domain_service_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe PurgeDomainService, type: :service do
-  subject { PurgeDomainService.new }
+  subject { described_class.new }
 
   let!(:old_account) { Fabricate(:account, domain: 'obsolete.org') }
   let!(:old_status1) { Fabricate(:status, account: old_account) }
diff --git a/spec/services/reblog_service_spec.rb b/spec/services/reblog_service_spec.rb
index 69500848d..7b85e37ed 100644
--- a/spec/services/reblog_service_spec.rb
+++ b/spec/services/reblog_service_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe ReblogService, type: :service do
   let(:alice)  { Fabricate(:account, username: 'alice') }
 
   context 'when creates a reblog with appropriate visibility' do
-    subject { ReblogService.new }
+    subject { described_class.new }
 
     let(:visibility)        { :public }
     let(:reblog_visibility) { :public }
@@ -62,7 +62,7 @@ RSpec.describe ReblogService, type: :service do
   end
 
   context 'with ActivityPub' do
-    subject { ReblogService.new }
+    subject { described_class.new }
 
     let(:bob)    { Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
     let(:status) { Fabricate(:status, account: bob) }
diff --git a/spec/services/reject_follow_service_spec.rb b/spec/services/reject_follow_service_spec.rb
index be9363d84..d28104b2c 100644
--- a/spec/services/reject_follow_service_spec.rb
+++ b/spec/services/reject_follow_service_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe RejectFollowService, type: :service do
-  subject { RejectFollowService.new }
+  subject { described_class.new }
 
   let(:sender) { Fabricate(:account, username: 'alice') }
 
diff --git a/spec/services/remove_from_followers_service_spec.rb b/spec/services/remove_from_followers_service_spec.rb
index 21cea2e4f..1b29cdcbe 100644
--- a/spec/services/remove_from_followers_service_spec.rb
+++ b/spec/services/remove_from_followers_service_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe RemoveFromFollowersService, type: :service do
-  subject { RemoveFromFollowersService.new }
+  subject { described_class.new }
 
   let(:bob) { Fabricate(:account, username: 'bob') }
 
diff --git a/spec/services/remove_status_service_spec.rb b/spec/services/remove_status_service_spec.rb
index a836109a0..77b01d307 100644
--- a/spec/services/remove_status_service_spec.rb
+++ b/spec/services/remove_status_service_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe RemoveStatusService, type: :service do
-  subject { RemoveStatusService.new }
+  subject { described_class.new }
 
   let!(:alice)  { Fabricate(:account) }
   let!(:bob)    { Fabricate(:account, username: 'bob', domain: 'example.com') }
diff --git a/spec/services/translate_status_service_spec.rb b/spec/services/translate_status_service_spec.rb
new file mode 100644
index 000000000..074f55544
--- /dev/null
+++ b/spec/services/translate_status_service_spec.rb
@@ -0,0 +1,226 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe TranslateStatusService, type: :service do
+  subject(:service) { described_class.new }
+
+  let(:status) { Fabricate(:status, text: text, spoiler_text: spoiler_text, language: 'en', preloadable_poll: poll, media_attachments: media_attachments) }
+  let(:text) { 'Hello' }
+  let(:spoiler_text) { '' }
+  let(:poll) { nil }
+  let(:media_attachments) { [] }
+
+  before do
+    Fabricate(:custom_emoji, shortcode: 'highfive')
+  end
+
+  describe '#call' do
+    before do
+      translation_service = TranslationService.new
+      allow(translation_service).to receive(:languages).and_return({ 'en' => ['es'] })
+      allow(translation_service).to receive(:translate) do |texts|
+        texts.map do |text|
+          TranslationService::Translation.new(
+            text: text.gsub('Hello', 'Hola').gsub('higfive', 'cincoaltos'),
+            detected_source_language: 'en',
+            provider: 'Dummy'
+          )
+        end
+      end
+
+      allow(TranslationService).to receive(:configured?).and_return(true)
+      allow(TranslationService).to receive(:configured).and_return(translation_service)
+    end
+
+    it 'returns translated status content' do
+      expect(service.call(status, 'es').content).to eq '<p>Hola</p>'
+    end
+
+    it 'returns source language' do
+      expect(service.call(status, 'es').detected_source_language).to eq 'en'
+    end
+
+    it 'returns translation provider' do
+      expect(service.call(status, 'es').provider).to eq 'Dummy'
+    end
+
+    it 'returns original status' do
+      expect(service.call(status, 'es').status).to eq status
+    end
+
+    describe 'status has content with custom emoji' do
+      let(:text) { 'Hello & :highfive:' }
+
+      it 'does not translate shortcode' do
+        expect(service.call(status, 'es').content).to eq '<p>Hola &amp; :highfive:</p>'
+      end
+    end
+
+    describe 'status has no spoiler_text' do
+      it 'returns an empty string' do
+        expect(service.call(status, 'es').spoiler_text).to eq ''
+      end
+    end
+
+    describe 'status has spoiler_text' do
+      let(:spoiler_text) { 'Hello & Hello!' }
+
+      it 'translates the spoiler text' do
+        expect(service.call(status, 'es').spoiler_text).to eq 'Hola & Hola!'
+      end
+    end
+
+    describe 'status has spoiler_text with custom emoji' do
+      let(:spoiler_text) { 'Hello :highfive:' }
+
+      it 'does not translate shortcode' do
+        expect(service.call(status, 'es').spoiler_text).to eq 'Hola :highfive:'
+      end
+    end
+
+    describe 'status has spoiler_text with unmatched custom emoji' do
+      let(:spoiler_text) { 'Hello :Hello:' }
+
+      it 'translates the invalid shortcode' do
+        expect(service.call(status, 'es').spoiler_text).to eq 'Hola :Hola:'
+      end
+    end
+
+    describe 'status has poll' do
+      let(:poll) { Fabricate(:poll, options: ['Hello 1', 'Hello 2']) }
+
+      it 'translates the poll option title' do
+        status_translation = service.call(status, 'es')
+        expect(status_translation.poll_options.size).to eq 2
+        expect(status_translation.poll_options.first.title).to eq 'Hola 1'
+      end
+    end
+
+    describe 'status has media attachment' do
+      let(:media_attachments) { [Fabricate(:media_attachment, description: 'Hello & :highfive:')] }
+
+      it 'translates the media attachment description' do
+        status_translation = service.call(status, 'es')
+
+        media_attachment = status_translation.media_attachments.first
+        expect(media_attachment.id).to eq media_attachments.first.id
+        expect(media_attachment.description).to eq 'Hola & :highfive:'
+      end
+    end
+  end
+
+  describe '#source_texts' do
+    before do
+      service.instance_variable_set(:@status, status)
+    end
+
+    describe 'status only has content' do
+      it 'returns formatted content' do
+        expect(service.send(:source_texts)).to eq({ content: '<p>Hello</p>' })
+      end
+    end
+
+    describe 'status content contains custom emoji' do
+      let(:status) { Fabricate(:status, text: 'Hello :highfive:') }
+
+      it 'returns formatted content' do
+        source_texts = service.send(:source_texts)
+        expect(source_texts[:content]).to eq '<p>Hello <span translate="no">:highfive:</span></p>'
+      end
+    end
+
+    describe 'status content contains tags' do
+      let(:status) { Fabricate(:status, text: 'Hello #hola') }
+
+      it 'returns formatted content' do
+        source_texts = service.send(:source_texts)
+        expect(source_texts[:content]).to include '<p>Hello <a'
+        expect(source_texts[:content]).to include '/tags/hola'
+      end
+    end
+
+    describe 'status has spoiler text' do
+      let(:status) { Fabricate(:status, spoiler_text: 'Hello :highfive:') }
+
+      it 'returns formatted spoiler text' do
+        source_texts = service.send(:source_texts)
+        expect(source_texts[:spoiler_text]).to eq 'Hello <span translate="no">:highfive:</span>'
+      end
+    end
+
+    describe 'status has poll' do
+      let(:poll) { Fabricate(:poll, options: %w(Blue Green)) }
+
+      it 'returns formatted poll options' do
+        source_texts = service.send(:source_texts)
+        expect(source_texts.size).to eq 3
+        expect(source_texts.values).to eq %w(<p>Hello</p> Blue Green)
+
+        expect(source_texts.keys.first).to eq :content
+
+        option1 = source_texts.keys.second
+        expect(option1).to be_a Poll::Option
+        expect(option1.id).to eq '0'
+        expect(option1.title).to eq 'Blue'
+
+        option2 = source_texts.keys.third
+        expect(option2).to be_a Poll::Option
+        expect(option2.id).to eq '1'
+        expect(option2.title).to eq 'Green'
+      end
+    end
+
+    describe 'status has poll with custom emoji' do
+      let(:poll) { Fabricate(:poll, options: ['Blue', 'Green :highfive:']) }
+
+      it 'returns formatted poll options' do
+        html = service.send(:source_texts).values.last
+        expect(html).to eq 'Green <span translate="no">:highfive:</span>'
+      end
+    end
+
+    describe 'status has media attachments' do
+      let(:text) { '' }
+      let(:media_attachments) { [Fabricate(:media_attachment, description: 'Hello :highfive:')] }
+
+      it 'returns media attachments without custom emoji rendering' do
+        source_texts = service.send(:source_texts)
+        expect(source_texts.size).to eq 1
+
+        key, text = source_texts.first
+        expect(key).to eq media_attachments.first
+        expect(text).to eq 'Hello :highfive:'
+      end
+    end
+  end
+
+  describe '#wrap_emoji_shortcodes' do
+    before do
+      service.instance_variable_set(:@status, status)
+    end
+
+    describe 'string contains custom emoji' do
+      let(:text) { ':highfive:' }
+
+      it 'renders the emoji' do
+        html = service.send(:wrap_emoji_shortcodes, 'Hello :highfive:'.html_safe)
+        expect(html).to eq 'Hello <span translate="no">:highfive:</span>'
+      end
+    end
+  end
+
+  describe '#unwrap_emoji_shortcodes' do
+    describe 'string contains custom emoji' do
+      it 'inserts the shortcode' do
+        fragment = service.send(:unwrap_emoji_shortcodes, '<p>Hello <span translate="no">:highfive:</span>!</p>')
+        expect(fragment.to_html).to eq '<p>Hello :highfive:!</p>'
+      end
+
+      it 'preserves other attributes than translate=no' do
+        fragment = service.send(:unwrap_emoji_shortcodes, '<p>Hello <span translate="no" class="foo">:highfive:</span>!</p>')
+        expect(fragment.to_html).to eq '<p>Hello <span class="foo">:highfive:</span>!</p>'
+      end
+    end
+  end
+end
diff --git a/spec/services/unallow_domain_service_spec.rb b/spec/services/unallow_domain_service_spec.rb
index fbc1d5959..4db718d07 100644
--- a/spec/services/unallow_domain_service_spec.rb
+++ b/spec/services/unallow_domain_service_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe UnallowDomainService, type: :service do
-  subject { UnallowDomainService.new }
+  subject { described_class.new }
 
   let!(:bad_account) { Fabricate(:account, username: 'badguy666', domain: 'evil.org') }
   let!(:bad_status1) { Fabricate(:status, account: bad_account, text: 'You suck') }
diff --git a/spec/services/unblock_service_spec.rb b/spec/services/unblock_service_spec.rb
index 8098d7e6d..86632c393 100644
--- a/spec/services/unblock_service_spec.rb
+++ b/spec/services/unblock_service_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe UnblockService, type: :service do
-  subject { UnblockService.new }
+  subject { described_class.new }
 
   let(:sender) { Fabricate(:account, username: 'alice') }
 
diff --git a/spec/services/unfollow_service_spec.rb b/spec/services/unfollow_service_spec.rb
index a12f01fa5..3e65e610b 100644
--- a/spec/services/unfollow_service_spec.rb
+++ b/spec/services/unfollow_service_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe UnfollowService, type: :service do
-  subject { UnfollowService.new }
+  subject { described_class.new }
 
   let(:sender) { Fabricate(:account, username: 'alice') }
 
diff --git a/spec/services/unmute_service_spec.rb b/spec/services/unmute_service_spec.rb
index 2edb6cfc2..236f837e2 100644
--- a/spec/services/unmute_service_spec.rb
+++ b/spec/services/unmute_service_spec.rb
@@ -3,5 +3,5 @@
 require 'rails_helper'
 
 RSpec.describe UnmuteService, type: :service do
-  subject { UnmuteService.new }
+  subject { described_class.new }
 end
diff --git a/spec/services/update_account_service_spec.rb b/spec/services/update_account_service_spec.rb
index a711a8ae7..6318cc95f 100644
--- a/spec/services/update_account_service_spec.rb
+++ b/spec/services/update_account_service_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe UpdateAccountService, type: :service do
-  subject { UpdateAccountService.new }
+  subject { described_class.new }
 
   describe 'switching form locked to unlocked accounts' do
     let(:account) { Fabricate(:account, locked: true) }
diff --git a/spec/support/examples/models/concerns/account_avatar.rb b/spec/support/examples/models/concerns/account_avatar.rb
index 2180f5273..8f5b81f3a 100644
--- a/spec/support/examples/models/concerns/account_avatar.rb
+++ b/spec/support/examples/models/concerns/account_avatar.rb
@@ -17,7 +17,7 @@ shared_examples 'AccountAvatar' do |fabricator|
     end
   end
 
-  describe 'base64-encoded files' do
+  describe 'base64-encoded files', paperclip_processing: true do
     let(:base64_attachment) { "data:image/jpeg;base64,#{Base64.encode64(attachment_fixture('attachment.jpg').read)}" }
     let(:account) { Fabricate(fabricator, avatar: base64_attachment) }
 
diff --git a/spec/support/examples/models/concerns/account_header.rb b/spec/support/examples/models/concerns/account_header.rb
index 77ee0e629..d65f54f00 100644
--- a/spec/support/examples/models/concerns/account_header.rb
+++ b/spec/support/examples/models/concerns/account_header.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 shared_examples 'AccountHeader' do |fabricator|
-  describe 'base64-encoded files' do
+  describe 'base64-encoded files', paperclip_processing: true do
     let(:base64_attachment) { "data:image/jpeg;base64,#{Base64.encode64(attachment_fixture('attachment.jpg').read)}" }
     let(:account) { Fabricate(fabricator, header: base64_attachment) }
 
diff --git a/spec/validators/note_length_validator_spec.rb b/spec/validators/note_length_validator_spec.rb
index 390ac8d90..e45d221d7 100644
--- a/spec/validators/note_length_validator_spec.rb
+++ b/spec/validators/note_length_validator_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe NoteLengthValidator do
-  subject { NoteLengthValidator.new(attributes: { note: true }, maximum: 500) }
+  subject { described_class.new(attributes: { note: true }, maximum: 500) }
 
   describe '#validate' do
     it 'adds an error when text is over 500 characters' do
diff --git a/streaming/index.js b/streaming/index.js
index 36c99ca8f..916962c59 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -52,18 +52,31 @@ const redisUrlToClient = async (defaultConfig, redisUrl) => {
 };
 
 /**
+ * Attempts to safely parse a string as JSON, used when both receiving a message
+ * from redis and when receiving a message from a client over a websocket
+ * connection, this is why it accepts a `req` argument.
  * @param {string} json
- * @param {any} req
+ * @param {any?} req
  * @returns {Object.<string, any>|null}
  */
 const parseJSON = (json, req) => {
   try {
     return JSON.parse(json);
   } catch (err) {
-    if (req.accountId) {
-      log.warn(req.requestId, `Error parsing message from user ${req.accountId}: ${err}`);
+    /* FIXME: This logging isn't great, and should probably be done at the
+     * call-site of parseJSON, not in the method, but this would require changing
+     * the signature of parseJSON to return something akin to a Result type:
+     * [Error|null, null|Object<string,any}], and then handling the error
+     * scenarios.
+     */
+    if (req) {
+      if (req.accountId) {
+        log.warn(req.requestId, `Error parsing message from user ${req.accountId}: ${err}`);
+      } else {
+        log.silly(req.requestId, `Error parsing message from ${req.remoteAddress}: ${err}`);
+      }
     } else {
-      log.silly(req.requestId, `Error parsing message from ${req.remoteAddress}: ${err}`);
+      log.warn(`Error parsing message from redis: ${err}`);
     }
     return null;
   }
@@ -163,7 +176,7 @@ const startServer = async () => {
   const { redisParams, redisUrl, redisPrefix } = redisConfigFromEnv(process.env);
 
   /**
-   * @type {Object.<string, Array.<function(string): void>>}
+   * @type {Object.<string, Array.<function(Object<string, any>): void>>}
    */
   const subs = {};
 
@@ -203,7 +216,10 @@ const startServer = async () => {
       return;
     }
 
-    callbacks.forEach(callback => callback(message));
+    const json = parseJSON(message, null);
+    if (!json) return;
+
+    callbacks.forEach(callback => callback(json));
   };
 
   /**
@@ -225,7 +241,7 @@ const startServer = async () => {
 
   /**
    * @param {string} channel
-   * @param {function(string): void} callback
+   * @param {function(Object<string, any>): void} callback
    */
   const unsubscribe = (channel, callback) => {
     log.silly(`Removing listener for ${channel}`);
@@ -369,7 +385,7 @@ const startServer = async () => {
 
   /**
    * @param {any} req
-   * @returns {string}
+   * @returns {string|undefined}
    */
   const channelNameFromPath = req => {
     const { path, query } = req;
@@ -478,15 +494,11 @@ const startServer = async () => {
   /**
    * @param {any} req
    * @param {SystemMessageHandlers} eventHandlers
-   * @returns {function(string): void}
+   * @returns {function(object): void}
    */
   const createSystemMessageListener = (req, eventHandlers) => {
     return message => {
-      const json = parseJSON(message, req);
-
-      if (!json) return;
-
-      const { event } = json;
+      const { event } = message;
 
       log.silly(req.requestId, `System message for ${req.accountId}: ${event}`);
 
@@ -604,19 +616,16 @@ const startServer = async () => {
    * @param {function(string[], function(string): void): void} attachCloseHandler
    * @param {boolean=} needsFiltering
    * @param {boolean=} allowLocalOnly
-   * @returns {function(string): void}
+   * @returns {function(object): void}
    */
   const streamFrom = (ids, req, output, attachCloseHandler, needsFiltering = false, allowLocalOnly = false) => {
     const accountId = req.accountId || req.remoteAddress;
 
     log.verbose(req.requestId, `Starting stream from ${ids.join(', ')} for ${accountId}`);
 
+    // Currently message is of type string, soon it'll be Record<string, any>
     const listener = message => {
-      const json = parseJSON(message, req);
-
-      if (!json) return;
-
-      const { event, payload, queued_at } = json;
+      const { event, payload, queued_at } = message;
 
       const transmit = () => {
         const now = new Date().getTime();
@@ -1219,8 +1228,15 @@ const startServer = async () => {
     ws.on('close', onEnd);
     ws.on('error', onEnd);
 
-    ws.on('message', data => {
-      const json = parseJSON(data, session.request);
+    ws.on('message', (data, isBinary) => {
+      if (isBinary) {
+        log.warn('socket', 'Received binary data, closing connection');
+        ws.close(1003, 'The mastodon streaming server does not support binary messages');
+        return;
+      }
+      const message = data.toString('utf8');
+
+      const json = parseJSON(message, session.request);
 
       if (!json) return;
 
diff --git a/yarn.lock b/yarn.lock
index 44a1ec91d..97f9da3f6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -24,7 +24,7 @@
     jsonpointer "^5.0.0"
     leven "^3.1.0"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.21.4":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4":
   version "7.21.4"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39"
   integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==
@@ -36,7 +36,28 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.3.tgz#cd502a6a0b6e37d7ad72ce7e71a7160a3ae36f7e"
   integrity sha512-aNtko9OPOwVESUFp3MZfD8Uzxl7JzSeJpd7npIoxCasU37PFbAQRpKglkaKwlHOyeJdrREpo8TW8ldrkYWwvIQ==
 
-"@babel/core@^7.11.1", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.22.1", "@babel/core@^7.7.2":
+"@babel/core@^7.10.4", "@babel/core@^7.11.1", "@babel/core@^7.11.6", "@babel/core@^7.12.3":
+  version "7.21.8"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.8.tgz#2a8c7f0f53d60100ba4c32470ba0281c92aa9aa4"
+  integrity sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ==
+  dependencies:
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.21.4"
+    "@babel/generator" "^7.21.5"
+    "@babel/helper-compilation-targets" "^7.21.5"
+    "@babel/helper-module-transforms" "^7.21.5"
+    "@babel/helpers" "^7.21.5"
+    "@babel/parser" "^7.21.8"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.21.5"
+    "@babel/types" "^7.21.5"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.2"
+    semver "^6.3.0"
+
+"@babel/core@^7.22.1":
   version "7.22.1"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.1.tgz#5de51c5206f4c6f5533562838337a603c1033cfd"
   integrity sha512-Hkqu7J4ynysSXxmAahpN1jjRwVJ+NdpraFLIWflgjpVob3KNyK3/tIUc7Q7szed8WMp0JNa7Qtd1E9Oo22F9gA==
@@ -57,7 +78,7 @@
     json5 "^2.2.2"
     semver "^6.3.0"
 
-"@babel/generator@^7.22.0", "@babel/generator@^7.22.3", "@babel/generator@^7.7.2":
+"@babel/generator@^7.21.5", "@babel/generator@^7.22.0", "@babel/generator@^7.22.3", "@babel/generator@^7.7.2":
   version "7.22.3"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.3.tgz#0ff675d2edb93d7596c5f6728b52615cfc0df01e"
   integrity sha512-C17MW4wlk//ES/CJDL51kPNwl+qiBQyN7b9SKyVp11BLGFeSPoVaHrv+MNt8jwQFhQWowW88z1eeBx3pFz9v8A==
@@ -90,7 +111,7 @@
     "@babel/helper-annotate-as-pure" "^7.18.6"
     "@babel/types" "^7.19.0"
 
-"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.1":
+"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.21.5", "@babel/helper-compilation-targets@^7.22.1":
   version "7.22.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.1.tgz#bfcd6b7321ffebe33290d68550e2c9d7eb7c7a58"
   integrity sha512-Rqx13UM3yVB5q0D/KwQ8+SPfX/+Rnsy1Lw1k/UwOC4KC6qrzIQoY3lYnBu5EHKBlEHHcj0M0W8ltPSkD8rqfsQ==
@@ -164,7 +185,7 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
   integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
 
-"@babel/helper-environment-visitor@^7.22.1":
+"@babel/helper-environment-visitor@^7.21.5", "@babel/helper-environment-visitor@^7.22.1":
   version "7.22.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.1.tgz#ac3a56dbada59ed969d712cf527bd8271fe3eba8"
   integrity sha512-Z2tgopurB/kTbidvzeBrc2To3PUP/9i5MUe+fU6QJCQDyPwSH2oRapkLw3KGECDYSjhQZCNxEvNvZlLw8JjGwA==
@@ -333,7 +354,7 @@
     "@babel/traverse" "^7.18.10"
     "@babel/types" "^7.18.10"
 
-"@babel/helpers@^7.22.0":
+"@babel/helpers@^7.21.5", "@babel/helpers@^7.22.0":
   version "7.22.3"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.3.tgz#53b74351da9684ea2f694bf0877998da26dd830e"
   integrity sha512-jBJ7jWblbgr7r6wYZHMdIqKc73ycaTcCaWRq4/2LpuPHcx7xMlZvpGQkOYc9HeSjn6rcx15CPlgVcBtZ4WZJ2w==
@@ -351,7 +372,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.9", "@babel/parser@^7.22.0", "@babel/parser@^7.22.4":
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.5", "@babel/parser@^7.21.8", "@babel/parser@^7.21.9", "@babel/parser@^7.22.0", "@babel/parser@^7.22.4":
   version "7.22.4"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.4.tgz#a770e98fd785c231af9d93f6459d36770993fb32"
   integrity sha512-VLLsx06XkEYqBtE5YGPwfSGwfrjnyPP5oiGty3S8pQLFDFLaS8VwWSIxkTXpcvr5zeYLE6+MBNl2npl/YnfofA==
@@ -460,7 +481,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.12.13", "@babel/plugin-syntax-jsx@^7.21.4", "@babel/plugin-syntax-jsx@^7.7.2":
+"@babel/plugin-syntax-jsx@7", "@babel/plugin-syntax-jsx@^7.12.13", "@babel/plugin-syntax-jsx@^7.21.4", "@babel/plugin-syntax-jsx@^7.7.2":
   version "7.21.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz#f264ed7bf40ffc9ec239edabc17a50c4f5b6fea2"
   integrity sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ==
@@ -1135,7 +1156,16 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.21.9", "@babel/template@^7.3.3":
+"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.3.3":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
+  integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
+
+"@babel/template@^7.21.9":
   version "7.21.9"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.21.9.tgz#bf8dad2859130ae46088a99c1f265394877446fb"
   integrity sha512-MK0X5k8NKOuWRamiEfc3KEJiHMTkGZNUjzMipqCGDDc6ijRl/B7RGSKVGncu4Ro/HdyzzY6cmoXuKI2Gffk7vQ==
@@ -1144,7 +1174,23 @@
     "@babel/parser" "^7.21.9"
     "@babel/types" "^7.21.5"
 
-"@babel/traverse@^7.18.10", "@babel/traverse@^7.20.7", "@babel/traverse@^7.22.1", "@babel/traverse@^7.7.2":
+"@babel/traverse@7":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.5.tgz#ad22361d352a5154b498299d523cf72998a4b133"
+  integrity sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw==
+  dependencies:
+    "@babel/code-frame" "^7.21.4"
+    "@babel/generator" "^7.21.5"
+    "@babel/helper-environment-visitor" "^7.21.5"
+    "@babel/helper-function-name" "^7.21.0"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/parser" "^7.21.5"
+    "@babel/types" "^7.21.5"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/traverse@^7.18.10", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.5", "@babel/traverse@^7.22.1", "@babel/traverse@^7.7.2":
   version "7.22.4"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.4.tgz#c3cf96c5c290bd13b55e29d025274057727664c0"
   integrity sha512-Tn1pDsjIcI+JcLKq1AVlZEr4226gpuAQTsLMorsYg9tuS/kG7nuwwJ4AB8jfQuEgb/COBwR/DqJxmoiYFu5/rQ==
@@ -1160,7 +1206,16 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.4", "@babel/types@^7.21.5", "@babel/types@^7.22.0", "@babel/types@^7.22.3", "@babel/types@^7.22.4", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.12.11", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.4", "@babel/types@^7.21.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.5.tgz#18dfbd47c39d3904d5db3d3dc2cc80bedb60e5b6"
+  integrity sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==
+  dependencies:
+    "@babel/helper-string-parser" "^7.21.5"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.22.0", "@babel/types@^7.22.3", "@babel/types@^7.22.4":
   version "7.22.4"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.4.tgz#56a2653ae7e7591365dabf20b76295410684c071"
   integrity sha512-Tx9x3UBHTTsMSW85WB2kphxYQVvrZ/t1FxD88IpSgIjiUJlCm9z+xWIDwyo1vffTwSqteqyznB8ZE9vYYk16zA==
@@ -1335,6 +1390,11 @@
   dependencies:
     "@floating-ui/core" "^1.0.1"
 
+"@formatjs/cli@^6.1.1":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@formatjs/cli/-/cli-6.1.1.tgz#089d6d25fe96490f8d1401a53705b3cdfefd7afb"
+  integrity sha512-prUblUQRJwFQqfmBtRWXZFKX+QmhXQkBKRl54hWTCwenskorK6+LTlm9TFbUDhfib2Xt3iDsjk7o9LpeU/AQCw==
+
 "@formatjs/ecma402-abstract@1.15.0":
   version "1.15.0"
   resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.15.0.tgz#0a285a5dc69889e15d53803bd5036272e23e5a18"
@@ -1343,6 +1403,13 @@
     "@formatjs/intl-localematcher" "0.2.32"
     tslib "^2.4.0"
 
+"@formatjs/fast-memoize@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-2.0.1.tgz#f15aaa73caad5562899c69bdcad8db82adcd3b0b"
+  integrity sha512-M2GgV+qJn5WJQAYewz7q2Cdl6fobQa69S1AzSM2y0P68ZDbK5cWrJIcPCO395Of1ksftGZoOt4LYCO/j9BKBSA==
+  dependencies:
+    tslib "^2.4.0"
+
 "@formatjs/icu-messageformat-parser@2.4.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.4.0.tgz#e165f3594c68416ce15f63793768251de2a85f88"
@@ -1360,6 +1427,24 @@
     "@formatjs/ecma402-abstract" "1.15.0"
     tslib "^2.4.0"
 
+"@formatjs/intl-displaynames@6.3.2":
+  version "6.3.2"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-6.3.2.tgz#be169393a132eed9ca9c10ccb9d22ab150e24c90"
+  integrity sha512-kBOh0O7QYKLUqaZujLSEF2+au017plPp63R6Hrokl+oDtLyTt9y9pEuCTbOKh/P8CC9THnDLKRKgeVWZw5Ek8A==
+  dependencies:
+    "@formatjs/ecma402-abstract" "1.15.0"
+    "@formatjs/intl-localematcher" "0.2.32"
+    tslib "^2.4.0"
+
+"@formatjs/intl-listformat@7.2.2":
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-7.2.2.tgz#d787932b5d6f1f936c73c5fec531692ab7069c7a"
+  integrity sha512-YIruRGwUrmgVOXjWi6VbwPcRNBkEfgK2DFjyyqopCmpfJ+39vnl46oLpVchErnuXs6kkARy5GcGaGV7xRsH4lw==
+  dependencies:
+    "@formatjs/ecma402-abstract" "1.15.0"
+    "@formatjs/intl-localematcher" "0.2.32"
+    tslib "^2.4.0"
+
 "@formatjs/intl-localematcher@0.2.32":
   version "0.2.32"
   resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.2.32.tgz#00d4d307cd7d514b298e15a11a369b86c8933ec1"
@@ -1367,17 +1452,27 @@
   dependencies:
     tslib "^2.4.0"
 
-"@formatjs/intl-unified-numberformat@^3.3.3":
-  version "3.3.6"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-unified-numberformat/-/intl-unified-numberformat-3.3.6.tgz#ab69818f7568894023cb31fdb5b5c7eed62c6537"
-  integrity sha512-VQYswh9Pxf4kN6FQvKprAQwSJrF93eJstCDPM1HIt3c3O6NqPFWNWhZ91PLTppOV11rLYsFK11ZxiGbnLNiPTg==
+"@formatjs/intl-pluralrules@^5.2.2":
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl-pluralrules/-/intl-pluralrules-5.2.2.tgz#6322d20a6d0172459e4faf4b0f06603c931673aa"
+  integrity sha512-mEbnbRzsSCIYqaBmrmUlOsPu5MG6KfMcnzekPzUrUucX2dNiI1KWBGHK6IoXl5c8zx60L1NXJ6cSQ7akoc15SQ==
   dependencies:
-    "@formatjs/intl-utils" "^2.2.5"
+    "@formatjs/ecma402-abstract" "1.15.0"
+    "@formatjs/intl-localematcher" "0.2.32"
+    tslib "^2.4.0"
 
-"@formatjs/intl-utils@^2.2.5":
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/@formatjs/intl-utils/-/intl-utils-2.2.5.tgz#eaafd94df3d102ee13e54e80f992a33868a6b1e8"
-  integrity sha512-p7gcmazKROteL4IECCp03Qrs790fZ8tbemUAjQu0+K0AaAlK49rI1SIFFq3LzDUAqXIshV95JJhRe/yXxkal5g==
+"@formatjs/intl@2.7.2":
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-2.7.2.tgz#83dc77080a984d4883195bed39eedd947ebfd3d7"
+  integrity sha512-ziiQfnXwY0/rXhtohSAmYMqDjRsihoMKdl8H2aA+FvxG9638E0XrvfBFCb+1HhimNiuqRz5fTY7F/bZtsJxsjA==
+  dependencies:
+    "@formatjs/ecma402-abstract" "1.15.0"
+    "@formatjs/fast-memoize" "2.0.1"
+    "@formatjs/icu-messageformat-parser" "2.4.0"
+    "@formatjs/intl-displaynames" "6.3.2"
+    "@formatjs/intl-listformat" "7.2.2"
+    intl-messageformat "10.3.5"
+    tslib "^2.4.0"
 
 "@formatjs/ts-transformer@3.13.1":
   version "3.13.1"
@@ -1648,6 +1743,15 @@
     "@jridgewell/set-array" "^1.0.0"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
+"@jridgewell/gen-mapping@^0.3.0":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
+  integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
 "@jridgewell/gen-mapping@^0.3.2":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
@@ -1672,6 +1776,14 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
+"@jridgewell/source-map@^0.3.2":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.3.tgz#8108265659d4c33e72ffe14e33d6cc5eb59f2fda"
+  integrity sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
 "@jridgewell/sourcemap-codec@1.4.14":
   version "1.4.14"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
@@ -1748,10 +1860,10 @@
     picocolors "^1.0.0"
     tslib "^2.5.0"
 
-"@polka/url@^1.0.0-next.9":
-  version "1.0.0-next.11"
-  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.11.tgz#aeb16f50649a91af79dbe36574b66d0f9e4d9f71"
-  integrity sha512-3NsZsJIA/22P3QUyrEDNA2D133H4j224twJrdipXN38dpnIOzAbUDtOwkcJ5pXmn75w7LSQDjA4tO9dm1XlqlA==
+"@polka/url@^1.0.0-next.20":
+  version "1.0.0-next.21"
+  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1"
+  integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==
 
 "@popperjs/core@^2.11.6":
   version "2.11.6"
@@ -1768,10 +1880,10 @@
   resolved "https://registry.yarnpkg.com/@redis/bloom/-/bloom-1.2.0.tgz#d3fd6d3c0af3ef92f26767b56414a370c7b63b71"
   integrity sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==
 
-"@redis/client@1.5.6":
-  version "1.5.6"
-  resolved "https://registry.yarnpkg.com/@redis/client/-/client-1.5.6.tgz#869cc65718d7d5493ef655a71dc40f3bc64a1b28"
-  integrity sha512-dFD1S6je+A47Lj22jN/upVU2fj4huR7S9APd7/ziUXsIXDL+11GPYti4Suv5y8FuXaN+0ZG4JF+y1houEJ7ToA==
+"@redis/client@1.5.8":
+  version "1.5.8"
+  resolved "https://registry.yarnpkg.com/@redis/client/-/client-1.5.8.tgz#a375ba7861825bd0d2dc512282b8bff7b98dbcb1"
+  integrity sha512-xzElwHIO6rBAqzPeVnCzgvrnBEcFL1P0w8P65VNLRkdVW8rOE58f52hdj0BDgmsdOm4f1EoXPZtH4Fh7M/qUpw==
   dependencies:
     cluster-key-slot "1.1.2"
     generic-pool "3.9.0"
@@ -1787,10 +1899,10 @@
   resolved "https://registry.yarnpkg.com/@redis/json/-/json-1.0.4.tgz#f372b5f93324e6ffb7f16aadcbcb4e5c3d39bda1"
   integrity sha512-LUZE2Gdrhg0Rx7AN+cZkb1e6HjoSKaeeW8rYnt89Tly13GBI5eP4CwDVr+MY8BAYfCg4/N15OUrtLoona9uSgw==
 
-"@redis/search@1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@redis/search/-/search-1.1.2.tgz#6a8f66ba90812d39c2457420f859ce8fbd8f3838"
-  integrity sha512-/cMfstG/fOh/SsE+4/BQGeuH/JJloeWuH+qJzM8dbxuWvdWibWAOAHHCZTMPhV3xIlH4/cUEIA8OV5QnYpaVoA==
+"@redis/search@1.1.3":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@redis/search/-/search-1.1.3.tgz#b5a6837522ce9028267fe6f50762a8bcfd2e998b"
+  integrity sha512-4Dg1JjvCevdiCBTZqjhKkGoC5/BcB7k9j99kdMnaXFXg8x4eyOIVg9487CMv7/BUVkFLZCaIh8ead9mU15DNng==
 
 "@redis/time-series@1.0.4":
   version "1.0.4"
@@ -1933,7 +2045,29 @@
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.1.tgz#3286741fb8f1e1580ac28784add4c7a1d49bdfbc"
   integrity sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==
 
-"@types/babel__core@^7.1.12", "@types/babel__core@^7.1.14", "@types/babel__core@^7.1.3", "@types/babel__core@^7.20.1":
+"@types/babel__core@*", "@types/babel__core@^7.1.7":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.0.tgz#61bc5a4cae505ce98e1e36c5445e4bee060d8891"
+  integrity sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==
+  dependencies:
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
+    "@types/babel__generator" "*"
+    "@types/babel__template" "*"
+    "@types/babel__traverse" "*"
+
+"@types/babel__core@^7.1.12", "@types/babel__core@^7.1.14":
+  version "7.1.18"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.18.tgz#1a29abcc411a9c05e2094c98f9a1b7da6cdf49f8"
+  integrity sha512-S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+    "@types/babel__generator" "*"
+    "@types/babel__template" "*"
+    "@types/babel__traverse" "*"
+
+"@types/babel__core@^7.20.1":
   version "7.20.1"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.1.tgz#916ecea274b0c776fec721e333e55762d3a9614b"
   integrity sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==
@@ -1951,6 +2085,13 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
+"@types/babel__helper-plugin-utils@^7.10.0":
+  version "7.10.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__helper-plugin-utils/-/babel__helper-plugin-utils-7.10.0.tgz#dcd2416f9c189d5837ab2a276368cf67134efe78"
+  integrity sha512-60YtHzhQ9HAkToHVV+TB4VLzBn9lrfgrsOjiJMtbv/c1jPdekBxaByd6DMsGBzROXWoIL6U3lEFvvbu69RkUoA==
+  dependencies:
+    "@types/babel__core" "*"
+
 "@types/babel__template@*":
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307"
@@ -1966,6 +2107,13 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
+"@types/babel__traverse@^7.1.7":
+  version "7.18.5"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.5.tgz#c107216842905afafd3b6e774f6f935da6f5db80"
+  integrity sha512-enCvTL8m/EHS/zIvJno9nE+ndYPh1/oNFzRYRmtUqJICG2VnCSBzMLW5VN2KCQU91f23tsNKR8v7VJJQMatl7Q==
+  dependencies:
+    "@babel/types" "^7.3.0"
+
 "@types/body-parser@*":
   version "1.19.2"
   resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
@@ -2100,10 +2248,10 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/jest@*", "@types/jest@^29.5.1":
-  version "29.5.1"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.1.tgz#83c818aa9a87da27d6da85d3378e5a34d2f31a47"
-  integrity sha512-tEuVcHrpaixS36w7hpsfLBLpjtMRJUE09/MHXn923LOVojDwyC14cWcfc0rDs0VEfUyYmt/+iX1kxxp+gZMcaQ==
+"@types/jest@*", "@types/jest@^29.5.2":
+  version "29.5.2"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.2.tgz#86b4afc86e3a8f3005b297ed8a72494f89e6395b"
+  integrity sha512-mSoZVJF5YzGVCk+FsDxzDuH7s+SCkzrgKZzf0Z0T2WudhBUPoF6ktoTPC4R0ZoCPCV5xUvuU6ias5NvxcBcMMg==
   dependencies:
     expect "^29.0.0"
     pretty-format "^29.0.0"
@@ -2127,11 +2275,16 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
   integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
 
-"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6":
+"@types/json-schema@^7.0.5":
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
   integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==
 
+"@types/json-schema@^7.0.6", "@types/json-schema@^7.0.8":
+  version "7.0.12"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
+  integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
+
 "@types/json-stable-stringify@^1.0.32":
   version "1.0.34"
   resolved "https://registry.yarnpkg.com/@types/json-stable-stringify/-/json-stable-stringify-1.0.34.tgz#c0fb25e4d957e0ee2e497c1f553d7f8bb668fd75"
@@ -2253,11 +2406,6 @@
     "@types/prop-types" "*"
     immutable "^3.8.2"
 
-"@types/react-intl@2.3.18":
-  version "2.3.18"
-  resolved "https://registry.yarnpkg.com/@types/react-intl/-/react-intl-2.3.18.tgz#fd2d8b7f4d0a1dd05b5f1784ab0d7fe1786a690d"
-  integrity sha512-DVNJs49zUxKRZng8VuILE886Yihdsf3yLr5vHk9zJrmF8SyRSK3sxNSvikAKxNkv9hX55XBTJShz6CkJnbNjgg==
-
 "@types/react-motion@^0.0.34":
   version "0.0.34"
   resolved "https://registry.yarnpkg.com/@types/react-motion/-/react-motion-0.0.34.tgz#789ff2063e2f7fbb6085d291135c442e8b35291a"
@@ -2338,7 +2486,16 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@>=16.9.11", "@types/react@^18.0.26", "@types/react@^18.2.7":
+"@types/react@*", "@types/react@16 || 17 || 18", "@types/react@>=16.9.11", "@types/react@^18.0.26":
+  version "18.2.6"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.6.tgz#5cd53ee0d30ffc193b159d3516c8c8ad2f19d571"
+  integrity sha512-wRZClXn//zxCFW+ye/D2qY65UsYP1Fpex2YXorHc8awoNamkMZSvBxwxdYVInsHOZZd2Ppq8isnSzJL5Mpf8OA==
+  dependencies:
+    "@types/prop-types" "*"
+    "@types/scheduler" "*"
+    csstype "^3.0.2"
+
+"@types/react@^18.2.7":
   version "18.2.7"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.7.tgz#dfb4518042a3117a045b8c222316f83414a783b3"
   integrity sha512-ojrXpSH2XFCmHm7Jy3q44nXDyN54+EYKP2lBhJ2bqfyPj6cIUW/FZW/Csdia34NQgq7KYcAlHi5184m4X88+yw==
@@ -2368,14 +2525,9 @@
     "@types/node" "*"
 
 "@types/scheduler@*":
-  version "0.16.1"
-  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz#18845205e86ff0038517aab7a18a62a6b9f71275"
-  integrity sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA==
-
-"@types/schema-utils@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/schema-utils/-/schema-utils-1.0.0.tgz#295d36f01e2cb8bc3207ca1d9a68e210db6b40cb"
-  integrity sha512-YesPanU1+WCigC/Aj1Mga8UCOjHIfMNHZ3zzDsUY7lI8GlKnh/Kv2QwJOQ+jNQ36Ru7IfzSedlG14hppYaN13A==
+  version "0.16.3"
+  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.3.tgz#cef09e3ec9af1d63d2a6cc5b383a737e24e6dcf5"
+  integrity sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==
 
 "@types/semver@^7.3.12":
   version "7.3.13"
@@ -2877,9 +3029,9 @@ ansi-regex@^2.0.0:
   integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
 ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
+  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
 
 ansi-regex@^5.0.0, ansi-regex@^5.0.1:
   version "5.0.1"
@@ -3126,6 +3278,13 @@ async-limiter@~1.0.0:
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
   integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
+async-mutex@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/async-mutex/-/async-mutex-0.4.0.tgz#ae8048cd4d04ace94347507504b3cf15e631c25f"
+  integrity sha512-eJFZ1YhRR8UN8eBLoNzcDPcy/jqjsg6I1AP+KvWQX80BqOSW1oJPJXDylPUEeMr2ZQvHgnQ//Lp6f3RQ1zI7HA==
+  dependencies:
+    tslib "^2.4.0"
+
 async@^2.6.2:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
@@ -3219,6 +3378,23 @@ babel-loader@^8.3.0:
     make-dir "^3.1.0"
     schema-utils "^2.6.5"
 
+babel-plugin-formatjs@^10.5.1:
+  version "10.5.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-formatjs/-/babel-plugin-formatjs-10.5.1.tgz#9baeccb590538fb1915ef85fb7dfd13aedd8b1fa"
+  integrity sha512-IkwrKjl2Zg6br2wuayPIsaPF92RzGgh5WdQj+A/9zokpYeIF7sscZGwwHmeTSoPnIAAENvjRMm/escMQkp+eKg==
+  dependencies:
+    "@babel/core" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-jsx" "7"
+    "@babel/traverse" "7"
+    "@babel/types" "^7.12.11"
+    "@formatjs/icu-messageformat-parser" "2.4.0"
+    "@formatjs/ts-transformer" "3.13.1"
+    "@types/babel__core" "^7.1.7"
+    "@types/babel__helper-plugin-utils" "^7.10.0"
+    "@types/babel__traverse" "^7.1.7"
+    tslib "^2.4.0"
+
 babel-plugin-istanbul@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
@@ -3303,19 +3479,6 @@ babel-plugin-preval@^5.1.0:
     babel-plugin-macros "^3.0.1"
     require-from-string "^2.0.2"
 
-babel-plugin-react-intl@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-react-intl/-/babel-plugin-react-intl-6.2.0.tgz#ac51ca757f318938792fc91e1747515e9225386a"
-  integrity sha512-ajGpa14mLzyDgdOS75DRlQ0aEL+q7iSCB77613YUPOZbxnAvfB0wg+gLngbd/43eKRw7a4y+IzO3P8kDHl40nA==
-  dependencies:
-    "@babel/core" "^7.7.2"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@types/babel__core" "^7.1.3"
-    "@types/schema-utils" "^1.0.0"
-    fs-extra "^8.1.0"
-    intl-messageformat-parser "^4.1.1"
-    schema-utils "^2.2.0"
-
 babel-plugin-transform-react-remove-prop-types@^0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz#f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a"
@@ -3756,7 +3919,7 @@ chalk@5.2.0:
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.2.0.tgz#249623b7d66869c673699fb66d65723e54dfcfb3"
   integrity sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==
 
-chalk@^2.0.0, chalk@^2.3.2, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -4430,9 +4593,9 @@ csstype@^2.6.7:
   integrity sha512-ul26pfSQTZW8dcOnD2iiJssfXw0gdNVX9IJDH/X3K5DGPfj+fUYe3kB+swUY6BF3oZDxaID3AJt+9/ojSAE05A==
 
 csstype@^3.0.2:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.6.tgz#865d0b5833d7d8d40f4e5b8a6d76aea3de4725ef"
-  integrity sha512-+ZAmfyWMT7TiIlzdqJgjMb7S4f1beorDbWbsocyK4RaiqA5RTX3K14bnBWmmA9QEM0gRdsjyyrEmcyga8Zsxmw==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b"
+  integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
 
 damerau-levenshtein@^1.0.8:
   version "1.0.8"
@@ -4821,9 +4984,9 @@ domutils@^3.0.1:
     domhandler "^5.0.1"
 
 dotenv@^16.0.3:
-  version "16.0.3"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07"
-  integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==
+  version "16.1.4"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.1.4.tgz#67ac1a10cd9c25f5ba604e4e08bc77c0ebe0ca8c"
+  integrity sha512-m55RtE8AsPeJBpOIFKihEmqUcoVncQIwo7x9U8ZwLEZw9ZpXboz2c+rvog+jUaJvVrZ5kBOeYQBX5+8Aa/OZQw==
 
 duplexer@^0.1.2:
   version "0.1.2"
@@ -5130,10 +5293,10 @@ eslint-plugin-import@~2.27.5:
     semver "^6.3.0"
     tsconfig-paths "^3.14.1"
 
-eslint-plugin-jsdoc@^45.0.0:
-  version "45.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-45.0.0.tgz#6be84e4842a7138cc571a907ea9c31c42eaac5c0"
-  integrity sha512-l2+Jcs/Ps7oFA+SWY+0sweU/e5LgricnEl6EsDlyRTF5y0+NWL1y9Qwz9PHwHAxtdJq6lxPjEQWmYLMkvhzD4g==
+eslint-plugin-jsdoc@^46.1.0:
+  version "46.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-46.1.0.tgz#3ff932b70bc25f3745049f525a789faed7c948da"
+  integrity sha512-NpjpSuWR+Wwxzmssji7AVty1Vu0JvI7v+cTj+Rw1nKVjGv2eMvLGM/SI4VpgTXp82JbLtFOsA2QYLHT3YSmASA==
   dependencies:
     "@es-joy/jsdoccomment" "~0.39.4"
     are-docs-informative "^0.0.2"
@@ -5756,15 +5919,6 @@ fresh@0.5.2:
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
-fs-extra@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
-  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fs-extra@^9.0.1:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
@@ -5936,7 +6090,7 @@ glob@^10.2.5, glob@^10.2.6:
     minipass "^5.0.0 || ^6.0.2"
     path-scurry "^1.7.0"
 
-glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@^7.0.3, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
   integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
@@ -6521,48 +6675,17 @@ intersection-observer@^0.12.0:
   resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.12.2.tgz#4a45349cc0cd91916682b1f44c28d7ec737dc375"
   integrity sha512-7m1vEcPCxXYI8HqnL8CKI6siDyD+eIWSwgB3DZA+ZTogxk9I4CDnj4wilt9x/+/QbHI4YG5YZNmC6458/e9Ktg==
 
-intl-format-cache@^2.0.5:
-  version "2.2.9"
-  resolved "https://registry.yarnpkg.com/intl-format-cache/-/intl-format-cache-2.2.9.tgz#fb560de20c549cda20b569cf1ffb6dc62b5b93b4"
-  integrity sha512-Zv/u8wRpekckv0cLkwpVdABYST4hZNTDaX7reFetrYTJwxExR2VyTqQm+l0WmL0Qo8Mjb9Tf33qnfj0T7pjxdQ==
-
-intl-messageformat-parser@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz#b43d45a97468cadbe44331d74bb1e8dea44fc075"
-  integrity sha1-tD1FqXRoytvkQzHXS7Ho3qRPwHU=
-
-intl-messageformat-parser@^4.1.1:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-4.1.4.tgz#98f3415e6990d44bebf2e0ad8e4cfbacf3ef5ed3"
-  integrity sha512-zV4kBUD1yhxSyaXm6bGhmP4HFH9Gh4pRQwNn+xq5P+B1dT8mpaAfU75nfUn4HgddIB6pyFnzM5MQjO55UpJwkQ==
+intl-messageformat@10.3.5, intl-messageformat@^10.3.5:
+  version "10.3.5"
+  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.3.5.tgz#f55684fc663e62616ad59d3a504ea0cac3f267b7"
+  integrity sha512-6kPkftF8Jg3XJCkGKa5OD+nYQ+qcSxF4ZkuDdXZ6KGG0VXn+iblJqRFyDdm9VvKcMyC0Km2+JlVQffFM52D0YA==
   dependencies:
-    "@formatjs/intl-unified-numberformat" "^3.3.3"
+    "@formatjs/ecma402-abstract" "1.15.0"
+    "@formatjs/fast-memoize" "2.0.1"
+    "@formatjs/icu-messageformat-parser" "2.4.0"
+    tslib "^2.4.0"
 
-intl-messageformat@^2.0.0, intl-messageformat@^2.1.0, intl-messageformat@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-2.2.0.tgz#345bcd46de630b7683330c2e52177ff5eab484fc"
-  integrity sha1-NFvNRt5jC3aDMwwuUhd/9eq0hPw=
-  dependencies:
-    intl-messageformat-parser "1.4.0"
-
-intl-relativeformat@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/intl-relativeformat/-/intl-relativeformat-2.2.0.tgz#6aca95d019ec8d30b6c5653b6629f9983ea5b6c5"
-  integrity sha512-4bV/7kSKaPEmu6ArxXf9xjv1ny74Zkwuey8Pm01NH4zggPP7JHwg2STk8Y3JdspCKRDriwIyLRfEXnj2ZLr4Bw==
-  dependencies:
-    intl-messageformat "^2.0.0"
-
-intl-relativeformat@^6.4.3:
-  version "6.4.3"
-  resolved "https://registry.yarnpkg.com/intl-relativeformat/-/intl-relativeformat-6.4.3.tgz#cb5559e1e257cc2e763583502012a354bb777efe"
-  integrity sha512-VxZXZfhuX/zBVfxzE/J6kPUpsyWKYjqtZ3jVGZwr6wzK5BOLVpe1vSlwCQX56w5UjlpL63fS8Nxq0kgTyf1gJA==
-
-intl@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/intl/-/intl-1.2.5.tgz#82244a2190c4e419f8371f5aa34daa3420e2abde"
-  integrity sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94=
-
-invariant@^2.1.1, invariant@^2.2.2, invariant@^2.2.4:
+invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
@@ -7618,13 +7741,6 @@ json5@^2.1.2, json5@^2.2.0, json5@^2.2.2:
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
-jsonfile@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
 jsonfile@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
@@ -7673,9 +7789,9 @@ kleur@^3.0.3:
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
 klona@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"
-  integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22"
+  integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==
 
 known-css-properties@^0.27.0:
   version "0.27.0"
@@ -7773,9 +7889,9 @@ loader-utils@^1.2.3, loader-utils@^1.4.0:
     json5 "^1.0.1"
 
 loader-utils@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
-  integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
+  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"
@@ -8116,7 +8232,7 @@ mime@1.6.0:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mime@^2.3.1, mime@^2.4.4:
+mime@^2.4.4:
   version "2.4.7"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz#962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74"
   integrity sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA==
@@ -8266,6 +8382,11 @@ mousetrap@^1.5.2:
   resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.5.tgz#8a766d8c272b08393d5f56074e0b5ec183485bf9"
   integrity sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA==
 
+mrmime@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.1.tgz#5f90c825fad4bdd41dc914eff5d1a8cfdaf24f27"
+  integrity sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -9602,28 +9723,23 @@ react-immutable-pure-component@^2.2.2:
   resolved "https://registry.yarnpkg.com/react-immutable-pure-component/-/react-immutable-pure-component-2.2.2.tgz#3014d3e20cd5a7a4db73b81f1f1464f4d351684b"
   integrity sha512-vkgoMJUDqHZfXXnjVlG3keCxSO/U6WeDQ5/Sl0GK2cH8TOxEzQ5jXqDXHEL/jqk6fsNxV05oH5kD7VNMUE2k+A==
 
-react-intl-translations-manager@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/react-intl-translations-manager/-/react-intl-translations-manager-5.0.3.tgz#aee010ecf35975673e033ca5d7d3f4147894324d"
-  integrity sha512-EfBeugnOGFcdUbQyY9TqBMbuauQ8wm73ZqFr0UqCljhbXl7YDHQcVzclWFRkVmlUffzxitLQFhAZEVVeRNQSwA==
+react-intl@^6.4.2:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-6.4.2.tgz#cf4f49f5f89e66e0975927783d0d270e708314fd"
+  integrity sha512-q8QyLZfbyqV3Ifa7vtjRrgfSQPGTR6Fi+u9tP/CuzhUPl9DJEPIrvUFhlBryKtRW2qNASqchaP/79Obip+h6oA==
   dependencies:
-    chalk "^2.3.2"
-    glob "^7.1.2"
-    json-stable-stringify "^1.0.1"
-    mkdirp "^0.5.1"
+    "@formatjs/ecma402-abstract" "1.15.0"
+    "@formatjs/icu-messageformat-parser" "2.4.0"
+    "@formatjs/intl" "2.7.2"
+    "@formatjs/intl-displaynames" "6.3.2"
+    "@formatjs/intl-listformat" "7.2.2"
+    "@types/hoist-non-react-statics" "^3.3.1"
+    "@types/react" "16 || 17 || 18"
+    hoist-non-react-statics "^3.3.2"
+    intl-messageformat "10.3.5"
+    tslib "^2.4.0"
 
-react-intl@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-2.9.0.tgz#c97c5d17d4718f1575fdbd5a769f96018a3b1843"
-  integrity sha512-27jnDlb/d2A7mSJwrbOBnUgD+rPep+abmoJE511Tf8BnoONIAUehy/U1zZCHGO17mnOwMWxqN4qC0nW11cD6rA==
-  dependencies:
-    hoist-non-react-statics "^3.3.0"
-    intl-format-cache "^2.0.5"
-    intl-messageformat "^2.1.0"
-    intl-relativeformat "^2.1.0"
-    invariant "^2.1.1"
-
-"react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^18.2.0:
+"react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^18.0.0, react-is@^18.2.0:
   version "18.2.0"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
   integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
@@ -9638,11 +9754,6 @@ react-is@^17.0.1:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
-react-is@^18.0.0:
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.1.0.tgz#61aaed3096d30eacf2a2127118b5b41387d32a67"
-  integrity sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==
-
 react-lifecycles-compat@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
@@ -9687,9 +9798,9 @@ react-redux-loading-bar@^5.0.4:
     react-lifecycles-compat "^3.0.4"
 
 react-redux@^8.0.4:
-  version "8.0.5"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-8.0.5.tgz#e5fb8331993a019b8aaf2e167a93d10af469c7bd"
-  integrity sha512-Q2f6fCKxPFpkXt1qNRZdEDLlScsDWyrgSj0mliK59qU6W5gvBiKkdMEG2lJzhd1rCctf0hb6EtePPLZ2e0m1uw==
+  version "8.0.7"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-8.0.7.tgz#b74ef2f7ce2076e354540aa3511d3670c2b62571"
+  integrity sha512-1vRQuCQI5Y2uNmrMXg81RXKiBHY3jBzvCvNmZF437O/Z9/pZ+ba2uYHbemYXb3g8rjsacBGo+/wmfrQKzMhJsg==
   dependencies:
     "@babel/runtime" "^7.12.1"
     "@types/hoist-non-react-statics" "^3.3.1"
@@ -9915,15 +10026,15 @@ redent@^3.0.0:
     strip-indent "^3.0.0"
 
 redis@^4.6.5:
-  version "4.6.5"
-  resolved "https://registry.yarnpkg.com/redis/-/redis-4.6.5.tgz#f32fbde44429e96f562bb0c9b1db0143ab8cfa4f"
-  integrity sha512-O0OWA36gDQbswOdUuAhRL6mTZpHFN525HlgZgDaVNgCJIAZR3ya06NTESb0R+TUZ+BFaDpz6NnnVvoMx9meUFg==
+  version "4.6.7"
+  resolved "https://registry.yarnpkg.com/redis/-/redis-4.6.7.tgz#c73123ad0b572776223f172ec78185adb72a6b57"
+  integrity sha512-KrkuNJNpCwRm5vFJh0tteMxW8SaUzkm5fBH7eL5hd/D0fAkzvapxbfGPP/r+4JAXdQuX7nebsBkBqA2RHB7Usw==
   dependencies:
     "@redis/bloom" "1.2.0"
-    "@redis/client" "1.5.6"
+    "@redis/client" "1.5.8"
     "@redis/graph" "1.1.0"
     "@redis/json" "1.0.4"
-    "@redis/search" "1.1.2"
+    "@redis/search" "1.1.3"
     "@redis/time-series" "1.0.4"
 
 redux-immutable@^4.0.0:
@@ -10291,9 +10402,9 @@ safe-regex@^1.1.0:
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 sass-loader@^10.2.0:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.2.0.tgz#3d64c1590f911013b3fa48a0b22a83d5e1494716"
-  integrity sha512-kUceLzC1gIHz0zNJPpqRsJyisWatGYNFRmv2CKZK2/ngMJgLqxTbXwe/hJ85luyvZkgqU3VlJ33UVF2T/0g6mw==
+  version "10.4.1"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.4.1.tgz#bea4e173ddf512c9d7f53e9ec686186146807cbf"
+  integrity sha512-aX/iJZTTpNUNx/OSYzo2KsjIUQHqvWsAhhUijFjAPdZTEhstjZI9zTNvkTTwsx+uNUJqUwOw5gacxQMx4hJxGQ==
   dependencies:
     klona "^2.0.4"
     loader-utils "^2.0.0"
@@ -10333,7 +10444,7 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.2.0, schema-utils@^2.6.5:
+schema-utils@^2.6.5:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
   integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
@@ -10342,7 +10453,7 @@ schema-utils@^2.2.0, schema-utils@^2.6.5:
     ajv "^6.12.4"
     ajv-keywords "^3.5.2"
 
-schema-utils@^3.0, schema-utils@^3.0.0:
+schema-utils@^3.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef"
   integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==
@@ -10351,6 +10462,15 @@ schema-utils@^3.0, schema-utils@^3.0.0:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
+schema-utils@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.2.tgz#36c10abca6f7577aeae136c804b0c741edeadc99"
+  integrity sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==
+  dependencies:
+    "@types/json-schema" "^7.0.8"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
+
 scroll-behavior@^0.9.1:
   version "0.9.12"
   resolved "https://registry.yarnpkg.com/scroll-behavior/-/scroll-behavior-0.9.12.tgz#1c22d273ec4ce6cd4714a443fead50227da9424c"
@@ -10538,12 +10658,12 @@ signal-exit@^4.0.1:
   integrity sha512-uUWsN4aOxJAS8KOuf3QMyFtgm1pkb6I+KRZbRF/ghdf5T7sM+B1lLLzPDxswUjkmHyxQAVzEgG35E3NzDM9GVw==
 
 sirv@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.10.tgz#3e591f5a9ae2520f50d5830f5fae38d97e7be194"
-  integrity sha512-H5EZCoZaggEUQy8ocKsF7WAToGuZhjJlLvM3XOef46CbdIgbNeQ1p32N1PCuCjkVYwrAVOSMacN6CXXgIzuspg==
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49"
+  integrity sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==
   dependencies:
-    "@polka/url" "^1.0.0-next.9"
-    mime "^2.3.1"
+    "@polka/url" "^1.0.0-next.20"
+    mrmime "^1.0.0"
     totalist "^1.0.0"
 
 sisteransi@^1.0.4:
@@ -10700,7 +10820,7 @@ source-map@^0.7.3:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
   integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
 
-source-map@^0.8.0-beta.0, source-map@~0.8.0-beta.0:
+source-map@^0.8.0-beta.0:
   version "0.8.0-beta.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.8.0-beta.0.tgz#d4c1bb42c3f7ee925f005927ba10709e0d1d1f11"
   integrity sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==
@@ -10781,9 +10901,9 @@ sprintf-js@~1.0.2:
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 ssri@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz#79ca74e21f8ceaeddfcb4b90143c458b8d988808"
-  integrity sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
+  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
   dependencies:
     minipass "^3.1.1"
 
@@ -11277,13 +11397,13 @@ terser-webpack-plugin@^1.4.3, terser-webpack-plugin@^4.2.3:
     webpack-sources "^1.4.3"
 
 terser@^5.0.0, terser@^5.3.4:
-  version "5.13.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.13.1.tgz#66332cdc5a01b04a224c9fad449fc1a18eaa1799"
-  integrity sha512-hn4WKOfwnwbYfe48NgrQjqNOH9jzLqRcIfbYytOXCOv46LBfWr9bDS17MQqOi+BWGD0sJK3Sj5NC/gJjiojaoA==
+  version "5.17.6"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.17.6.tgz#d810e75e1bb3350c799cd90ebefe19c9412c12de"
+  integrity sha512-V8QHcs8YuyLkLHsJO5ucyff1ykrLVsR4dNnS//L5Y3NiSXpbK1J+WMVUs67eI0KTxs9JtHhgEQpXQVHlHI92DQ==
   dependencies:
+    "@jridgewell/source-map" "^0.3.2"
     acorn "^8.5.0"
     commander "^2.20.0"
-    source-map "~0.8.0-beta.0"
     source-map-support "~0.5.20"
 
 tesseract.js-core@^2.2.0:
@@ -11659,11 +11779,6 @@ unique-string@^2.0.0:
   dependencies:
     crypto-random-string "^2.0.0"
 
-universalify@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-
 universalify@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
@@ -11706,9 +11821,9 @@ update-browserslist-db@^1.0.10:
     picocolors "^1.0.0"
 
 uri-js@^4.2.2:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602"
-  integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
     punycode "^2.1.0"
 
@@ -11922,9 +12037,9 @@ webpack-assets-manifest@^4.0.6:
     webpack-sources "^1.0"
 
 webpack-bundle-analyzer@^4.8.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.8.0.tgz#951b8aaf491f665d2ae325d8b84da229157b1d04"
-  integrity sha512-ZzoSBePshOKhr+hd8u6oCkZVwpVaXgpw23ScGLFpR6SjYI7+7iIWYarjN6OEYOfRt8o7ZyZZQk0DuMizJ+LEIg==
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.9.0.tgz#fc093c4ab174fd3dcbd1c30b763f56d10141209d"
+  integrity sha512-+bXGmO1LyiNx0i9enBu3H8mv42sj/BJWhZNFwjz92tVnBa9J3JMGo2an2IXlEleoDOPn/Hofl5hr/xCpObUDtw==
   dependencies:
     "@discoveryjs/json-ext" "0.5.7"
     acorn "^8.0.4"
@@ -12190,25 +12305,25 @@ word-wrap@^1.2.3, word-wrap@~1.2.3:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
-workbox-background-sync@6.6.1:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.6.1.tgz#08d603a33717ce663e718c30cc336f74909aff2f"
-  integrity sha512-trJd3ovpWCvzu4sW0E8rV3FUyIcC0W8G+AZ+VcqzzA890AsWZlUGOTSxIMmIHVusUw/FDq1HFWfy/kC/WTRqSg==
+workbox-background-sync@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-7.0.0.tgz#2b84b96ca35fec976e3bd2794b70e4acec46b3a5"
+  integrity sha512-S+m1+84gjdueM+jIKZ+I0Lx0BDHkk5Nu6a3kTVxP4fdj3gKouRNmhO8H290ybnJTOPfBDtTMXSQA/QLTvr7PeA==
   dependencies:
     idb "^7.0.1"
-    workbox-core "6.6.1"
+    workbox-core "7.0.0"
 
-workbox-broadcast-update@6.6.1:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.6.1.tgz#0fad9454cf8e4ace0c293e5617c64c75d8a8c61e"
-  integrity sha512-fBhffRdaANdeQ1V8s692R9l/gzvjjRtydBOvR6WCSB0BNE2BacA29Z4r9/RHd9KaXCPl6JTdI9q0bR25YKP8TQ==
+workbox-broadcast-update@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-7.0.0.tgz#7f611ca1a94ba8ac0aa40fa171c9713e0f937d22"
+  integrity sha512-oUuh4jzZrLySOo0tC0WoKiSg90bVAcnE98uW7F8GFiSOXnhogfNDGZelPJa+6KpGBO5+Qelv04Hqx2UD+BJqNQ==
   dependencies:
-    workbox-core "6.6.1"
+    workbox-core "7.0.0"
 
-workbox-build@6.6.1:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-6.6.1.tgz#6010e9ce550910156761448f2dbea8cfcf759cb0"
-  integrity sha512-INPgDx6aRycAugUixbKgiEQBWD0MPZqU5r0jyr24CehvNuLPSXp/wGOpdRJmts656lNiXwqV7dC2nzyrzWEDnw==
+workbox-build@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-7.0.0.tgz#02ab5ef2991b3369b8b9395703f08912212769b4"
+  integrity sha512-CttE7WCYW9sZC+nUYhQg3WzzGPr4IHmrPnjKiu3AMXsiNQKx+l4hHl63WTrnicLmKEKHScWDH8xsGBdrYgtBzg==
   dependencies:
     "@apideck/better-ajv-errors" "^0.3.1"
     "@babel/core" "^7.11.1"
@@ -12232,132 +12347,132 @@ workbox-build@6.6.1:
     strip-comments "^2.0.1"
     tempy "^0.6.0"
     upath "^1.2.0"
-    workbox-background-sync "6.6.1"
-    workbox-broadcast-update "6.6.1"
-    workbox-cacheable-response "6.6.1"
-    workbox-core "6.6.1"
-    workbox-expiration "6.6.1"
-    workbox-google-analytics "6.6.1"
-    workbox-navigation-preload "6.6.1"
-    workbox-precaching "6.6.1"
-    workbox-range-requests "6.6.1"
-    workbox-recipes "6.6.1"
-    workbox-routing "6.6.1"
-    workbox-strategies "6.6.1"
-    workbox-streams "6.6.1"
-    workbox-sw "6.6.1"
-    workbox-window "6.6.1"
+    workbox-background-sync "7.0.0"
+    workbox-broadcast-update "7.0.0"
+    workbox-cacheable-response "7.0.0"
+    workbox-core "7.0.0"
+    workbox-expiration "7.0.0"
+    workbox-google-analytics "7.0.0"
+    workbox-navigation-preload "7.0.0"
+    workbox-precaching "7.0.0"
+    workbox-range-requests "7.0.0"
+    workbox-recipes "7.0.0"
+    workbox-routing "7.0.0"
+    workbox-strategies "7.0.0"
+    workbox-streams "7.0.0"
+    workbox-sw "7.0.0"
+    workbox-window "7.0.0"
 
-workbox-cacheable-response@6.6.1:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.6.1.tgz#284c2b86be3f4fd191970ace8c8e99797bcf58e9"
-  integrity sha512-85LY4veT2CnTCDxaVG7ft3NKaFbH6i4urZXgLiU4AiwvKqS2ChL6/eILiGRYXfZ6gAwDnh5RkuDbr/GMS4KSag==
+workbox-cacheable-response@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-7.0.0.tgz#ee27c036728189eed69d25a135013053277482d2"
+  integrity sha512-0lrtyGHn/LH8kKAJVOQfSu3/80WDc9Ma8ng0p2i/5HuUndGttH+mGMSvOskjOdFImLs2XZIimErp7tSOPmu/6g==
   dependencies:
-    workbox-core "6.6.1"
+    workbox-core "7.0.0"
 
-workbox-core@6.6.1:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.6.1.tgz#7184776d4134c5ed2f086878c882728fc9084265"
-  integrity sha512-ZrGBXjjaJLqzVothoE12qTbVnOAjFrHDXpZe7coCb6q65qI/59rDLwuFMO4PcZ7jcbxY+0+NhUVztzR/CbjEFw==
+workbox-core@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-7.0.0.tgz#dec114ec923cc2adc967dd9be1b8a0bed50a3545"
+  integrity sha512-81JkAAZtfVP8darBpfRTovHg8DGAVrKFgHpOArZbdFd78VqHr5Iw65f2guwjE2NlCFbPFDoez3D3/6ZvhI/rwQ==
 
-workbox-expiration@6.6.1, workbox-expiration@^6.6.0:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.6.1.tgz#a841fa36676104426dbfb9da1ef6a630b4f93739"
-  integrity sha512-qFiNeeINndiOxaCrd2DeL1Xh1RFug3JonzjxUHc5WkvkD2u5abY3gZL1xSUNt3vZKsFFGGORItSjVTVnWAZO4A==
+workbox-expiration@7.0.0, workbox-expiration@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-7.0.0.tgz#3d90bcf2a7577241de950f89784f6546b66c2baa"
+  integrity sha512-MLK+fogW+pC3IWU9SFE+FRStvDVutwJMR5if1g7oBJx3qwmO69BNoJQVaMXq41R0gg3MzxVfwOGKx3i9P6sOLQ==
   dependencies:
     idb "^7.0.1"
-    workbox-core "6.6.1"
+    workbox-core "7.0.0"
 
-workbox-google-analytics@6.6.1:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.6.1.tgz#a07a6655ab33d89d1b0b0a935ffa5dea88618c5d"
-  integrity sha512-1TjSvbFSLmkpqLcBsF7FuGqqeDsf+uAXO/pjiINQKg3b1GN0nBngnxLcXDYo1n/XxK4N7RaRrpRlkwjY/3ocuA==
+workbox-google-analytics@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-7.0.0.tgz#603b2c4244af1e85de0fb26287d4e17d3293452a"
+  integrity sha512-MEYM1JTn/qiC3DbpvP2BVhyIH+dV/5BjHk756u9VbwuAhu0QHyKscTnisQuz21lfRpOwiS9z4XdqeVAKol0bzg==
   dependencies:
-    workbox-background-sync "6.6.1"
-    workbox-core "6.6.1"
-    workbox-routing "6.6.1"
-    workbox-strategies "6.6.1"
+    workbox-background-sync "7.0.0"
+    workbox-core "7.0.0"
+    workbox-routing "7.0.0"
+    workbox-strategies "7.0.0"
 
-workbox-navigation-preload@6.6.1:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.6.1.tgz#61a34fe125558dd88cf09237f11bd966504ea059"
-  integrity sha512-DQCZowCecO+wRoIxJI2V6bXWK6/53ff+hEXLGlQL4Rp9ZaPDLrgV/32nxwWIP7QpWDkVEtllTAK5h6cnhxNxDA==
+workbox-navigation-preload@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-7.0.0.tgz#4913878dbbd97057181d57baa18d2bbdde085c6c"
+  integrity sha512-juWCSrxo/fiMz3RsvDspeSLGmbgC0U9tKqcUPZBCf35s64wlaLXyn2KdHHXVQrb2cqF7I0Hc9siQalainmnXJA==
   dependencies:
-    workbox-core "6.6.1"
+    workbox-core "7.0.0"
 
-workbox-precaching@6.6.1, workbox-precaching@^6.6.0:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.6.1.tgz#dedeeba10a2d163d990bf99f1c2066ac0d1a19e2"
-  integrity sha512-K4znSJ7IKxCnCYEdhNkMr7X1kNh8cz+mFgx9v5jFdz1MfI84pq8C2zG+oAoeE5kFrUf7YkT5x4uLWBNg0DVZ5A==
+workbox-precaching@7.0.0, workbox-precaching@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-7.0.0.tgz#3979ba8033aadf3144b70e9fe631d870d5fbaa03"
+  integrity sha512-EC0vol623LJqTJo1mkhD9DZmMP604vHqni3EohhQVwhJlTgyKyOkMrZNy5/QHfOby+39xqC01gv4LjOm4HSfnA==
   dependencies:
-    workbox-core "6.6.1"
-    workbox-routing "6.6.1"
-    workbox-strategies "6.6.1"
+    workbox-core "7.0.0"
+    workbox-routing "7.0.0"
+    workbox-strategies "7.0.0"
 
-workbox-range-requests@6.6.1:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.6.1.tgz#ddaf7e73af11d362fbb2f136a9063a4c7f507a39"
-  integrity sha512-4BDzk28govqzg2ZpX0IFkthdRmCKgAKreontYRC5YsAPB2jDtPNxqx3WtTXgHw1NZalXpcH/E4LqUa9+2xbv1g==
+workbox-range-requests@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-7.0.0.tgz#97511901e043df27c1aa422adcc999a7751f52ed"
+  integrity sha512-SxAzoVl9j/zRU9OT5+IQs7pbJBOUOlriB8Gn9YMvi38BNZRbM+RvkujHMo8FOe9IWrqqwYgDFBfv6sk76I1yaQ==
   dependencies:
-    workbox-core "6.6.1"
+    workbox-core "7.0.0"
 
-workbox-recipes@6.6.1:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-6.6.1.tgz#ea70d2b2b0b0bce8de0a9d94f274d4a688e69fae"
-  integrity sha512-/oy8vCSzromXokDA+X+VgpeZJvtuf8SkQ8KL0xmRivMgJZrjwM3c2tpKTJn6PZA6TsbxGs3Sc7KwMoZVamcV2g==
+workbox-recipes@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-7.0.0.tgz#1a6a01c8c2dfe5a41eef0fed3fe517e8a45c6514"
+  integrity sha512-DntcK9wuG3rYQOONWC0PejxYYIDHyWWZB/ueTbOUDQgefaeIj1kJ7pdP3LZV2lfrj8XXXBWt+JDRSw1lLLOnww==
   dependencies:
-    workbox-cacheable-response "6.6.1"
-    workbox-core "6.6.1"
-    workbox-expiration "6.6.1"
-    workbox-precaching "6.6.1"
-    workbox-routing "6.6.1"
-    workbox-strategies "6.6.1"
+    workbox-cacheable-response "7.0.0"
+    workbox-core "7.0.0"
+    workbox-expiration "7.0.0"
+    workbox-precaching "7.0.0"
+    workbox-routing "7.0.0"
+    workbox-strategies "7.0.0"
 
-workbox-routing@6.6.1, workbox-routing@^6.6.0:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.6.1.tgz#cba9a1c7e0d1ea11e24b6f8c518840efdc94f581"
-  integrity sha512-j4ohlQvfpVdoR8vDYxTY9rA9VvxTHogkIDwGdJ+rb2VRZQ5vt1CWwUUZBeD/WGFAni12jD1HlMXvJ8JS7aBWTg==
+workbox-routing@7.0.0, workbox-routing@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-7.0.0.tgz#6668438a06554f60645aedc77244a4fe3a91e302"
+  integrity sha512-8YxLr3xvqidnbVeGyRGkaV4YdlKkn5qZ1LfEePW3dq+ydE73hUUJJuLmGEykW3fMX8x8mNdL0XrWgotcuZjIvA==
   dependencies:
-    workbox-core "6.6.1"
+    workbox-core "7.0.0"
 
-workbox-strategies@6.6.1, workbox-strategies@^6.6.0:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.6.1.tgz#38d0f0fbdddba97bd92e0c6418d0b1a2ccd5b8bf"
-  integrity sha512-WQLXkRnsk4L81fVPkkgon1rZNxnpdO5LsO+ws7tYBC6QQQFJVI6v98klrJEjFtZwzw/mB/HT5yVp7CcX0O+mrw==
+workbox-strategies@7.0.0, workbox-strategies@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-7.0.0.tgz#dcba32b3f3074476019049cc490fe1a60ea73382"
+  integrity sha512-dg3qJU7tR/Gcd/XXOOo7x9QoCI9nk74JopaJaYAQ+ugLi57gPsXycVdBnYbayVj34m6Y8ppPwIuecrzkpBVwbA==
   dependencies:
-    workbox-core "6.6.1"
+    workbox-core "7.0.0"
 
-workbox-streams@6.6.1:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.6.1.tgz#b2f7ba7b315c27a6e3a96a476593f99c5d227d26"
-  integrity sha512-maKG65FUq9e4BLotSKWSTzeF0sgctQdYyTMq529piEN24Dlu9b6WhrAfRpHdCncRS89Zi2QVpW5V33NX8PgH3Q==
+workbox-streams@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-7.0.0.tgz#36722aecd04785f88b6f709e541c094fc658c0f9"
+  integrity sha512-moVsh+5to//l6IERWceYKGiftc+prNnqOp2sgALJJFbnNVpTXzKISlTIsrWY+ogMqt+x1oMazIdHj25kBSq/HQ==
   dependencies:
-    workbox-core "6.6.1"
-    workbox-routing "6.6.1"
+    workbox-core "7.0.0"
+    workbox-routing "7.0.0"
 
-workbox-sw@6.6.1:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-6.6.1.tgz#d4c4ca3125088e8b9fd7a748ed537fa0247bd72c"
-  integrity sha512-R7whwjvU2abHH/lR6kQTTXLHDFU2izht9kJOvBRYK65FbwutT4VvnUAJIgHvfWZ/fokrOPhfoWYoPCMpSgUKHQ==
+workbox-sw@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-7.0.0.tgz#7350126411e3de1409f7ec243df8d06bb5b08b86"
+  integrity sha512-SWfEouQfjRiZ7GNABzHUKUyj8pCoe+RwjfOIajcx6J5mtgKkN+t8UToHnpaJL5UVVOf5YhJh+OHhbVNIHe+LVA==
 
-workbox-webpack-plugin@^6.6.0:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-6.6.1.tgz#4f81cc1ad4e5d2cd7477a86ba83c84ee2d187531"
-  integrity sha512-zpZ+ExFj9NmiI66cFEApyjk7hGsfJ1YMOaLXGXBoZf0v7Iu6hL0ZBe+83mnDq3YYWAfA3fnyFejritjOHkFcrA==
+workbox-webpack-plugin@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-7.0.0.tgz#6c61661a2cacde1239192a5877a041a2943d1a55"
+  integrity sha512-R1ZzCHPfzeJjLK2/TpKUhxSQ3fFDCxlWxgRhhSjMQLz3G2MlBnyw/XeYb34e7SGgSv0qG22zEhMIzjMNqNeKbw==
   dependencies:
     fast-json-stable-stringify "^2.1.0"
     pretty-bytes "^5.4.1"
     upath "^1.2.0"
     webpack-sources "^1.4.3"
-    workbox-build "6.6.1"
+    workbox-build "7.0.0"
 
-workbox-window@6.6.1, workbox-window@^6.6.0:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-6.6.1.tgz#f22a394cbac36240d0dadcbdebc35f711bb7b89e"
-  integrity sha512-wil4nwOY58nTdCvif/KEZjQ2NP8uk3gGeRNy2jPBbzypU4BT4D9L8xiwbmDBpZlSgJd2xsT9FvSNU0gsxV51JQ==
+workbox-window@7.0.0, workbox-window@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-7.0.0.tgz#a683ab33c896e4f16786794eac7978fc98a25d08"
+  integrity sha512-j7P/bsAWE/a7sxqTzXo3P2ALb1reTfZdvVp6OJ/uLr/C2kZAMvjeWGm8V4htQhor7DOvYg0sSbFN2+flT5U0qA==
   dependencies:
     "@types/trusted-types" "^2.0.2"
-    workbox-core "6.6.1"
+    workbox-core "7.0.0"
 
 wrap-ansi@^5.1.0:
   version "5.1.0"
@@ -12408,16 +12523,16 @@ write-file-atomic@^5.0.1:
     signal-exit "^4.0.1"
 
 ws@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
-  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
+  integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
   dependencies:
     async-limiter "~1.0.0"
 
 ws@^7.3.1:
-  version "7.4.6"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
-  integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
+  version "7.5.9"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
+  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
 
 ws@^8.11.0, ws@^8.12.1, ws@^8.13.0:
   version "8.13.0"