1188 changed files with 13541 additions and 99145 deletions
--- a/.browserslistrc
+++ b/.browserslistrc
@ -1,5 +1,6 @@
 [production]
 defaults
+not IE 11
 not dead

 [development]
--- a/.dockerignore
+++ b/.dockerignore
@ -1,39 +1,21 @@
-.pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
-
-# Order-independent
-*.sw*
-*~
-.DS_Store
 .bundle
 .env
 .env.*
 .git
 .gitattributes
-.github
 .gitignore
-.woodpecker.yml
-build
-chart
-coverage
-data
-db
-elasticsearch
-log
-neo4j
-node_modules
-postgres
-postgres14
+.github
+public/system
 public/assets
 public/packs
-public/packs-test
-public/system
-redis
-sorbet
-tmp
+node_modules
+neo4j
 vendor/bundle
+.DS_Store
+*.swp
+*~
+postgres
+postgres14
+redis
+elasticsearch
+chart
--- a/.env.development
+++ b/.env.development
@ -1,9 +0,0 @@
-LOCAL_DOMAIN=localhost
-ALTERNATE_DOMAINS=mastodon.internal
-
-DB_HOST=$(pwd)/data/postgres
-DB_USER=mastodon
-DB_NAME=mastodon_dev
-REDIS_URL=unix://./data/redis/redis-dev.sock
-
-TH_USE_INVITE_QUOTA=1
--- a/.env.production.sample
+++ b/.env.production.sample
@ -14,94 +14,44 @@
 # ----------
 # This identifies your server and cannot be changed safely later
 # ----------
-LOCAL_DOMAIN=localhost
-
-# Use this only if you need to run mastodon on a different domain than the one used for federation.
-# You can read more about this option on https://docs.joinmastodon.org/admin/config/#web-domain
-# DO *NOT* USE THIS UNLESS YOU KNOW *EXACTLY* WHAT YOU ARE DOING.
-# WEB_DOMAIN=mastodon.example.com
-
-# Use this if you want to have several aliases handler@example1.com
-# handler@example2.com etc. for the same user. LOCAL_DOMAIN should not
-# be added. Comma separated values
-# ALTERNATE_DOMAINS=example1.com,example2.com
-ALTERNATE_DOMAINS=mastodon.internal
-
-# Use HTTP proxy for outgoing request (optional)
-# http_proxy=http://gateway.local:8118
-# Access control for hidden service.
-# ALLOW_ACCESS_TO_HIDDEN_SERVICE=true
-
-# Authorized fetch mode (optional)
-# Require remote servers to authentify when fetching toots, see
-# https://docs.joinmastodon.org/admin/config/#authorized_fetch
-# AUTHORIZED_FETCH=true
-
-# Limited federation mode (optional)
-# Only allow federation with specific domains, see
-# https://docs.joinmastodon.org/admin/config/#whitelist_mode
-# LIMITED_FEDERATION_MODE=true
+LOCAL_DOMAIN=example.com

 # Redis
 # -----
-REDIS_HOST=redis
+REDIS_HOST=localhost
 REDIS_PORT=6379

-
 # PostgreSQL
 # ----------
-DB_HOST=db
-DB_USER=postgres
+DB_HOST=/var/run/postgresql
+DB_USER=mastodon
 DB_NAME=mastodon_production
 DB_PASS=
 DB_PORT=5432

-
 # Elasticsearch (optional)
 # ------------------------
-#ES_ENABLED=true
-#ES_HOST=localhost
-#ES_PORT=9200
+ES_ENABLED=true
+ES_HOST=localhost
+ES_PORT=9200
 # Authentication for ES (optional)
-#ES_USER=elastic
-#ES_PASS=password
-
+ES_USER=elastic
+ES_PASS=password

 # Secrets
 # -------
-# Generate each with the `RAILS_ENV=production bundle exec rake secret` task (`docker-compose run --rm web bundle exec rake secret` if you use docker compose)
+# Make sure to use `rake secret` to generate secrets
 # -------
 SECRET_KEY_BASE=
 OTP_SECRET=

-
 # Web Push
 # --------
-# Generate with `rake mastodon:webpush:generate_vapid_key` (first is the private key, second is the public one)
-# You should only generate this once per instance. If you later decide to change it, all push subscription will
-# be invalidated, requiring the users to access the website again to resubscribe.
+# Generate with `rake mastodon:webpush:generate_vapid_key`
 # --------
 VAPID_PRIVATE_KEY=
 VAPID_PUBLIC_KEY=

-
-# Registrations
-# -------------
-
-# Single user mode will disable registrations and redirect frontpage to the first profile
-# SINGLE_USER_MODE=true
-
-# Prevent registrations with following e-mail domains
-# EMAIL_DOMAIN_DENYLIST=example1.com|example2.de|etc
-
-# Only allow registrations with the following e-mail domains
-# EMAIL_DOMAIN_ALLOWLIST=example1.com|example2.de|etc
-
-#TODO move this
-# Optionally change default language
-# DEFAULT_LOCALE=de
-
-
 # Sending mail
 # ------------
 SMTP_SERVER=
@ -110,190 +60,13 @@ SMTP_LOGIN=
 SMTP_PASSWORD=
 SMTP_FROM_ADDRESS=notifications@example.com

-
 # File storage (optional)
 # -----------------------
-# The attachment host must allow cross origin request from WEB_DOMAIN or
-# LOCAL_DOMAIN if WEB_DOMAIN is not set. For example, the server may have the
-# following header field:
-# Access-Control-Allow-Origin: https://192.168.1.123:9000/
-# -----------------------
-#S3_ENABLED=true
-#S3_BUCKET=files.example.com
-#AWS_ACCESS_KEY_ID=
-#AWS_SECRET_ACCESS_KEY=
-#S3_ALIAS_HOST=files.example.com
-
-# Swift (optional)
-# The attachment host must allow cross origin request - see the description
-# above.
-# SWIFT_ENABLED=true
-# SWIFT_USERNAME=
-# For Keystone V3, the value for SWIFT_TENANT should be the project name
-# SWIFT_TENANT=
-# SWIFT_PASSWORD=
-# Some OpenStack V3 providers require PROJECT_ID (optional)
-# SWIFT_PROJECT_ID=
-# Keystone V2 and V3 URLs are supported. Use a V3 URL if possible to avoid
-# issues with token rate-limiting during high load.
-# SWIFT_AUTH_URL=
-# SWIFT_CONTAINER=
-# SWIFT_OBJECT_URL=
-# SWIFT_REGION=
-# Defaults to 'default'
-# SWIFT_DOMAIN_NAME=
-# Defaults to 60 seconds. Set to 0 to disable
-# SWIFT_CACHE_TTL=
-
-# Optional asset host for multi-server setups
-# The asset host must allow cross origin request from WEB_DOMAIN or LOCAL_DOMAIN
-# if WEB_DOMAIN is not set. For example, the server may have the
-# following header field:
-# Access-Control-Allow-Origin: https://example.com/
-# CDN_HOST=https://assets.example.com
-
-# Optional list of hosts that are allowed to serve media for your instance
-# This is useful if you include external media in your custom CSS or about page,
-# or if your data storage provider makes use of redirects to other domains.
-# EXTRA_DATA_HOSTS=https://data.example1.com|https://data.example2.com
-
-# Optional alias for S3 (e.g. to serve files on a custom domain, possibly using Cloudfront or Cloudflare)
-# S3_ALIAS_HOST=
-
-# Streaming API integration
-# STREAMING_API_BASE_URL=
-
-
-# External authentication (optional)
-# ----------------------------------
-# LDAP authentication (optional)
-# LDAP_ENABLED=true
-# LDAP_HOST=localhost
-# LDAP_PORT=389
-# LDAP_METHOD=simple_tls
-# LDAP_BASE=
-# LDAP_BIND_DN=
-# LDAP_PASSWORD=
-# LDAP_UID=cn
-# LDAP_MAIL=mail
-# LDAP_SEARCH_FILTER=(|(%{uid}=%{email})(%{mail}=%{email}))
-# LDAP_UID_CONVERSION_ENABLED=true
-# LDAP_UID_CONVERSION_SEARCH=., -
-# LDAP_UID_CONVERSION_REPLACE=_
-
-# PAM authentication (optional)
-# PAM authentication uses for the email generation the "email" pam variable
-# and optional as fallback PAM_DEFAULT_SUFFIX
-# The pam environment variable "email" is provided by:
-# https://github.com/devkral/pam_email_extractor
-# PAM_ENABLED=true
-# Fallback email domain for email address generation (LOCAL_DOMAIN by default)
-# PAM_EMAIL_DOMAIN=example.com
-# Name of the pam service (pam "auth" section is evaluated)
-# PAM_DEFAULT_SERVICE=rpam
-# Name of the pam service used for checking if an user can register (pam "account" section is evaluated) (nil (disabled) by default)
-# PAM_CONTROLLED_SERVICE=rpam
-
-# Global OAuth settings (optional) :
-# If you have only one strategy, you may want to enable this
-# OAUTH_REDIRECT_AT_SIGN_IN=true
-
-# Optional CAS authentication (cf. omniauth-cas) :
-# CAS_ENABLED=true
-# CAS_URL=https://sso.myserver.com/
-# CAS_HOST=sso.myserver.com/
-# CAS_PORT=443
-# CAS_SSL=true
-# CAS_VALIDATE_URL=
-# CAS_CALLBACK_URL=
-# CAS_LOGOUT_URL=
-# CAS_LOGIN_URL=
-# CAS_UID_FIELD='user'
-# CAS_CA_PATH=
-# CAS_DISABLE_SSL_VERIFICATION=false
-# CAS_UID_KEY='user'
-# CAS_NAME_KEY='name'
-# CAS_EMAIL_KEY='email'
-# CAS_NICKNAME_KEY='nickname'
-# CAS_FIRST_NAME_KEY='firstname'
-# CAS_LAST_NAME_KEY='lastname'
-# CAS_LOCATION_KEY='location'
-# CAS_IMAGE_KEY='image'
-# CAS_PHONE_KEY='phone'
-
-# Optional SAML authentication (cf. omniauth-saml)
-# SAML_ENABLED=true
-# SAML_ACS_URL=http://localhost:3000/auth/auth/saml/callback
-# SAML_ISSUER=https://example.com
-# SAML_IDP_SSO_TARGET_URL=https://idp.testshib.org/idp/profile/SAML2/Redirect/SSO
-# SAML_IDP_CERT=
-# SAML_IDP_CERT_FINGERPRINT=
-# SAML_NAME_IDENTIFIER_FORMAT=
-# SAML_CERT=
-# SAML_PRIVATE_KEY=
-# SAML_SECURITY_WANT_ASSERTION_SIGNED=true
-# SAML_SECURITY_WANT_ASSERTION_ENCRYPTED=true
-# SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED=true
-# SAML_ATTRIBUTES_STATEMENTS_UID="urn:oid:0.9.2342.19200300.100.1.1"
-# SAML_ATTRIBUTES_STATEMENTS_EMAIL="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"
-# SAML_ATTRIBUTES_STATEMENTS_FULL_NAME="urn:oid:2.16.840.1.113730.3.1.241"
-# SAML_ATTRIBUTES_STATEMENTS_FIRST_NAME="urn:oid:2.5.4.42"
-# SAML_ATTRIBUTES_STATEMENTS_LAST_NAME="urn:oid:2.5.4.4"
-# SAML_UID_ATTRIBUTE="urn:oid:0.9.2342.19200300.100.1.1"
-# SAML_ATTRIBUTES_STATEMENTS_VERIFIED=
-# SAML_ATTRIBUTES_STATEMENTS_VERIFIED_EMAIL=
-
-
-# Custom settings
-# ---------------
-# Various ways to customize Mastodon's behavior
-# ---------------
-
-# Maximum allowed character count
-MAX_TOOT_CHARS=500
-
-# Maximum number of pinned posts
-MAX_PINNED_TOOTS=5
-
-# Maximum allowed bio characters
-MAX_BIO_CHARS=500
-
-# Maximim number of profile fields allowed
-MAX_PROFILE_FIELDS=4
-
-# Maximum allowed display name characters
-MAX_DISPLAY_NAME_CHARS=30
-
-# Maximum allowed poll options
-MAX_POLL_OPTIONS=5
-
-# Maximum allowed poll option characters
-MAX_POLL_OPTION_CHARS=100
-
-# Maximum image and video/audio upload sizes
-# Units are in bytes
-# 1048576 bytes equals 1 megabyte
-# MAX_IMAGE_SIZE=8388608
-# MAX_VIDEO_SIZE=41943040
-
-# Maximum search results to display
-# Only relevant when elasticsearch is installed
-# MAX_SEARCH_RESULTS=20
-
-# Maximum hashtags to display
-# Customize the number of hashtags shown in 'Explore'
-# MAX_TRENDING_TAGS=10
-
-# Maximum custom emoji file sizes
-# If undefined or smaller than MAX_EMOJI_SIZE, the value
-# of MAX_EMOJI_SIZE will be used for MAX_REMOTE_EMOJI_SIZE
-# Units are in bytes
-# MAX_EMOJI_SIZE=262144
-# MAX_REMOTE_EMOJI_SIZE=262144
-
-# Optional hCaptcha support
-# HCAPTCHA_SECRET_KEY=
-# HCAPTCHA_SITE_KEY=
+S3_ENABLED=true
+S3_BUCKET=files.example.com
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+S3_ALIAS_HOST=files.example.com

 # IP and session retention
 # -----------------------
--- a/.env.test
+++ b/.env.test
@ -3,8 +3,3 @@ NODE_ENV=tests
 # Federation
 LOCAL_DOMAIN=cb6e6126.ngrok.io
 LOCAL_HTTPS=true
-
-DB_HOST=$(pwd)/data/postgres
-DB_USER=mastodon
-DB_NAME=mastodon_dev
-REDIS_URL=unix://./data/redis/redis-dev.sock
--- a/.eslintrc.js
+++ b/.eslintrc.js
@ -247,7 +247,7 @@ module.exports = {
          },
          // Internal packages
          {
-            pattern: '{mastodon/**,flavours/glitch-soc/**}',
+            pattern: '{mastodon/**}',
            group: 'internal',
            position: 'after',
          },
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@ -4,6 +4,8 @@ on:
  push:
    branches:
      - 'main'
+    tags:
+      - '*'
  pull_request:
    paths:
      - .github/workflows/build-image.yml
@ -26,22 +28,34 @@ jobs:
      - uses: docker/setup-qemu-action@v2
      - uses: docker/setup-buildx-action@v2

+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+        if: github.repository == 'mastodon/mastodon' && github.event_name != 'pull_request'
+
      - name: Log in to the Github Container registry
        uses: docker/login-action@v2
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}
-        if: github.event_name != 'pull_request'
+        if: github.repository == 'mastodon/mastodon' && github.event_name != 'pull_request'

      - uses: docker/metadata-action@v4
        id: meta
        with:
-          images: ghcr.io/${{ github.repository_owner }}/mastodon
+          images: |
+            tootsuite/mastodon
+            ghcr.io/mastodon/mastodon
+          flavor: |
+            latest=auto
          tags: |
-            type=raw,value=latest,enable={{is_default_branch}}
            type=edge,branch=main
-            type=sha,prefix=,format=long
+            type=pep440,pattern={{raw}}
+            type=pep440,pattern=v{{major}}.{{minor}}
+            type=ref,event=pr

      - name: Generate version suffix
        id: version_vars
@ -56,7 +70,7 @@ jobs:
          platforms: linux/amd64,linux/arm64
          provenance: false
          builder: ${{ steps.buildx.outputs.name }}
-          push: ${{ github.event_name != 'pull_request' }}
+          push: ${{ github.repository == 'mastodon/mastodon' && github.event_name != 'pull_request' }}
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
          cache-from: type=gha
--- a/.gitignore
+++ b/.gitignore
@ -4,9 +4,6 @@
 # or operating system, you probably want to add a global ignore instead:
 #   git config --global core.excludesfile '~/.gitignore_global'

-# Ignore local dotenv overrides
-.env.*.local
-
 # Ignore bundler config and downloaded libraries.
 /.bundle
 /vendor/bundle
@ -15,9 +12,6 @@
 /db/*.sqlite3
 /db/*.sqlite3-journal

-# Ignore local data directory
-/data
-
 # Ignore all logfiles and tempfiles.
 .eslintcache
 /log/*
@ -69,12 +63,3 @@ yarn-debug.log

 # Ignore Docker option files
 docker-compose.override.yml
-
-# Yarn Berry
-.pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
--- a/.gitmodules
+++ b/.gitmodules
--- a/.prettierignore
+++ b/.prettierignore
@ -76,16 +76,3 @@ app/javascript/styles/mastodon/reset.scss

 # Ignore the generated AUTHORS.md
 AUTHORS.md
-
-# Ignore glitch-soc emoji map file
-/app/javascript/flavours/glitch/features/emoji/emoji_map.json
-
-# Ignore glitch-soc locale files
-/app/javascript/flavours/glitch/locales
-/config/locales-glitch
-
-# Ignore glitch-soc vendored CSS reset
-app/javascript/flavours/glitch/styles/reset.scss
-
-# Ignore win95 theme
-app/javascript/styles/win95.scss
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@ -151,8 +151,6 @@ Lint/Void:
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
  Max: 150
-  Exclude:
-    - 'app/serializers/initial_state_serializer.rb'

 # Configuration parameters: CountBlocks, Max.
 Metrics/BlockNesting:
@ -653,7 +651,6 @@ Rails/ThreeStateBooleanColumn:
    - 'db/migrate/20170209184350_add_reply_to_statuses.rb'
    - 'db/migrate/20170330163835_create_imports.rb'
    - 'db/migrate/20170905165803_add_local_to_statuses.rb'
-    - 'db/migrate/20171210213213_add_local_only_flag_to_statuses.rb'
    - 'db/migrate/20181203021853_add_discoverable_to_accounts.rb'
    - 'db/migrate/20190509164208_add_by_moderator_to_tombstone.rb'
    - 'db/migrate/20190805123746_add_capabilities_to_tags.rb'
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@ -1,78 +0,0 @@
-variables:
-  environment: &docker-environment
-    NAME: gitea.treehouse.systems/treehouse/mastodon
-    DATE_COMMAND: export COMMIT_DATE=$(date -u -Idate -d @$(git show -s --format=%ct))
-  docker-step: &docker-step
-    image: docker:rc-git
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    environment:
-      <<: *docker-environment
-
-clone:
-  git:
-    image: woodpeckerci/plugin-git
-    settings:
-      partial: false
-      depth: 10
-
-pipeline:
-  # build-base:
-  #   <<: *docker-step
-  #   commands:
-  #     - docker version
-  #     - docker image build -f Dockerfile --build-arg SOURCE_TAG=$CI_COMMIT_SHA . --target build-base -t $NAME:build-base
-
-  # build:
-  #   <<: *docker-step
-  #   commands:
-  #     - docker version
-  #     - docker image build -f Dockerfile --build-arg SOURCE_TAG=$CI_COMMIT_SHA . --target build -t $NAME:build
-
-  # output-base:
-  #   <<: *docker-step
-  #   commands:
-  #     - docker version
-  #     - docker image build -f Dockerfile --build-arg SOURCE_TAG=$CI_COMMIT_SHA . --target output-base -t $NAME:build
-
-  # the world is not yet ready for this step
-  # test:
-  #   <<: *docker-step
-  #   commands:
-  #     - docker run --rm -e RAILS_ENV=test -e NODE_ENV=development $NAME:build-base sh -c 'bundle config set --local without development && bundle install && rake spec'
-
-  output:
-    <<: *docker-step
-    commands:
-      - eval $DATE_COMMAND
-      - export TAG=$${COMMIT_DATE}.$CI_COMMIT_SHA && echo $${TAG}
-      - docker image build -f Dockerfile --build-arg SOURCE_TAG=$CI_COMMIT_SHA . -t $NAME:latest
-      - docker tag $NAME:latest $NAME:$TAG
-      # idk what's actually persisted between steps
-      # /shrug this works, so,???
-      - echo $${TAG} > tags.txt
-      - echo latest >> tags.txt
-
-  # maybe we can use tags someday,,,
-  # tag-tag:
-  #   image: *docker-git
-  #   volumes:
-  #     - /var/run/docker.sock:/var/run/docker.sock
-  #   commands:
-  #     - docker tag $NAME:latest $NAME:$CI_COMMIT_TAG
-  #   when:
-  #     event: tag
-
-  push:
-    <<: *docker-step
-    commands:
-      - echo $REGISTRY_SECRET | docker login -u $REGISTRY_USER --password-stdin gitea.treehouse.systems
-      - cat tags.txt | xargs -n 1 -I% echo docker image push $NAME:%
-      - cat tags.txt | xargs -n 1 -I% docker image push $NAME:%
-    when:
-      event: [push, tag]
-      branch: main
-    secrets: [REGISTRY_SECRET]
-    environment:
-      <<: *docker-environment
-      REGISTRY_USER: ariadne
--- a/.yarn/releases/yarn-3.4.1.cjs
+++ b/.yarn/releases/yarn-3.4.1.cjs
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@ -1,9 +0,0 @@
-enableGlobalCache: true
-
-nodeLinker: node-modules
-
-yarnPath: .yarn/releases/yarn-3.4.1.cjs
-
-logFilters:
-  - code: YN0013
-    level: ${YARN_NOISE_LOG_CODE_LEVEL:-info}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,14 +2,6 @@

 All notable changes to this project will be documented in this file.

-## [4.1.4] - 2023-07-07
-
-### Fixed
-
- Fix branding:generate_app_icons failing because of disallowed ICO coder ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25794))
- Fix crash in admin interface when viewing a remote user with verified links ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25796))
- Fix processing of media files with unusual names ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25788))
-
 ## [4.1.3] - 2023-07-06

 ### Added
@ -37,7 +29,7 @@ All notable changes to this project will be documented in this file.
 - Fix multiple inefficiencies in automatic post cleanup worker ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/24607), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24785), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24840))
 - Fix performance of streaming by parsing message JSON once ([ThisIsMissEm](https://github.com/mastodon/mastodon/pull/25278), [ThisIsMissEm](https://github.com/mastodon/mastodon/pull/25361))
 - Fix CSP headers when `S3_ALIAS_HOST` includes a path component ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25273))
- Fix `tootctl accounts approve --number N` not approving N earliest registrations ([danielmbrasil](https://github.com/mastodon/mastodon/pull/24605))
+- Fix `tootctl accounts approve --number N` not aproving N earliest registrations ([danielmbrasil](https://github.com/mastodon/mastodon/pull/24605))
 - Fix reports not being closed when performing batch suspensions ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/24988))
 - Fix being able to vote on your own polls ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25015))
 - Fix race condition when reblogging a status ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25016))
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@ -2,45 +2,131 @@

 ## Our Pledge

-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.

 ## Our Standards

-Examples of behavior that contributes to creating a positive environment include:
+Examples of behavior that contributes to a positive environment for our
+community include:

- Using welcoming and inclusive language
- Being respectful of differing viewpoints and experiences
- Gracefully accepting constructive criticism
- Focusing on what is best for the community
- Showing empathy towards other community members
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+- Focusing on what is best not just for us as individuals, but for the overall
+  community

-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:

- The use of sexualized language or imagery and unwelcome sexual attention or advances
- Trolling, insulting/derogatory comments, and personal or political attacks
+- The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+- Trolling, insulting or derogatory comments, and personal or political attacks
 - Public or private harassment
- Publishing others' private information, such as a physical or electronic address, without explicit permission
- Other conduct which could reasonably be considered inappropriate in a professional setting
+- Publishing others' private information, such as a physical or email address,
+  without their explicit permission
+- Other conduct which could reasonably be considered inappropriate in a
+  professional setting

-## Our Responsibilities
+## Enforcement Responsibilities

-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.

-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.

 ## Scope

-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.

 ## Enforcement

-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at glitch-abuse@sitedethib.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+[hello@joinmastodon.org](mailto:hello@joinmastodon.org).
+All complaints will be reviewed and investigated promptly and fairly.

-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.

 ## Attribution

-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [https://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].

-[homepage]: https://contributor-covenant.org
-[version]: https://contributor-covenant.org/version/1/4/
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,47 +1,3 @@
-#  Contributing to Mastodon Glitch+Treehouse Edition  #
-
-Thank you for your interest in contributing to the **Treehouse Mastodon** project!
-Here are some guidelines, and ways you can help.
-
->   (This document is a bit of a work-in-progress, so please bear with us.
->   If you don't see what you're looking for here, please don't hesitate to reach out!)
-
-## Translations
-
-You can submit glitch-soc-specific translations via [Crowdin](https://crowdin.com/project/glitch-soc). They are periodically merged into the codebase.
-
-[![Crowdin](https://badges.crowdin.net/glitch-soc/localized.svg)](https://crowdin.com/project/glitch-soc)
-
-##  Planning  ##
-
-Right now a lot of the planning for this project takes place in the `#fediverse`
-channel of the Treehouse Discord, or through Gitea Issues.
-
-We're working on ways to improve the planning structure and better solicit feedback, and if you feel like you can help in this respect, feel free to give us a holler.
-
-##  Documentation  ##
-
-The upstream Glitch documentation for this repository is available at [`glitch-soc/docs`](https://github.com/glitch-soc/docs) (online at [glitch-soc.github.io/docs/](https://glitch-soc.github.io/docs/)).
-
-##  Setup  ##
-
-For a some-batteries-required guide to setting up a development environment for this repository, read Rin's excellent
-[SETUP.md](https://gitea.treehouse.systems/treehouse/mastodon/src/branch/main/SETUP.md).
-
-##  Frontend Development  ##
-
-Check out [the documentation here](https://glitch-soc.github.io/docs/contributing/frontend/) for more information.
-
-##  Backend Development  ##
-
-See the guidelines below.
-
- - - -
-
-You should also try to follow the guidelines set out in the original `CONTRIBUTING.md` from `mastodon/mastodon`, reproduced below.
-
-<blockquote>
-
 # Contributing

 Thank you for considering contributing to Mastodon 🐘
@ -85,10 +41,6 @@ It is not always possible to phrase every change in such a manner, but it is des
 - Code style rules (rubocop, eslint)
 - Normalization of locale files (i18n-tasks)

-**Note**: You may need to log in and authorise the GitHub account your fork of this repository belongs to with CircleCI to enable some of the automated checks to run.
-
 ## Documentation

 The [Mastodon documentation](https://docs.joinmastodon.org) is a statically generated site. You can [submit merge requests to mastodon/documentation](https://github.com/mastodon/documentation).
-
-</blockquote>
--- a/162
+++ b/162
@ -1,14 +1,9 @@
 # syntax=docker/dockerfile:1.4
 # This needs to be bullseye-slim because the Ruby image is built on bullseye-slim
-ARG NODE_IMAGE=node:18.16-bullseye-slim
-ARG RUBY_IMAGE=ghcr.io/moritzheiber/ruby-jemalloc:3.2.2-slim
+ARG NODE_VERSION="16.20-bullseye-slim"

-# hadolint ignore=DL3006
-FROM ${RUBY_IMAGE} as ruby
-
-# build-base
-# hadolint ignore=DL3006
-FROM ${NODE_IMAGE} as build-base
+FROM ghcr.io/moritzheiber/ruby-jemalloc:3.2.2-slim as ruby
+FROM node:${NODE_VERSION} as build

 COPY --link --from=ruby /opt/ruby /opt/ruby

@ -18,153 +13,92 @@ ENV DEBIAN_FRONTEND="noninteractive" \
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]

 WORKDIR /opt/mastodon
+COPY Gemfile* package.json yarn.lock /opt/mastodon/

-# hadolint ignore=DL3008,DL3009
-RUN --mount=type=cache,id=apt,target=/var/cache/apt,sharing=private \
-    set -eux && \
-    rm -f /etc/apt/apt.conf.d/docker-clean && \
-    echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends \
-        build-essential \
-        ca-certificates \
+# hadolint ignore=DL3008
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends build-essential \
        git \
-        libgdbm-dev \
-        libgmp-dev \
        libicu-dev \
        libidn11-dev \
-        libjemalloc-dev \
        libpq-dev \
-        libreadline8 \
+        libjemalloc-dev \
+        zlib1g-dev \
+        libgdbm-dev \
+        libgmp-dev \
        libssl-dev \
        libyaml-0-2 \
-        python3 \
-        shared-mime-info \
-        zlib1g-dev
-
-COPY --link .yarn/releases/ /opt/mastodon/.yarn/releases/
-COPY --link Gemfile* package.json yarn.lock .yarnrc.yml /opt/mastodon/
-
-ENV NODE_OPTIONS=--openssl-legacy-provider \
-    YARN_GLOBAL_FOLDER=/opt/yarn \
-    YARN_ENABLE_GLOBAL_CACHE=1
-
-# hadolint ignore=DL3060
-RUN --mount=type=cache,id=bundle,target=/opt/bundle/cache,sharing=private \
-    --mount=type=cache,id=yarn,target=/opt/yarn/cache,sharing=private \
-    set -eux && \
-    bundle config set cache_path /opt/bundle/cache && \
-    bundle config set silence_root_warning 'true' && \
-    bundle cache --no-install && \
-    bundle config set --local deployment 'true' && \
-    bundle install --local -j"$(nproc)" && \
-    yarn install --immutable
-
-# Precompile assets
-# TODO(kouhai): we're currently patching node_modules because of emoji-mart.
-# we should integrate our own fork instead.
-COPY --link . /opt/mastodon
-
-# build
-FROM build-base AS build
-
-ENV RAILS_ENV="production" \
-    NODE_ENV="production"
-
-ENV NODE_OPTIONS=--openssl-legacy-provider \
-    YARN_GLOBAL_FOLDER=/opt/yarn \
-    YARN_ENABLE_GLOBAL_CACHE=1
-
-ENV OTP_SECRET=precompile_placeholder \
-    SECRET_KEY_BASE=precompile_placeholder \
-    RAKE_NO_YARN_INSTALL_HACK=1
-
-# override this at will
-ENV BOOTSNAP_READONLY=1
-
-RUN --mount=type=cache,id=yarn,target=/opt/yarn/cache,sharing=private \
-    --mount=type=cache,id=webpacker,target=/opt/webpacker/cache,sharing=private \
-    set -eux && \
-    mkdir -p tmp/cache && \
-    ln -sf /opt/webpacker/cache tmp/cache/webpacker && \
-    mv ./emoji_data/all.json ./node_modules/emoji-mart/data/all.json && \
-    yarn install && \
-    bundle exec rails assets:precompile
-
-# final image
-# hadolint ignore=DL3006
-FROM ${NODE_IMAGE} as output-base
-
-ENV DEBIAN_FRONTEND="noninteractive"
-
-# Ignoring these here since we don't want to pin any versions and the Debian image removes apt-get content after use
-# hadolint ignore=DL3008,DL3009
-RUN --mount=type=cache,id=apt,target=/var/cache/apt,sharing=private \
-    set -eux && \
-    rm -f /etc/apt/apt.conf.d/docker-clean && \
-    echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache && \
-    echo "Etc/UTC" > /etc/localtime && \
-    apt-get update && \
-    apt-get -y --no-install-recommends install \
        ca-certificates \
-        ffmpeg \
-        file \
-        imagemagick \
-        libicu67 \
-        libidn11 \
-        libjemalloc2 \
-        libpq5 \
        libreadline8 \
-        libssl1.1 \
-        libyaml-0-2 \
-        procps \
-        tini \
-        tzdata \
-        wget \
-        whois
+        python3 \
+        shared-mime-info && \
+    bundle config set --local deployment 'true' && \
+    bundle config set --local without 'development test' && \
+    bundle config set silence_root_warning true && \
+    bundle install -j"$(nproc)" && \
+    yarn install --pure-lockfile --production --network-timeout 600000 && \
+    yarn cache clean

-# final image
-FROM output-base as output
+FROM node:${NODE_VERSION}

 # Use those args to specify your own version flags & suffixes
-ARG SOURCE_TAG=""
 ARG MASTODON_VERSION_FLAGS=""
 ARG MASTODON_VERSION_SUFFIX=""

 ARG UID="991"
 ARG GID="991"

+COPY --link --from=ruby /opt/ruby /opt/ruby
+
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]

-ENV PATH="${PATH}:/opt/ruby/bin:/opt/mastodon/bin"
+ENV DEBIAN_FRONTEND="noninteractive" \
+    PATH="${PATH}:/opt/ruby/bin:/opt/mastodon/bin"

 # Ignoring these here since we don't want to pin any versions and the Debian image removes apt-get content after use
 # hadolint ignore=DL3008,DL3009
-RUN groupadd -g "${GID}" mastodon && \
+RUN apt-get update && \
+    echo "Etc/UTC" > /etc/localtime && \
+    groupadd -g "${GID}" mastodon && \
    useradd -l -u "$UID" -g "${GID}" -m -d /opt/mastodon mastodon && \
+    apt-get -y --no-install-recommends install whois \
+        wget \
+        procps \
+        libssl1.1 \
+        libpq5 \
+        imagemagick \
+        ffmpeg \
+        libjemalloc2 \
+        libicu67 \
+        libidn11 \
+        libyaml-0-2 \
+        file \
+        ca-certificates \
+        tzdata \
+        libreadline8 \
+        tini && \
    ln -s /opt/mastodon /mastodon

 # Note: no, cleaning here since Debian does this automatically
 # See the file /etc/apt/apt.conf.d/docker-clean within the Docker image's filesystem

-COPY --link --from=ruby /opt/ruby /opt/ruby
-COPY --link --chown=mastodon:mastodon --from=build /opt/mastodon /opt/mastodon
+COPY --chown=mastodon:mastodon . /opt/mastodon
+COPY --chown=mastodon:mastodon --from=build /opt/mastodon /opt/mastodon

 ENV RAILS_ENV="production" \
    NODE_ENV="production" \
    RAILS_SERVE_STATIC_FILES="true" \
    BIND="0.0.0.0" \
-    SOURCE_TAG="${SOURCE_TAG}" \
    MASTODON_VERSION_FLAGS="${MASTODON_VERSION_FLAGS}" \
    MASTODON_VERSION_SUFFIX="${MASTODON_VERSION_SUFFIX}"

-# override this at will
-ENV BOOTSNAP_READONLY=1
-
 # Set the run user
 USER mastodon
 WORKDIR /opt/mastodon

+# Precompile assets
+RUN OTP_SECRET=precompile_placeholder SECRET_KEY_BASE=precompile_placeholder rails assets:precompile
+
 # Set the work dir and the container entry point
 ENTRYPOINT ["/usr/bin/tini", "--"]
 EXPOSE 3000 4000
--- a/4
+++ b/4
@ -177,9 +177,6 @@ group :development do
  # Profiling tools
  gem 'memory_profiler', require: false
  gem 'stackprof', require: false
-
-  # foreman
-  gem 'foreman'
 end

 group :production do
@ -189,7 +186,6 @@ end
 gem 'concurrent-ruby', require: false
 gem 'connection_pool', require: false
 gem 'xorcist', '~> 1.1'
-
 gem 'cocoon', '~> 1.2'

 gem 'net-http', '~> 0.3.2'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -273,7 +273,6 @@ GEM
      fog-core (>= 1.45, <= 2.1.0)
      fog-json (>= 1.0)
      ipaddress (>= 0.8)
-    foreman (0.87.2)
    formatador (0.3.0)
    fugit (1.8.1)
      et-orbi (~> 1, >= 1.2.7)
@ -292,11 +291,11 @@ GEM
      activesupport (>= 5.1)
      haml (>= 4.0.6)
      railties (>= 5.1)
-    haml_lint (0.46.0)
+    haml_lint (0.45.0)
      haml (>= 4.0, < 6.2)
      parallel (~> 1.10)
      rainbow
-      rubocop (>= 1.0)
+      rubocop (>= 0.50.0)
      sysexits (~> 1.1)
    hashdiff (1.0.1)
    hashie (5.0.0)
@ -374,7 +373,6 @@ GEM
      marcel (~> 1.0.1)
      mime-types
      terrapin (~> 0.6.0)
-    language_server-protocol (3.17.0.3)
    launchy (2.5.2)
      addressable (~> 2.8)
    letter_opener (1.8.1)
@ -434,7 +432,7 @@ GEM
      net-protocol
    net-ssh (7.1.0)
    nio4r (2.5.9)
-    nokogiri (1.15.3)
+    nokogiri (1.15.2)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
    oj (3.15.0)
@ -593,9 +591,8 @@ GEM
      sidekiq (>= 2.4.0)
    rspec-support (3.12.0)
    rspec_chunked (0.6)
-    rubocop (1.54.1)
+    rubocop (1.52.1)
      json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
      parallel (~> 1.10)
      parser (>= 3.2.2.3)
      rainbow (>= 2.2.2, < 4.0)
@ -631,7 +628,7 @@ GEM
      fugit (~> 1.1, >= 1.1.6)
    safety_net_attestation (0.4.0)
      jwt (~> 2.0)
-    sanitize (6.0.2)
+    sanitize (6.0.1)
      crass (~> 1.0.2)
      nokogiri (>= 1.12.0)
    scenic (1.7.0)
@ -798,7 +795,6 @@ DEPENDENCIES
  fastimage
  fog-core (<= 2.4.0)
  fog-openstack (~> 0.3)
-  foreman
  fuubar (~> 2.5)
  haml-rails (~> 2.0)
  haml_lint
--- a/Procfile.dev
+++ b/Procfile.dev
@ -1,4 +1,4 @@
 web: env PORT=3000 RAILS_ENV=development bundle exec puma -C config/puma.rb
 sidekiq: env PORT=3000 RAILS_ENV=development bundle exec sidekiq
 stream: env PORT=4000 yarn run start
-webpack: env RAILS_ENV=development NODE_ENV=development ./bin/webpack-dev-server --listen-host 0.0.0.0
+webpack: ./bin/webpack-dev-server --listen-host 0.0.0.0
--- a/README.md
+++ b/README.md
@ -1,21 +1,111 @@
-#  Mastodon Glitch+Treehouse Edition  #
+<h1><picture>
+  <source media="(prefers-color-scheme: dark)" srcset="./lib/assets/wordmark.dark.png?raw=true">
+  <source media="(prefers-color-scheme: light)" srcset="./lib/assets/wordmark.light.png?raw=true">
+  <img alt="Mastodon" src="./lib/assets/wordmark.light.png?raw=true" height="34">
+</picture></h1>

-> Now with bunny ears!
+[![GitHub release](https://img.shields.io/github/release/mastodon/mastodon.svg)][releases]
+[![Ruby Testing](https://github.com/mastodon/mastodon/actions/workflows/test-ruby.yml/badge.svg)](https://github.com/mastodon/mastodon/actions/workflows/test-ruby.yml)
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/mastodon/localized.svg)][crowdin]

-So here's the deal: we all work on this code, and anyone who uses that does so absolutely at their own risk. Can you dig it?
+[releases]: https://github.com/mastodon/mastodon/releases
+[crowdin]: https://crowdin.com/project/mastodon

-Specifically, this fork-of-a-fork is intended for Treehouse use only. Unless
-otherwise communicated, we will not put effort into supporting other deployments
-or upstreaming our patches.
+Mastodon is a **free, open-source social network server** based on ActivityPub where users can follow friends and discover new ones. On Mastodon, users can publish anything they want: links, pictures, text, video. All Mastodon servers are interoperable as a federated network (users on one server can seamlessly communicate with users from another one, including non-Mastodon software that implements ActivityPub!)

-## Links
+Click below to **learn more** in a video:

- You can view upstream Glitch's documentation for this project at [glitch-soc.github.io/docs/](https://glitch-soc.github.io/docs/).
- Contributing guidelines are available [here](CONTRIBUTING.md).
+[![Screenshot](https://blog.joinmastodon.org/2018/06/why-activitypub-is-the-future/ezgif-2-60f1b00403.gif)][youtube_demo]

-## Known Deployments
+[youtube_demo]: https://www.youtube.com/watch?v=IPSbNdBmWKE

- Treehouse Social: [social.treehouse.systems](https://social.treehouse.systems)
- VT Social: [vt.social](https://vt.social)
- Unstable Systems: [unstable.systems](https://unstable.systems)
- Slowest (dot) Network: [slowest.network](https://slowest.network)
+## Navigation
+
+- [Project homepage 🐘](https://joinmastodon.org)
+- [Support the development via Patreon][patreon]
+- [View sponsors](https://joinmastodon.org/sponsors)
+- [Blog](https://blog.joinmastodon.org)
+- [Documentation](https://docs.joinmastodon.org)
+- [Roadmap](https://joinmastodon.org/roadmap)
+- [Official Docker image](https://github.com/mastodon/mastodon/pkgs/container/mastodon)
+- [Browse Mastodon servers](https://joinmastodon.org/communities)
+- [Browse Mastodon apps](https://joinmastodon.org/apps)
+
+[patreon]: https://www.patreon.com/mastodon
+
+## Features
+
+<img src="/app/javascript/images/elephant_ui_working.svg?raw=true" align="right" width="30%" />
+
+### No vendor lock-in: Fully interoperable with any conforming platform
+
+It doesn't have to be Mastodon; whatever implements ActivityPub is part of the social network! [Learn more](https://blog.joinmastodon.org/2018/06/why-activitypub-is-the-future/)
+
+### Real-time, chronological timeline updates
+
+Updates of people you're following appear in real-time in the UI via WebSockets. There's a firehose view as well!
+
+### Media attachments like images and short videos
+
+Upload and view images and WebM/MP4 videos attached to the updates. Videos with no audio track are treated like GIFs; normal videos loop continuously!
+
+### Safety and moderation tools
+
+Mastodon includes private posts, locked accounts, phrase filtering, muting, blocking and all sorts of other features, along with a reporting and moderation system. [Learn more](https://blog.joinmastodon.org/2018/07/cage-the-mastodon/)
+
+### OAuth2 and a straightforward REST API
+
+Mastodon acts as an OAuth2 provider, so 3rd party apps can use the REST and Streaming APIs. This results in a rich app ecosystem with a lot of choices!
+
+## Deployment
+
+### Tech stack:
+
+- **Ruby on Rails** powers the REST API and other web pages
+- **React.js** and Redux are used for the dynamic parts of the interface
+- **Node.js** powers the streaming API
+
+### Requirements:
+
+- **PostgreSQL** 9.5+
+- **Redis** 4+
+- **Ruby** 2.7+
+- **Node.js** 14+
+
+The repository includes deployment configurations for **Docker and docker-compose** as well as specific platforms like **Heroku**, **Scalingo**, and **Nanobox**. For Helm charts, reference the [mastodon/chart repository](https://github.com/mastodon/chart). The [**standalone** installation guide](https://docs.joinmastodon.org/admin/install/) is available in the documentation.
+
+A **Vagrant** configuration is included for development purposes. To use it, complete following steps:
+
+- Install Vagrant and Virtualbox
+- Install the `vagrant-hostsupdater` plugin: `vagrant plugin install vagrant-hostsupdater`
+- Run `vagrant up`
+- Run `vagrant ssh -c "cd /vagrant && foreman start"`
+- Open `http://mastodon.local` in your browser
+
+### Getting Started with GitHub Codespaces
+
+To get started, create a codespace for this repository by clicking this 👇
+
+[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new?hide_repo_select=true&ref=main&repo=52281283)
+
+A codespace will open in a web-based version of Visual Studio Code. The [dev container](.devcontainer/devcontainer.json) is fully configured with software needed for this project.
+
+**Note**: Dev containers is an open spec which is supported by [GitHub Codespaces](https://github.com/codespaces) and [other tools](https://containers.dev/supporting).
+
+## Contributing
+
+Mastodon is **free, open-source software** licensed under **AGPLv3**.
+
+You can open issues for bugs you've found or features you think are missing. You can also submit pull requests to this repository or submit translations using Crowdin. To get started, take a look at [CONTRIBUTING.md](CONTRIBUTING.md). If your contributions are accepted into Mastodon, you can request to be paid through [our OpenCollective](https://opencollective.com/mastodon).
+
+**IRC channel**: #mastodon on irc.libera.chat
+
+## License
+
+Copyright (C) 2016-2022 Eugen Rochko & other Mastodon contributors (see [AUTHORS.md](AUTHORS.md))
+
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
--- a/9
+++ b/9
@ -4,12 +4,3 @@
 require File.expand_path('../config/application', __FILE__)

 Rails.application.load_tasks
-
-# please don't do this
-if Rake::Task.task_defined?('assets:precompile') && ENV.include?('RAKE_NO_YARN_INSTALL_HACK')
-  task = Rake::Task['assets:precompile']
-  puts task.prerequisites
-  task.prerequisites.delete('webpacker:yarn_install')
-  task.prerequisites.delete('yarn:install')
-  puts task.prerequisites
-end
--- a/SETUP.md
+++ b/SETUP.md
@ -1,143 +0,0 @@
-# Setting up a dev environment
-
-## Prerequisites
-
-Mastodon development requires the following:
-
- Ruby 3.0
- Ruby gems:
-  - `bundler`
-  - `irb`
-  - `foreman`
- NodeJS v18 (LTS)
- NPM packages:
-  - `yarn`
- Postgres
- Redis
-
-### macOS
-
-First, make sure you have Homebrew installed. Follow the instructions at [brew.sh](https://brew.sh).
-
-Run the following to install all necessary packages:
-```
-brew install ruby@3.0 foreman node yarn postgresql redis
-```
-
-Ruby 3.0 is **keg-only** by default. Follow the instructions in the **Caveat** to add it to your path.
-
-### Linux
-
-We will assume that you know how to locate the correct packages for your distro. That said, some distros package `bundler` and `irb` separately. Make sure that you also install these.
-
-On Arch, you will need:
- `ruby`
- `ruby-bundler`
- `ruby-irb`
- `ruby-foreman`
- `redis`
- `postgresql`
- `yarn`
- `gmp`
- `libidn`
-
-### Windows
-
-Unfortunately, none of the authors use Windows. Contributions welcome!
-
-## Database
-
-In the root of this repository, go through the following script:
-```sh
-# Create a folder for local data
-mkdir -p data
-
-# Set up a local database
-pg_ctl -D data/postgres initdb -o '-U mastodon --auth-host=trust'
-
-# Use the data/postgres folder for the DB connection unix socket
-#
-# If you don't know what that means, it's just a way for Mastodon to communicate
-# with a database on the same machine efficiently.
-#
-# See: https://manpages.ubuntu.com/manpages/jammy/man7/unix.7.html
-echo 'unix_socket_directories = .' >> data/postgres/postgresql.conf
-
-# Start the database
-pg_ctl -D data/postgres start --silent
-```
-
-## Redis
-
-In the root of this repository, run the following:
-```sh
-# Create a folder for redis data
-mkdir -p data/redis
-
-# Start Redis
-redis-server ./redis-dev.conf
-
-# [Optional] Stop Redis
-# kill "$(cat ./data/redis/redis-dev.pid)"
-```
-
-## Ruby
-
-```sh
-export RAILS_ENV=development
-
-# Bundle installs all Ruby gems globally by default, which might cause problems.
-bundle config set --local path 'vendor/bundle'
-
-# [Apple Silicon] If using macOS on Apple Silicon, run the following:
-# bundle config build.idn-ruby -- --with-idn-dir="$(brew --prefix libidn)"
-
-# Install dependencies using bundle (Ruby) and yarn (JS)
-bundle install
-yarn install
-
-# Setup the database using the pre-defined Rake task
-#
-# Rake is a command runner for Ruby projects. The `bundle exec` ensures that
-# we use the version of Rake that this project requires.
-bundle exec rake db:setup
-
-# [Optional] If that fails, run the following and try again:
-# bundle exec rake db:reset
-```
-
-## Running Mastodon
-
-1. Run `export RAILS_ENV=development NODE_ENV=development`.
-    - Put these in your shell's .rc, or a script you can source if you want to skip this step in the future.
-2. Run `bundle exec rake assets:precompile`.
-    - If this explodes, complaining about `Hash`, you'll need to `export NODE_OPTIONS=--openssl-legacy-provider`.
-    - After doing this, you will need to run `bundle exec rake assets:clobber` and then re-run `bundle exec rake assets:precompile`.
-3. Run `foreman start`
-
-# Updates/Troubleshooting
-
-## RubyVM/DebugInspector Issues
-
-Still unable to fix. Circumvent by removing `better_errors` and `binding_of_caller` from Gemfile.
-
-Happy to troubleshoot with someone better with Ruby than us >_<'/.
-
-## Webpack Issues
-
-If Webpack compalins about being unable to find some assets or locales:
-
-Try:
-1. `rm -rf node_modules`
-2. `yarn install`
-
-If this doesn't help, try:
-1. `yarn add webpack`
-2. `git restore package.json yarn.lock`
-3. `yarn install`
-
-Then re-run `foreman start`. No. We have no idea why this worked.
-
-# Need Help?
-
-If the above instructions don't work, please contact @Rin here, or @tammy@social.treehouse.systems.
--- a/2
+++ b/2
@ -102,7 +102,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|

  config.vm.provider :virtualbox do |vb|
    vb.name = "mastodon"
-    vb.customize ["modifyvm", :id, "--memory", "4096"]
+    vb.customize ["modifyvm", :id, "--memory", "2048"]
    # Increase the number of CPUs. Uncomment and adjust to
    # increase performance
    # vb.customize ["modifyvm", :id, "--cpus", "3"]
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@ -48,7 +48,7 @@ class AccountsController < ApplicationController
  end

  def default_statuses
-    @account.statuses.not_local_only.where(visibility: [:public, :unlisted])
+    @account.statuses.where(visibility: [:public, :unlisted])
  end

  def only_media_scope
--- a/app/controllers/activitypub/collections_controller.rb
+++ b/app/controllers/activitypub/collections_controller.rb
@ -21,7 +21,7 @@ class ActivityPub::CollectionsController < ActivityPub::BaseController
  def set_items
    case params[:id]
    when 'featured'
-      @items = for_signed_account { cache_collection(@account.pinned_statuses.not_local_only, Status) }
+      @items = for_signed_account { cache_collection(@account.pinned_statuses, Status) }
      @items = @items.map { |item| item.distributable? ? item : ActivityPub::TagManager.instance.uri_for(item) }
    when 'tags'
      @items = for_signed_account { @account.featured_tags }
--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@ -7,7 +7,6 @@ module Admin

    layout 'admin'

-    before_action :set_pack
    before_action :set_body_classes
    before_action :set_cache_headers

@ -19,10 +18,6 @@ module Admin
      @body_classes = 'admin'
    end

-    def set_pack
-      use_pack 'admin'
-    end
-
    def set_cache_headers
      response.cache_control.replace(private: true, no_store: true)
    end
--- a/app/controllers/admin/custom_emojis_controller.rb
+++ b/app/controllers/admin/custom_emojis_controller.rb
@ -37,9 +37,6 @@ module Admin
      flash[:alert] = I18n.t('admin.custom_emojis.no_emoji_selected')
    rescue Mastodon::NotPermittedError
      flash[:alert] = I18n.t('admin.custom_emojis.not_permitted')
-    rescue ActiveRecord::RecordInvalid => e
-      error_message = action_from_button == 'copy' ? 'admin.custom_emojis.batch_copy_error' : 'admin.custom_emojis.batch_error'
-      flash[:alert] = I18n.t(error_message, message: e.message)
    ensure
      redirect_to admin_custom_emojis_path(filter_params)
    end
--- a/app/controllers/admin/settings/other_controller.rb
+++ b/app/controllers/admin/settings/other_controller.rb
@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Admin::Settings::OtherController < Admin::SettingsController
-  private
-
-  def after_update_redirect_path
-    admin_settings_other_path
-  end
-end
--- a/app/controllers/api/v1/accounts/relationships_controller.rb
+++ b/app/controllers/api/v1/accounts/relationships_controller.rb
@ -5,7 +5,7 @@ class Api::V1::Accounts::RelationshipsController < Api::BaseController
  before_action :require_user!

  def index
-    accounts = Account.where(id: account_ids).select('id')
+    accounts = Account.without_suspended.where(id: account_ids).select('id')
    # .where doesn't guarantee that our results are in the same order
    # we requested them, so return the "right" order to the requestor.
    @accounts = accounts.index_by(&:id).values_at(*account_ids).compact
--- a/app/controllers/api/v1/notifications_controller.rb
+++ b/app/controllers/api/v1/notifications_controller.rb
@ -1,8 +1,8 @@
 # frozen_string_literal: true

 class Api::V1::NotificationsController < Api::BaseController
-  before_action -> { doorkeeper_authorize! :read, :'read:notifications' }, except: [:clear, :dismiss, :destroy, :destroy_multiple]
-  before_action -> { doorkeeper_authorize! :write, :'write:notifications' }, only: [:clear, :dismiss, :destroy, :destroy_multiple]
+  before_action -> { doorkeeper_authorize! :read, :'read:notifications' }, except: [:clear, :dismiss]
+  before_action -> { doorkeeper_authorize! :write, :'write:notifications' }, only: [:clear, :dismiss]
  before_action :require_user!
  after_action :insert_pagination_headers, only: :index

@ -23,20 +23,11 @@ class Api::V1::NotificationsController < Api::BaseController
    render_empty
  end

-  def destroy
-    dismiss
-  end
-
  def dismiss
    current_account.notifications.find(params[:id]).destroy!
    render_empty
  end

-  def destroy_multiple
-    current_account.notifications.where(id: params[:ids]).destroy_all
-    render_empty
-  end
-
  private

  def load_notifications
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@ -66,11 +66,9 @@ class Api::V1::StatusesController < Api::BaseController
      scheduled_at: status_params[:scheduled_at],
      application: doorkeeper_token.application,
      poll: status_params[:poll],
-      content_type: status_params[:content_type],
      allowed_mentions: status_params[:allowed_mentions],
      idempotency: request.headers['Idempotency-Key'],
-      with_rate_limit: true,
-      quote_id: status_params[:quote_id].presence
+      with_rate_limit: true
    )

    render json: @status, serializer: @status.is_a?(ScheduledStatus) ? REST::ScheduledStatusSerializer : REST::StatusSerializer
@ -95,8 +93,7 @@ class Api::V1::StatusesController < Api::BaseController
      sensitive: status_params[:sensitive],
      language: status_params[:language],
      spoiler_text: status_params[:spoiler_text],
-      poll: status_params[:poll],
-      content_type: status_params[:content_type]
+      poll: status_params[:poll]
    )

    render json: @status, serializer: REST::StatusSerializer
@ -141,8 +138,6 @@ class Api::V1::StatusesController < Api::BaseController
      :visibility,
      :language,
      :scheduled_at,
-      :quote_id,
-      :content_type,
      allowed_mentions: [],
      media_ids: [],
      media_attributes: [
--- a/app/controllers/api/v1/timelines/direct_controller.rb
+++ b/app/controllers/api/v1/timelines/direct_controller.rb
@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-class Api::V1::Timelines::DirectController < Api::BaseController
-  before_action -> { doorkeeper_authorize! :read, :'read:statuses' }, only: [:show]
-  before_action :require_user!, only: [:show]
-  after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
-
-  respond_to :json
-
-  def show
-    @statuses = load_statuses
-    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
-  end
-
-  private
-
-  def load_statuses
-    cached_direct_statuses
-  end
-
-  def cached_direct_statuses
-    cache_collection direct_statuses, Status
-  end
-
-  def direct_statuses
-    direct_timeline_statuses
-  end
-
-  def direct_timeline_statuses
-    account_direct_feed.get(
-      limit_param(DEFAULT_STATUSES_LIMIT),
-      params[:max_id],
-      params[:since_id],
-      params[:min_id]
-    )
-  end
-
-  def account_direct_feed
-    DirectFeed.new(current_account)
-  end
-
-  def insert_pagination_headers
-    set_pagination_headers(next_path, prev_path)
-  end
-
-  def pagination_params(core_params)
-    params.permit(:local, :limit).merge(core_params)
-  end
-
-  def next_path
-    api_v1_timelines_direct_url pagination_params(max_id: pagination_max_id)
-  end
-
-  def prev_path
-    api_v1_timelines_direct_url pagination_params(since_id: pagination_since_id)
-  end
-
-  def pagination_max_id
-    @statuses.last.id
-  end
-
-  def pagination_since_id
-    @statuses.first.id
-  end
-end
--- a/app/controllers/api/v1/timelines/public_controller.rb
+++ b/app/controllers/api/v1/timelines/public_controller.rb
@ -38,10 +38,7 @@ class Api::V1::Timelines::PublicController < Api::BaseController
      current_account,
      local: truthy_param?(:local),
      remote: truthy_param?(:remote),
-      only_media: truthy_param?(:only_media),
-      allow_local_only: truthy_param?(:allow_local_only),
-      with_replies: Setting.show_replies_in_public_timelines,
-      with_reblogs: Setting.show_reblogs_in_public_timelines
+      only_media: truthy_param?(:only_media)
    )
  end

@ -50,7 +47,7 @@ class Api::V1::Timelines::PublicController < Api::BaseController
  end

  def pagination_params(core_params)
-    params.slice(:local, :remote, :limit, :only_media, :allow_local_only).permit(:local, :remote, :limit, :only_media, :allow_local_only).merge(core_params)
+    params.slice(:local, :remote, :limit, :only_media).permit(:local, :remote, :limit, :only_media).merge(core_params)
  end

  def next_path
--- a/app/controllers/api/v1/trends/tags_controller.rb
+++ b/app/controllers/api/v1/trends/tags_controller.rb
@ -5,7 +5,7 @@ class Api::V1::Trends::TagsController < Api::BaseController

  after_action :insert_pagination_headers

-  DEFAULT_TAGS_LIMIT = (ENV['MAX_TRENDING_TAGS'] || 10).to_i
+  DEFAULT_TAGS_LIMIT = 10

  def index
    cache_if_unauthenticated!
--- a/app/controllers/api/v2/search_controller.rb
+++ b/app/controllers/api/v2/search_controller.rb
@ -3,7 +3,7 @@
 class Api::V2::SearchController < Api::BaseController
  include Authorization

-  RESULTS_LIMIT = (ENV['MAX_SEARCH_RESULTS'] || 20).to_i
+  RESULTS_LIMIT = 20

  before_action -> { authorize_if_got_token! :read, :'read:search' }
  before_action :validate_search_params!
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -10,12 +10,10 @@ class ApplicationController < ActionController::Base
  include SessionTrackingConcern
  include CacheConcern
  include DomainControlHelper
-  include ThemingConcern

  helper_method :current_account
  helper_method :current_session
-  helper_method :current_flavour
-  helper_method :current_skin
+  helper_method :current_theme
  helper_method :single_user_mode?
  helper_method :use_seamless_external_login?
  helper_method :omniauth_only?
@ -157,16 +155,19 @@ class ApplicationController < ActionController::Base
    @current_session = SessionActivation.find_by(session_id: cookies.signed['_session_id']) if cookies.signed['_session_id'].present?
  end

+  def current_theme
+    return Setting.theme unless Themes.instance.names.include? current_user&.setting_theme
+
+    current_user.setting_theme
+  end
+
  def body_class_string
    @body_classes || ''
  end

  def respond_with_error(code)
    respond_to do |format|
-      format.any do
-        use_pack 'error'
-        render "errors/#{code}", layout: 'error', status: code, formats: [:html]
-      end
+      format.any  { render "errors/#{code}", layout: 'error', status: code, formats: [:html] }
      format.json { render json: { error: Rack::Utils::HTTP_STATUS_CODES[code] }, status: code }
    end
  end
--- a/app/controllers/auth/challenges_controller.rb
+++ b/app/controllers/auth/challenges_controller.rb
@ -5,7 +5,6 @@ class Auth::ChallengesController < ApplicationController

  layout 'auth'

-  before_action :set_pack
  before_action :authenticate_user!

  skip_before_action :require_functional!
@ -20,10 +19,4 @@ class Auth::ChallengesController < ApplicationController
      render_challenge
    end
  end
-
-  private
-
-  def set_pack
-    use_pack 'auth'
-  end
 end
--- a/app/controllers/auth/confirmations_controller.rb
+++ b/app/controllers/auth/confirmations_controller.rb
@ -6,7 +6,6 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController
  layout 'auth'

  before_action :set_body_classes
-  before_action :set_pack
  before_action :set_confirmation_user!, only: [:show, :confirm_captcha]
  before_action :require_unconfirmed!

@ -59,10 +58,6 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController
    return true if @confirmation_user.nil? || @confirmation_user.confirmed?
  end

-  def set_pack
-    use_pack 'auth'
-  end
-
  def require_unconfirmed!
    if user_signed_in? && current_user.confirmed? && current_user.unconfirmed_email.blank?
      redirect_to(current_user.approved? ? root_path : edit_user_registration_path)
--- a/app/controllers/auth/passwords_controller.rb
+++ b/app/controllers/auth/passwords_controller.rb
@ -2,7 +2,6 @@

 class Auth::PasswordsController < Devise::PasswordsController
  before_action :check_validity_of_reset_password_token, only: :edit
-  before_action :set_pack
  before_action :set_body_classes

  layout 'auth'
@ -33,8 +32,4 @@ class Auth::PasswordsController < Devise::PasswordsController
  def reset_password_token_is_valid?
    resource_class.with_reset_password_token(params[:reset_password_token]).present?
  end
-
-  def set_pack
-    use_pack 'auth'
-  end
 end
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@ -8,7 +8,6 @@ class Auth::RegistrationsController < Devise::RegistrationsController
  before_action :set_invite, only: [:new, :create]
  before_action :check_enabled_registrations, only: [:new, :create]
  before_action :configure_sign_up_params, only: [:create]
-  before_action :set_pack
  before_action :set_sessions, only: [:edit, :update]
  before_action :set_strikes, only: [:edit, :update]
  before_action :set_instance_presenter, only: [:new, :create, :update]
@ -108,10 +107,6 @@ class Auth::RegistrationsController < Devise::RegistrationsController

  private

-  def set_pack
-    use_pack %w(edit update).include?(action_name) ? 'admin' : 'auth'
-  end
-
  def set_instance_presenter
    @instance_presenter = InstancePresenter.new
  end
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@ -7,7 +7,6 @@ class Auth::SessionsController < Devise::SessionsController
  skip_before_action :require_functional!
  skip_before_action :update_user_sign_in

-  prepend_before_action :set_pack
  prepend_before_action :check_suspicious!, only: [:create]

  include TwoFactorAuthenticationConcern
@ -100,10 +99,6 @@ class Auth::SessionsController < Devise::SessionsController

  private

-  def set_pack
-    use_pack 'auth'
-  end
-
  def set_instance_presenter
    @instance_presenter = InstancePresenter.new
  end
--- a/app/controllers/auth/setup_controller.rb
+++ b/app/controllers/auth/setup_controller.rb
@ -3,7 +3,6 @@
 class Auth::SetupController < ApplicationController
  layout 'auth'

-  before_action :set_pack
  before_action :authenticate_user!
  before_action :require_unconfirmed_or_pending!
  before_action :set_body_classes
@ -43,8 +42,4 @@ class Auth::SetupController < ApplicationController
  def user_params
    params.require(:user).permit(:email)
  end
-
-  def set_pack
-    use_pack 'sign_up'
-  end
 end
--- a/app/controllers/authorize_interactions_controller.rb
+++ b/app/controllers/authorize_interactions_controller.rb
@ -8,7 +8,6 @@ class AuthorizeInteractionsController < ApplicationController
  before_action :authenticate_user!
  before_action :set_body_classes
  before_action :set_resource
-  before_action :set_pack

  def show
    if @resource.is_a?(Account)
@ -66,8 +65,4 @@ class AuthorizeInteractionsController < ApplicationController
  def set_body_classes
    @body_classes = 'modal-layout'
  end
-
-  def set_pack
-    use_pack 'modal'
-  end
 end
--- a/app/controllers/concerns/theming_concern.rb
+++ b/app/controllers/concerns/theming_concern.rb
@ -1,89 +0,0 @@
-# frozen_string_literal: true
-
-module ThemingConcern
-  extend ActiveSupport::Concern
-
-  def use_pack(pack_name)
-    @core = resolve_pack_with_common(Themes.instance.core, pack_name)
-    @theme = resolve_pack_with_common(Themes.instance.flavour(current_flavour), pack_name, current_skin)
-  end
-
-  private
-
-  def current_flavour
-    [current_user&.setting_flavour, Setting.flavour, 'glitch', 'vanilla'].find { |flavour| Themes.instance.flavours.include?(flavour) }
-  end
-
-  def current_skin
-    skins = Themes.instance.skins_for(current_flavour)
-    [current_user&.setting_skin, Setting.skin, 'default'].find { |skin| skins.include?(skin) }
-  end
-
-  def valid_pack_data?(data, pack_name)
-    data['pack'].is_a?(Hash) && data['pack'][pack_name].present?
-  end
-
-  def nil_pack(data)
-    {
-      use_common: true,
-      flavour: data['name'],
-      pack: nil,
-      preload: nil,
-      skin: nil,
-      supported_locales: data['locales'],
-    }
-  end
-
-  def pack(data, pack_name, skin)
-    pack_data = {
-      use_common: true,
-      flavour: data['name'],
-      pack: pack_name,
-      preload: nil,
-      skin: nil,
-      supported_locales: data['locales'],
-    }
-
-    return pack_data unless data['pack'][pack_name].is_a?(Hash)
-
-    pack_data[:use_common] = false if data['pack'][pack_name]['use_common'] == false
-    pack_data[:pack] = nil unless data['pack'][pack_name]['filename']
-
-    preloads = data['pack'][pack_name]['preload']
-    pack_data[:preload] = [preloads] if preloads.is_a?(String)
-    pack_data[:preload] = preloads if preloads.is_a?(Array)
-
-    if skin != 'default' && data['skin'][skin]
-      pack_data[:skin] = skin if data['skin'][skin].include?(pack_name)
-    elsif data['pack'][pack_name]['stylesheet']
-      pack_data[:skin] = 'default'
-    end
-
-    pack_data
-  end
-
-  def resolve_pack(data, pack_name, skin)
-    return pack(data, pack_name, skin) if valid_pack_data?(data, pack_name)
-    return if data['name'].blank?
-
-    fallbacks = []
-    if data.key?('fallback')
-      fallbacks = data['fallback'] if data['fallback'].is_a?(Array)
-      fallbacks = [data['fallback']] if data['fallback'].is_a?(String)
-    elsif data['name'] != Setting.default_settings['flavour']
-      fallbacks = [Setting.default_settings['flavour']]
-    end
-
-    fallbacks.each do |fallback|
-      return resolve_pack(Themes.instance.flavour(fallback), pack_name, skin) if Themes.instance.flavour(fallback)
-    end
-
-    nil
-  end
-
-  def resolve_pack_with_common(data, pack_name, skin = 'default')
-    result = resolve_pack(data, pack_name, skin) || nil_pack(data)
-    result[:common] = resolve_pack(data, 'common', skin) if result.delete(:use_common)
-    result
-  end
-end
--- a/app/controllers/concerns/two_factor_authentication_concern.rb
+++ b/app/controllers/concerns/two_factor_authentication_concern.rb
@ -77,8 +77,6 @@ module TwoFactorAuthenticationConcern
  def prompt_for_two_factor(user)
    set_attempt_session(user)

-    use_pack 'auth'
-
    @body_classes     = 'lighter'
    @webauthn_enabled = user.webauthn_enabled?
    @scheme_type      = if user.webauthn_enabled? && user_params[:otp_attempt].blank?
--- a/app/controllers/concerns/web_app_controller_concern.rb
+++ b/app/controllers/concerns/web_app_controller_concern.rb
@ -5,7 +5,6 @@ module WebAppControllerConcern

  included do
    prepend_before_action :redirect_unauthenticated_to_permalinks!
-    before_action :set_pack
    before_action :set_app_body_class

    vary_by 'Accept, Accept-Language, Cookie'
@ -20,14 +19,10 @@ module WebAppControllerConcern
  end

  def redirect_unauthenticated_to_permalinks!
-    return if user_signed_in? # NOTE: Different from upstream because we allow moved users to log in
+    return if user_signed_in? && current_account.moved_to_account_id.nil?

    redirect_path = PermalinkRedirector.new(request.path).redirect_path

    redirect_to(redirect_path) if redirect_path.present?
  end
-
-  def set_pack
-    use_pack 'home'
-  end
 end
--- a/app/controllers/disputes/base_controller.rb
+++ b/app/controllers/disputes/base_controller.rb
@ -9,15 +9,10 @@ class Disputes::BaseController < ApplicationController

  before_action :set_body_classes
  before_action :authenticate_user!
-  before_action :set_pack
  before_action :set_cache_headers

  private

-  def set_pack
-    use_pack 'admin'
-  end
-
  def set_body_classes
    @body_classes = 'admin'
  end
--- a/app/controllers/filters/statuses_controller.rb
+++ b/app/controllers/filters/statuses_controller.rb
@ -6,7 +6,6 @@ class Filters::StatusesController < ApplicationController
  before_action :authenticate_user!
  before_action :set_filter
  before_action :set_status_filters
-  before_action :set_pack
  before_action :set_body_classes
  before_action :set_cache_headers

@ -27,10 +26,6 @@ class Filters::StatusesController < ApplicationController

  private

-  def set_pack
-    use_pack 'admin'
-  end
-
  def set_filter
    @filter = current_account.custom_filters.find(params[:filter_id])
  end
--- a/app/controllers/filters_controller.rb
+++ b/app/controllers/filters_controller.rb
@ -5,7 +5,6 @@ class FiltersController < ApplicationController

  before_action :authenticate_user!
  before_action :set_filter, only: [:edit, :update, :destroy]
-  before_action :set_pack
  before_action :set_body_classes
  before_action :set_cache_headers

@ -45,10 +44,6 @@ class FiltersController < ApplicationController

  private

-  def set_pack
-    use_pack 'settings'
-  end
-
  def set_filter
    @filter = current_account.custom_filters.find(params[:id])
  end
--- a/app/controllers/follower_accounts_controller.rb
+++ b/app/controllers/follower_accounts_controller.rb
@ -59,22 +59,22 @@ class FollowerAccountsController < ApplicationController
  end

  def collection_presenter
-    options = { type: :ordered }
-    options[:size] = @account.followers_count unless Setting.hide_followers_count || @account.user&.setting_hide_followers_count
    if page_requested?
      ActivityPub::CollectionPresenter.new(
        id: account_followers_url(@account, page: params.fetch(:page, 1)),
+        type: :ordered,
+        size: @account.followers_count,
        items: follows.map { |follow| ActivityPub::TagManager.instance.uri_for(follow.account) },
        part_of: account_followers_url(@account),
        next: next_page_url,
-        prev: prev_page_url,
-        **options
+        prev: prev_page_url
      )
    else
      ActivityPub::CollectionPresenter.new(
        id: account_followers_url(@account),
-        first: page_url(1),
-        **options
+        type: :ordered,
+        size: @account.followers_count,
+        first: page_url(1)
      )
    end
  end
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@ -6,7 +6,6 @@ class InvitesController < ApplicationController
  layout 'admin'

  before_action :authenticate_user!
-  before_action :set_pack
  before_action :set_body_classes
  before_action :set_cache_headers

@ -15,8 +14,6 @@ class InvitesController < ApplicationController

    @invites = invites
    @invite  = Invite.new
-    @invite.max_uses ||= 1
-    @invite.expires_in ||= 1.day.in_seconds
  end

  def create
@ -42,10 +39,6 @@ class InvitesController < ApplicationController

  private

-  def set_pack
-    use_pack 'settings'
-  end
-
  def invites
    current_user.invites.order(id: :desc)
  end
--- a/app/controllers/media_controller.rb
+++ b/app/controllers/media_controller.rb
@ -10,7 +10,6 @@ class MediaController < ApplicationController
  before_action :verify_permitted_status!
  before_action :check_playable, only: :player
  before_action :allow_iframing, only: :player
-  before_action :set_pack, only: :player

  content_security_policy only: :player do |policy|
    policy.frame_ancestors(false)
@ -48,8 +47,4 @@ class MediaController < ApplicationController
  def allow_iframing
    response.headers.delete('X-Frame-Options')
  end
-
-  def set_pack
-    use_pack 'public'
-  end
 end
--- a/app/controllers/oauth/authorizations_controller.rb
+++ b/app/controllers/oauth/authorizations_controller.rb
@ -5,7 +5,6 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController

  before_action :store_current_location
  before_action :authenticate_resource_owner!
-  before_action :set_pack
  before_action :set_cache_headers

  content_security_policy do |p|
@ -20,10 +19,6 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
    store_location_for(:user, request.url)
  end

-  def set_pack
-    use_pack 'auth'
-  end
-
  def render_success
    if skip_authorization? || (matching_token? && !truthy_param?('force_login'))
      redirect_or_render authorize_response
--- a/app/controllers/oauth/authorized_applications_controller.rb
+++ b/app/controllers/oauth/authorized_applications_controller.rb
@ -5,7 +5,6 @@ class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicatio

  before_action :store_current_location
  before_action :authenticate_resource_owner!
-  before_action :set_pack
  before_action :require_not_suspended!, only: :destroy
  before_action :set_body_classes
  before_action :set_cache_headers
@ -31,10 +30,6 @@ class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicatio
    store_location_for(:user, request.url)
  end

-  def set_pack
-    use_pack 'settings'
-  end
-
  def require_not_suspended!
    forbidden if current_account.suspended?
  end
--- a/app/controllers/relationships_controller.rb
+++ b/app/controllers/relationships_controller.rb
@ -5,7 +5,6 @@ class RelationshipsController < ApplicationController

  before_action :authenticate_user!
  before_action :set_accounts, only: :show
-  before_action :set_pack
  before_action :set_relationships, only: :show
  before_action :set_body_classes
  before_action :set_cache_headers
@ -73,10 +72,6 @@ class RelationshipsController < ApplicationController
    @body_classes = 'admin'
  end

-  def set_pack
-    use_pack 'admin'
-  end
-
  def set_cache_headers
    response.cache_control.replace(private: true, no_store: true)
  end
--- a/app/controllers/settings/base_controller.rb
+++ b/app/controllers/settings/base_controller.rb
@ -1,7 +1,6 @@
 # frozen_string_literal: true

 class Settings::BaseController < ApplicationController
-  before_action :set_pack
  layout 'admin'

  before_action :authenticate_user!
@ -10,10 +9,6 @@ class Settings::BaseController < ApplicationController

  private

-  def set_pack
-    use_pack 'settings'
-  end
-
  def set_body_classes
    @body_classes = 'admin'
  end
--- a/app/controllers/settings/flavours_controller.rb
+++ b/app/controllers/settings/flavours_controller.rb
@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-class Settings::FlavoursController < Settings::BaseController
-  layout 'admin'
-
-  before_action :authenticate_user!
-
-  skip_before_action :require_functional!
-
-  def index
-    redirect_to action: 'show', flavour: current_flavour
-  end
-
-  def show
-    redirect_to action: 'show', flavour: current_flavour unless Themes.instance.flavours.include?(params[:flavour]) || (params[:flavour] == current_flavour)
-
-    @listing = Themes.instance.flavours
-    @selected = params[:flavour]
-  end
-
-  def update
-    current_user.settings.update(flavour: params.require(:flavour), skin: params.dig(:user, :setting_skin))
-    current_user.save
-    redirect_to action: 'show', flavour: params[:flavour]
-  end
-end
--- a/app/controllers/settings/login_activities_controller.rb
+++ b/app/controllers/settings/login_activities_controller.rb
@ -4,10 +4,4 @@ class Settings::LoginActivitiesController < Settings::BaseController
  def index
    @login_activities = LoginActivity.where(user: current_user).order(id: :desc).page(params[:page])
  end
-
-  private
-
-  def set_pack
-    use_pack 'settings'
-  end
 end
--- a/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb
+++ b/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb
@ -84,10 +84,6 @@ module Settings

      private

-      def set_pack
-        use_pack 'auth'
-      end
-
      def require_otp_enabled
        unless current_user.otp_enabled?
          flash[:error] = t('webauthn_credentials.otp_required')
--- a/app/controllers/shares_controller.rb
+++ b/app/controllers/shares_controller.rb
@ -4,17 +4,12 @@ class SharesController < ApplicationController
  layout 'modal'

  before_action :authenticate_user!
-  before_action :set_pack
  before_action :set_body_classes

  def show; end

  private

-  def set_pack
-    use_pack 'share'
-  end
-
  def set_body_classes
    @body_classes = 'modal-layout compose-standalone'
  end
--- a/app/controllers/statuses_cleanup_controller.rb
+++ b/app/controllers/statuses_cleanup_controller.rb
@ -6,7 +6,6 @@ class StatusesCleanupController < ApplicationController
  before_action :authenticate_user!
  before_action :set_policy
  before_action :set_body_classes
-  before_action :set_pack
  before_action :set_cache_headers

  def show; end
@ -27,10 +26,6 @@ class StatusesCleanupController < ApplicationController

  private

-  def set_pack
-    use_pack 'settings'
-  end
-
  def set_policy
    @policy = current_account.statuses_cleanup_policy || current_account.build_statuses_cleanup_policy(enabled: false)
  end
--- a/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@ -42,7 +42,6 @@ class StatusesController < ApplicationController
  end

  def embed
-    use_pack 'embed'
    return not_found if @status.hidden? || @status.reblog?

    expires_in 180, public: true
--- a/app/helpers/accounts_helper.rb
+++ b/app/helpers/accounts_helper.rb
@ -27,12 +27,8 @@ module AccountsHelper
    end
  end

-  def hide_followers_count?(account)
-    Setting.hide_followers_count || account.user&.settings&.[]('hide_followers_count')
-  end
-
  def account_description(account)
-    prepend_stats = [
+    prepend_str = [
      [
        number_to_human(account.statuses_count, precision: 3, strip_insignificant_zeros: true),
        I18n.t('accounts.posts', count: account.statuses_count),
@ -42,15 +38,13 @@ module AccountsHelper
        number_to_human(account.following_count, precision: 3, strip_insignificant_zeros: true),
        I18n.t('accounts.following', count: account.following_count),
      ].join(' '),
-    ]

-    unless hide_followers_count?(account)
-      prepend_stats << [
+      [
        number_to_human(account.followers_count, precision: 3, strip_insignificant_zeros: true),
        I18n.t('accounts.followers', count: account.followers_count),
-      ].join(' ')
-    end
+      ].join(' '),
+    ].join(', ')

-    [prepend_stats.join(', '), account.note].join(' · ')
+    [prepend_str, account.note].join(' · ')
  end
 end
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -153,8 +153,7 @@ module ApplicationHelper

  def body_classes
    output = body_class_string.split
-    output << "flavour-#{current_flavour.parameterize}"
-    output << "skin-#{current_skin.parameterize}"
+    output << "theme-#{current_theme.parameterize}"
    output << 'system-font' if current_account&.user&.setting_system_font_ui
    output << (current_account&.user&.setting_reduce_motion ? 'reduce-motion' : 'no-reduce-motion')
    output << 'rtl' if locale_direction == 'rtl'
--- a/app/helpers/context_helper.rb
+++ b/app/helpers/context_helper.rb
@ -7,7 +7,6 @@ module ContextHelper
  }.freeze

  CONTEXT_EXTENSION_MAP = {
-    direct_message: { 'litepub' => 'http://litepub.social/ns#', 'directMessage' => 'litepub:directMessage' },
    manually_approves_followers: { 'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers' },
    sensitive: { 'sensitive' => 'as:sensitive' },
    hashtag: { 'Hashtag' => 'as:Hashtag' },
@ -24,7 +23,6 @@ module ContextHelper
    voters_count: { 'toot' => 'http://joinmastodon.org/ns#', 'votersCount' => 'toot:votersCount' },
    olm: { 'toot' => 'http://joinmastodon.org/ns#', 'Device' => 'toot:Device', 'Ed25519Signature' => 'toot:Ed25519Signature', 'Ed25519Key' => 'toot:Ed25519Key', 'Curve25519Key' => 'toot:Curve25519Key', 'EncryptedMessage' => 'toot:EncryptedMessage', 'publicKeyBase64' => 'toot:publicKeyBase64', 'deviceId' => 'toot:deviceId', 'claim' => { '@type' => '@id', '@id' => 'toot:claim' }, 'fingerprintKey' => { '@type' => '@id', '@id' => 'toot:fingerprintKey' }, 'identityKey' => { '@type' => '@id', '@id' => 'toot:identityKey' }, 'devices' => { '@type' => '@id', '@id' => 'toot:devices' }, 'messageFranking' => 'toot:messageFranking', 'messageType' => 'toot:messageType', 'cipherText' => 'toot:cipherText' },
    suspended: { 'toot' => 'http://joinmastodon.org/ns#', 'suspended' => 'toot:suspended' },
-    quote_uri: { 'fedibird' => 'http://fedibird.com/ns#', 'quoteUri' => 'fedibird:quoteUri' },
  }.freeze

  def full_context
--- a/app/helpers/formatting_helper.rb
+++ b/app/helpers/formatting_helper.rb
@ -15,17 +15,7 @@ module FormattingHelper
  module_function :extract_status_plain_text

  def status_content_format(status)
-    base = html_aware_format(status.text, status.local?, preloaded_accounts: [status.account] + (status.respond_to?(:active_mentions) ? status.active_mentions.map(&:account) : []), content_type: status.content_type)
-
-    if status.quote? && status.local?
-      after_html = begin
-        "<span class=\"quote-inline\"><a href=\"#{status.quote.to_log_permalink}\" class=\"status-link unhandled-link\" target=\"_blank\">#{status.quote.to_log_permalink}</a></span>"
-      end.html_safe # rubocop:disable Rails/OutputSafety
-
-      base + after_html
-    else
-      base
-    end
+    html_aware_format(status.text, status.local?, preloaded_accounts: [status.account] + (status.respond_to?(:active_mentions) ? status.active_mentions.map(&:account) : []))
  end

  def rss_status_content_format(status)
--- a/app/javascript/core/admin.js
+++ b/app/javascript/core/admin.js
@ -1,228 +0,0 @@
-//  This file will be loaded on admin pages, regardless of theme.
-
-import 'packs/public-path';
-import { delegate } from '@rails/ujs';
-
-import ready from '../mastodon/ready';
-
-const setAnnouncementEndsAttributes = (target) => {
-  const valid = target?.value && target?.validity?.valid;
-  const element = document.querySelector('input[type="datetime-local"]#announcement_ends_at');
-  if (valid) {
-    element.classList.remove('optional');
-    element.required = true;
-    element.min = target.value;
-  } else {
-    element.classList.add('optional');
-    element.removeAttribute('required');
-    element.removeAttribute('min');
-  }
-};
-
-delegate(document, 'input[type="datetime-local"]#announcement_starts_at', 'change', ({ target }) => {
-  setAnnouncementEndsAttributes(target);
-});
-
-const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]';
-
-const showSelectAll = () => {
-  const selectAllMatchingElement = document.querySelector('.batch-table__select-all');
-  selectAllMatchingElement.classList.add('active');
-};
-
-const hideSelectAll = () => {
-  const selectAllMatchingElement = document.querySelector('.batch-table__select-all');
-  const hiddenField = document.querySelector('#select_all_matching');
-  const selectedMsg = document.querySelector('.batch-table__select-all .selected');
-  const notSelectedMsg = document.querySelector('.batch-table__select-all .not-selected');
-
-  selectAllMatchingElement.classList.remove('active');
-  selectedMsg.classList.remove('active');
-  notSelectedMsg.classList.add('active');
-  hiddenField.value = '0';
-};
-
-delegate(document, '#batch_checkbox_all', 'change', ({ target }) => {
-  const selectAllMatchingElement = document.querySelector('.batch-table__select-all');
-
-  [].forEach.call(document.querySelectorAll(batchCheckboxClassName), (content) => {
-    content.checked = target.checked;
-  });
-
-  if (selectAllMatchingElement) {
-    if (target.checked) {
-      showSelectAll();
-    } else {
-      hideSelectAll();
-    }
-  }
-});
-
-delegate(document, '.batch-table__select-all button', 'click', () => {
-  const hiddenField = document.querySelector('#select_all_matching');
-  const active = hiddenField.value === '1';
-  const selectedMsg = document.querySelector('.batch-table__select-all .selected');
-  const notSelectedMsg = document.querySelector('.batch-table__select-all .not-selected');
-
-  if (active) {
-    hiddenField.value = '0';
-    selectedMsg.classList.remove('active');
-    notSelectedMsg.classList.add('active');
-  } else {
-    hiddenField.value = '1';
-    notSelectedMsg.classList.remove('active');
-    selectedMsg.classList.add('active');
-  }
-});
-
-delegate(document, batchCheckboxClassName, 'change', () => {
-  const checkAllElement = document.querySelector('#batch_checkbox_all');
-  const selectAllMatchingElement = document.querySelector('.batch-table__select-all');
-
-  if (checkAllElement) {
-    checkAllElement.checked = [].every.call(document.querySelectorAll(batchCheckboxClassName), (content) => content.checked);
-    checkAllElement.indeterminate = !checkAllElement.checked && [].some.call(document.querySelectorAll(batchCheckboxClassName), (content) => content.checked);
-
-    if (selectAllMatchingElement) {
-      if (checkAllElement.checked) {
-        showSelectAll();
-      } else {
-        hideSelectAll();
-      }
-    }
-  }
-});
-
-delegate(document, '.media-spoiler-show-button', 'click', () => {
-  [].forEach.call(document.querySelectorAll('button.media-spoiler'), (element) => {
-    element.click();
-  });
-});
-
-delegate(document, '.media-spoiler-hide-button', 'click', () => {
-  [].forEach.call(document.querySelectorAll('.spoiler-button.spoiler-button--visible button'), (element) => {
-    element.click();
-  });
-});
-
-delegate(document, '.filter-subset--with-select select', 'change', ({ target }) => {
-  target.form.submit();
-});
-
-const onDomainBlockSeverityChange = (target) => {
-  const rejectMediaDiv   = document.querySelector('.input.with_label.domain_block_reject_media');
-  const rejectReportsDiv = document.querySelector('.input.with_label.domain_block_reject_reports');
-
-  if (rejectMediaDiv) {
-    rejectMediaDiv.style.display = (target.value === 'suspend') ? 'none' : 'block';
-  }
-
-  if (rejectReportsDiv) {
-    rejectReportsDiv.style.display = (target.value === 'suspend') ? 'none' : 'block';
-  }
-};
-
-delegate(document, '#domain_block_severity', 'change', ({ target }) => onDomainBlockSeverityChange(target));
-
-const onEnableBootstrapTimelineAccountsChange = (target) => {
-  const bootstrapTimelineAccountsField = document.querySelector('#form_admin_settings_bootstrap_timeline_accounts');
-
-  if (bootstrapTimelineAccountsField) {
-    bootstrapTimelineAccountsField.disabled = !target.checked;
-    if (target.checked) {
-      bootstrapTimelineAccountsField.parentElement.classList.remove('disabled');
-      bootstrapTimelineAccountsField.parentElement.parentElement.classList.remove('disabled');
-    } else {
-      bootstrapTimelineAccountsField.parentElement.classList.add('disabled');
-      bootstrapTimelineAccountsField.parentElement.parentElement.classList.add('disabled');
-    }
-  }
-};
-
-delegate(document, '#form_admin_settings_enable_bootstrap_timeline_accounts', 'change', ({ target }) => onEnableBootstrapTimelineAccountsChange(target));
-
-const onChangeRegistrationMode = (target) => {
-  const enabled = target.value === 'approved';
-
-  [].forEach.call(document.querySelectorAll('#form_admin_settings_require_invite_text'), (input) => {
-    input.disabled = !enabled;
-    if (enabled) {
-      let element = input;
-      do {
-        element.classList.remove('disabled');
-        element = element.parentElement;
-      } while (element && !element.classList.contains('fields-group'));
-    } else {
-      let element = input;
-      do {
-        element.classList.add('disabled');
-        element = element.parentElement;
-      } while (element && !element.classList.contains('fields-group'));
-    }
-  });
-};
-
-const convertUTCDateTimeToLocal = (value) => {
-  const date = new Date(value + 'Z');
-  const twoChars = (x) => (x.toString().padStart(2, '0'));
-  return `${date.getFullYear()}-${twoChars(date.getMonth()+1)}-${twoChars(date.getDate())}T${twoChars(date.getHours())}:${twoChars(date.getMinutes())}`;
-};
-
-const convertLocalDatetimeToUTC = (value) => {
-  const re = /^([0-9]{4,})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2})/;
-  const match = re.exec(value);
-  const date = new Date(match[1], match[2] - 1, match[3], match[4], match[5]);
-  const fullISO8601 = date.toISOString();
-  return fullISO8601.slice(0, fullISO8601.indexOf('T') + 6);
-};
-
-delegate(document, '#form_admin_settings_registrations_mode', 'change', ({ target }) => onChangeRegistrationMode(target));
-
-ready(() => {
-  const domainBlockSeverityInput = document.getElementById('domain_block_severity');
-  if (domainBlockSeverityInput) onDomainBlockSeverityChange(domainBlockSeverityInput);
-
-  const enableBootstrapTimelineAccounts = document.getElementById('form_admin_settings_enable_bootstrap_timeline_accounts');
-  if (enableBootstrapTimelineAccounts) onEnableBootstrapTimelineAccountsChange(enableBootstrapTimelineAccounts);
-
-  const registrationMode = document.getElementById('form_admin_settings_registrations_mode');
-  if (registrationMode) onChangeRegistrationMode(registrationMode);
-
-  const checkAllElement = document.querySelector('#batch_checkbox_all');
-  if (checkAllElement) {
-    checkAllElement.checked = [].every.call(document.querySelectorAll(batchCheckboxClassName), (content) => content.checked);
-    checkAllElement.indeterminate = !checkAllElement.checked && [].some.call(document.querySelectorAll(batchCheckboxClassName), (content) => content.checked);
-  }
-
-  document.querySelector('a#add-instance-button')?.addEventListener('click', (e) => {
-    const domain = document.querySelector('input[type="text"]#by_domain')?.value;
-
-    if (domain) {
-      const url = new URL(event.target.href);
-      url.searchParams.set('_domain', domain);
-      e.target.href = url;
-    }
-  });
-
-  [].forEach.call(document.querySelectorAll('input[type="datetime-local"]'), element => {
-    if (element.value) {
-      element.value = convertUTCDateTimeToLocal(element.value);
-    }
-    if (element.placeholder) {
-      element.placeholder = convertUTCDateTimeToLocal(element.placeholder);
-    }
-  });
-
-  delegate(document, 'form', 'submit', ({ target }) => {
-    [].forEach.call(target.querySelectorAll('input[type="datetime-local"]'), element => {
-      if (element.value && element.validity.valid) {
-        element.value = convertLocalDatetimeToUTC(element.value);
-      }
-    });
-  });
-
-  const announcementStartsAt = document.querySelector('input[type="datetime-local"]#announcement_starts_at');
-  if (announcementStartsAt) {
-    setAnnouncementEndsAttributes(announcementStartsAt);
-  }
-});
--- a/app/javascript/core/auth.js
+++ b/app/javascript/core/auth.js
@ -1,3 +0,0 @@
-import 'packs/public-path';
-import './settings';
-import './two_factor_authentication';
--- a/app/javascript/core/common.js
+++ b/app/javascript/core/common.js
@ -1,6 +0,0 @@
-//  This file will be loaded on all pages, regardless of theme.
-
-import 'packs/public-path';
-import 'font-awesome/css/font-awesome.css';
-
-require.context('../images/', true);
--- a/app/javascript/core/embed.js
+++ b/app/javascript/core/embed.js
@ -1,25 +0,0 @@
-//  This file will be loaded on embed pages, regardless of theme.
-
-import 'packs/public-path';
-
-window.addEventListener('message', e => {
-  const data = e.data || {};
-
-  if (!window.parent || data.type !== 'setHeight') {
-    return;
-  }
-
-  function setEmbedHeight () {
-    window.parent.postMessage({
-      type: 'setHeight',
-      id: data.id,
-      height: document.getElementsByTagName('html')[0].scrollHeight,
-    }, '*');
-  }
-
-  if (['interactive', 'complete'].includes(document.readyState)) {
-    setEmbedHeight();
-  } else {
-    document.addEventListener('DOMContentLoaded', setEmbedHeight);
-  }
-});
--- a/app/javascript/core/public.js
+++ b/app/javascript/core/public.js
@ -1,28 +0,0 @@
-//  This file will be loaded on public pages, regardless of theme.
-
-import 'packs/public-path';
-
-import { delegate } from '@rails/ujs';
-
-const getProfileAvatarAnimationHandler = (swapTo) => {
-  //animate avatar gifs on the profile page when moused over
-  return ({ target }) => {
-    const swapSrc = target.getAttribute(swapTo);
-    //only change the img source if autoplay is off and the image src is actually different
-    if(target.getAttribute('data-autoplay') !== 'true' && target.src !== swapSrc) {
-      target.src = swapSrc;
-    }
-  };
-};
-
-delegate(document, 'img#profile_page_avatar', 'mouseover', getProfileAvatarAnimationHandler('data-original'));
-
-delegate(document, 'img#profile_page_avatar', 'mouseout', getProfileAvatarAnimationHandler('data-static'));
-
-delegate(document, '#account_header', 'change', ({ target }) => {
-  const header = document.querySelector('.card .card__img img');
-  const [file] = target.files || [];
-  const url = file ? URL.createObjectURL(file) : header.dataset.originalSrc;
-
-  header.src = url;
-});
--- a/app/javascript/core/settings.js
+++ b/app/javascript/core/settings.js
@ -1,79 +0,0 @@
-//  This file will be loaded on settings pages, regardless of theme.
-
-import 'packs/public-path';
-import { delegate } from '@rails/ujs';
-import escapeTextContentForBrowser from 'escape-html';
-
-
-import emojify from '../mastodon/features/emoji/emoji';
-
-delegate(document, '#account_display_name', 'input', ({ target }) => {
-  const name = document.querySelector('.card .display-name strong');
-  if (name) {
-    if (target.value) {
-      name.innerHTML = emojify(escapeTextContentForBrowser(target.value));
-    } else {
-      name.textContent = name.textContent = target.dataset.default;
-    }
-  }
-});
-
-delegate(document, '#account_avatar', 'change', ({ target }) => {
-  const avatar = document.querySelector('.card .avatar img');
-  const [file] = target.files || [];
-  const url = file ? URL.createObjectURL(file) : avatar.dataset.originalSrc;
-
-  avatar.src = url;
-});
-
-delegate(document, '#account_header', 'change', ({ target }) => {
-  const header = document.querySelector('.card .card__img img');
-  const [file] = target.files || [];
-  const url = file ? URL.createObjectURL(file) : header.dataset.originalSrc;
-
-  header.src = url;
-});
-
-delegate(document, '#account_locked', 'change', ({ target }) => {
-  const lock = document.querySelector('.card .display-name i');
-
-  if (lock) {
-    if (target.checked) {
-      delete lock.dataset.hidden;
-    } else {
-      lock.dataset.hidden = 'true';
-    }
-  }
-});
-
-delegate(document, '.input-copy input', 'click', ({ target }) => {
-  target.focus();
-  target.select();
-  target.setSelectionRange(0, target.value.length);
-});
-
-delegate(document, '.input-copy button', 'click', ({ target }) => {
-  const input = target.parentNode.querySelector('.input-copy__wrapper input');
-
-  const oldReadOnly = input.readonly;
-
-  input.readonly = false;
-  input.focus();
-  input.select();
-  input.setSelectionRange(0, input.value.length);
-
-  try {
-    if (document.execCommand('copy')) {
-      input.blur();
-      target.parentNode.classList.add('copied');
-
-      setTimeout(() => {
-        target.parentNode.classList.remove('copied');
-      }, 700);
-    }
-  } catch (err) {
-    console.error(err);
-  }
-
-  input.readonly = oldReadOnly;
-});
--- a/app/javascript/core/theme.yml
+++ b/app/javascript/core/theme.yml
@ -1,20 +0,0 @@
-#  These packs will be loaded on every appropriate page, regardless of
-#  theme.
-pack:
-  about:
-  admin: admin.js
-  auth: auth.js
-  common:
-    filename: common.js
-    stylesheet: true
-  embed: embed.js
-  error:
-  home:
-  mailer:
-    filename: mailer.js
-    stylesheet: true
-  modal: public.js
-  public: public.js
-  settings: settings.js
-  sign_up:
-  share:
--- a/app/javascript/flavours/glitch/actions/account_notes.js
+++ b/app/javascript/flavours/glitch/actions/account_notes.js
@ -1,69 +0,0 @@
-import api from '../api';
-
-export const ACCOUNT_NOTE_SUBMIT_REQUEST = 'ACCOUNT_NOTE_SUBMIT_REQUEST';
-export const ACCOUNT_NOTE_SUBMIT_SUCCESS = 'ACCOUNT_NOTE_SUBMIT_SUCCESS';
-export const ACCOUNT_NOTE_SUBMIT_FAIL    = 'ACCOUNT_NOTE_SUBMIT_FAIL';
-
-export const ACCOUNT_NOTE_INIT_EDIT = 'ACCOUNT_NOTE_INIT_EDIT';
-export const ACCOUNT_NOTE_CANCEL    = 'ACCOUNT_NOTE_CANCEL';
-
-export const ACCOUNT_NOTE_CHANGE_COMMENT = 'ACCOUNT_NOTE_CHANGE_COMMENT';
-
-export function submitAccountNote() {
-  return (dispatch, getState) => {
-    dispatch(submitAccountNoteRequest());
-
-    const id = getState().getIn(['account_notes', 'edit', 'account_id']);
-
-    api(getState).post(`/api/v1/accounts/${id}/note`, {
-      comment: getState().getIn(['account_notes', 'edit', 'comment']),
-    }).then(response => {
-      dispatch(submitAccountNoteSuccess(response.data));
-    }).catch(error => dispatch(submitAccountNoteFail(error)));
-  };
-}
-
-export function submitAccountNoteRequest() {
-  return {
-    type: ACCOUNT_NOTE_SUBMIT_REQUEST,
-  };
-}
-
-export function submitAccountNoteSuccess(relationship) {
-  return {
-    type: ACCOUNT_NOTE_SUBMIT_SUCCESS,
-    relationship,
-  };
-}
-
-export function submitAccountNoteFail(error) {
-  return {
-    type: ACCOUNT_NOTE_SUBMIT_FAIL,
-    error,
-  };
-}
-
-export function initEditAccountNote(account) {
-  return (dispatch, getState) => {
-    const comment = getState().getIn(['relationships', account.get('id'), 'note']);
-
-    dispatch({
-      type: ACCOUNT_NOTE_INIT_EDIT,
-      account,
-      comment,
-    });
-  };
-}
-
-export function cancelAccountNote() {
-  return {
-    type: ACCOUNT_NOTE_CANCEL,
-  };
-}
-
-export function changeAccountNoteComment(comment) {
-  return {
-    type: ACCOUNT_NOTE_CHANGE_COMMENT,
-    comment,
-  };
-}
--- a/app/javascript/flavours/glitch/actions/accounts.js
+++ b/app/javascript/flavours/glitch/actions/accounts.js
@ -1,903 +0,0 @@
-import api, { getLinks } from '../api';
-
-import { importFetchedAccount, importFetchedAccounts } from './importer';
-
-export const ACCOUNT_FETCH_REQUEST = 'ACCOUNT_FETCH_REQUEST';
-export const ACCOUNT_FETCH_SUCCESS = 'ACCOUNT_FETCH_SUCCESS';
-export const ACCOUNT_FETCH_FAIL    = 'ACCOUNT_FETCH_FAIL';
-
-export const ACCOUNT_LOOKUP_REQUEST = 'ACCOUNT_LOOKUP_REQUEST';
-export const ACCOUNT_LOOKUP_SUCCESS = 'ACCOUNT_LOOKUP_SUCCESS';
-export const ACCOUNT_LOOKUP_FAIL    = 'ACCOUNT_LOOKUP_FAIL';
-
-export const ACCOUNT_FOLLOW_REQUEST = 'ACCOUNT_FOLLOW_REQUEST';
-export const ACCOUNT_FOLLOW_SUCCESS = 'ACCOUNT_FOLLOW_SUCCESS';
-export const ACCOUNT_FOLLOW_FAIL    = 'ACCOUNT_FOLLOW_FAIL';
-
-export const ACCOUNT_UNFOLLOW_REQUEST = 'ACCOUNT_UNFOLLOW_REQUEST';
-export const ACCOUNT_UNFOLLOW_SUCCESS = 'ACCOUNT_UNFOLLOW_SUCCESS';
-export const ACCOUNT_UNFOLLOW_FAIL    = 'ACCOUNT_UNFOLLOW_FAIL';
-
-export const ACCOUNT_BLOCK_REQUEST = 'ACCOUNT_BLOCK_REQUEST';
-export const ACCOUNT_BLOCK_SUCCESS = 'ACCOUNT_BLOCK_SUCCESS';
-export const ACCOUNT_BLOCK_FAIL    = 'ACCOUNT_BLOCK_FAIL';
-
-export const ACCOUNT_UNBLOCK_REQUEST = 'ACCOUNT_UNBLOCK_REQUEST';
-export const ACCOUNT_UNBLOCK_SUCCESS = 'ACCOUNT_UNBLOCK_SUCCESS';
-export const ACCOUNT_UNBLOCK_FAIL    = 'ACCOUNT_UNBLOCK_FAIL';
-
-export const ACCOUNT_MUTE_REQUEST = 'ACCOUNT_MUTE_REQUEST';
-export const ACCOUNT_MUTE_SUCCESS = 'ACCOUNT_MUTE_SUCCESS';
-export const ACCOUNT_MUTE_FAIL    = 'ACCOUNT_MUTE_FAIL';
-
-export const ACCOUNT_UNMUTE_REQUEST = 'ACCOUNT_UNMUTE_REQUEST';
-export const ACCOUNT_UNMUTE_SUCCESS = 'ACCOUNT_UNMUTE_SUCCESS';
-export const ACCOUNT_UNMUTE_FAIL    = 'ACCOUNT_UNMUTE_FAIL';
-
-export const ACCOUNT_PIN_REQUEST = 'ACCOUNT_PIN_REQUEST';
-export const ACCOUNT_PIN_SUCCESS = 'ACCOUNT_PIN_SUCCESS';
-export const ACCOUNT_PIN_FAIL    = 'ACCOUNT_PIN_FAIL';
-
-export const ACCOUNT_UNPIN_REQUEST = 'ACCOUNT_UNPIN_REQUEST';
-export const ACCOUNT_UNPIN_SUCCESS = 'ACCOUNT_UNPIN_SUCCESS';
-export const ACCOUNT_UNPIN_FAIL    = 'ACCOUNT_UNPIN_FAIL';
-
-export const FOLLOWERS_FETCH_REQUEST = 'FOLLOWERS_FETCH_REQUEST';
-export const FOLLOWERS_FETCH_SUCCESS = 'FOLLOWERS_FETCH_SUCCESS';
-export const FOLLOWERS_FETCH_FAIL    = 'FOLLOWERS_FETCH_FAIL';
-
-export const FOLLOWERS_EXPAND_REQUEST = 'FOLLOWERS_EXPAND_REQUEST';
-export const FOLLOWERS_EXPAND_SUCCESS = 'FOLLOWERS_EXPAND_SUCCESS';
-export const FOLLOWERS_EXPAND_FAIL    = 'FOLLOWERS_EXPAND_FAIL';
-
-export const FOLLOWING_FETCH_REQUEST = 'FOLLOWING_FETCH_REQUEST';
-export const FOLLOWING_FETCH_SUCCESS = 'FOLLOWING_FETCH_SUCCESS';
-export const FOLLOWING_FETCH_FAIL    = 'FOLLOWING_FETCH_FAIL';
-
-export const FOLLOWING_EXPAND_REQUEST = 'FOLLOWING_EXPAND_REQUEST';
-export const FOLLOWING_EXPAND_SUCCESS = 'FOLLOWING_EXPAND_SUCCESS';
-export const FOLLOWING_EXPAND_FAIL    = 'FOLLOWING_EXPAND_FAIL';
-
-export const RELATIONSHIPS_FETCH_REQUEST = 'RELATIONSHIPS_FETCH_REQUEST';
-export const RELATIONSHIPS_FETCH_SUCCESS = 'RELATIONSHIPS_FETCH_SUCCESS';
-export const RELATIONSHIPS_FETCH_FAIL    = 'RELATIONSHIPS_FETCH_FAIL';
-
-export const FOLLOW_REQUESTS_FETCH_REQUEST = 'FOLLOW_REQUESTS_FETCH_REQUEST';
-export const FOLLOW_REQUESTS_FETCH_SUCCESS = 'FOLLOW_REQUESTS_FETCH_SUCCESS';
-export const FOLLOW_REQUESTS_FETCH_FAIL    = 'FOLLOW_REQUESTS_FETCH_FAIL';
-
-export const FOLLOW_REQUESTS_EXPAND_REQUEST = 'FOLLOW_REQUESTS_EXPAND_REQUEST';
-export const FOLLOW_REQUESTS_EXPAND_SUCCESS = 'FOLLOW_REQUESTS_EXPAND_SUCCESS';
-export const FOLLOW_REQUESTS_EXPAND_FAIL    = 'FOLLOW_REQUESTS_EXPAND_FAIL';
-
-export const FOLLOW_REQUEST_AUTHORIZE_REQUEST = 'FOLLOW_REQUEST_AUTHORIZE_REQUEST';
-export const FOLLOW_REQUEST_AUTHORIZE_SUCCESS = 'FOLLOW_REQUEST_AUTHORIZE_SUCCESS';
-export const FOLLOW_REQUEST_AUTHORIZE_FAIL    = 'FOLLOW_REQUEST_AUTHORIZE_FAIL';
-
-export const FOLLOW_REQUEST_REJECT_REQUEST = 'FOLLOW_REQUEST_REJECT_REQUEST';
-export const FOLLOW_REQUEST_REJECT_SUCCESS = 'FOLLOW_REQUEST_REJECT_SUCCESS';
-export const FOLLOW_REQUEST_REJECT_FAIL    = 'FOLLOW_REQUEST_REJECT_FAIL';
-
-export const PINNED_ACCOUNTS_FETCH_REQUEST = 'PINNED_ACCOUNTS_FETCH_REQUEST';
-export const PINNED_ACCOUNTS_FETCH_SUCCESS = 'PINNED_ACCOUNTS_FETCH_SUCCESS';
-export const PINNED_ACCOUNTS_FETCH_FAIL    = 'PINNED_ACCOUNTS_FETCH_FAIL';
-
-export const PINNED_ACCOUNTS_SUGGESTIONS_FETCH_REQUEST  = 'PINNED_ACCOUNTS_SUGGESTIONS_FETCH_REQUEST';
-export const PINNED_ACCOUNTS_SUGGESTIONS_FETCH_SUCCESS  = 'PINNED_ACCOUNTS_SUGGESTIONS_FETCH_SUCCESS';
-export const PINNED_ACCOUNTS_SUGGESTIONS_FETCH_FAIL     = 'PINNED_ACCOUNTS_SUGGESTIONS_FETCH_FAIL';
-
-export const PINNED_ACCOUNTS_EDITOR_SUGGESTIONS_CLEAR  = 'PINNED_ACCOUNTS_EDITOR_SUGGESTIONS_CLEAR';
-export const PINNED_ACCOUNTS_EDITOR_SUGGESTIONS_CHANGE = 'PINNED_ACCOUNTS_EDITOR_SUGGESTIONS_CHANGE';
-
-export const PINNED_ACCOUNTS_EDITOR_RESET = 'PINNED_ACCOUNTS_EDITOR_RESET';
-
-
-export const ACCOUNT_REVEAL = 'ACCOUNT_REVEAL';
-
-export function fetchAccount(id) {
-  return (dispatch, getState) => {
-    dispatch(fetchRelationships([id]));
-
-    if (getState().getIn(['accounts', id], null) !== null) {
-      return;
-    }
-
-    dispatch(fetchAccountRequest(id));
-
-    api(getState).get(`/api/v1/accounts/${id}`).then(response => {
-      dispatch(importFetchedAccount(response.data));
-    }).then(() => {
-      dispatch(fetchAccountSuccess());
-    }).catch(error => {
-      dispatch(fetchAccountFail(id, error));
-    });
-  };
-}
-
-export const lookupAccount = acct => (dispatch, getState) => {
-  dispatch(lookupAccountRequest(acct));
-
-  api(getState).get('/api/v1/accounts/lookup', { params: { acct } }).then(response => {
-    dispatch(fetchRelationships([response.data.id]));
-    dispatch(importFetchedAccount(response.data));
-    dispatch(lookupAccountSuccess());
-  }).catch(error => {
-    dispatch(lookupAccountFail(acct, error));
-  });
-};
-
-export const lookupAccountRequest = (acct) => ({
-  type: ACCOUNT_LOOKUP_REQUEST,
-  acct,
-});
-
-export const lookupAccountSuccess = () => ({
-  type: ACCOUNT_LOOKUP_SUCCESS,
-});
-
-export const lookupAccountFail = (acct, error) => ({
-  type: ACCOUNT_LOOKUP_FAIL,
-  acct,
-  error,
-  skipAlert: true,
-});
-
-export function fetchAccountRequest(id) {
-  return {
-    type: ACCOUNT_FETCH_REQUEST,
-    id,
-  };
-}
-
-export function fetchAccountSuccess() {
-  return {
-    type: ACCOUNT_FETCH_SUCCESS,
-  };
-}
-
-export function fetchAccountFail(id, error) {
-  return {
-    type: ACCOUNT_FETCH_FAIL,
-    id,
-    error,
-    skipAlert: true,
-  };
-}
-
-export function followAccount(id, options = { reblogs: true }) {
-  return (dispatch, getState) => {
-    const alreadyFollowing = getState().getIn(['relationships', id, 'following']);
-    const locked = getState().getIn(['accounts', id, 'locked'], false);
-
-    dispatch(followAccountRequest(id, locked));
-
-    api(getState).post(`/api/v1/accounts/${id}/follow`, options).then(response => {
-      dispatch(followAccountSuccess(response.data, alreadyFollowing));
-    }).catch(error => {
-      dispatch(followAccountFail(error, locked));
-    });
-  };
-}
-
-export function unfollowAccount(id) {
-  return (dispatch, getState) => {
-    dispatch(unfollowAccountRequest(id));
-
-    api(getState).post(`/api/v1/accounts/${id}/unfollow`).then(response => {
-      dispatch(unfollowAccountSuccess(response.data, getState().get('statuses')));
-    }).catch(error => {
-      dispatch(unfollowAccountFail(error));
-    });
-  };
-}
-
-export function followAccountRequest(id, locked) {
-  return {
-    type: ACCOUNT_FOLLOW_REQUEST,
-    id,
-    locked,
-    skipLoading: true,
-  };
-}
-
-export function followAccountSuccess(relationship, alreadyFollowing) {
-  return {
-    type: ACCOUNT_FOLLOW_SUCCESS,
-    relationship,
-    alreadyFollowing,
-    skipLoading: true,
-  };
-}
-
-export function followAccountFail(error, locked) {
-  return {
-    type: ACCOUNT_FOLLOW_FAIL,
-    error,
-    locked,
-    skipLoading: true,
-  };
-}
-
-export function unfollowAccountRequest(id) {
-  return {
-    type: ACCOUNT_UNFOLLOW_REQUEST,
-    id,
-    skipLoading: true,
-  };
-}
-
-export function unfollowAccountSuccess(relationship, statuses) {
-  return {
-    type: ACCOUNT_UNFOLLOW_SUCCESS,
-    relationship,
-    statuses,
-    skipLoading: true,
-  };
-}
-
-export function unfollowAccountFail(error) {
-  return {
-    type: ACCOUNT_UNFOLLOW_FAIL,
-    error,
-    skipLoading: true,
-  };
-}
-
-export function blockAccount(id) {
-  return (dispatch, getState) => {
-    dispatch(blockAccountRequest(id));
-
-    api(getState).post(`/api/v1/accounts/${id}/block`).then(response => {
-      // Pass in entire statuses map so we can use it to filter stuff in different parts of the reducers
-      dispatch(blockAccountSuccess(response.data, getState().get('statuses')));
-    }).catch(error => {
-      dispatch(blockAccountFail(id, error));
-    });
-  };
-}
-
-export function unblockAccount(id) {
-  return (dispatch, getState) => {
-    dispatch(unblockAccountRequest(id));
-
-    api(getState).post(`/api/v1/accounts/${id}/unblock`).then(response => {
-      dispatch(unblockAccountSuccess(response.data));
-    }).catch(error => {
-      dispatch(unblockAccountFail(id, error));
-    });
-  };
-}
-
-export function blockAccountRequest(id) {
-  return {
-    type: ACCOUNT_BLOCK_REQUEST,
-    id,
-  };
-}
-
-export function blockAccountSuccess(relationship, statuses) {
-  return {
-    type: ACCOUNT_BLOCK_SUCCESS,
-    relationship,
-    statuses,
-  };
-}
-
-export function blockAccountFail(error) {
-  return {
-    type: ACCOUNT_BLOCK_FAIL,
-    error,
-  };
-}
-
-export function unblockAccountRequest(id) {
-  return {
-    type: ACCOUNT_UNBLOCK_REQUEST,
-    id,
-  };
-}
-
-export function unblockAccountSuccess(relationship) {
-  return {
-    type: ACCOUNT_UNBLOCK_SUCCESS,
-    relationship,
-  };
-}
-
-export function unblockAccountFail(error) {
-  return {
-    type: ACCOUNT_UNBLOCK_FAIL,
-    error,
-  };
-}
-
-
-export function muteAccount(id, notifications, duration=0) {
-  return (dispatch, getState) => {
-    dispatch(muteAccountRequest(id));
-
-    api(getState).post(`/api/v1/accounts/${id}/mute`, { notifications, duration }).then(response => {
-      // Pass in entire statuses map so we can use it to filter stuff in different parts of the reducers
-      dispatch(muteAccountSuccess(response.data, getState().get('statuses')));
-    }).catch(error => {
-      dispatch(muteAccountFail(id, error));
-    });
-  };
-}
-
-export function unmuteAccount(id) {
-  return (dispatch, getState) => {
-    dispatch(unmuteAccountRequest(id));
-
-    api(getState).post(`/api/v1/accounts/${id}/unmute`).then(response => {
-      dispatch(unmuteAccountSuccess(response.data));
-    }).catch(error => {
-      dispatch(unmuteAccountFail(id, error));
-    });
-  };
-}
-
-export function muteAccountRequest(id) {
-  return {
-    type: ACCOUNT_MUTE_REQUEST,
-    id,
-  };
-}
-
-export function muteAccountSuccess(relationship, statuses) {
-  return {
-    type: ACCOUNT_MUTE_SUCCESS,
-    relationship,
-    statuses,
-  };
-}
-
-export function muteAccountFail(error) {
-  return {
-    type: ACCOUNT_MUTE_FAIL,
-    error,
-  };
-}
-
-export function unmuteAccountRequest(id) {
-  return {
-    type: ACCOUNT_UNMUTE_REQUEST,
-    id,
-  };
-}
-
-export function unmuteAccountSuccess(relationship) {
-  return {
-    type: ACCOUNT_UNMUTE_SUCCESS,
-    relationship,
-  };
-}
-
-export function unmuteAccountFail(error) {
-  return {
-    type: ACCOUNT_UNMUTE_FAIL,
-    error,
-  };
-}
-
-
-export function fetchFollowers(id) {
-  return (dispatch, getState) => {
-    dispatch(fetchFollowersRequest(id));
-
-    api(getState).get(`/api/v1/accounts/${id}/followers`).then(response => {
-      const next = getLinks(response).refs.find(link => link.rel === 'next');
-
-      dispatch(importFetchedAccounts(response.data));
-      dispatch(fetchFollowersSuccess(id, response.data, next ? next.uri : null));
-      dispatch(fetchRelationships(response.data.map(item => item.id)));
-    }).catch(error => {
-      dispatch(fetchFollowersFail(id, error));
-    });
-  };
-}
-
-export function fetchFollowersRequest(id) {
-  return {
-    type: FOLLOWERS_FETCH_REQUEST,
-    id,
-  };
-}
-
-export function fetchFollowersSuccess(id, accounts, next) {
-  return {
-    type: FOLLOWERS_FETCH_SUCCESS,
-    id,
-    accounts,
-    next,
-  };
-}
-
-export function fetchFollowersFail(id, error) {
-  return {
-    type: FOLLOWERS_FETCH_FAIL,
-    id,
-    error,
-    skipNotFound: true,
-  };
-}
-
-export function expandFollowers(id) {
-  return (dispatch, getState) => {
-    const url = getState().getIn(['user_lists', 'followers', id, 'next']);
-
-    if (url === null) {
-      return;
-    }
-
-    dispatch(expandFollowersRequest(id));
-
-    api(getState).get(url).then(response => {
-      const next = getLinks(response).refs.find(link => link.rel === 'next');
-
-      dispatch(importFetchedAccounts(response.data));
-      dispatch(expandFollowersSuccess(id, response.data, next ? next.uri : null));
-      dispatch(fetchRelationships(response.data.map(item => item.id)));
-    }).catch(error => {
-      dispatch(expandFollowersFail(id, error));
-    });
-  };
-}
-
-export function expandFollowersRequest(id) {
-  return {
-    type: FOLLOWERS_EXPAND_REQUEST,
-    id,
-  };
-}
-
-export function expandFollowersSuccess(id, accounts, next) {
-  return {
-    type: FOLLOWERS_EXPAND_SUCCESS,
-    id,
-    accounts,
-    next,
-  };
-}
-
-export function expandFollowersFail(id, error) {
-  return {
-    type: FOLLOWERS_EXPAND_FAIL,
-    id,
-    error,
-  };
-}
-
-export function fetchFollowing(id) {
-  return (dispatch, getState) => {
-    dispatch(fetchFollowingRequest(id));
-
-    api(getState).get(`/api/v1/accounts/${id}/following`).then(response => {
-      const next = getLinks(response).refs.find(link => link.rel === 'next');
-
-      dispatch(importFetchedAccounts(response.data));
-      dispatch(fetchFollowingSuccess(id, response.data, next ? next.uri : null));
-      dispatch(fetchRelationships(response.data.map(item => item.id)));
-    }).catch(error => {
-      dispatch(fetchFollowingFail(id, error));
-    });
-  };
-}
-
-export function fetchFollowingRequest(id) {
-  return {
-    type: FOLLOWING_FETCH_REQUEST,
-    id,
-  };
-}
-
-export function fetchFollowingSuccess(id, accounts, next) {
-  return {
-    type: FOLLOWING_FETCH_SUCCESS,
-    id,
-    accounts,
-    next,
-  };
-}
-
-export function fetchFollowingFail(id, error) {
-  return {
-    type: FOLLOWING_FETCH_FAIL,
-    id,
-    error,
-    skipNotFound: true,
-  };
-}
-
-export function expandFollowing(id) {
-  return (dispatch, getState) => {
-    const url = getState().getIn(['user_lists', 'following', id, 'next']);
-
-    if (url === null) {
-      return;
-    }
-
-    dispatch(expandFollowingRequest(id));
-
-    api(getState).get(url).then(response => {
-      const next = getLinks(response).refs.find(link => link.rel === 'next');
-
-      dispatch(importFetchedAccounts(response.data));
-      dispatch(expandFollowingSuccess(id, response.data, next ? next.uri : null));
-      dispatch(fetchRelationships(response.data.map(item => item.id)));
-    }).catch(error => {
-      dispatch(expandFollowingFail(id, error));
-    });
-  };
-}
-
-export function expandFollowingRequest(id) {
-  return {
-    type: FOLLOWING_EXPAND_REQUEST,
-    id,
-  };
-}
-
-export function expandFollowingSuccess(id, accounts, next) {
-  return {
-    type: FOLLOWING_EXPAND_SUCCESS,
-    id,
-    accounts,
-    next,
-  };
-}
-
-export function expandFollowingFail(id, error) {
-  return {
-    type: FOLLOWING_EXPAND_FAIL,
-    id,
-    error,
-  };
-}
-
-export function fetchRelationships(accountIds) {
-  return (dispatch, getState) => {
-    const state = getState();
-    const loadedRelationships = state.get('relationships');
-    const newAccountIds = accountIds.filter(id => loadedRelationships.get(id, null) === null);
-    const signedIn = !!state.getIn(['meta', 'me']);
-
-    if (!signedIn || newAccountIds.length === 0) {
-      return;
-    }
-
-    dispatch(fetchRelationshipsRequest(newAccountIds));
-
-    api(getState).get(`/api/v1/accounts/relationships?${newAccountIds.map(id => `id[]=${id}`).join('&')}`).then(response => {
-      dispatch(fetchRelationshipsSuccess(response.data));
-    }).catch(error => {
-      dispatch(fetchRelationshipsFail(error));
-    });
-  };
-}
-
-export function fetchRelationshipsRequest(ids) {
-  return {
-    type: RELATIONSHIPS_FETCH_REQUEST,
-    ids,
-    skipLoading: true,
-  };
-}
-
-export function fetchRelationshipsSuccess(relationships) {
-  return {
-    type: RELATIONSHIPS_FETCH_SUCCESS,
-    relationships,
-    skipLoading: true,
-  };
-}
-
-export function fetchRelationshipsFail(error) {
-  return {
-    type: RELATIONSHIPS_FETCH_FAIL,
-    error,
-    skipLoading: true,
-    skipNotFound: true,
-  };
-}
-
-export function fetchFollowRequests() {
-  return (dispatch, getState) => {
-    dispatch(fetchFollowRequestsRequest());
-
-    api(getState).get('/api/v1/follow_requests').then(response => {
-      const next = getLinks(response).refs.find(link => link.rel === 'next');
-      dispatch(importFetchedAccounts(response.data));
-      dispatch(fetchFollowRequestsSuccess(response.data, next ? next.uri : null));
-    }).catch(error => dispatch(fetchFollowRequestsFail(error)));
-  };
-}
-
-export function fetchFollowRequestsRequest() {
-  return {
-    type: FOLLOW_REQUESTS_FETCH_REQUEST,
-  };
-}
-
-export function fetchFollowRequestsSuccess(accounts, next) {
-  return {
-    type: FOLLOW_REQUESTS_FETCH_SUCCESS,
-    accounts,
-    next,
-  };
-}
-
-export function fetchFollowRequestsFail(error) {
-  return {
-    type: FOLLOW_REQUESTS_FETCH_FAIL,
-    error,
-  };
-}
-
-export function expandFollowRequests() {
-  return (dispatch, getState) => {
-    const url = getState().getIn(['user_lists', 'follow_requests', 'next']);
-
-    if (url === null) {
-      return;
-    }
-
-    dispatch(expandFollowRequestsRequest());
-
-    api(getState).get(url).then(response => {
-      const next = getLinks(response).refs.find(link => link.rel === 'next');
-      dispatch(importFetchedAccounts(response.data));
-      dispatch(expandFollowRequestsSuccess(response.data, next ? next.uri : null));
-    }).catch(error => dispatch(expandFollowRequestsFail(error)));
-  };
-}
-
-export function expandFollowRequestsRequest() {
-  return {
-    type: FOLLOW_REQUESTS_EXPAND_REQUEST,
-  };
-}
-
-export function expandFollowRequestsSuccess(accounts, next) {
-  return {
-    type: FOLLOW_REQUESTS_EXPAND_SUCCESS,
-    accounts,
-    next,
-  };
-}
-
-export function expandFollowRequestsFail(error) {
-  return {
-    type: FOLLOW_REQUESTS_EXPAND_FAIL,
-    error,
-  };
-}
-
-export function authorizeFollowRequest(id) {
-  return (dispatch, getState) => {
-    dispatch(authorizeFollowRequestRequest(id));
-
-    api(getState)
-      .post(`/api/v1/follow_requests/${id}/authorize`)
-      .then(() => dispatch(authorizeFollowRequestSuccess(id)))
-      .catch(error => dispatch(authorizeFollowRequestFail(id, error)));
-  };
-}
-
-export function authorizeFollowRequestRequest(id) {
-  return {
-    type: FOLLOW_REQUEST_AUTHORIZE_REQUEST,
-    id,
-  };
-}
-
-export function authorizeFollowRequestSuccess(id) {
-  return {
-    type: FOLLOW_REQUEST_AUTHORIZE_SUCCESS,
-    id,
-  };
-}
-
-export function authorizeFollowRequestFail(id, error) {
-  return {
-    type: FOLLOW_REQUEST_AUTHORIZE_FAIL,
-    id,
-    error,
-  };
-}
-
-
-export function rejectFollowRequest(id) {
-  return (dispatch, getState) => {
-    dispatch(rejectFollowRequestRequest(id));
-
-    api(getState)
-      .post(`/api/v1/follow_requests/${id}/reject`)
-      .then(() => dispatch(rejectFollowRequestSuccess(id)))
-      .catch(error => dispatch(rejectFollowRequestFail(id, error)));
-  };
-}
-
-export function rejectFollowRequestRequest(id) {
-  return {
-    type: FOLLOW_REQUEST_REJECT_REQUEST,
-    id,
-  };
-}
-
-export function rejectFollowRequestSuccess(id) {
-  return {
-    type: FOLLOW_REQUEST_REJECT_SUCCESS,
-    id,
-  };
-}
-
-export function rejectFollowRequestFail(id, error) {
-  return {
-    type: FOLLOW_REQUEST_REJECT_FAIL,
-    id,
-    error,
-  };
-}
-
-export function pinAccount(id) {
-  return (dispatch, getState) => {
-    dispatch(pinAccountRequest(id));
-
-    api(getState).post(`/api/v1/accounts/${id}/pin`).then(response => {
-      dispatch(pinAccountSuccess(response.data));
-    }).catch(error => {
-      dispatch(pinAccountFail(error));
-    });
-  };
-}
-
-export function unpinAccount(id) {
-  return (dispatch, getState) => {
-    dispatch(unpinAccountRequest(id));
-
-    api(getState).post(`/api/v1/accounts/${id}/unpin`).then(response => {
-      dispatch(unpinAccountSuccess(response.data));
-    }).catch(error => {
-      dispatch(unpinAccountFail(error));
-    });
-  };
-}
-
-export function pinAccountRequest(id) {
-  return {
-    type: ACCOUNT_PIN_REQUEST,
-    id,
-  };
-}
-
-export function pinAccountSuccess(relationship) {
-  return {
-    type: ACCOUNT_PIN_SUCCESS,
-    relationship,
-  };
-}
-
-export function pinAccountFail(error) {
-  return {
-    type: ACCOUNT_PIN_FAIL,
-    error,
-  };
-}
-
-export function unpinAccountRequest(id) {
-  return {
-    type: ACCOUNT_UNPIN_REQUEST,
-    id,
-  };
-}
-
-export function unpinAccountSuccess(relationship) {
-  return {
-    type: ACCOUNT_UNPIN_SUCCESS,
-    relationship,
-  };
-}
-
-export function unpinAccountFail(error) {
-  return {
-    type: ACCOUNT_UNPIN_FAIL,
-    error,
-  };
-}
-
-export const revealAccount = id => ({
-  type: ACCOUNT_REVEAL,
-  id,
-});
-
-export function fetchPinnedAccounts() {
-  return (dispatch, getState) => {
-    dispatch(fetchPinnedAccountsRequest());
-
-    api(getState).get('/api/v1/endorsements', { params: { limit: 0 } }).then(response => {
-      dispatch(importFetchedAccounts(response.data));
-      dispatch(fetchPinnedAccountsSuccess(response.data));
-    }).catch(err => dispatch(fetchPinnedAccountsFail(err)));
-  };
-}
-
-export function fetchPinnedAccountsRequest() {
-  return {
-    type: PINNED_ACCOUNTS_FETCH_REQUEST,
-  };
-}
-
-export function fetchPinnedAccountsSuccess(accounts, next) {
-  return {
-    type: PINNED_ACCOUNTS_FETCH_SUCCESS,
-    accounts,
-    next,
-  };
-}
-
-export function fetchPinnedAccountsFail(error) {
-  return {
-    type: PINNED_ACCOUNTS_FETCH_FAIL,
-    error,
-  };
-}
-
-export function fetchPinnedAccountsSuggestions(q) {
-  return (dispatch, getState) => {
-    dispatch(fetchPinnedAccountsSuggestionsRequest());
-
-    const params = {
-      q,
-      resolve: false,
-      limit: 4,
-      following: true,
-    };
-
-    api(getState).get('/api/v1/accounts/search', { params }).then(response => {
-      dispatch(importFetchedAccounts(response.data));
-      dispatch(fetchPinnedAccountsSuggestionsSuccess(q, response.data));
-    }).catch(err => dispatch(fetchPinnedAccountsSuggestionsFail(err)));
-  };
-}
-
-export function fetchPinnedAccountsSuggestionsRequest() {
-  return {
-    type: PINNED_ACCOUNTS_SUGGESTIONS_FETCH_REQUEST,
-  };
-}
-
-export function fetchPinnedAccountsSuggestionsSuccess(query, accounts) {
-  return {
-    type: PINNED_ACCOUNTS_SUGGESTIONS_FETCH_SUCCESS,
-    query,
-    accounts,
-  };
-}
-
-export function fetchPinnedAccountsSuggestionsFail(error) {
-  return {
-    type: PINNED_ACCOUNTS_SUGGESTIONS_FETCH_FAIL,
-    error,
-  };
-}
-
-export function clearPinnedAccountsSuggestions() {
-  return {
-    type: PINNED_ACCOUNTS_EDITOR_SUGGESTIONS_CLEAR,
-  };
-}
-
-export function changePinnedAccountsSuggestions(value) {
-  return {
-    type: PINNED_ACCOUNTS_EDITOR_SUGGESTIONS_CHANGE,
-    value,
-  };
-}
-
-export function resetPinnedAccountsEditor() {
-  return {
-    type: PINNED_ACCOUNTS_EDITOR_RESET,
-  };
-}
-
--- a/app/javascript/flavours/glitch/actions/alerts.js
+++ b/app/javascript/flavours/glitch/actions/alerts.js
@ -1,63 +0,0 @@
-import { defineMessages } from 'react-intl';
-
-const messages = defineMessages({
-  unexpectedTitle: { id: 'alert.unexpected.title', defaultMessage: 'Oops!' },
-  unexpectedMessage: { id: 'alert.unexpected.message', defaultMessage: 'An unexpected error occurred.' },
-  rateLimitedTitle: { id: 'alert.rate_limited.title', defaultMessage: 'Rate limited' },
-  rateLimitedMessage: { id: 'alert.rate_limited.message', defaultMessage: 'Please retry after {retry_time, time, medium}.' },
-});
-
-export const ALERT_SHOW    = 'ALERT_SHOW';
-export const ALERT_DISMISS = 'ALERT_DISMISS';
-export const ALERT_CLEAR   = 'ALERT_CLEAR';
-export const ALERT_NOOP    = 'ALERT_NOOP';
-
-export function dismissAlert(alert) {
-  return {
-    type: ALERT_DISMISS,
-    alert,
-  };
-}
-
-export function clearAlert() {
-  return {
-    type: ALERT_CLEAR,
-  };
-}
-
-export function showAlert(title = messages.unexpectedTitle, message = messages.unexpectedMessage, message_values = undefined) {
-  return {
-    type: ALERT_SHOW,
-    title,
-    message,
-    message_values,
-  };
-}
-
-export function showAlertForError(error, skipNotFound = false) {
-  if (error.response) {
-    const { data, status, statusText, headers } = error.response;
-
-    if (skipNotFound && (status === 404 || status === 410)) {
-      // Skip these errors as they are reflected in the UI
-      return { type: ALERT_NOOP };
-    }
-
-    if (status === 429 && headers['x-ratelimit-reset']) {
-      const reset_date = new Date(headers['x-ratelimit-reset']);
-      return showAlert(messages.rateLimitedTitle, messages.rateLimitedMessage, { 'retry_time': reset_date });
-    }
-
-    let message = statusText;
-    let title   = `${status}`;
-
-    if (data.error) {
-      message = data.error;
-    }
-
-    return showAlert(title, message);
-  } else {
-    console.error(error);
-    return showAlert();
-  }
-}
--- a/app/javascript/flavours/glitch/actions/announcements.js
+++ b/app/javascript/flavours/glitch/actions/announcements.js
@ -1,181 +0,0 @@
-import api from '../api';
-
-import { normalizeAnnouncement } from './importer/normalizer';
-
-export const ANNOUNCEMENTS_FETCH_REQUEST = 'ANNOUNCEMENTS_FETCH_REQUEST';
-export const ANNOUNCEMENTS_FETCH_SUCCESS = 'ANNOUNCEMENTS_FETCH_SUCCESS';
-export const ANNOUNCEMENTS_FETCH_FAIL    = 'ANNOUNCEMENTS_FETCH_FAIL';
-export const ANNOUNCEMENTS_UPDATE        = 'ANNOUNCEMENTS_UPDATE';
-export const ANNOUNCEMENTS_DELETE        = 'ANNOUNCEMENTS_DELETE';
-
-export const ANNOUNCEMENTS_DISMISS_REQUEST = 'ANNOUNCEMENTS_DISMISS_REQUEST';
-export const ANNOUNCEMENTS_DISMISS_SUCCESS = 'ANNOUNCEMENTS_DISMISS_SUCCESS';
-export const ANNOUNCEMENTS_DISMISS_FAIL    = 'ANNOUNCEMENTS_DISMISS_FAIL';
-
-export const ANNOUNCEMENTS_REACTION_ADD_REQUEST = 'ANNOUNCEMENTS_REACTION_ADD_REQUEST';
-export const ANNOUNCEMENTS_REACTION_ADD_SUCCESS = 'ANNOUNCEMENTS_REACTION_ADD_SUCCESS';
-export const ANNOUNCEMENTS_REACTION_ADD_FAIL    = 'ANNOUNCEMENTS_REACTION_ADD_FAIL';
-
-export const ANNOUNCEMENTS_REACTION_REMOVE_REQUEST = 'ANNOUNCEMENTS_REACTION_REMOVE_REQUEST';
-export const ANNOUNCEMENTS_REACTION_REMOVE_SUCCESS = 'ANNOUNCEMENTS_REACTION_REMOVE_SUCCESS';
-export const ANNOUNCEMENTS_REACTION_REMOVE_FAIL    = 'ANNOUNCEMENTS_REACTION_REMOVE_FAIL';
-
-export const ANNOUNCEMENTS_REACTION_UPDATE = 'ANNOUNCEMENTS_REACTION_UPDATE';
-
-export const ANNOUNCEMENTS_TOGGLE_SHOW = 'ANNOUNCEMENTS_TOGGLE_SHOW';
-
-const noOp = () => {};
-
-export const fetchAnnouncements = (done = noOp) => (dispatch, getState) => {
-  dispatch(fetchAnnouncementsRequest());
-
-  api(getState).get('/api/v1/announcements').then(response => {
-    dispatch(fetchAnnouncementsSuccess(response.data.map(x => normalizeAnnouncement(x))));
-  }).catch(error => {
-    dispatch(fetchAnnouncementsFail(error));
-  }).finally(() => {
-    done();
-  });
-};
-
-export const fetchAnnouncementsRequest = () => ({
-  type: ANNOUNCEMENTS_FETCH_REQUEST,
-  skipLoading: true,
-});
-
-export const fetchAnnouncementsSuccess = announcements => ({
-  type: ANNOUNCEMENTS_FETCH_SUCCESS,
-  announcements,
-  skipLoading: true,
-});
-
-export const fetchAnnouncementsFail= error => ({
-  type: ANNOUNCEMENTS_FETCH_FAIL,
-  error,
-  skipLoading: true,
-  skipAlert: true,
-});
-
-export const updateAnnouncements = announcement => ({
-  type: ANNOUNCEMENTS_UPDATE,
-  announcement: normalizeAnnouncement(announcement),
-});
-
-export const dismissAnnouncement = announcementId => (dispatch, getState) => {
-  dispatch(dismissAnnouncementRequest(announcementId));
-
-  api(getState).post(`/api/v1/announcements/${announcementId}/dismiss`).then(() => {
-    dispatch(dismissAnnouncementSuccess(announcementId));
-  }).catch(error => {
-    dispatch(dismissAnnouncementFail(announcementId, error));
-  });
-};
-
-export const dismissAnnouncementRequest = announcementId => ({
-  type: ANNOUNCEMENTS_DISMISS_REQUEST,
-  id: announcementId,
-});
-
-export const dismissAnnouncementSuccess = announcementId => ({
-  type: ANNOUNCEMENTS_DISMISS_SUCCESS,
-  id: announcementId,
-});
-
-export const dismissAnnouncementFail = (announcementId, error) => ({
-  type: ANNOUNCEMENTS_DISMISS_FAIL,
-  id: announcementId,
-  error,
-});
-
-export const addReaction = (announcementId, name) => (dispatch, getState) => {
-  const announcement = getState().getIn(['announcements', 'items']).find(x => x.get('id') === announcementId);
-
-  let alreadyAdded = false;
-
-  if (announcement) {
-    const reaction = announcement.get('reactions').find(x => x.get('name') === name);
-    if (reaction && reaction.get('me')) {
-      alreadyAdded = true;
-    }
-  }
-
-  if (!alreadyAdded) {
-    dispatch(addReactionRequest(announcementId, name, alreadyAdded));
-  }
-
-  api(getState).put(`/api/v1/announcements/${announcementId}/reactions/${encodeURIComponent(name)}`).then(() => {
-    dispatch(addReactionSuccess(announcementId, name, alreadyAdded));
-  }).catch(err => {
-    if (!alreadyAdded) {
-      dispatch(addReactionFail(announcementId, name, err));
-    }
-  });
-};
-
-export const addReactionRequest = (announcementId, name) => ({
-  type: ANNOUNCEMENTS_REACTION_ADD_REQUEST,
-  id: announcementId,
-  name,
-  skipLoading: true,
-});
-
-export const addReactionSuccess = (announcementId, name) => ({
-  type: ANNOUNCEMENTS_REACTION_ADD_SUCCESS,
-  id: announcementId,
-  name,
-  skipLoading: true,
-});
-
-export const addReactionFail = (announcementId, name, error) => ({
-  type: ANNOUNCEMENTS_REACTION_ADD_FAIL,
-  id: announcementId,
-  name,
-  error,
-  skipLoading: true,
-});
-
-export const removeReaction = (announcementId, name) => (dispatch, getState) => {
-  dispatch(removeReactionRequest(announcementId, name));
-
-  api(getState).delete(`/api/v1/announcements/${announcementId}/reactions/${encodeURIComponent(name)}`).then(() => {
-    dispatch(removeReactionSuccess(announcementId, name));
-  }).catch(err => {
-    dispatch(removeReactionFail(announcementId, name, err));
-  });
-};
-
-export const removeReactionRequest = (announcementId, name) => ({
-  type: ANNOUNCEMENTS_REACTION_REMOVE_REQUEST,
-  id: announcementId,
-  name,
-  skipLoading: true,
-});
-
-export const removeReactionSuccess = (announcementId, name) => ({
-  type: ANNOUNCEMENTS_REACTION_REMOVE_SUCCESS,
-  id: announcementId,
-  name,
-  skipLoading: true,
-});
-
-export const removeReactionFail = (announcementId, name, error) => ({
-  type: ANNOUNCEMENTS_REACTION_REMOVE_FAIL,
-  id: announcementId,
-  name,
-  error,
-  skipLoading: true,
-});
-
-export const updateReaction = reaction => ({
-  type: ANNOUNCEMENTS_REACTION_UPDATE,
-  reaction,
-});
-
-export const toggleShowAnnouncements = () => ({
-  type: ANNOUNCEMENTS_TOGGLE_SHOW,
-});
-
-export const deleteAnnouncement = id => ({
-  type: ANNOUNCEMENTS_DELETE,
-  id,
-});
--- a/app/javascript/flavours/glitch/actions/app.ts
+++ b/app/javascript/flavours/glitch/actions/app.ts
@ -1,9 +0,0 @@
-import { createAction } from '@reduxjs/toolkit';
-
-import type { LayoutType } from '../is_mobile';
-
-interface ChangeLayoutPayload {
-  layout: LayoutType;
-}
-export const changeLayout =
-  createAction<ChangeLayoutPayload>('APP_LAYOUT_CHANGE');
--- a/app/javascript/flavours/glitch/actions/blocks.js
+++ b/app/javascript/flavours/glitch/actions/blocks.js
@ -1,100 +0,0 @@
-import api, { getLinks } from '../api';
-
-import { fetchRelationships } from './accounts';
-import { importFetchedAccounts } from './importer';
-import { openModal } from './modal';
-
-export const BLOCKS_FETCH_REQUEST = 'BLOCKS_FETCH_REQUEST';
-export const BLOCKS_FETCH_SUCCESS = 'BLOCKS_FETCH_SUCCESS';
-export const BLOCKS_FETCH_FAIL    = 'BLOCKS_FETCH_FAIL';
-
-export const BLOCKS_EXPAND_REQUEST = 'BLOCKS_EXPAND_REQUEST';
-export const BLOCKS_EXPAND_SUCCESS = 'BLOCKS_EXPAND_SUCCESS';
-export const BLOCKS_EXPAND_FAIL    = 'BLOCKS_EXPAND_FAIL';
-
-export const BLOCKS_INIT_MODAL = 'BLOCKS_INIT_MODAL';
-
-export function fetchBlocks() {
-  return (dispatch, getState) => {
-    dispatch(fetchBlocksRequest());
-
-    api(getState).get('/api/v1/blocks').then(response => {
-      const next = getLinks(response).refs.find(link => link.rel === 'next');
-      dispatch(importFetchedAccounts(response.data));
-      dispatch(fetchBlocksSuccess(response.data, next ? next.uri : null));
-      dispatch(fetchRelationships(response.data.map(item => item.id)));
-    }).catch(error => dispatch(fetchBlocksFail(error)));
-  };
-}
-
-export function fetchBlocksRequest() {
-  return {
-    type: BLOCKS_FETCH_REQUEST,
-  };
-}
-
-export function fetchBlocksSuccess(accounts, next) {
-  return {
-    type: BLOCKS_FETCH_SUCCESS,
-    accounts,
-    next,
-  };
-}
-
-export function fetchBlocksFail(error) {
-  return {
-    type: BLOCKS_FETCH_FAIL,
-    error,
-  };
-}
-
-export function expandBlocks() {
-  return (dispatch, getState) => {
-    const url = getState().getIn(['user_lists', 'blocks', 'next']);
-
-    if (url === null) {
-      return;
-    }
-
-    dispatch(expandBlocksRequest());
-
-    api(getState).get(url).then(response => {
-      const next = getLinks(response).refs.find(link => link.rel === 'next');
-      dispatch(importFetchedAccounts(response.data));
-      dispatch(expandBlocksSuccess(response.data, next ? next.uri : null));
-      dispatch(fetchRelationships(response.data.map(item => item.id)));
-    }).catch(error => dispatch(expandBlocksFail(error)));
-  };
-}
-
-export function expandBlocksRequest() {
-  return {
-    type: BLOCKS_EXPAND_REQUEST,
-  };
-}
-
-export function expandBlocksSuccess(accounts, next) {
-  return {
-    type: BLOCKS_EXPAND_SUCCESS,
-    accounts,
-    next,
-  };
-}
-
-export function expandBlocksFail(error) {
-  return {
-    type: BLOCKS_EXPAND_FAIL,
-    error,
-  };
-}
-
-export function initBlockModal(account) {
-  return dispatch => {
-    dispatch({
-      type: BLOCKS_INIT_MODAL,
-      account,
-    });
-
-    dispatch(openModal({ modalType: 'BLOCK' }));
-  };
-}
--- a/app/javascript/flavours/glitch/actions/bookmarks.js
+++ b/app/javascript/flavours/glitch/actions/bookmarks.js
@ -1,91 +0,0 @@
-import api, { getLinks } from '../api';
-
-import { importFetchedStatuses } from './importer';
-
-export const BOOKMARKED_STATUSES_FETCH_REQUEST = 'BOOKMARKED_STATUSES_FETCH_REQUEST';
-export const BOOKMARKED_STATUSES_FETCH_SUCCESS = 'BOOKMARKED_STATUSES_FETCH_SUCCESS';
-export const BOOKMARKED_STATUSES_FETCH_FAIL    = 'BOOKMARKED_STATUSES_FETCH_FAIL';
-
-export const BOOKMARKED_STATUSES_EXPAND_REQUEST = 'BOOKMARKED_STATUSES_EXPAND_REQUEST';
-export const BOOKMARKED_STATUSES_EXPAND_SUCCESS = 'BOOKMARKED_STATUSES_EXPAND_SUCCESS';
-export const BOOKMARKED_STATUSES_EXPAND_FAIL    = 'BOOKMARKED_STATUSES_EXPAND_FAIL';
-
-export function fetchBookmarkedStatuses() {
-  return (dispatch, getState) => {
-    if (getState().getIn(['status_lists', 'bookmarks', 'isLoading'])) {
-      return;
-    }
-
-    dispatch(fetchBookmarkedStatusesRequest());
-
-    api(getState).get('/api/v1/bookmarks').then(response => {
-      const next = getLinks(response).refs.find(link => link.rel === 'next');
-      dispatch(importFetchedStatuses(response.data));
-      dispatch(fetchBookmarkedStatusesSuccess(response.data, next ? next.uri : null));
-    }).catch(error => {
-      dispatch(fetchBookmarkedStatusesFail(error));
-    });
-  };
-}
-
-export function fetchBookmarkedStatusesRequest() {
-  return {
-    type: BOOKMARKED_STATUSES_FETCH_REQUEST,
-  };
-}
-
-export function fetchBookmarkedStatusesSuccess(statuses, next) {
-  return {
-    type: BOOKMARKED_STATUSES_FETCH_SUCCESS,
-    statuses,
-    next,
-  };
-}
-
-export function fetchBookmarkedStatusesFail(error) {
-  return {
-    type: BOOKMARKED_STATUSES_FETCH_FAIL,
-    error,
-  };
-}
-
-export function expandBookmarkedStatuses() {
-  return (dispatch, getState) => {
-    const url = getState().getIn(['status_lists', 'bookmarks', 'next'], null);
-
-    if (url === null || getState().getIn(['status_lists', 'bookmarks', 'isLoading'])) {
-      return;
-    }
-
-    dispatch(expandBookmarkedStatusesRequest());
-
-    api(getState).get(url).then(response => {
-      const next = getLinks(response).refs.find(link => link.rel === 'next');
-      dispatch(importFetchedStatuses(response.data));
-      dispatch(expandBookmarkedStatusesSuccess(response.data, next ? next.uri : null));
-    }).catch(error => {
-      dispatch(expandBookmarkedStatusesFail(error));
-    });
-  };
-}
-
-export function expandBookmarkedStatusesRequest() {
-  return {
-    type: BOOKMARKED_STATUSES_EXPAND_REQUEST,
-  };
-}
-
-export function expandBookmarkedStatusesSuccess(statuses, next) {
-  return {
-    type: BOOKMARKED_STATUSES_EXPAND_SUCCESS,
-    statuses,
-    next,
-  };
-}
-
-export function expandBookmarkedStatusesFail(error) {
-  return {
-    type: BOOKMARKED_STATUSES_EXPAND_FAIL,
-    error,
-  };
-}
--- a/app/javascript/flavours/glitch/actions/boosts.js
+++ b/app/javascript/flavours/glitch/actions/boosts.js
@ -1,32 +0,0 @@
-import { openModal } from './modal';
-
-export const BOOSTS_INIT_MODAL = 'BOOSTS_INIT_MODAL';
-export const BOOSTS_CHANGE_PRIVACY = 'BOOSTS_CHANGE_PRIVACY';
-
-export function initBoostModal(props) {
-  return (dispatch, getState) => {
-    const default_privacy = getState().getIn(['compose', 'default_privacy']);
-
-    const privacy = props.status.get('visibility') === 'private' ? 'private' : default_privacy;
-
-    dispatch({
-      type: BOOSTS_INIT_MODAL,
-      privacy,
-    });
-
-    dispatch(openModal({
-      modalType: 'BOOST',
-      modalProps: props,
-    }));
-  };
-}
-
-
-export function changeBoostPrivacy(privacy) {
-  return dispatch => {
-    dispatch({
-      type: BOOSTS_CHANGE_PRIVACY,
-      privacy,
-    });
-  };
-}
--- a/app/javascript/flavours/glitch/actions/bundles.js
+++ b/app/javascript/flavours/glitch/actions/bundles.js
@ -1,25 +0,0 @@
-export const BUNDLE_FETCH_REQUEST = 'BUNDLE_FETCH_REQUEST';
-export const BUNDLE_FETCH_SUCCESS = 'BUNDLE_FETCH_SUCCESS';
-export const BUNDLE_FETCH_FAIL = 'BUNDLE_FETCH_FAIL';
-
-export function fetchBundleRequest(skipLoading) {
-  return {
-    type: BUNDLE_FETCH_REQUEST,
-    skipLoading,
-  };
-}
-
-export function fetchBundleSuccess(skipLoading) {
-  return {
-    type: BUNDLE_FETCH_SUCCESS,
-    skipLoading,
-  };
-}
-
-export function fetchBundleFail(error, skipLoading) {
-  return {
-    type: BUNDLE_FETCH_FAIL,
-    error,
-    skipLoading,
-  };
-}
--- a/app/javascript/flavours/glitch/actions/columns.js
+++ b/app/javascript/flavours/glitch/actions/columns.js
@ -1,54 +0,0 @@
-import { saveSettings } from './settings';
-
-export const COLUMN_ADD           = 'COLUMN_ADD';
-export const COLUMN_REMOVE        = 'COLUMN_REMOVE';
-export const COLUMN_MOVE          = 'COLUMN_MOVE';
-export const COLUMN_PARAMS_CHANGE = 'COLUMN_PARAMS_CHANGE';
-
-export function addColumn(id, params) {
-  return dispatch => {
-    dispatch({
-      type: COLUMN_ADD,
-      id,
-      params,
-    });
-
-    dispatch(saveSettings());
-  };
-}
-
-export function removeColumn(uuid) {
-  return dispatch => {
-    dispatch({
-      type: COLUMN_REMOVE,
-      uuid,
-    });
-
-    dispatch(saveSettings());
-  };
-}
-
-export function moveColumn(uuid, direction) {
-  return dispatch => {
-    dispatch({
-      type: COLUMN_MOVE,
-      uuid,
-      direction,
-    });
-
-    dispatch(saveSettings());
-  };
-}
-
-export function changeColumnParams(uuid, path, value) {
-  return dispatch => {
-    dispatch({
-      type: COLUMN_PARAMS_CHANGE,
-      uuid,
-      path,
-      value,
-    });
-
-    dispatch(saveSettings());
-  };
-}
--- a/app/javascript/flavours/glitch/actions/compose.js
+++ b/app/javascript/flavours/glitch/actions/compose.js
@ -1,845 +0,0 @@
-import { defineMessages } from 'react-intl';
-
-import axios from 'axios';
-import { throttle } from 'lodash';
-
-import api from 'flavours/glitch/api';
-import { search as emojiSearch } from 'flavours/glitch/features/emoji/emoji_mart_search_light';
-import { tagHistory } from 'flavours/glitch/settings';
-import { recoverHashtags } from 'flavours/glitch/utils/hashtag';
-import resizeImage from 'flavours/glitch/utils/resize_image';
-
-import { showAlert, showAlertForError } from './alerts';
-import { useEmoji } from './emojis';
-import { importFetchedAccounts, importFetchedStatus } from './importer';
-import { openModal } from './modal';
-import { updateTimeline } from './timelines';
-
-/** @type {AbortController | undefined} */
-let fetchComposeSuggestionsAccountsController;
-/** @type {AbortController | undefined} */
-let fetchComposeSuggestionsTagsController;
-
-export const COMPOSE_CHANGE          = 'COMPOSE_CHANGE';
-export const COMPOSE_CYCLE_ELEFRIEND = 'COMPOSE_CYCLE_ELEFRIEND';
-export const COMPOSE_SUBMIT_REQUEST  = 'COMPOSE_SUBMIT_REQUEST';
-export const COMPOSE_SUBMIT_SUCCESS  = 'COMPOSE_SUBMIT_SUCCESS';
-export const COMPOSE_SUBMIT_FAIL     = 'COMPOSE_SUBMIT_FAIL';
-export const COMPOSE_REPLY           = 'COMPOSE_REPLY';
-export const COMPOSE_REPLY_CANCEL    = 'COMPOSE_REPLY_CANCEL';
-export const COMPOSE_DIRECT          = 'COMPOSE_DIRECT';
-export const COMPOSE_MENTION         = 'COMPOSE_MENTION';
-export const COMPOSE_RESET           = 'COMPOSE_RESET';
-
-export const COMPOSE_UPLOAD_REQUEST    = 'COMPOSE_UPLOAD_REQUEST';
-export const COMPOSE_UPLOAD_SUCCESS    = 'COMPOSE_UPLOAD_SUCCESS';
-export const COMPOSE_UPLOAD_FAIL       = 'COMPOSE_UPLOAD_FAIL';
-export const COMPOSE_UPLOAD_PROGRESS   = 'COMPOSE_UPLOAD_PROGRESS';
-export const COMPOSE_UPLOAD_PROCESSING = 'COMPOSE_UPLOAD_PROCESSING';
-export const COMPOSE_UPLOAD_UNDO       = 'COMPOSE_UPLOAD_UNDO';
-
-export const THUMBNAIL_UPLOAD_REQUEST  = 'THUMBNAIL_UPLOAD_REQUEST';
-export const THUMBNAIL_UPLOAD_SUCCESS  = 'THUMBNAIL_UPLOAD_SUCCESS';
-export const THUMBNAIL_UPLOAD_FAIL     = 'THUMBNAIL_UPLOAD_FAIL';
-export const THUMBNAIL_UPLOAD_PROGRESS = 'THUMBNAIL_UPLOAD_PROGRESS';
-
-export const COMPOSE_SUGGESTIONS_CLEAR = 'COMPOSE_SUGGESTIONS_CLEAR';
-export const COMPOSE_SUGGESTIONS_READY = 'COMPOSE_SUGGESTIONS_READY';
-export const COMPOSE_SUGGESTION_SELECT = 'COMPOSE_SUGGESTION_SELECT';
-export const COMPOSE_SUGGESTION_IGNORE = 'COMPOSE_SUGGESTION_IGNORE';
-export const COMPOSE_SUGGESTION_TAGS_UPDATE = 'COMPOSE_SUGGESTION_TAGS_UPDATE';
-
-export const COMPOSE_TAG_HISTORY_UPDATE = 'COMPOSE_TAG_HISTORY_UPDATE';
-
-export const COMPOSE_MOUNT   = 'COMPOSE_MOUNT';
-export const COMPOSE_UNMOUNT = 'COMPOSE_UNMOUNT';
-
-export const COMPOSE_ADVANCED_OPTIONS_CHANGE = 'COMPOSE_ADVANCED_OPTIONS_CHANGE';
-export const COMPOSE_SENSITIVITY_CHANGE  = 'COMPOSE_SENSITIVITY_CHANGE';
-export const COMPOSE_SPOILERNESS_CHANGE  = 'COMPOSE_SPOILERNESS_CHANGE';
-export const COMPOSE_SPOILER_TEXT_CHANGE = 'COMPOSE_SPOILER_TEXT_CHANGE';
-export const COMPOSE_VISIBILITY_CHANGE   = 'COMPOSE_VISIBILITY_CHANGE';
-export const COMPOSE_LISTABILITY_CHANGE  = 'COMPOSE_LISTABILITY_CHANGE';
-export const COMPOSE_CONTENT_TYPE_CHANGE = 'COMPOSE_CONTENT_TYPE_CHANGE';
-export const COMPOSE_LANGUAGE_CHANGE     = 'COMPOSE_LANGUAGE_CHANGE';
-
-export const COMPOSE_EMOJI_INSERT = 'COMPOSE_EMOJI_INSERT';
-
-export const COMPOSE_UPLOAD_CHANGE_REQUEST     = 'COMPOSE_UPLOAD_UPDATE_REQUEST';
-export const COMPOSE_UPLOAD_CHANGE_SUCCESS     = 'COMPOSE_UPLOAD_UPDATE_SUCCESS';
-export const COMPOSE_UPLOAD_CHANGE_FAIL        = 'COMPOSE_UPLOAD_UPDATE_FAIL';
-
-export const COMPOSE_DOODLE_SET        = 'COMPOSE_DOODLE_SET';
-
-export const COMPOSE_POLL_ADD             = 'COMPOSE_POLL_ADD';
-export const COMPOSE_POLL_REMOVE          = 'COMPOSE_POLL_REMOVE';
-export const COMPOSE_POLL_OPTION_ADD      = 'COMPOSE_POLL_OPTION_ADD';
-export const COMPOSE_POLL_OPTION_CHANGE   = 'COMPOSE_POLL_OPTION_CHANGE';
-export const COMPOSE_POLL_OPTION_REMOVE   = 'COMPOSE_POLL_OPTION_REMOVE';
-export const COMPOSE_POLL_SETTINGS_CHANGE = 'COMPOSE_POLL_SETTINGS_CHANGE';
-
-export const INIT_MEDIA_EDIT_MODAL = 'INIT_MEDIA_EDIT_MODAL';
-
-export const COMPOSE_CHANGE_MEDIA_DESCRIPTION = 'COMPOSE_CHANGE_MEDIA_DESCRIPTION';
-export const COMPOSE_CHANGE_MEDIA_FOCUS       = 'COMPOSE_CHANGE_MEDIA_FOCUS';
-
-export const COMPOSE_SET_STATUS = 'COMPOSE_SET_STATUS';
-
-export const COMPOSE_QUOTE        = 'COMPOSE_QUOTE';
-export const COMPOSE_QUOTE_CANCEL = 'COMPOSE_QUOTE_CANCEL';
-
-const messages = defineMessages({
-  uploadErrorLimit: { id: 'upload_error.limit', defaultMessage: 'File upload limit exceeded.' },
-  uploadErrorPoll:  { id: 'upload_error.poll', defaultMessage: 'File upload not allowed with polls.' },
-});
-
-export const ensureComposeIsVisible = (getState, routerHistory) => {
-  if (!getState().getIn(['compose', 'mounted'])) {
-    routerHistory.push('/publish');
-  }
-};
-
-export function setComposeToStatus(status, text, spoiler_text, content_type) {
-  return{
-    type: COMPOSE_SET_STATUS,
-    status,
-    text,
-    spoiler_text,
-    content_type,
-  };
-}
-
-export function changeCompose(text) {
-  return {
-    type: COMPOSE_CHANGE,
-    text: text,
-  };
-}
-
-export function cycleElefriendCompose() {
-  return {
-    type: COMPOSE_CYCLE_ELEFRIEND,
-  };
-}
-
-export function replyCompose(status, routerHistory) {
-  return (dispatch, getState) => {
-    const prependCWRe = getState().getIn(['local_settings', 'prepend_cw_re']);
-    dispatch({
-      type: COMPOSE_REPLY,
-      status: status,
-      prependCWRe: prependCWRe,
-    });
-
-    ensureComposeIsVisible(getState, routerHistory);
-  };
-}
-
-export function cancelReplyCompose() {
-  return {
-    type: COMPOSE_REPLY_CANCEL,
-  };
-}
-
-export function quoteCompose(status, router) {
-  return (dispatch, getState) => {
-    dispatch({
-      type: COMPOSE_QUOTE,
-      status: status,
-    });
-
-    if (!getState().getIn(['compose', 'mounted'])) {
-      router.push('/publish');
-    }
-  };
-};
-
-export function cancelQuoteCompose() {
-  return {
-    type: COMPOSE_QUOTE_CANCEL,
-  };
-};
-
-export function resetCompose() {
-  return {
-    type: COMPOSE_RESET,
-  };
-}
-
-export function mentionCompose(account, routerHistory) {
-  return (dispatch, getState) => {
-    dispatch({
-      type: COMPOSE_MENTION,
-      account: account,
-    });
-
-    ensureComposeIsVisible(getState, routerHistory);
-  };
-}
-
-export function directCompose(account, routerHistory) {
-  return (dispatch, getState) => {
-    dispatch({
-      type: COMPOSE_DIRECT,
-      account: account,
-    });
-
-    ensureComposeIsVisible(getState, routerHistory);
-  };
-}
-
-export function submitCompose(routerHistory) {
-  return function (dispatch, getState) {
-    let status     = getState().getIn(['compose', 'text'], '');
-    const media    = getState().getIn(['compose', 'media_attachments']);
-    const statusId = getState().getIn(['compose', 'id'], null);
-    const spoilers = getState().getIn(['compose', 'spoiler']) || getState().getIn(['local_settings', 'always_show_spoilers_field']);
-    let spoilerText = spoilers ? getState().getIn(['compose', 'spoiler_text'], '') : '';
-
-    if ((!status || !status.length) && media.size === 0) {
-      return;
-    }
-
-    if (getState().getIn(['compose', 'advanced_options', 'do_not_federate'])) {
-      status = status + ' 👁️';
-    }
-
-    dispatch(submitComposeRequest());
-
-    // If we're editing a post with media attachments, those have not
-    // necessarily been changed on the server. Do it now in the same
-    // API call.
-    let media_attributes;
-    if (statusId !== null) {
-      media_attributes = media.map(item => {
-        let focus;
-
-        if (item.getIn(['meta', 'focus'])) {
-          focus = `${item.getIn(['meta', 'focus', 'x']).toFixed(2)},${item.getIn(['meta', 'focus', 'y']).toFixed(2)}`;
-        }
-
-        return {
-          id: item.get('id'),
-          description: item.get('description'),
-          focus,
-        };
-      });
-    }
-
-    api(getState).request({
-      url: statusId === null ? '/api/v1/statuses' : `/api/v1/statuses/${statusId}`,
-      method: statusId === null ? 'post' : 'put',
-      data: {
-        status,
-        content_type: getState().getIn(['compose', 'content_type']),
-        in_reply_to_id: getState().getIn(['compose', 'in_reply_to'], null),
-        quote_id: getState().getIn(['compose', 'quote_id'], null),
-        media_ids: media.map(item => item.get('id')),
-        media_attributes,
-        sensitive: getState().getIn(['compose', 'sensitive']) || (spoilerText.length > 0 && media.size !== 0),
-        spoiler_text: spoilerText,
-        visibility: getState().getIn(['compose', 'privacy']),
-        poll: getState().getIn(['compose', 'poll'], null),
-        language: getState().getIn(['compose', 'language']),
-      },
-      headers: {
-        'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']),
-      },
-    }).then(function (response) {
-      if (routerHistory
-          && (routerHistory.location.pathname === '/publish' || routerHistory.location.pathname === '/statuses/new')
-          && window.history.state
-          && !getState().getIn(['compose', 'advanced_options', 'threaded_mode'])) {
-        routerHistory.goBack();
-      }
-
-      dispatch(insertIntoTagHistory(response.data.tags, status));
-      dispatch(submitComposeSuccess({ ...response.data }));
-
-      //  If the response has no data then we can't do anything else.
-      if (!response.data) {
-        return;
-      }
-
-      // To make the app more responsive, immediately get the status into the columns
-
-      const insertIfOnline = (timelineId) => {
-        const timeline = getState().getIn(['timelines', timelineId]);
-
-        if (timeline && timeline.get('items').size > 0 && timeline.getIn(['items', 0]) !== null && timeline.get('online')) {
-          dispatch(updateTimeline(timelineId, { ...response.data }));
-        }
-      };
-
-      if (statusId) {
-        dispatch(importFetchedStatus({ ...response.data }));
-      }
-
-      if (statusId === null) {
-        insertIfOnline('home');
-      }
-
-      if (statusId === null && response.data.in_reply_to_id === null && response.data.visibility === 'public') {
-        insertIfOnline('community');
-        if (!response.data.local_only) {
-          insertIfOnline('public');
-        }
-      } else if (statusId === null && response.data.visibility === 'direct') {
-        insertIfOnline('direct');
-      }
-    }).catch(function (error) {
-      dispatch(submitComposeFail(error));
-    });
-  };
-}
-
-export function submitComposeRequest() {
-  return {
-    type: COMPOSE_SUBMIT_REQUEST,
-  };
-}
-
-export function submitComposeSuccess(status) {
-  return {
-    type: COMPOSE_SUBMIT_SUCCESS,
-    status: status,
-  };
-}
-
-export function submitComposeFail(error) {
-  return {
-    type: COMPOSE_SUBMIT_FAIL,
-    error: error,
-  };
-}
-
-export function doodleSet(options) {
-  return {
-    type: COMPOSE_DOODLE_SET,
-    options: options,
-  };
-}
-
-export function uploadCompose(files) {
-  return function (dispatch, getState) {
-    const uploadLimit = 4;
-    const media  = getState().getIn(['compose', 'media_attachments']);
-    const pending  = getState().getIn(['compose', 'pending_media_attachments']);
-    const progress = new Array(files.length).fill(0);
-    let total = Array.from(files).reduce((a, v) => a + v.size, 0);
-
-    if (files.length + media.size + pending > uploadLimit) {
-      dispatch(showAlert(undefined, messages.uploadErrorLimit));
-      return;
-    }
-
-    if (getState().getIn(['compose', 'poll'])) {
-      dispatch(showAlert(undefined, messages.uploadErrorPoll));
-      return;
-    }
-
-    dispatch(uploadComposeRequest());
-
-    for (const [i, f] of Array.from(files).entries()) {
-      if (media.size + i > 3) break;
-
-      resizeImage(f).then(file => {
-        const data = new FormData();
-        data.append('file', file);
-        // Account for disparity in size of original image and resized data
-        total += file.size - f.size;
-
-        return api(getState).post('/api/v2/media', data, {
-          onUploadProgress: function({ loaded }){
-            progress[i] = loaded;
-            dispatch(uploadComposeProgress(progress.reduce((a, v) => a + v, 0), total));
-          },
-        }).then(({ status, data }) => {
-          // If server-side processing of the media attachment has not completed yet,
-          // poll the server until it is, before showing the media attachment as uploaded
-
-          if (status === 200) {
-            dispatch(uploadComposeSuccess(data, f));
-          } else if (status === 202) {
-            dispatch(uploadComposeProcessing());
-
-            let tryCount = 1;
-
-            const poll = () => {
-              api(getState).get(`/api/v1/media/${data.id}`).then(response => {
-                if (response.status === 200) {
-                  dispatch(uploadComposeSuccess(response.data, f));
-                } else if (response.status === 206) {
-                  const retryAfter = (Math.log2(tryCount) || 1) * 1000;
-                  tryCount += 1;
-                  setTimeout(() => poll(), retryAfter);
-                }
-              }).catch(error => dispatch(uploadComposeFail(error)));
-            };
-
-            poll();
-          }
-        });
-      }).catch(error => dispatch(uploadComposeFail(error)));
-    }
-  };
-}
-
-export const uploadComposeProcessing = () => ({
-  type: COMPOSE_UPLOAD_PROCESSING,
-});
-
-export const uploadThumbnail = (id, file) => (dispatch, getState) => {
-  dispatch(uploadThumbnailRequest());
-
-  const total = file.size;
-  const data = new FormData();
-
-  data.append('thumbnail', file);
-
-  api(getState).put(`/api/v1/media/${id}`, data, {
-    onUploadProgress: ({ loaded }) => {
-      dispatch(uploadThumbnailProgress(loaded, total));
-    },
-  }).then(({ data }) => {
-    dispatch(uploadThumbnailSuccess(data));
-  }).catch(error => {
-    dispatch(uploadThumbnailFail(id, error));
-  });
-};
-
-export const uploadThumbnailRequest = () => ({
-  type: THUMBNAIL_UPLOAD_REQUEST,
-  skipLoading: true,
-});
-
-export const uploadThumbnailProgress = (loaded, total) => ({
-  type: THUMBNAIL_UPLOAD_PROGRESS,
-  loaded,
-  total,
-  skipLoading: true,
-});
-
-export const uploadThumbnailSuccess = media => ({
-  type: THUMBNAIL_UPLOAD_SUCCESS,
-  media,
-  skipLoading: true,
-});
-
-export const uploadThumbnailFail = error => ({
-  type: THUMBNAIL_UPLOAD_FAIL,
-  error,
-  skipLoading: true,
-});
-
-export function initMediaEditModal(id) {
-  return dispatch => {
-    dispatch({
-      type: INIT_MEDIA_EDIT_MODAL,
-      id,
-    });
-
-    dispatch(openModal({
-      modalType: 'FOCAL_POINT',
-      modalProps: { id },
-    }));
-  };
-}
-
-export function onChangeMediaDescription(description) {
-  return {
-    type: COMPOSE_CHANGE_MEDIA_DESCRIPTION,
-    description,
-  };
-}
-
-export function onChangeMediaFocus(focusX, focusY) {
-  return {
-    type: COMPOSE_CHANGE_MEDIA_FOCUS,
-    focusX,
-    focusY,
-  };
-}
-
-export function changeUploadCompose(id, params) {
-  return (dispatch, getState) => {
-    dispatch(changeUploadComposeRequest());
-
-    let media = getState().getIn(['compose', 'media_attachments']).find((item) => item.get('id') === id);
-
-    // Editing already-attached media is deferred to editing the post itself.
-    // For simplicity's sake, fake an API reply.
-    if (media && !media.get('unattached')) {
-      const { focus, ...other } = params;
-      const data = { ...media.toJS(), ...other };
-
-      if (focus) {
-        const [x, y] = focus.split(',');
-        data.meta = { focus: { x: parseFloat(x), y: parseFloat(y) } };
-      }
-
-      dispatch(changeUploadComposeSuccess(data, true));
-    } else {
-      api(getState).put(`/api/v1/media/${id}`, params).then(response => {
-        dispatch(changeUploadComposeSuccess(response.data, false));
-      }).catch(error => {
-        dispatch(changeUploadComposeFail(id, error));
-      });
-    }
-  };
-}
-
-export function changeUploadComposeRequest() {
-  return {
-    type: COMPOSE_UPLOAD_CHANGE_REQUEST,
-    skipLoading: true,
-  };
-}
-
-export function changeUploadComposeSuccess(media, attached) {
-  return {
-    type: COMPOSE_UPLOAD_CHANGE_SUCCESS,
-    media: media,
-    attached: attached,
-    skipLoading: true,
-  };
-}
-
-export function changeUploadComposeFail(error) {
-  return {
-    type: COMPOSE_UPLOAD_CHANGE_FAIL,
-    error: error,
-    skipLoading: true,
-  };
-}
-
-export function uploadComposeRequest() {
-  return {
-    type: COMPOSE_UPLOAD_REQUEST,
-    skipLoading: true,
-  };
-}
-
-export function uploadComposeProgress(loaded, total) {
-  return {
-    type: COMPOSE_UPLOAD_PROGRESS,
-    loaded: loaded,
-    total: total,
-  };
-}
-
-export function uploadComposeSuccess(media, file) {
-  return {
-    type: COMPOSE_UPLOAD_SUCCESS,
-    media: media,
-    file: file,
-    skipLoading: true,
-  };
-}
-
-export function uploadComposeFail(error) {
-  return {
-    type: COMPOSE_UPLOAD_FAIL,
-    error: error,
-    skipLoading: true,
-  };
-}
-
-export function undoUploadCompose(media_id) {
-  return {
-    type: COMPOSE_UPLOAD_UNDO,
-    media_id: media_id,
-  };
-}
-
-export function clearComposeSuggestions() {
-  if (fetchComposeSuggestionsAccountsController) {
-    fetchComposeSuggestionsAccountsController.abort();
-  }
-  return {
-    type: COMPOSE_SUGGESTIONS_CLEAR,
-  };
-}
-
-const fetchComposeSuggestionsAccounts = throttle((dispatch, getState, token) => {
-  if (fetchComposeSuggestionsAccountsController) {
-    fetchComposeSuggestionsAccountsController.abort();
-  }
-
-  fetchComposeSuggestionsAccountsController = new AbortController();
-
-  api(getState).get('/api/v1/accounts/search', {
-    signal: fetchComposeSuggestionsAccountsController.signal,
-
-    params: {
-      q: token.slice(1),
-      resolve: false,
-      limit: 4,
-    },
-  }).then(response => {
-    dispatch(importFetchedAccounts(response.data));
-    dispatch(readyComposeSuggestionsAccounts(token, response.data));
-  }).catch(error => {
-    if (!axios.isCancel(error)) {
-      dispatch(showAlertForError(error));
-    }
-  }).finally(() => {
-    fetchComposeSuggestionsAccountsController = undefined;
-  });
-}, 200, { leading: true, trailing: true });
-
-const fetchComposeSuggestionsEmojis = (dispatch, getState, token) => {
-  const results = emojiSearch(token.replace(':', ''), { maxResults: 5 });
-  dispatch(readyComposeSuggestionsEmojis(token, results));
-};
-
-const fetchComposeSuggestionsTags = throttle((dispatch, getState, token) => {
-  if (fetchComposeSuggestionsTagsController) {
-    fetchComposeSuggestionsTagsController.abort();
-  }
-
-  dispatch(updateSuggestionTags(token));
-
-  fetchComposeSuggestionsTagsController = new AbortController();
-
-  api(getState).get('/api/v2/search', {
-    signal: fetchComposeSuggestionsTagsController.signal,
-
-    params: {
-      type: 'hashtags',
-      q: token.slice(1),
-      resolve: false,
-      limit: 4,
-    },
-  }).then(({ data }) => {
-    dispatch(readyComposeSuggestionsTags(token, data.hashtags));
-  }).catch(error => {
-    if (!axios.isCancel(error)) {
-      dispatch(showAlertForError(error));
-    }
-  }).finally(() => {
-    fetchComposeSuggestionsTagsController = undefined;
-  });
-}, 200, { leading: true, trailing: true });
-
-export function fetchComposeSuggestions(token) {
-  return (dispatch, getState) => {
-    switch (token[0]) {
-    case ':':
-      fetchComposeSuggestionsEmojis(dispatch, getState, token);
-      break;
-    case '#':
-      fetchComposeSuggestionsTags(dispatch, getState, token);
-      break;
-    default:
-      fetchComposeSuggestionsAccounts(dispatch, getState, token);
-      break;
-    }
-  };
-}
-
-export function readyComposeSuggestionsEmojis(token, emojis) {
-  return {
-    type: COMPOSE_SUGGESTIONS_READY,
-    token,
-    emojis,
-  };
-}
-
-export function readyComposeSuggestionsAccounts(token, accounts) {
-  return {
-    type: COMPOSE_SUGGESTIONS_READY,
-    token,
-    accounts,
-  };
-}
-
-export const readyComposeSuggestionsTags = (token, tags) => ({
-  type: COMPOSE_SUGGESTIONS_READY,
-  token,
-  tags,
-});
-
-export function selectComposeSuggestion(position, token, suggestion, path) {
-  return (dispatch, getState) => {
-    let completion;
-    if (suggestion.type === 'emoji') {
-      dispatch(useEmoji(suggestion));
-      completion = suggestion.native || suggestion.colons;
-    } else if (suggestion.type === 'hashtag') {
-      completion = `#${suggestion.name}`;
-    } else if (suggestion.type === 'account') {
-      completion = '@' + getState().getIn(['accounts', suggestion.id, 'acct']);
-    }
-
-    // We don't want to replace hashtags that vary only in case due to accessibility, but we need to fire off an event so that
-    // the suggestions are dismissed and the cursor moves forward.
-    if (suggestion.type !== 'hashtag' || token.slice(1).localeCompare(suggestion.name, undefined, { sensitivity: 'accent' }) !== 0) {
-      dispatch({
-        type: COMPOSE_SUGGESTION_SELECT,
-        position,
-        token,
-        completion,
-        path,
-      });
-    } else {
-      dispatch({
-        type: COMPOSE_SUGGESTION_IGNORE,
-        position,
-        token,
-        completion,
-        path,
-      });
-    }
-  };
-}
-
-export function updateSuggestionTags(token) {
-  return {
-    type: COMPOSE_SUGGESTION_TAGS_UPDATE,
-    token,
-  };
-}
-
-export function updateTagHistory(tags) {
-  return {
-    type: COMPOSE_TAG_HISTORY_UPDATE,
-    tags,
-  };
-}
-
-export function hydrateCompose() {
-  return (dispatch, getState) => {
-    const me = getState().getIn(['meta', 'me']);
-    const history = tagHistory.get(me);
-
-    if (history !== null) {
-      dispatch(updateTagHistory(history));
-    }
-  };
-}
-
-function insertIntoTagHistory(recognizedTags, text) {
-  return (dispatch, getState) => {
-    const state = getState();
-    const oldHistory = state.getIn(['compose', 'tagHistory']);
-    const me = state.getIn(['meta', 'me']);
-    const names = recoverHashtags(recognizedTags, text);
-    const intersectedOldHistory = oldHistory.filter(name => names.findIndex(newName => newName.toLowerCase() === name.toLowerCase()) === -1);
-
-    names.push(...intersectedOldHistory.toJS());
-
-    const newHistory = names.slice(0, 1000);
-
-    tagHistory.set(me, newHistory);
-    dispatch(updateTagHistory(newHistory));
-  };
-}
-
-export function mountCompose() {
-  return {
-    type: COMPOSE_MOUNT,
-  };
-}
-
-export function unmountCompose() {
-  return {
-    type: COMPOSE_UNMOUNT,
-  };
-}
-
-export function changeComposeAdvancedOption(option, value) {
-  return {
-    option,
-    type: COMPOSE_ADVANCED_OPTIONS_CHANGE,
-    value,
-  };
-}
-
-export function changeComposeSensitivity() {
-  return {
-    type: COMPOSE_SENSITIVITY_CHANGE,
-  };
-}
-
-export const changeComposeLanguage = language => ({
-  type: COMPOSE_LANGUAGE_CHANGE,
-  language,
-});
-
-export function changeComposeSpoilerness() {
-  return {
-    type: COMPOSE_SPOILERNESS_CHANGE,
-  };
-}
-
-export function changeComposeSpoilerText(text) {
-  return {
-    type: COMPOSE_SPOILER_TEXT_CHANGE,
-    text,
-  };
-}
-
-export function changeComposeVisibility(value) {
-  return {
-    type: COMPOSE_VISIBILITY_CHANGE,
-    value,
-  };
-}
-
-export function changeComposeContentType(value) {
-  return {
-    type: COMPOSE_CONTENT_TYPE_CHANGE,
-    value,
-  };
-}
-
-export function insertEmojiCompose(position, emoji) {
-  return {
-    type: COMPOSE_EMOJI_INSERT,
-    position,
-    emoji,
-  };
-}
-
-export function addPoll() {
-  return {
-    type: COMPOSE_POLL_ADD,
-  };
-}
-
-export function removePoll() {
-  return {
-    type: COMPOSE_POLL_REMOVE,
-  };
-}
-
-export function addPollOption(title) {
-  return {
-    type: COMPOSE_POLL_OPTION_ADD,
-    title,
-  };
-}
-
-export function changePollOption(index, title) {
-  return {
-    type: COMPOSE_POLL_OPTION_CHANGE,
-    index,
-    title,
-  };
-}
-
-export function removePollOption(index) {
-  return {
-    type: COMPOSE_POLL_OPTION_REMOVE,
-    index,
-  };
-}
-
-export function changePollSettings(expiresIn, isMultiple) {
-  return {
-    type: COMPOSE_POLL_SETTINGS_CHANGE,
-    expiresIn,
-    isMultiple,
-  };
-}
--- a/app/javascript/flavours/glitch/actions/conversations.js
+++ b/app/javascript/flavours/glitch/actions/conversations.js
@ -1,113 +0,0 @@
-import api, { getLinks } from '../api';
-
-import {
-  importFetchedAccounts,
-  importFetchedStatuses,
-  importFetchedStatus,
-} from './importer';
-
-export const CONVERSATIONS_MOUNT   = 'CONVERSATIONS_MOUNT';
-export const CONVERSATIONS_UNMOUNT = 'CONVERSATIONS_UNMOUNT';
-
-export const CONVERSATIONS_FETCH_REQUEST = 'CONVERSATIONS_FETCH_REQUEST';
-export const CONVERSATIONS_FETCH_SUCCESS = 'CONVERSATIONS_FETCH_SUCCESS';
-export const CONVERSATIONS_FETCH_FAIL    = 'CONVERSATIONS_FETCH_FAIL';
-export const CONVERSATIONS_UPDATE        = 'CONVERSATIONS_UPDATE';
-
-export const CONVERSATIONS_READ = 'CONVERSATIONS_READ';
-
-export const CONVERSATIONS_DELETE_REQUEST = 'CONVERSATIONS_DELETE_REQUEST';
-export const CONVERSATIONS_DELETE_SUCCESS = 'CONVERSATIONS_DELETE_SUCCESS';
-export const CONVERSATIONS_DELETE_FAIL    = 'CONVERSATIONS_DELETE_FAIL';
-
-export const mountConversations = () => ({
-  type: CONVERSATIONS_MOUNT,
-});
-
-export const unmountConversations = () => ({
-  type: CONVERSATIONS_UNMOUNT,
-});
-
-export const markConversationRead = conversationId => (dispatch, getState) => {
-  dispatch({
-    type: CONVERSATIONS_READ,
-    id: conversationId,
-  });
-
-  api(getState).post(`/api/v1/conversations/${conversationId}/read`);
-};
-
-export const expandConversations = ({ maxId } = {}) => (dispatch, getState) => {
-  dispatch(expandConversationsRequest());
-
-  const params = { max_id: maxId };
-
-  if (!maxId) {
-    params.since_id = getState().getIn(['conversations', 'items', 0, 'last_status']);
-  }
-
-  const isLoadingRecent = !!params.since_id;
-
-  api(getState).get('/api/v1/conversations', { params })
-    .then(response => {
-      const next = getLinks(response).refs.find(link => link.rel === 'next');
-
-      dispatch(importFetchedAccounts(response.data.reduce((aggr, item) => aggr.concat(item.accounts), [])));
-      dispatch(importFetchedStatuses(response.data.map(item => item.last_status).filter(x => !!x)));
-      dispatch(expandConversationsSuccess(response.data, next ? next.uri : null, isLoadingRecent));
-    })
-    .catch(err => dispatch(expandConversationsFail(err)));
-};
-
-export const expandConversationsRequest = () => ({
-  type: CONVERSATIONS_FETCH_REQUEST,
-});
-
-export const expandConversationsSuccess = (conversations, next, isLoadingRecent) => ({
-  type: CONVERSATIONS_FETCH_SUCCESS,
-  conversations,
-  next,
-  isLoadingRecent,
-});
-
-export const expandConversationsFail = error => ({
-  type: CONVERSATIONS_FETCH_FAIL,
-  error,
-});
-
-export const updateConversations = conversation => dispatch => {
-  dispatch(importFetchedAccounts(conversation.accounts));
-
-  if (conversation.last_status) {
-    dispatch(importFetchedStatus(conversation.last_status));
-  }
-
-  dispatch({
-    type: CONVERSATIONS_UPDATE,
-    conversation,
-  });
-};
-
-export const deleteConversation = conversationId => (dispatch, getState) => {
-  dispatch(deleteConversationRequest(conversationId));
-
-  api(getState).delete(`/api/v1/conversations/${conversationId}`)
-    .then(() => dispatch(deleteConversationSuccess(conversationId)))
-    .catch(error => dispatch(deleteConversationFail(conversationId, error)));
-};
-
-export const deleteConversationRequest = id => ({
-  type: CONVERSATIONS_DELETE_REQUEST,
-  id,
-});
-
-export const deleteConversationSuccess = id => ({
-  type: CONVERSATIONS_DELETE_SUCCESS,
-  id,
-});
-
-export const deleteConversationFail = (id, error) => ({
-  type: CONVERSATIONS_DELETE_FAIL,
-  id,
-  error,
-});
--- a/app/javascript/flavours/glitch/actions/custom_emojis.js
+++ b/app/javascript/flavours/glitch/actions/custom_emojis.js
@ -1,40 +0,0 @@
-import api from '../api';
-
-export const CUSTOM_EMOJIS_FETCH_REQUEST = 'CUSTOM_EMOJIS_FETCH_REQUEST';
-export const CUSTOM_EMOJIS_FETCH_SUCCESS = 'CUSTOM_EMOJIS_FETCH_SUCCESS';
-export const CUSTOM_EMOJIS_FETCH_FAIL = 'CUSTOM_EMOJIS_FETCH_FAIL';
-
-export function fetchCustomEmojis() {
-  return (dispatch, getState) => {
-    dispatch(fetchCustomEmojisRequest());
-
-    api(getState).get('/api/v1/custom_emojis').then(response => {
-      dispatch(fetchCustomEmojisSuccess(response.data));
-    }).catch(error => {
-      dispatch(fetchCustomEmojisFail(error));
-    });
-  };
-}
-
-export function fetchCustomEmojisRequest() {
-  return {
-    type: CUSTOM_EMOJIS_FETCH_REQUEST,
-    skipLoading: true,
-  };
-}
-
-export function fetchCustomEmojisSuccess(custom_emojis) {
-  return {
-    type: CUSTOM_EMOJIS_FETCH_SUCCESS,
-    custom_emojis,
-    skipLoading: true,
-  };
-}
-
-export function fetchCustomEmojisFail(error) {
-  return {
-    type: CUSTOM_EMOJIS_FETCH_FAIL,
-    error,
-    skipLoading: true,
-  };
-}
--- a/app/javascript/flavours/glitch/actions/directory.js
+++ b/app/javascript/flavours/glitch/actions/directory.js
@ -1,62 +0,0 @@
-import api from '../api';
-
-import { fetchRelationships } from './accounts';
-import { importFetchedAccounts } from './importer';
-
-export const DIRECTORY_FETCH_REQUEST = 'DIRECTORY_FETCH_REQUEST';
-export const DIRECTORY_FETCH_SUCCESS = 'DIRECTORY_FETCH_SUCCESS';
-export const DIRECTORY_FETCH_FAIL    = 'DIRECTORY_FETCH_FAIL';
-
-export const DIRECTORY_EXPAND_REQUEST = 'DIRECTORY_EXPAND_REQUEST';
-export const DIRECTORY_EXPAND_SUCCESS = 'DIRECTORY_EXPAND_SUCCESS';
-export const DIRECTORY_EXPAND_FAIL    = 'DIRECTORY_EXPAND_FAIL';
-
-export const fetchDirectory = params => (dispatch, getState) => {
-  dispatch(fetchDirectoryRequest());
-
-  api(getState).get('/api/v1/directory', { params: { ...params, limit: 20 } }).then(({ data }) => {
-    dispatch(importFetchedAccounts(data));
-    dispatch(fetchDirectorySuccess(data));
-    dispatch(fetchRelationships(data.map(x => x.id)));
-  }).catch(error => dispatch(fetchDirectoryFail(error)));
-};
-
-export const fetchDirectoryRequest = () => ({
-  type: DIRECTORY_FETCH_REQUEST,
-});
-
-export const fetchDirectorySuccess = accounts => ({
-  type: DIRECTORY_FETCH_SUCCESS,
-  accounts,
-});
-
-export const fetchDirectoryFail = error => ({
-  type: DIRECTORY_FETCH_FAIL,
-  error,
-});
-
-export const expandDirectory = params => (dispatch, getState) => {
-  dispatch(expandDirectoryRequest());
-
-  const loadedItems = getState().getIn(['user_lists', 'directory', 'items']).size;
-
-  api(getState).get('/api/v1/directory', { params: { ...params, offset: loadedItems, limit: 20 } }).then(({ data }) => {
-    dispatch(importFetchedAccounts(data));
-    dispatch(expandDirectorySuccess(data));
-    dispatch(fetchRelationships(data.map(x => x.id)));
-  }).catch(error => dispatch(expandDirectoryFail(error)));
-};
-
-export const expandDirectoryRequest = () => ({
-  type: DIRECTORY_EXPAND_REQUEST,
-});
-
-export const expandDirectorySuccess = accounts => ({
-  type: DIRECTORY_EXPAND_SUCCESS,
-  accounts,
-});
-
-export const expandDirectoryFail = error => ({
-  type: DIRECTORY_EXPAND_FAIL,
-  error,
-});
--- a/app/javascript/flavours/glitch/actions/domain_blocks.js
+++ b/app/javascript/flavours/glitch/actions/domain_blocks.js
@ -1,166 +0,0 @@
-import api, { getLinks } from '../api';
-
-export const DOMAIN_BLOCK_REQUEST = 'DOMAIN_BLOCK_REQUEST';
-export const DOMAIN_BLOCK_SUCCESS = 'DOMAIN_BLOCK_SUCCESS';
-export const DOMAIN_BLOCK_FAIL    = 'DOMAIN_BLOCK_FAIL';
-
-export const DOMAIN_UNBLOCK_REQUEST = 'DOMAIN_UNBLOCK_REQUEST';
-export const DOMAIN_UNBLOCK_SUCCESS = 'DOMAIN_UNBLOCK_SUCCESS';
-export const DOMAIN_UNBLOCK_FAIL    = 'DOMAIN_UNBLOCK_FAIL';
-
-export const DOMAIN_BLOCKS_FETCH_REQUEST = 'DOMAIN_BLOCKS_FETCH_REQUEST';
-export const DOMAIN_BLOCKS_FETCH_SUCCESS = 'DOMAIN_BLOCKS_FETCH_SUCCESS';
-export const DOMAIN_BLOCKS_FETCH_FAIL    = 'DOMAIN_BLOCKS_FETCH_FAIL';
-
-export const DOMAIN_BLOCKS_EXPAND_REQUEST = 'DOMAIN_BLOCKS_EXPAND_REQUEST';
-export const DOMAIN_BLOCKS_EXPAND_SUCCESS = 'DOMAIN_BLOCKS_EXPAND_SUCCESS';
-export const DOMAIN_BLOCKS_EXPAND_FAIL    = 'DOMAIN_BLOCKS_EXPAND_FAIL';
-
-export function blockDomain(domain) {
-  return (dispatch, getState) => {
-    dispatch(blockDomainRequest(domain));
-
-    api(getState).post('/api/v1/domain_blocks', { domain }).then(() => {
-      const at_domain = '@' + domain;
-      const accounts = getState().get('accounts').filter(item => item.get('acct').endsWith(at_domain)).valueSeq().map(item => item.get('id'));
-
-      dispatch(blockDomainSuccess(domain, accounts));
-    }).catch(err => {
-      dispatch(blockDomainFail(domain, err));
-    });
-  };
-}
-
-export function blockDomainRequest(domain) {
-  return {
-    type: DOMAIN_BLOCK_REQUEST,
-    domain,
-  };
-}
-
-export function blockDomainSuccess(domain, accounts) {
-  return {
-    type: DOMAIN_BLOCK_SUCCESS,
-    domain,
-    accounts,
-  };
-}
-
-export function blockDomainFail(domain, error) {
-  return {
-    type: DOMAIN_BLOCK_FAIL,
-    domain,
-    error,
-  };
-}
-
-export function unblockDomain(domain) {
-  return (dispatch, getState) => {
-    dispatch(unblockDomainRequest(domain));
-
-    api(getState).delete('/api/v1/domain_blocks', { params: { domain } }).then(() => {
-      const at_domain = '@' + domain;
-      const accounts = getState().get('accounts').filter(item => item.get('acct').endsWith(at_domain)).valueSeq().map(item => item.get('id'));
-      dispatch(unblockDomainSuccess(domain, accounts));
-    }).catch(err => {
-      dispatch(unblockDomainFail(domain, err));
-    });
-  };
-}
-
-export function unblockDomainRequest(domain) {
-  return {
-    type: DOMAIN_UNBLOCK_REQUEST,
-    domain,
-  };
-}
-
-export function unblockDomainSuccess(domain, accounts) {
-  return {
-    type: DOMAIN_UNBLOCK_SUCCESS,
-    domain,
-    accounts,
-  };
-}
-
-export function unblockDomainFail(domain, error) {
-  return {
-    type: DOMAIN_UNBLOCK_FAIL,
-    domain,
-    error,
-  };
-}
-
-export function fetchDomainBlocks() {
-  return (dispatch, getState) => {
-    dispatch(fetchDomainBlocksRequest());
-
-    api(getState).get('/api/v1/domain_blocks').then(response => {
-      const next = getLinks(response).refs.find(link => link.rel === 'next');
-      dispatch(fetchDomainBlocksSuccess(response.data, next ? next.uri : null));
-    }).catch(err => {
-      dispatch(fetchDomainBlocksFail(err));
-    });
-  };
-}
-
-export function fetchDomainBlocksRequest() {
-  return {
-    type: DOMAIN_BLOCKS_FETCH_REQUEST,
-  };
-}
-
-export function fetchDomainBlocksSuccess(domains, next) {
-  return {
-    type: DOMAIN_BLOCKS_FETCH_SUCCESS,
-    domains,
-    next,
-  };
-}
-
-export function fetchDomainBlocksFail(error) {
-  return {
-    type: DOMAIN_BLOCKS_FETCH_FAIL,
-    error,
-  };
-}
-
-export function expandDomainBlocks() {
-  return (dispatch, getState) => {
-    const url = getState().getIn(['domain_lists', 'blocks', 'next']);
-
-    if (!url) {
-      return;
-    }
-
-    dispatch(expandDomainBlocksRequest());
-
-    api(getState).get(url).then(response => {
-      const next = getLinks(response).refs.find(link => link.rel === 'next');
-      dispatch(expandDomainBlocksSuccess(response.data, next ? next.uri : null));
-    }).catch(err => {
-      dispatch(expandDomainBlocksFail(err));
-    });
-  };
-}
-
-export function expandDomainBlocksRequest() {
-  return {
-    type: DOMAIN_BLOCKS_EXPAND_REQUEST,
-  };
-}
-
-export function expandDomainBlocksSuccess(domains, next) {
-  return {
-    type: DOMAIN_BLOCKS_EXPAND_SUCCESS,
-    domains,
-    next,
-  };
-}
-
-export function expandDomainBlocksFail(error) {
-  return {
-    type: DOMAIN_BLOCKS_EXPAND_FAIL,
-    error,
-  };
-}
--- a/app/javascript/flavours/glitch/actions/dropdown_menu.js
+++ b/app/javascript/flavours/glitch/actions/dropdown_menu.js
@ -1,10 +0,0 @@
-export const DROPDOWN_MENU_OPEN = 'DROPDOWN_MENU_OPEN';
-export const DROPDOWN_MENU_CLOSE = 'DROPDOWN_MENU_CLOSE';
-
-export function openDropdownMenu(id, keyboard, scroll_key) {
-  return { type: DROPDOWN_MENU_OPEN, id, keyboard, scroll_key };
-}
-
-export function closeDropdownMenu(id) {
-  return { type: DROPDOWN_MENU_CLOSE, id };
-}
--- a/app/javascript/flavours/glitch/actions/emojis.js
+++ b/app/javascript/flavours/glitch/actions/emojis.js
@ -1,14 +0,0 @@
-import { saveSettings } from './settings';
-
-export const EMOJI_USE = 'EMOJI_USE';
-
-export function useEmoji(emoji) {
-  return dispatch => {
-    dispatch({
-      type: EMOJI_USE,
-      emoji,
-    });
-
-    dispatch(saveSettings());
-  };
-}
--- a/app/javascript/flavours/glitch/actions/favourites.js
+++ b/app/javascript/flavours/glitch/actions/favourites.js
@ -1,94 +0,0 @@
-import api, { getLinks } from '../api';
-
-import { importFetchedStatuses } from './importer';
-
-export const FAVOURITED_STATUSES_FETCH_REQUEST = 'FAVOURITED_STATUSES_FETCH_REQUEST';
-export const FAVOURITED_STATUSES_FETCH_SUCCESS = 'FAVOURITED_STATUSES_FETCH_SUCCESS';
-export const FAVOURITED_STATUSES_FETCH_FAIL    = 'FAVOURITED_STATUSES_FETCH_FAIL';
-
-export const FAVOURITED_STATUSES_EXPAND_REQUEST = 'FAVOURITED_STATUSES_EXPAND_REQUEST';
-export const FAVOURITED_STATUSES_EXPAND_SUCCESS = 'FAVOURITED_STATUSES_EXPAND_SUCCESS';
-export const FAVOURITED_STATUSES_EXPAND_FAIL    = 'FAVOURITED_STATUSES_EXPAND_FAIL';
-
-export function fetchFavouritedStatuses() {
-  return (dispatch, getState) => {
-    if (getState().getIn(['status_lists', 'favourites', 'isLoading'])) {
-      return;
-    }
-
-    dispatch(fetchFavouritedStatusesRequest());
-
-    api(getState).get('/api/v1/favourites').then(response => {
-      const next = getLinks(response).refs.find(link => link.rel === 'next');
-      dispatch(importFetchedStatuses(response.data));
-      dispatch(fetchFavouritedStatusesSuccess(response.data, next ? next.uri : null));
-    }).catch(error => {
-      dispatch(fetchFavouritedStatusesFail(error));
-    });
-  };
-}
-
-export function fetchFavouritedStatusesRequest() {
-  return {
-    type: FAVOURITED_STATUSES_FETCH_REQUEST,
-    skipLoading: true,
-  };
-}
-
-export function fetchFavouritedStatusesSuccess(statuses, next) {
-  return {
-    type: FAVOURITED_STATUSES_FETCH_SUCCESS,
-    statuses,
-    next,
-    skipLoading: true,
-  };
-}
-
-export function fetchFavouritedStatusesFail(error) {
-  return {
-    type: FAVOURITED_STATUSES_FETCH_FAIL,
-    error,
-    skipLoading: true,
-  };
-}
-
-export function expandFavouritedStatuses() {
-  return (dispatch, getState) => {
-    const url = getState().getIn(['status_lists', 'favourites', 'next'], null);
-
-    if (url === null || getState().getIn(['status_lists', 'favourites', 'isLoading'])) {
-      return;
-    }
-
-    dispatch(expandFavouritedStatusesRequest());
-
-    api(getState).get(url).then(response => {
-      const next = getLinks(response).refs.find(link => link.rel === 'next');
-      dispatch(importFetchedStatuses(response.data));
-      dispatch(expandFavouritedStatusesSuccess(response.data, next ? next.uri : null));
-    }).catch(error => {
-      dispatch(expandFavouritedStatusesFail(error));
-    });
-  };
-}
-
-export function expandFavouritedStatusesRequest() {
-  return {
-    type: FAVOURITED_STATUSES_EXPAND_REQUEST,
-  };
-}
-
-export function expandFavouritedStatusesSuccess(statuses, next) {
-  return {
-    type: FAVOURITED_STATUSES_EXPAND_SUCCESS,
-    statuses,
-    next,
-  };
-}
-
-export function expandFavouritedStatusesFail(error) {
-  return {
-    type: FAVOURITED_STATUSES_EXPAND_FAIL,
-    error,
-  };
-}
--- a/app/javascript/flavours/glitch/actions/featured_tags.js
+++ b/app/javascript/flavours/glitch/actions/featured_tags.js
@ -1,34 +0,0 @@
-import api from '../api';
-
-export const FEATURED_TAGS_FETCH_REQUEST = 'FEATURED_TAGS_FETCH_REQUEST';
-export const FEATURED_TAGS_FETCH_SUCCESS = 'FEATURED_TAGS_FETCH_SUCCESS';
-export const FEATURED_TAGS_FETCH_FAIL    = 'FEATURED_TAGS_FETCH_FAIL';
-
-export const fetchFeaturedTags = (id) => (dispatch, getState) => {
-  if (getState().getIn(['user_lists', 'featured_tags', id, 'items'])) {
-    return;
-  }
-
-  dispatch(fetchFeaturedTagsRequest(id));
-
-  api(getState).get(`/api/v1/accounts/${id}/featured_tags`)
-    .then(({ data }) => dispatch(fetchFeaturedTagsSuccess(id, data)))
-    .catch(err => dispatch(fetchFeaturedTagsFail(id, err)));
-};
-
-export const fetchFeaturedTagsRequest = (id) => ({
-  type: FEATURED_TAGS_FETCH_REQUEST,
-  id,
-});
-
-export const fetchFeaturedTagsSuccess = (id, tags) => ({
-  type: FEATURED_TAGS_FETCH_SUCCESS,
-  id,
-  tags,
-});
-
-export const fetchFeaturedTagsFail = (id, error) => ({
-  type: FEATURED_TAGS_FETCH_FAIL,
-  id,
-  error,
-});
--- a/app/javascript/flavours/glitch/actions/filters.js
+++ b/app/javascript/flavours/glitch/actions/filters.js
@ -1,97 +0,0 @@
-import api from '../api';
-
-import { openModal } from './modal';
-
-export const FILTERS_FETCH_REQUEST = 'FILTERS_FETCH_REQUEST';
-export const FILTERS_FETCH_SUCCESS = 'FILTERS_FETCH_SUCCESS';
-export const FILTERS_FETCH_FAIL    = 'FILTERS_FETCH_FAIL';
-
-export const FILTERS_STATUS_CREATE_REQUEST = 'FILTERS_STATUS_CREATE_REQUEST';
-export const FILTERS_STATUS_CREATE_SUCCESS = 'FILTERS_STATUS_CREATE_SUCCESS';
-export const FILTERS_STATUS_CREATE_FAIL    = 'FILTERS_STATUS_CREATE_FAIL';
-
-export const FILTERS_CREATE_REQUEST = 'FILTERS_CREATE_REQUEST';
-export const FILTERS_CREATE_SUCCESS = 'FILTERS_CREATE_SUCCESS';
-export const FILTERS_CREATE_FAIL    = 'FILTERS_CREATE_FAIL';
-
-export const initAddFilter = (status, { contextType }) => dispatch =>
-  dispatch(openModal({
-    modalType: 'FILTER',
-    modalProps: {
-      statusId: status?.get('id'),
-      contextType: contextType,
-    },
-  }));
-
-export const fetchFilters = () => (dispatch, getState) => {
-  dispatch({
-    type: FILTERS_FETCH_REQUEST,
-    skipLoading: true,
-  });
-
-  api(getState)
-    .get('/api/v2/filters')
-    .then(({ data }) => dispatch({
-      type: FILTERS_FETCH_SUCCESS,
-      filters: data,
-      skipLoading: true,
-    }))
-    .catch(err => dispatch({
-      type: FILTERS_FETCH_FAIL,
-      err,
-      skipLoading: true,
-      skipAlert: true,
-    }));
-};
-
-export const createFilterStatus = (params, onSuccess, onFail) => (dispatch, getState) => {
-  dispatch(createFilterStatusRequest());
-
-  api(getState).post(`/api/v2/filters/${params.filter_id}/statuses`, params).then(response => {
-    dispatch(createFilterStatusSuccess(response.data));
-    if (onSuccess) onSuccess();
-  }).catch(error => {
-    dispatch(createFilterStatusFail(error));
-    if (onFail) onFail();
-  });
-};
-
-export const createFilterStatusRequest = () => ({
-  type: FILTERS_STATUS_CREATE_REQUEST,
-});
-
-export const createFilterStatusSuccess = filter_status => ({
-  type: FILTERS_STATUS_CREATE_SUCCESS,
-  filter_status,
-});
-
-export const createFilterStatusFail = error => ({
-  type: FILTERS_STATUS_CREATE_FAIL,
-  error,
-});
-
-export const createFilter = (params, onSuccess, onFail) => (dispatch, getState) => {
-  dispatch(createFilterRequest());
-
-  api(getState).post('/api/v2/filters', params).then(response => {
-    dispatch(createFilterSuccess(response.data));
-    if (onSuccess) onSuccess(response.data);
-  }).catch(error => {
-    dispatch(createFilterFail(error));
-    if (onFail) onFail();
-  });
-};
-
-export const createFilterRequest = () => ({
-  type: FILTERS_CREATE_REQUEST,
-});
-
-export const createFilterSuccess = filter => ({
-  type: FILTERS_CREATE_SUCCESS,
-  filter,
-});
-
-export const createFilterFail = error => ({
-  type: FILTERS_CREATE_FAIL,
-  error,
-});
--- a/app/javascript/flavours/glitch/actions/height_cache.js
+++ b/app/javascript/flavours/glitch/actions/height_cache.js
@ -1,17 +0,0 @@
-export const HEIGHT_CACHE_SET = 'HEIGHT_CACHE_SET';
-export const HEIGHT_CACHE_CLEAR = 'HEIGHT_CACHE_CLEAR';
-
-export function setHeight (key, id, height) {
-  return {
-    type: HEIGHT_CACHE_SET,
-    key,
-    id,
-    height,
-  };
-}
-
-export function clearHeight () {
-  return {
-    type: HEIGHT_CACHE_CLEAR,
-  };
-}
--- a/app/javascript/flavours/glitch/actions/history.js
+++ b/app/javascript/flavours/glitch/actions/history.js
@ -1,38 +0,0 @@
-import api from '../api';
-
-import { importFetchedAccounts } from './importer';
-
-export const HISTORY_FETCH_REQUEST = 'HISTORY_FETCH_REQUEST';
-export const HISTORY_FETCH_SUCCESS = 'HISTORY_FETCH_SUCCESS';
-export const HISTORY_FETCH_FAIL    = 'HISTORY_FETCH_FAIL';
-
-export const fetchHistory = statusId => (dispatch, getState) => {
-  const loading = getState().getIn(['history', statusId, 'loading']);
-
-  if (loading) {
-    return;
-  }
-
-  dispatch(fetchHistoryRequest(statusId));
-
-  api(getState).get(`/api/v1/statuses/${statusId}/history`).then(({ data }) => {
-    dispatch(importFetchedAccounts(data.map(x => x.account)));
-    dispatch(fetchHistorySuccess(statusId, data));
-  }).catch(error => dispatch(fetchHistoryFail(error)));
-};
-
-export const fetchHistoryRequest = statusId => ({
-  type: HISTORY_FETCH_REQUEST,
-  statusId,
-});
-
-export const fetchHistorySuccess = (statusId, history) => ({
-  type: HISTORY_FETCH_SUCCESS,
-  statusId,
-  history,
-});
-
-export const fetchHistoryFail = error => ({
-  type: HISTORY_FETCH_FAIL,
-  error,
-});
--- a/app/javascript/flavours/glitch/actions/identity_proofs.js
+++ b/app/javascript/flavours/glitch/actions/identity_proofs.js
@ -1,31 +0,0 @@
-import api from '../api';
-
-export const IDENTITY_PROOFS_ACCOUNT_FETCH_REQUEST = 'IDENTITY_PROOFS_ACCOUNT_FETCH_REQUEST';
-export const IDENTITY_PROOFS_ACCOUNT_FETCH_SUCCESS = 'IDENTITY_PROOFS_ACCOUNT_FETCH_SUCCESS';
-export const IDENTITY_PROOFS_ACCOUNT_FETCH_FAIL    = 'IDENTITY_PROOFS_ACCOUNT_FETCH_FAIL';
-
-export const fetchAccountIdentityProofs = accountId => (dispatch, getState) => {
-  dispatch(fetchAccountIdentityProofsRequest(accountId));
-
-  api(getState).get(`/api/v1/accounts/${accountId}/identity_proofs`)
-    .then(({ data }) => dispatch(fetchAccountIdentityProofsSuccess(accountId, data)))
-    .catch(err => dispatch(fetchAccountIdentityProofsFail(accountId, err)));
-};
-
-export const fetchAccountIdentityProofsRequest = id => ({
-  type: IDENTITY_PROOFS_ACCOUNT_FETCH_REQUEST,
-  id,
-});
-
-export const fetchAccountIdentityProofsSuccess = (accountId, identity_proofs) => ({
-  type: IDENTITY_PROOFS_ACCOUNT_FETCH_SUCCESS,
-  accountId,
-  identity_proofs,
-});
-
-export const fetchAccountIdentityProofsFail = (accountId, err) => ({
-  type: IDENTITY_PROOFS_ACCOUNT_FETCH_FAIL,
-  accountId,
-  err,
-  skipNotFound: true,
-});
--- a/app/javascript/flavours/glitch/actions/importer/index.js
+++ b/app/javascript/flavours/glitch/actions/importer/index.js
@ -1,101 +0,0 @@
-import { normalizeAccount, normalizeStatus, normalizePoll } from './normalizer';
-
-export const ACCOUNT_IMPORT  = 'ACCOUNT_IMPORT';
-export const ACCOUNTS_IMPORT = 'ACCOUNTS_IMPORT';
-export const STATUS_IMPORT   = 'STATUS_IMPORT';
-export const STATUSES_IMPORT = 'STATUSES_IMPORT';
-export const POLLS_IMPORT    = 'POLLS_IMPORT';
-export const FILTERS_IMPORT  = 'FILTERS_IMPORT';
-
-function pushUnique(array, object) {
-  if (array.every(element => element.id !== object.id)) {
-    array.push(object);
-  }
-}
-
-export function importAccount(account) {
-  return { type: ACCOUNT_IMPORT, account };
-}
-
-export function importAccounts(accounts) {
-  return { type: ACCOUNTS_IMPORT, accounts };
-}
-
-export function importStatus(status) {
-  return { type: STATUS_IMPORT, status };
-}
-
-export function importStatuses(statuses) {
-  return { type: STATUSES_IMPORT, statuses };
-}
-
-export function importFilters(filters) {
-  return { type: FILTERS_IMPORT, filters };
-}
-
-export function importPolls(polls) {
-  return { type: POLLS_IMPORT, polls };
-}
-
-export function importFetchedAccount(account) {
-  return importFetchedAccounts([account]);
-}
-
-export function importFetchedAccounts(accounts) {
-  const normalAccounts = [];
-
-  function processAccount(account) {
-    pushUnique(normalAccounts, normalizeAccount(account));
-
-    if (account.moved) {
-      processAccount(account.moved);
-    }
-  }
-
-  accounts.forEach(processAccount);
-
-  return importAccounts(normalAccounts);
-}
-
-export function importFetchedStatus(status) {
-  return importFetchedStatuses([status]);
-}
-
-export function importFetchedStatuses(statuses) {
-  return (dispatch, getState) => {
-    const accounts = [];
-    const normalStatuses = [];
-    const polls = [];
-    const filters = [];
-
-    function processStatus(status) {
-      pushUnique(normalStatuses, normalizeStatus(status, getState().getIn(['statuses', status.id]), getState().get('local_settings')));
-      pushUnique(accounts, status.account);
-
-      if (status.filtered) {
-        status.filtered.forEach(result => pushUnique(filters, result.filter));
-      }
-
-      if (status.reblog && status.reblog.id) {
-        processStatus(status.reblog);
-      }
-
-      if (status.poll && status.poll.id) {
-        pushUnique(polls, normalizePoll(status.poll));
-      }
-    }
-
-    statuses.forEach(processStatus);
-
-    dispatch(importPolls(polls));
-    dispatch(importFetchedAccounts(accounts));
-    dispatch(importStatuses(normalStatuses));
-    dispatch(importFilters(filters));
-  };
-}
-
-export function importFetchedPoll(poll) {
-  return dispatch => {
-    dispatch(importPolls([normalizePoll(poll)]));
-  };
-}
--- a/app/javascript/flavours/glitch/actions/importer/normalizer.js
+++ b/app/javascript/flavours/glitch/actions/importer/normalizer.js
@ -1,169 +0,0 @@
-import escapeTextContentForBrowser from 'escape-html';
-
-import emojify from 'flavours/glitch/features/emoji/emoji';
-import { autoHideCW } from 'flavours/glitch/utils/content_warning';
-import { unescapeHTML } from 'flavours/glitch/utils/html';
-
-const domParser = new DOMParser();
-
-const makeEmojiMap = emojis => emojis.reduce((obj, emoji) => {
-  obj[`:${emoji.shortcode}:`] = emoji;
-  return obj;
-}, {});
-
-export function searchTextFromRawStatus (status) {
-  const spoilerText   = status.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');
-  return domParser.parseFromString(searchContent, 'text/html').documentElement.textContent;
-}
-
-export function normalizeAccount(account) {
-  account = { ...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);
-  account.note_emojified = emojify(account.note, emojiMap);
-  account.note_plain = unescapeHTML(account.note);
-
-  if (account.fields) {
-    account.fields = account.fields.map(pair => ({
-      ...pair,
-      name_emojified: emojify(escapeTextContentForBrowser(pair.name), emojiMap),
-      value_emojified: emojify(pair.value, emojiMap),
-      value_plain: unescapeHTML(pair.value),
-    }));
-  }
-
-  if (account.moved) {
-    account.moved = account.moved.id;
-  }
-
-  return account;
-}
-
-export function normalizeFilterResult(result) {
-  const normalResult = { ...result };
-
-  normalResult.filter = normalResult.filter.id;
-
-  return normalResult;
-}
-
-export function normalizeStatus(status, normalOldStatus, settings) {
-  const normalStatus   = { ...status };
-  normalStatus.account = status.account.id;
-
-  if (status.reblog && status.reblog.id) {
-    normalStatus.reblog = status.reblog.id;
-  }
-
-  if (status.poll && status.poll.id) {
-    normalStatus.poll = status.poll.id;
-  }
-
-  if (status.filtered) {
-    normalStatus.filtered = status.filtered.map(normalizeFilterResult);
-  }
-
-  // Only calculate these values when status first encountered and
-  // when the underlying values change. Otherwise keep the ones
-  // already in the reducer
-  if (normalOldStatus && normalOldStatus.get('content') === normalStatus.content && normalOldStatus.get('spoiler_text') === normalStatus.spoiler_text) {
-    normalStatus.search_index = normalOldStatus.get('search_index');
-    normalStatus.contentHtml = normalOldStatus.get('contentHtml');
-    normalStatus.spoilerHtml = normalOldStatus.get('spoilerHtml');
-    normalStatus.hidden = normalOldStatus.get('hidden');
-    normalStatus.quote = normalOldStatus.get('quote');
-    normalStatus.quote_hidden = normalOldStatus.get('quote_hidden');
-  } 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.emojis);
-
-    normalStatus.search_index = domParser.parseFromString(searchContent, 'text/html').documentElement.textContent;
-    normalStatus.contentHtml  = emojify(normalStatus.content, emojiMap);
-    normalStatus.spoilerHtml  = emojify(escapeTextContentForBrowser(spoilerText), emojiMap);
-    normalStatus.hidden       = (spoilerText.length > 0 || normalStatus.sensitive) && autoHideCW(settings, spoilerText);
-
-    if (status.quote && status.quote.id) {
-      const quote_spoilerText = status.quote.spoiler_text || '';
-      const quote_searchContent = [quote_spoilerText, status.quote.content].join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
-
-      const quote_emojiMap = makeEmojiMap(normalStatus.quote.emojis);
-
-      const quote_account_emojiMap = makeEmojiMap(status.quote.account.emojis);
-      const displayName = normalStatus.quote.account.display_name.length === 0 ? normalStatus.quote.account.username : normalStatus.quote.account.display_name;
-      normalStatus.quote.account.display_name_html = emojify(escapeTextContentForBrowser(displayName), quote_account_emojiMap);
-      normalStatus.quote.search_index = domParser.parseFromString(quote_searchContent, 'text/html').documentElement.textContent;
-      let docElem = domParser.parseFromString(normalStatus.quote.content, 'text/html').documentElement;
-      Array.from(docElem.querySelectorAll('span.quote-inline'), span => span.remove());
-      Array.from(docElem.querySelectorAll('p,br'), line => {
-        let parentNode = line.parentNode;
-        if (line.nextSibling) {
-          parentNode.insertBefore(document.createTextNode(' '), line.nextSibling);
-        }
-      });
-      let _contentHtml = docElem.textContent;
-      normalStatus.quote.contentHtml  = '<p>'+emojify(_contentHtml.substr(0, 150), quote_emojiMap) + (_contentHtml.substr(150) ? '...' : '')+'</p>';
-      normalStatus.quote.spoilerHtml  = emojify(escapeTextContentForBrowser(quote_spoilerText), quote_emojiMap);
-      normalStatus.quote_hidden       = (quote_spoilerText.length > 0 || normalStatus.quote.sensitive) && autoHideCW(settings, quote_spoilerText);
-
-      // delete the quote link!!!!
-      let parentDocElem = domParser.parseFromString(normalStatus.contentHtml, 'text/html').documentElement;
-      Array.from(parentDocElem.querySelectorAll('span.quote-inline'), span => span.remove());
-      normalStatus.contentHtml = parentDocElem.children[1].innerHTML;
-    }
-  }
-
-  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(poll.emojis);
-
-  normalPoll.options = poll.options.map((option, index) => ({
-    ...option,
-    voted: poll.own_votes && poll.own_votes.includes(index),
-    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.emojis);
-
-  normalAnnouncement.contentHtml = emojify(normalAnnouncement.content, emojiMap);
-
-  return normalAnnouncement;
-}
--- a/Show More
+++ b/Show More