Merge branch 'main' into glitch-soc/merge-upstream

Conflicts: - `.github/workflows/build-image.yml`: Upstream updated `docker/build-push-action`, and we a different config for `docker/metadata-action` so the lines directly above were different, but it's not a real conflict. Upgraded `docker/build-push-action` as upstream did. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Upstream changed the codestyle near a line we had modified to accommodate configurable character count. Kept our change.
2023-02-03 19:07:58 +01:00 · 2023-02-03 19:07:58 +01:00 · aeacebb3d7
commit aeacebb3d7
parent ec26f7c1b1 79ca19e9b2
249 changed files with 4854 additions and 3174 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@ -3,6 +3,8 @@ module.exports = {

  extends: [
    'eslint:recommended',
+    'plugin:react/recommended',
+    'plugin:jsx-a11y/recommended',
  ],

  env: {
@ -80,8 +82,6 @@ module.exports = {
      },
    ],
    'no-empty': 'off',
-    'no-nested-ternary': 'warn',
-    'no-prototype-builtins': 'off',
    'no-restricted-properties': [
      'error',
      { property: 'substring', message: 'Use .slice instead of .substring.' },
@ -113,55 +113,42 @@ module.exports = {
    'react/jsx-boolean-value': 'error',
    'react/jsx-closing-bracket-location': ['error', 'line-aligned'],
    'react/jsx-curly-spacing': 'error',
+    'react/display-name': 'off',
    'react/jsx-equals-spacing': 'error',
    'react/jsx-first-prop-new-line': ['error', 'multiline-multiprop'],
    'react/jsx-indent': ['error', 2],
    'react/jsx-no-bind': 'error',
-    'react/jsx-no-duplicate-props': 'error',
-    'react/jsx-no-undef': 'error',
+    'react/jsx-no-target-blank': 'off',
    'react/jsx-tag-spacing': 'error',
-    'react/jsx-uses-react': 'error',
-    'react/jsx-uses-vars': 'error',
    'react/jsx-wrap-multilines': 'error',
-    'react/no-multi-comp': 'off',
-    'react/no-string-refs': 'error',
-    'react/prop-types': 'error',
+    'react/no-deprecated': 'off',
+    'react/no-unknown-property': 'off',
    'react/self-closing-comp': 'error',

+    // recommended values found in https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/main/src/index.js
    'jsx-a11y/accessible-emoji': 'warn',
-    'jsx-a11y/alt-text': 'warn',
-    'jsx-a11y/anchor-has-content': 'warn',
-    'jsx-a11y/anchor-is-valid': [
-      'warn',
-      {
-        components: [
-          'Link',
-          'NavLink',
-        ],
-        specialLink: [
-          'to',
-        ],
-        aspect: [
-          'noHref',
-          'invalidHref',
-          'preferButton',
-        ],
-      },
-    ],
-    'jsx-a11y/aria-activedescendant-has-tabindex': 'warn',
-    'jsx-a11y/aria-props': 'warn',
-    'jsx-a11y/aria-proptypes': 'warn',
-    'jsx-a11y/aria-role': 'warn',
-    'jsx-a11y/aria-unsupported-elements': 'warn',
-    'jsx-a11y/heading-has-content': 'warn',
-    'jsx-a11y/html-has-lang': 'warn',
-    'jsx-a11y/iframe-has-title': 'warn',
-    'jsx-a11y/img-redundant-alt': 'warn',
-    'jsx-a11y/interactive-supports-focus': 'warn',
-    'jsx-a11y/label-has-for': 'off',
-    'jsx-a11y/mouse-events-have-key-events': 'warn',
-    'jsx-a11y/no-access-key': 'warn',
-    'jsx-a11y/no-distracting-elements': 'warn',
+    'jsx-a11y/click-events-have-key-events': 'off',
+    'jsx-a11y/label-has-associated-control': 'off',
+    'jsx-a11y/media-has-caption': 'off',
+    'jsx-a11y/no-autofocus': 'off',
+    // recommended rule is:
+    // 'jsx-a11y/no-interactive-element-to-noninteractive-role': [
+    //   'error',
+    //   {
+    //     tr: ['none', 'presentation'],
+    //     canvas: ['img'],
+    //   },
+    // ],
+    'jsx-a11y/no-interactive-element-to-noninteractive-role': 'off',
+    // recommended rule is:
+    // 'jsx-a11y/no-noninteractive-element-interactions': [
+    //   'error',
+    //   {
+    //     body: ['onError', 'onLoad'],
+    //     iframe: ['onError', 'onLoad'],
+    //     img: ['onError', 'onLoad'],
+    //   },
+    // ],
    'jsx-a11y/no-noninteractive-element-interactions': [
      'warn',
      {
@ -170,8 +157,18 @@ module.exports = {
        ],
      },
    ],
+    // recommended rule is:
+    // 'jsx-a11y/no-noninteractive-tabindex': [
+    //   'error',
+    //   {
+    //     tags: [],
+    //     roles: ['tabpanel'],
+    //     allowExpressionValues: true,
+    //   },
+    // ],
+    'jsx-a11y/no-noninteractive-tabindex': 'off',
    'jsx-a11y/no-onchange': 'warn',
-    'jsx-a11y/no-redundant-roles': 'warn',
+    // recommended is full 'error'
    'jsx-a11y/no-static-element-interactions': [
      'warn',
      {
@ -180,10 +177,6 @@ module.exports = {
        ],
      },
    ],
-    'jsx-a11y/role-has-required-aria-props': 'warn',
-    'jsx-a11y/role-supports-aria-props': 'off',
-    'jsx-a11y/scope': 'warn',
-    'jsx-a11y/tabindex-no-positive': 'warn',

    'import/extensions': [
      'error',
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@ -15,6 +15,11 @@ permissions:
 jobs:
  build-image:
    runs-on: ubuntu-latest
+
+    concurrency:
+      group: ${{ github.ref }}
+      cancel-in-progress: true
+
    steps:
      - uses: actions/checkout@v3
      - uses: hadolint/hadolint-action@v3.1.0
@ -34,10 +39,11 @@ jobs:
            type=raw,value=latest,enable={{is_default_branch}}
            type=edge,branch=main
            type=sha,prefix=,format=long
-      - uses: docker/build-push-action@v3
+      - uses: docker/build-push-action@v4
        with:
          context: .
          platforms: linux/amd64,linux/arm64
+          provenance: false
          builder: ${{ steps.buildx.outputs.name }}
          push: ${{ github.event_name != 'pull_request' }}
          tags: ${{ steps.meta.outputs.tags }}
--- a/.github/workflows/lint-css.yml
+++ b/.github/workflows/lint-css.yml
@ -0,0 +1,48 @@
+name: CSS Linting
+on:
+  push:
+    branches-ignore:
+      - 'dependabot/**'
+    paths:
+      - 'package.json'
+      - 'yarn.lock'
+      - '.prettier*'
+      - 'stylelint.config.js'
+      - '**/*.css'
+      - '**/*.scss'
+      - '.github/workflows/lint-css.yml'
+      - '.github/stylelint-matcher.json'
+
+  pull_request:
+    paths:
+      - 'package.json'
+      - 'yarn.lock'
+      - '.prettier*'
+      - 'stylelint.config.js'
+      - '**/*.css'
+      - '**/*.scss'
+      - '.github/workflows/lint-css.yml'
+      - '.github/stylelint-matcher.json'
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          cache: yarn
+
+      - name: Install all yarn packages
+        run: yarn --frozen-lockfile
+
+      - uses: xt0rted/stylelint-problem-matcher@v1
+
+      - run: echo "::add-matcher::.github/stylelint-matcher.json"
+
+      - name: Stylelint
+        run: yarn test:lint:sass
--- a/.github/workflows/lint-js.yml
+++ b/.github/workflows/lint-js.yml
@ -0,0 +1,40 @@
+name: JavaScript Linting
+on:
+  push:
+    branches-ignore:
+      - 'dependabot/**'
+    paths:
+      - 'package.json'
+      - 'yarn.lock'
+      - '.prettier*'
+      - '.eslint*'
+      - '**/*.js'
+      - '.github/workflows/lint-js.yml'
+
+  pull_request:
+    paths:
+      - 'package.json'
+      - 'yarn.lock'
+      - '.prettier*'
+      - '.eslint*'
+      - '**/*.js'
+      - '.github/workflows/lint-js.yml'
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          cache: yarn
+
+      - name: Install all yarn packages
+        run: yarn --frozen-lockfile
+
+      - name: ESLint
+        run: yarn test:lint:js
--- a/.github/workflows/lint-json.yml
+++ b/.github/workflows/lint-json.yml
@ -9,6 +9,7 @@ on:
      - '.prettier*'
      - '**/*.json'
      - '.github/workflows/lint-json.yml'
+      - '!app/javascript/mastodon/locales/*.json'

  pull_request:
    paths:
@ -17,6 +18,7 @@ on:
      - '.prettier*'
      - '**/*.json'
      - '.github/workflows/lint-json.yml'
+      - '!app/javascript/mastodon/locales/*.json'

 jobs:
  lint:
--- a/.github/workflows/lint-ruby.yml
+++ b/.github/workflows/lint-ruby.yml
@ -0,0 +1,41 @@
+name: Ruby Linting
+on:
+  push:
+    branches-ignore:
+      - 'dependabot/**'
+    paths:
+      - 'Gemfile*'
+      - '.rubocop.yml'
+      - '**/*.rb'
+      - '**/*.rake'
+      - '.github/workflows/lint-ruby.yml'
+
+  pull_request:
+    paths:
+      - 'Gemfile*'
+      - '.rubocop.yml'
+      - '**/*.rb'
+      - '**/*.rake'
+      - '.github/workflows/lint-ruby.yml'
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set-up RuboCop Problem Mathcher
+        uses: r7kamura/rubocop-problem-matchers-action@v1
+
+      - name: Run rubocop
+        uses: github/super-linter@v4
+        env:
+          DEFAULT_BRANCH: main
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          LINTER_RULES_PATH: .
+          RUBY_CONFIG_FILE: .rubocop.yml
+          VALIDATE_ALL_CODEBASE: false
+          VALIDATE_RUBY: true
--- a/.github/workflows/lint-yml.yml
+++ b/.github/workflows/lint-yml.yml
@ -10,6 +10,7 @@ on:
      - '**/*.yaml'
      - '**/*.yml'
      - '.github/workflows/lint-yml.yml'
+      - '!config/locales/*.yml'

  pull_request:
    paths:
@ -19,6 +20,7 @@ on:
      - '**/*.yaml'
      - '**/*.yml'
      - '.github/workflows/lint-yml.yml'
+      - '!config/locales/*.yml'

 jobs:
  lint:
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@ -1,83 +0,0 @@
---
-#################################
-#################################
-## Super Linter GitHub Actions ##
-#################################
-#################################
-name: Lint Code Base
-
-#
-# Documentation:
-# https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions
-#
-
-#############################
-# Start the job on all push #
-#############################
-on:
-  push:
-    branches-ignore: [main]
-    # Remove the line above to run when pushing to master
-  pull_request:
-    branches: [main]
-
-###############
-# Set the Job #
-###############
-permissions:
-  checks: write
-  contents: read
-  pull-requests: write
-  statuses: write
-
-jobs:
-  build:
-    # Name the Job
-    name: Lint Code Base
-    # Set the agent to run on
-    runs-on: ubuntu-latest
-
-    ##################
-    # Load all steps #
-    ##################
-    steps:
-      ##########################
-      # Checkout the code base #
-      ##########################
-      - name: Checkout Code
-        uses: actions/checkout@v3
-        with:
-          # Full git history is needed to get a proper list of changed files within `super-linter`
-          fetch-depth: 0
-
-      - name: Set-up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version-file: .nvmrc
-          cache: yarn
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile
-      - name: Set-up RuboCop Problem Mathcher
-        uses: r7kamura/rubocop-problem-matchers-action@v1
-      - name: Set-up Stylelint Problem Matcher
-        uses: xt0rted/stylelint-problem-matcher@v1
-      # https://github.com/xt0rted/stylelint-problem-matcher/issues/360
-      - run: echo "::add-matcher::.github/stylelint-matcher.json"
-
-      ################################
-      # Run Linter against code base #
-      ################################
-      - name: Lint Code Base
-        uses: github/super-linter@v4
-        env:
-          CSS_FILE_NAME: stylelint.config.js
-          DEFAULT_BRANCH: main
-          NO_COLOR: 1 # https://github.com/xt0rted/stylelint-problem-matcher/issues/360
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          JAVASCRIPT_ES_CONFIG_FILE: .eslintrc.js
-          LINTER_RULES_PATH: .
-          RUBY_CONFIG_FILE: .rubocop.yml
-          VALIDATE_ALL_CODEBASE: false
-          VALIDATE_CSS: true
-          VALIDATE_JAVASCRIPT_ES: true
-          VALIDATE_RUBY: true
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -38,8 +38,10 @@ All notable changes to this project will be documented in this file.
 - Add brotli compression to `assets:precompile` ([Izorkin](https://github.com/mastodon/mastodon/pull/19025))
 - Add “disabled” account filter to the `/admin/accounts` UI ([tribela](https://github.com/mastodon/mastodon/pull/21282))
 - Add transparency to modal background for accessibility ([edent](https://github.com/mastodon/mastodon/pull/18081))
+- Add `lang` attribute to image description textarea and poll option field ([c960657](https://github.com/mastodon/mastodon/pull/23293))
 - Add `title` attribute to video elements in media attachments ([bramus](https://github.com/mastodon/mastodon/pull/21420))
 - Add left and right margins to emojis ([dsblank](https://github.com/mastodon/mastodon/pull/20464))
+- Add `roles` attribute to `Account` entities in REST API ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/23255))
 - Add `reading:autoplay:gifs` to `/api/v1/preferences` ([j-f1](https://github.com/mastodon/mastodon/pull/22706))
 - Add `hide_collections` parameter to `/api/v1/accounts/credentials` ([CarlSchwan](https://github.com/mastodon/mastodon/pull/22790))
 - Add `policy` attribute to web push subscription objects in `/api/v1/push/subscriptions` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/23210))
@ -67,8 +69,13 @@ All notable changes to this project will be documented in this file.
 - Change confirm prompts for relationships management ([tribela](https://github.com/mastodon/mastodon/pull/19411))
 - Change language surrounding disability in prompts for media descriptions ([hs4man21](https://github.com/mastodon/mastodon/pull/20923))
 - Change confusing wording in the sign in banner ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/22490))
+- Change `POST /settings/applications/:id` to regenerate token on scopes change ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/23359))
 - Change account moderation notes to make links clickable ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/22553))
+- Change link previews for statuses to never use avatar as fallback ([Gargron](https://github.com/mastodon/mastodon/pull/23376))
 - Change email address input to be read-only for logged-in users when requesting a new confirmation e-mail ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/23247))
+- Change notifications per page from 15 to 40 in REST API ([Gargron](https://github.com/mastodon/mastodon/pull/23348))
+- Change number of stored items in home feed from 400 to 800 ([Gargron](https://github.com/mastodon/mastodon/pull/23349))
+- Change API rate limits from 300/5min per user to 1500/5min per user, 300/5min per app ([Gargron](https://github.com/mastodon/mastodon/pull/23347))
 - Save avatar or header correctly even if the other one fails ([tribela](https://github.com/mastodon/mastodon/pull/18465))
 - Change `referrer-policy` to `same-origin` application-wide ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/23014), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/23037))
 - Add 'private' to `Cache-Control`, match Rails expectations ([daxtens](https://github.com/mastodon/mastodon/pull/20608))
@ -88,7 +95,7 @@ All notable changes to this project will be documented in this file.
 - Allow adding relays in secure mode and limited federation mode ([ineffyble](https://github.com/mastodon/mastodon/pull/22324))
 - Change timestamps to be displayed using the user's timezone throughout the moderation interface ([FrancisMurillo](https://github.com/mastodon/mastodon/pull/21878), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/22555))
 - Change CSP directives on API to be tight and concise ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/20960))
- Change web UI to not autofocus the compose form ([raboof](https://github.com/mastodon/mastodon/pull/16517))
+- Change web UI to not autofocus the compose form ([raboof](https://github.com/mastodon/mastodon/pull/16517), [Akkiesoft](https://github.com/mastodon/mastodon/pull/23094))
 - Change idempotency key handling for posting when database access is slow ([lambda](https://github.com/mastodon/mastodon/pull/21840))
 - Change remote media files to be downloaded outside of transactions ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/21796))
 - Improve contrast of charts in “poll has ended” notifications ([j-f1](https://github.com/mastodon/mastodon/pull/22575))
@ -101,6 +108,7 @@ All notable changes to this project will be documented in this file.

 - Officially remove support for Ruby 2.6 ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/21477))
 - Remove `object-fit` polyfill used for old versions of Microsoft Edge ([shuuji3](https://github.com/mastodon/mastodon/pull/22693))
+- Remove `intersection-observer` polyfill for old Safari support ([shuuji3](https://github.com/mastodon/mastodon/pull/23284))
 - Remove empty `title` tag from mailer layout ([nametoolong](https://github.com/mastodon/mastodon/pull/23078))

 ### Fixed
@ -110,6 +118,7 @@ All notable changes to this project will be documented in this file.
 - Fix possible race conditions when suspending/unsuspending accounts ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/22363))
 - Fix being stuck in edit mode when deleting the edited status ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/22126))
 - Fix filters not being applied to some notification types ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/23211))
+- Fix incorrect link in push notifications for some event types ([elizabeth-dev](https://github.com/mastodon/mastodon/pull/23286))
 - Fix some performance issues with `/admin/instances` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/21907))
 - Fix some pre-4.0 admin audit logs ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/22091))
 - Fix moderation audit log items for warnings having incorrect links ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/23242))
@ -126,6 +135,7 @@ All notable changes to this project will be documented in this file.
 - Fix wrong padding in RTL layout ([Gargron](https://github.com/mastodon/mastodon/pull/23157))
 - Fix drag & drop upload area display in single-column mode ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/23217))
 - Fix being unable to get a single EmailDomainBlock from the admin API ([trwnh](https://github.com/mastodon/mastodon/pull/20846))
+- Fix unserialized `role` on account entities in admin API ([Gargron](https://github.com/mastodon/mastodon/pull/23290))
 - Fix pagination of followed tags ([trwnh](https://github.com/mastodon/mastodon/pull/20861))
 - Fix dropdown menu positions when scrolling ([sidp](https://github.com/mastodon/mastodon/pull/22916), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/23062))
 - Fix email with empty domain name labels passing validation ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/23246))
@ -150,6 +160,7 @@ All notable changes to this project will be documented in this file.
 - Fix crash when trying to fetch unobtainable avatar of user using external authentication ([lochiiconnectivity](https://github.com/mastodon/mastodon/pull/22462))
 - Fix potential duplicate statuses in Explore tab ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/22121))
 - Fix deprecation warning in `tootctl accounts rotate` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/22120))
+- Fix styling of featured tags in light theme ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/23252))
 - Fix missing style in warning and strike cards ([AtelierSnek](https://github.com/mastodon/mastodon/pull/22177), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/22302))
 - Fix wasteful request to `/api/v1/custom_emojis` when not logged in ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/22326))
 - Fix replies sometimes being delivered to user-blocked domains ([tribela](https://github.com/mastodon/mastodon/pull/22117))
--- a/8
+++ b/8
@ -18,7 +18,7 @@ gem 'makara', '~> 0.5'
 gem 'pghero'
 gem 'dotenv-rails', '~> 2.8'

-gem 'aws-sdk-s3', '~> 1.117', require: false
+gem 'aws-sdk-s3', '~> 1.119', require: false
 gem 'fog-core', '<= 2.4.0'
 gem 'fog-openstack', '~> 0.3', require: false
 gem 'kt-paperclip', '~> 7.1'
@ -40,7 +40,7 @@ end
 gem 'net-ldap', '~> 0.17'
 gem 'omniauth-cas', '~> 2.0'
 gem 'omniauth-saml', '~> 1.10'
-gem 'gitlab-omniauth-openid-connect', '~>0.10.0', require: 'omniauth_openid_connect'
+gem 'gitlab-omniauth-openid-connect', '~>0.10.1', require: 'omniauth_openid_connect'
 gem 'omniauth', '~> 1.9'
 gem 'omniauth-rails_csrf_protection', '~> 0.1'

@ -73,7 +73,7 @@ gem 'rack-attack', '~> 6.6'
 gem 'rack-cors', '~> 1.1', require: 'rack/cors'
 gem 'rails-i18n', '~> 6.0'
 gem 'rails-settings-cached', '~> 0.6'
-gem 'redcarpet', '~> 3.5'
+gem 'redcarpet', '~> 3.6'
 gem 'redis', '~> 4.5', require: ['redis', 'redis/connection/hiredis']
 gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
 gem 'rqrcode', '~> 2.1'
@ -85,7 +85,7 @@ gem 'sidekiq-scheduler', '~> 4.0'
 gem 'sidekiq-unique-jobs', '~> 7.1'
 gem 'sidekiq-bulk', '~> 0.2.0'
 gem 'simple-navigation', '~> 4.4'
-gem 'simple_form', '~> 5.1'
+gem 'simple_form', '~> 5.2'
 gem 'sprockets-rails', '~> 3.4', require: 'sprockets/railtie'
 gem 'stoplight', '~> 3.0.1'
 gem 'strong_migrations', '~> 0.7'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -10,40 +10,40 @@ GIT
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (6.1.7.1)
-      actionpack (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    actioncable (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.1)
-      actionpack (= 6.1.7.1)
-      activejob (= 6.1.7.1)
-      activerecord (= 6.1.7.1)
-      activestorage (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    actionmailbox (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      activejob (= 6.1.7.2)
+      activerecord (= 6.1.7.2)
+      activestorage (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
      mail (>= 2.7.1)
-    actionmailer (6.1.7.1)
-      actionpack (= 6.1.7.1)
-      actionview (= 6.1.7.1)
-      activejob (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    actionmailer (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      actionview (= 6.1.7.2)
+      activejob (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.1)
-      actionview (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    actionpack (6.1.7.2)
+      actionview (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
      rack (~> 2.0, >= 2.0.9)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.1)
-      actionpack (= 6.1.7.1)
-      activerecord (= 6.1.7.1)
-      activestorage (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    actiontext (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      activerecord (= 6.1.7.2)
+      activestorage (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
      nokogiri (>= 1.8.5)
-    actionview (6.1.7.1)
-      activesupport (= 6.1.7.1)
+    actionview (6.1.7.2)
+      activesupport (= 6.1.7.2)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
@ -54,22 +54,22 @@ GEM
      case_transform (>= 0.2)
      jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
    active_record_query_trace (1.8)
-    activejob (6.1.7.1)
-      activesupport (= 6.1.7.1)
+    activejob (6.1.7.2)
+      activesupport (= 6.1.7.2)
      globalid (>= 0.3.6)
-    activemodel (6.1.7.1)
-      activesupport (= 6.1.7.1)
-    activerecord (6.1.7.1)
-      activemodel (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
-    activestorage (6.1.7.1)
-      actionpack (= 6.1.7.1)
-      activejob (= 6.1.7.1)
-      activerecord (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    activemodel (6.1.7.2)
+      activesupport (= 6.1.7.2)
+    activerecord (6.1.7.2)
+      activemodel (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
+    activestorage (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      activejob (= 6.1.7.2)
+      activerecord (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
      marcel (~> 1.0)
      mini_mime (>= 1.1.0)
-    activesupport (6.1.7.1)
+    activesupport (6.1.7.2)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 1.6, < 2)
      minitest (>= 5.1)
@ -90,16 +90,16 @@ GEM
    attr_required (1.0.1)
    awrence (1.2.1)
    aws-eventstream (1.2.0)
-    aws-partitions (1.670.0)
-    aws-sdk-core (3.168.2)
+    aws-partitions (1.701.0)
+    aws-sdk-core (3.170.0)
      aws-eventstream (~> 1, >= 1.0.2)
      aws-partitions (~> 1, >= 1.651.0)
      aws-sigv4 (~> 1.5)
      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.60.0)
+    aws-sdk-kms (1.62.0)
      aws-sdk-core (~> 3, >= 3.165.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.117.2)
+    aws-sdk-s3 (1.119.0)
      aws-sdk-core (~> 3, >= 3.165.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.4)
@ -117,7 +117,7 @@ GEM
      erubi (~> 1.4)
      parser (>= 2.4)
      smart_properties
-    bindata (2.4.10)
+    bindata (2.4.14)
    binding_of_caller (1.0.0)
      debug_inspector (>= 0.0.1)
    blurhash (0.1.6)
@ -207,7 +207,7 @@ GEM
    docile (1.4.0)
    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (5.6.2)
+    doorkeeper (5.6.3)
      railties (>= 5)
    dotenv (2.8.1)
    dotenv-rails (2.8.1)
@ -279,11 +279,11 @@ GEM
    fuubar (2.5.1)
      rspec-core (~> 3.0)
      ruby-progressbar (~> 1.4)
-    gitlab-omniauth-openid-connect (0.10.0)
+    gitlab-omniauth-openid-connect (0.10.1)
      addressable (~> 2.7)
      omniauth (>= 1.9, < 3)
      openid_connect (~> 1.2)
-    globalid (1.0.1)
+    globalid (1.1.0)
      activesupport (>= 5.0)
    hamlit (2.13.0)
      temple (>= 0.8.2)
@ -333,10 +333,11 @@ GEM
    jmespath (1.6.2)
    json (2.6.3)
    json-canonicalization (0.3.0)
-    json-jwt (1.14.0)
+    json-jwt (1.15.3)
      activesupport (>= 4.2)
      aes_key_wrap
      bindata
+      httpclient
    json-ld (3.2.3)
      htmlentities (~> 4.3)
      json-canonicalization (~> 0.3)
@ -418,7 +419,7 @@ GEM
    net-ldap (0.17.1)
    net-pop (0.1.2)
      net-protocol
-    net-protocol (0.1.3)
+    net-protocol (0.2.1)
      timeout
    net-scp (4.0.0.rc1)
      net-ssh (>= 2.6.5, < 8.0.0)
@ -426,7 +427,7 @@ GEM
      net-protocol
    net-ssh (7.0.1)
    nio4r (2.5.8)
-    nokogiri (1.14.0)
+    nokogiri (1.14.1)
      mini_portile2 (~> 2.8.0)
      racc (~> 1.4)
    nsa (0.2.8)
@ -448,21 +449,22 @@ GEM
    omniauth-saml (1.10.3)
      omniauth (~> 1.3, >= 1.3.2)
      ruby-saml (~> 1.9)
-    openid_connect (1.3.0)
+    openid_connect (1.4.2)
      activemodel
      attr_required (>= 1.0.0)
-      json-jwt (>= 1.5.0)
-      rack-oauth2 (>= 1.6.1)
-      swd (>= 1.0.0)
+      json-jwt (>= 1.15.0)
+      net-smtp
+      rack-oauth2 (~> 1.21)
+      swd (~> 1.3)
      tzinfo
      validate_email
      validate_url
-      webfinger (>= 1.0.1)
+      webfinger (~> 1.2)
    openssl (3.0.0)
    openssl-signature_algorithm (1.2.1)
      openssl (> 2.0, < 3.1)
    orm_adapter (0.5.0)
-    ox (2.14.13)
+    ox (2.14.14)
    parallel (1.22.1)
    parser (3.2.0.0)
      ast (~> 2.4.1)
@ -503,7 +505,7 @@ GEM
      rack (>= 1.0, < 3)
    rack-cors (1.1.1)
      rack (>= 2.0.0)
-    rack-oauth2 (1.19.0)
+    rack-oauth2 (1.21.3)
      activesupport
      attr_required
      httpclient
@ -513,20 +515,20 @@ GEM
      rack
    rack-test (2.0.2)
      rack (>= 1.3)
-    rails (6.1.7.1)
-      actioncable (= 6.1.7.1)
-      actionmailbox (= 6.1.7.1)
-      actionmailer (= 6.1.7.1)
-      actionpack (= 6.1.7.1)
-      actiontext (= 6.1.7.1)
-      actionview (= 6.1.7.1)
-      activejob (= 6.1.7.1)
-      activemodel (= 6.1.7.1)
-      activerecord (= 6.1.7.1)
-      activestorage (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    rails (6.1.7.2)
+      actioncable (= 6.1.7.2)
+      actionmailbox (= 6.1.7.2)
+      actionmailer (= 6.1.7.2)
+      actionpack (= 6.1.7.2)
+      actiontext (= 6.1.7.2)
+      actionview (= 6.1.7.2)
+      activejob (= 6.1.7.2)
+      activemodel (= 6.1.7.2)
+      activerecord (= 6.1.7.2)
+      activestorage (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
      bundler (>= 1.15.0)
-      railties (= 6.1.7.1)
+      railties (= 6.1.7.2)
      sprockets-rails (>= 2.0.0)
    rails-controller-testing (1.0.5)
      actionpack (>= 5.0.1.rc1)
@ -535,16 +537,16 @@ GEM
    rails-dom-testing (2.0.3)
      activesupport (>= 4.2.0)
      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.4)
+    rails-html-sanitizer (1.5.0)
      loofah (~> 2.19, >= 2.19.1)
    rails-i18n (6.0.0)
      i18n (>= 0.7, < 2)
      railties (>= 6.0.0, < 7)
    rails-settings-cached (0.6.6)
      rails (>= 4.2.0)
-    railties (6.1.7.1)
-      actionpack (= 6.1.7.1)
-      activesupport (= 6.1.7.1)
+    railties (6.1.7.2)
+      actionpack (= 6.1.7.2)
+      activesupport (= 6.1.7.2)
      method_source
      rake (>= 12.2)
      thor (~> 1.0)
@ -554,7 +556,7 @@ GEM
      link_header (~> 0.0, >= 0.0.8)
    rdf-normalize (0.5.1)
      rdf (~> 3.2)
-    redcarpet (3.5.1)
+    redcarpet (3.6.0)
    redis (4.5.1)
    redis-namespace (1.10.0)
      redis (>= 4)
@ -595,7 +597,7 @@ GEM
    rspec-support (3.11.1)
    rspec_junit_formatter (0.6.0)
      rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.44.0)
+    rubocop (1.44.1)
      json (~> 2.3)
      parallel (~> 1.10)
      parser (>= 3.2.0.0)
@ -628,7 +630,7 @@ GEM
      fugit (~> 1.1, >= 1.1.6)
    safety_net_attestation (0.4.0)
      jwt (~> 2.0)
-    sanitize (6.0.0)
+    sanitize (6.0.1)
      crass (~> 1.0.2)
      nokogiri (>= 1.12.0)
    scenic (1.7.0)
@ -654,7 +656,7 @@ GEM
      thor (>= 0.20, < 3.0)
    simple-navigation (4.4.0)
      activesupport (>= 2.3.2)
-    simple_form (5.1.0)
+    simple_form (5.2.0)
      actionpack (>= 5.2)
      activemodel (>= 5.2)
    simplecov (0.22.0)
@ -691,7 +693,7 @@ GEM
      climate_control (>= 0.0.3, < 1.0)
    thor (1.2.1)
    tilt (2.0.11)
-    timeout (0.3.0)
+    timeout (0.3.1)
    tpm-key_attestation (0.11.0)
      bindata (~> 2.4)
      openssl (> 2.0, < 3.1)
@ -709,7 +711,7 @@ GEM
    twitter-text (3.1.0)
      idn-ruby
      unf (~> 0.1.0)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
      concurrent-ruby (~> 1.0)
    tzinfo-data (1.2022.7)
      tzinfo (>= 1.0.0)
@ -764,7 +766,7 @@ DEPENDENCIES
  active_record_query_trace (~> 1.8)
  addressable (~> 2.8)
  annotate (~> 3.2)
-  aws-sdk-s3 (~> 1.117)
+  aws-sdk-s3 (~> 1.119)
  better_errors (~> 2.9)
  binding_of_caller (~> 1.0)
  blurhash (~> 0.1)
@ -799,7 +801,7 @@ DEPENDENCIES
  fog-core (<= 2.4.0)
  fog-openstack (~> 0.3)
  fuubar (~> 2.5)
-  gitlab-omniauth-openid-connect (~> 0.10.0)
+  gitlab-omniauth-openid-connect (~> 0.10.1)
  hamlit-rails (~> 0.2)
  hcaptcha (~> 7.1)
  hiredis (~> 0.6)
@ -852,7 +854,7 @@ DEPENDENCIES
  rails-i18n (~> 6.0)
  rails-settings-cached (~> 0.6)
  rdf-normalize (~> 0.5)
-  redcarpet (~> 3.5)
+  redcarpet (~> 3.6)
  redis (~> 4.5)
  redis-namespace (~> 1.10)
  rexml (~> 3.2)
@ -872,7 +874,7 @@ DEPENDENCIES
  sidekiq-scheduler (~> 4.0)
  sidekiq-unique-jobs (~> 7.1)
  simple-navigation (~> 4.4)
-  simple_form (~> 5.1)
+  simple_form (~> 5.2)
  simplecov (~> 0.22)
  sprockets (~> 3.7.2)
  sprockets-rails (~> 3.4)
--- a/app/controllers/api/v1/notifications_controller.rb
+++ b/app/controllers/api/v1/notifications_controller.rb
@ -6,7 +6,7 @@ class Api::V1::NotificationsController < Api::BaseController
  before_action :require_user!
  after_action :insert_pagination_headers, only: :index

-  DEFAULT_NOTIFICATIONS_LIMIT = 15
+  DEFAULT_NOTIFICATIONS_LIMIT = 40

  def index
    @notifications = load_notifications
--- a/app/controllers/settings/applications_controller.rb
+++ b/app/controllers/settings/applications_controller.rb
@ -29,7 +29,13 @@ class Settings::ApplicationsController < Settings::BaseController

  def update
    if @application.update(application_params)
-      redirect_to settings_applications_path, notice: I18n.t('generic.changes_saved_msg')
+      if @application.scopes_previously_changed?
+        @access_token = current_user.token_for_app(@application)
+        @access_token.destroy
+        redirect_to settings_application_path(@application), notice: I18n.t('applications.token_regenerated')
+      else
+        redirect_to settings_application_path(@application), notice: I18n.t('generic.changes_saved_msg')
+      end
    else
      render :show
    end
--- a/app/helpers/languages_helper.rb
+++ b/app/helpers/languages_helper.rb
@ -199,6 +199,8 @@ module LanguagesHelper
    sco: ['Scots', 'Scots'].freeze,
    sma: ['Southern Sami', 'Åarjelsaemien Gïele'].freeze,
    smj: ['Lule Sami', 'Julevsámegiella'].freeze,
+    szl: ['Silesian', 'ślůnsko godka'].freeze,
+    tai: ['Tai', 'ภาษาไท or ภาษาไต'].freeze,
    tok: ['Toki Pona', 'toki pona'].freeze,
    zba: ['Balaibalan', 'باليبلن'].freeze,
    zgh: ['Standard Moroccan Tamazight', 'ⵜⴰⵎⴰⵣⵉⵖⵜ'].freeze,
@ -210,8 +212,10 @@ module LanguagesHelper
  # names, but for some translations, we need the names of the
  # regional variants specifically
  REGIONAL_LOCALE_NAMES = {
+    'en-GB': 'English (British)',
    'es-AR': 'Español (Argentina)',
    'es-MX': 'Español (México)',
+    'fr-QC': 'Français (Canadien)',
    'pt-BR': 'Português (Brasil)',
    'pt-PT': 'Português (Portugal)',
    'sr-Latn': 'Srpski (latinica)',
--- a/app/javascript/mastodon/actions/tags.js
+++ b/app/javascript/mastodon/actions/tags.js
@ -60,7 +60,7 @@ export function fetchFollowedHashtagsRequest() {
  return {
    type: FOLLOWED_HASHTAGS_FETCH_REQUEST,
  };
-};
+}

 export function fetchFollowedHashtagsSuccess(followed_tags, next) {
  return {
@ -68,14 +68,14 @@ export function fetchFollowedHashtagsSuccess(followed_tags, next) {
    followed_tags,
    next,
  };
-};
+}

 export function fetchFollowedHashtagsFail(error) {
  return {
    type: FOLLOWED_HASHTAGS_FETCH_FAIL,
    error,
  };
-};
+}

 export function expandFollowedHashtags() {
  return (dispatch, getState) => {
@ -94,13 +94,13 @@ export function expandFollowedHashtags() {
      dispatch(expandFollowedHashtagsFail(error));
    });
  };
-};
+}

 export function expandFollowedHashtagsRequest() {
  return {
    type: FOLLOWED_HASHTAGS_EXPAND_REQUEST,
  };
-};
+}

 export function expandFollowedHashtagsSuccess(followed_tags, next) {
  return {
@ -108,14 +108,14 @@ export function expandFollowedHashtagsSuccess(followed_tags, next) {
    followed_tags,
    next,
  };
-};
+}

 export function expandFollowedHashtagsFail(error) {
  return {
    type: FOLLOWED_HASHTAGS_EXPAND_FAIL,
    error,
  };
-};
+}

 export const followHashtag = name => (dispatch, getState) => {
  dispatch(followHashtagRequest(name));
--- a/app/javascript/mastodon/components/account.js
+++ b/app/javascript/mastodon/components/account.js
@ -47,27 +47,27 @@ class Account extends ImmutablePureComponent {

  handleFollow = () => {
    this.props.onFollow(this.props.account);
-  }
+  };

  handleBlock = () => {
    this.props.onBlock(this.props.account);
-  }
+  };

  handleMute = () => {
    this.props.onMute(this.props.account);
-  }
+  };

  handleMuteNotifications = () => {
    this.props.onMuteNotifications(this.props.account, true);
-  }
+  };

  handleUnmuteNotifications = () => {
    this.props.onMuteNotifications(this.props.account, false);
-  }
+  };

  handleAction = () => {
    this.props.onActionClick(this.props.account);
-  }
+  };

  render () {
    const { account, intl, hidden, onActionClick, actionIcon, actionTitle, defaultAction, size } = this.props;
--- a/app/javascript/mastodon/components/animated_number.js
+++ b/app/javascript/mastodon/components/animated_number.js
@ -38,13 +38,13 @@ export default class AnimatedNumber extends React.PureComponent {
    const { direction } = this.state;

    return { y: -1 * direction };
-  }
+  };

  willLeave = () => {
    const { direction } = this.state;

    return { y: spring(1 * direction, { damping: 35, stiffness: 400 }) };
-  }
+  };

  render () {
    const { value, obfuscate } = this.props;
--- a/app/javascript/mastodon/components/autosuggest_input.js
+++ b/app/javascript/mastodon/components/autosuggest_input.js
@ -78,7 +78,7 @@ export default class AutosuggestInput extends ImmutablePureComponent {
    }

    this.props.onChange(e);
-  }
+  };

  onKeyDown = (e) => {
    const { suggestions, disabled } = this.props;
@ -136,22 +136,22 @@ export default class AutosuggestInput extends ImmutablePureComponent {
    }

    this.props.onKeyDown(e);
-  }
+  };

  onBlur = () => {
    this.setState({ suggestionsHidden: true, focused: false });
-  }
+  };

  onFocus = () => {
    this.setState({ focused: true });
-  }
+  };

  onSuggestionClick = (e) => {
    const suggestion = this.props.suggestions.get(e.currentTarget.getAttribute('data-index'));
    e.preventDefault();
    this.props.onSuggestionSelected(this.state.tokenStart, this.state.lastToken, suggestion);
    this.input.focus();
-  }
+  };

  componentWillReceiveProps (nextProps) {
    if (nextProps.suggestions !== this.props.suggestions && nextProps.suggestions.size > 0 && this.state.suggestionsHidden && this.state.focused) {
@ -161,7 +161,7 @@ export default class AutosuggestInput extends ImmutablePureComponent {

  setInput = (c) => {
    this.input = c;
-  }
+  };

  renderSuggestion = (suggestion, i) => {
    const { selectedSuggestion } = this.state;
@ -183,7 +183,7 @@ export default class AutosuggestInput extends ImmutablePureComponent {
        {inner}
      </div>
    );
-  }
+  };

  render () {
    const { value, suggestions, disabled, placeholder, onKeyUp, autoFocus, className, id, maxLength, lang } = this.props;
--- a/app/javascript/mastodon/components/autosuggest_textarea.js
+++ b/app/javascript/mastodon/components/autosuggest_textarea.js
@ -75,7 +75,7 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
    }

    this.props.onChange(e);
-  }
+  };

  onKeyDown = (e) => {
    const { suggestions, disabled } = this.props;
@ -133,25 +133,25 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
    }

    this.props.onKeyDown(e);
-  }
+  };

  onBlur = () => {
    this.setState({ suggestionsHidden: true, focused: false });
-  }
+  };

  onFocus = (e) => {
    this.setState({ focused: true });
    if (this.props.onFocus) {
      this.props.onFocus(e);
    }
-  }
+  };

  onSuggestionClick = (e) => {
    const suggestion = this.props.suggestions.get(e.currentTarget.getAttribute('data-index'));
    e.preventDefault();
    this.props.onSuggestionSelected(this.state.tokenStart, this.state.lastToken, suggestion);
    this.textarea.focus();
-  }
+  };

  componentWillReceiveProps (nextProps) {
    if (nextProps.suggestions !== this.props.suggestions && nextProps.suggestions.size > 0 && this.state.suggestionsHidden && this.state.focused) {
@ -161,14 +161,14 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {

  setTextarea = (c) => {
    this.textarea = c;
-  }
+  };

  onPaste = (e) => {
    if (e.clipboardData && e.clipboardData.files.length === 1) {
      this.props.onPaste(e.clipboardData.files);
      e.preventDefault();
    }
-  }
+  };

  renderSuggestion = (suggestion, i) => {
    const { selectedSuggestion } = this.state;
@ -190,7 +190,7 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
        {inner}
      </div>
    );
-  }
+  };

  render () {
    const { value, suggestions, disabled, placeholder, onKeyUp, autoFocus, lang, children } = this.props;
--- a/app/javascript/mastodon/components/avatar.js
+++ b/app/javascript/mastodon/components/avatar.js
@ -27,12 +27,12 @@ export default class Avatar extends React.PureComponent {
  handleMouseEnter = () => {
    if (this.props.animate) return;
    this.setState({ hovering: true });
-  }
+  };

  handleMouseLeave = () => {
    if (this.props.animate) return;
    this.setState({ hovering: false });
-  }
+  };

  render () {
    const { account, size, animate, inline } = this.props;
--- a/app/javascript/mastodon/components/avatar_overlay.js
+++ b/app/javascript/mastodon/components/avatar_overlay.js
@ -29,12 +29,12 @@ export default class AvatarOverlay extends React.PureComponent {
  handleMouseEnter = () => {
    if (this.props.animate) return;
    this.setState({ hovering: true });
-  }
+  };

  handleMouseLeave = () => {
    if (this.props.animate) return;
    this.setState({ hovering: false });
-  }
+  };

  render() {
    const { account, friend, animate, size, baseSize, overlaySize } = this.props;
--- a/app/javascript/mastodon/components/button.js
+++ b/app/javascript/mastodon/components/button.js
@ -24,11 +24,11 @@ export default class Button extends React.PureComponent {
    if (!this.props.disabled && this.props.onClick) {
      this.props.onClick(e);
    }
-  }
+  };

  setRef = (c) => {
    this.node = c;
-  }
+  };

  focus() {
    this.node.focus();
--- a/app/javascript/mastodon/components/column.js
+++ b/app/javascript/mastodon/components/column.js
@ -27,11 +27,11 @@ export default class Column extends React.PureComponent {
    }

    this._interruptScrollAnimation();
-  }
+  };

  setRef = c => {
    this.node = c;
-  }
+  };

  componentDidMount () {
    if (this.props.bindToDocument) {
--- a/app/javascript/mastodon/components/column_back_button.js
+++ b/app/javascript/mastodon/components/column_back_button.js
@ -20,7 +20,7 @@ export default class ColumnBackButton extends React.PureComponent {
    } else {
      this.context.router.history.goBack();
    }
-  }
+  };

  render () {
    const { multiColumn } = this.props;
--- a/app/javascript/mastodon/components/column_header.js
+++ b/app/javascript/mastodon/components/column_header.js
@ -49,32 +49,32 @@ class ColumnHeader extends React.PureComponent {
    } else {
      this.context.router.history.goBack();
    }
-  }
+  };

  handleToggleClick = (e) => {
    e.stopPropagation();
    this.setState({ collapsed: !this.state.collapsed, animating: true });
-  }
+  };

  handleTitleClick = () => {
    this.props.onClick?.();
-  }
+  };

  handleMoveLeft = () => {
    this.props.onMove(-1);
-  }
+  };

  handleMoveRight = () => {
    this.props.onMove(1);
-  }
+  };

  handleBackClick = () => {
    this.historyBack();
-  }
+  };

  handleTransitionEnd = () => {
    this.setState({ animating: false });
-  }
+  };

  handlePin = () => {
    if (!this.props.pinned) {
@ -82,7 +82,7 @@ class ColumnHeader extends React.PureComponent {
    }

    this.props.onPin();
-  }
+  };

  render () {
    const { title, icon, active, children, pinned, multiColumn, extraButton, showBackButton, intl: { formatMessage }, placeholder, appendContent, collapseIssues } = this.props;
--- a/app/javascript/mastodon/components/dismissable_banner.js
+++ b/app/javascript/mastodon/components/dismissable_banner.js
@ -24,7 +24,7 @@ class DismissableBanner extends React.PureComponent {
  handleDismiss = () => {
    const { id } = this.props;
    this.setState({ visible: false }, () => bannerSettings.set(id, true));
-  }
+  };

  render () {
    const { visible } = this.state;
--- a/app/javascript/mastodon/components/display_name.js
+++ b/app/javascript/mastodon/components/display_name.js
@ -23,7 +23,7 @@ export default class DisplayName extends React.PureComponent {
      let emoji = emojis[i];
      emoji.src = emoji.getAttribute('data-original');
    }
-  }
+  };

  handleMouseLeave = ({ currentTarget }) => {
    if (autoPlayGif) {
@ -36,7 +36,7 @@ export default class DisplayName extends React.PureComponent {
      let emoji = emojis[i];
      emoji.src = emoji.getAttribute('data-static');
    }
-  }
+  };

  render () {
    const { others, localDomain } = this.props;
--- a/app/javascript/mastodon/components/domain.js
+++ b/app/javascript/mastodon/components/domain.js
@ -19,7 +19,7 @@ class Account extends ImmutablePureComponent {

  handleDomainUnblock = () => {
    this.props.onUnblockDomain(this.props.domain);
-  }
+  };

  render () {
    const { domain, intl } = this.props;
--- a/app/javascript/mastodon/components/dropdown_menu.js
+++ b/app/javascript/mastodon/components/dropdown_menu.js
@ -36,7 +36,7 @@ class DropdownMenu extends React.PureComponent {
    if (this.node && !this.node.contains(e.target)) {
      this.props.onClose();
    }
-  }
+  };

  componentDidMount () {
    document.addEventListener('click', this.handleDocumentClick, false);
@ -56,11 +56,11 @@ class DropdownMenu extends React.PureComponent {

  setRef = c => {
    this.node = c;
-  }
+  };

  setFocusRef = c => {
    this.focusedItem = c;
-  }
+  };

  handleKeyDown = e => {
    const items = Array.from(this.node.querySelectorAll('a, button'));
@ -97,18 +97,18 @@ class DropdownMenu extends React.PureComponent {
      e.preventDefault();
      e.stopPropagation();
    }
-  }
+  };

  handleItemKeyPress = e => {
    if (e.key === 'Enter' || e.key === ' ') {
      this.handleClick(e);
    }
-  }
+  };

  handleClick = e => {
    const { onItemClick } = this.props;
    onItemClick(e);
-  }
+  };

  renderItem = (option, i) => {
    if (option === null) {
@ -124,7 +124,7 @@ class DropdownMenu extends React.PureComponent {
        </a>
      </li>
    );
-  }
+  };

  render () {
    const { items, scrollable, renderHeader, loading } = this.props;
@ -194,7 +194,7 @@ export default class Dropdown extends React.PureComponent {
    } else {
      this.props.onOpen(this.state.id, this.handleItemClick, type !== 'click');
    }
-  }
+  };

  handleClose = () => {
    if (this.activeElement) {
@ -202,13 +202,13 @@ export default class Dropdown extends React.PureComponent {
      this.activeElement = null;
    }
    this.props.onClose(this.state.id);
-  }
+  };

  handleMouseDown = () => {
    if (!this.state.open) {
      this.activeElement = document.activeElement;
    }
-  }
+  };

  handleButtonKeyDown = (e) => {
    switch(e.key) {
@ -217,7 +217,7 @@ export default class Dropdown extends React.PureComponent {
      this.handleMouseDown();
      break;
    }
-  }
+  };

  handleKeyPress = (e) => {
    switch(e.key) {
@ -228,7 +228,7 @@ export default class Dropdown extends React.PureComponent {
      e.preventDefault();
      break;
    }
-  }
+  };

  handleItemClick = e => {
    const { onItemClick } = this.props;
@ -247,25 +247,25 @@ export default class Dropdown extends React.PureComponent {
      e.preventDefault();
      this.context.router.history.push(item.to);
    }
-  }
+  };

  setTargetRef = c => {
    this.target = c;
-  }
+  };

  findTarget = () => {
    return this.target;
-  }
+  };

  componentWillUnmount = () => {
    if (this.state.id === this.props.openDropdownId) {
      this.handleClose();
    }
-  }
+  };

  close = () => {
    this.handleClose();
-  }
+  };

  render () {
    const {
--- a/app/javascript/mastodon/components/edited_timestamp/index.js
+++ b/app/javascript/mastodon/components/edited_timestamp/index.js
@ -36,7 +36,7 @@ class EditedTimestamp extends React.PureComponent {
    return (
      <FormattedMessage id='status.edited_x_times' defaultMessage='Edited {count, plural, one {{count} time} other {{count} times}}' values={{ count: items.size - 1 }} />
    );
-  }
+  };

  renderItem = (item, index, { onClick, onKeyPress }) => {
    const formattedDate = <RelativeTimestamp timestamp={item.get('created_at')} short={false} />;
@ -53,7 +53,7 @@ class EditedTimestamp extends React.PureComponent {
        <button data-index={index} onClick={onClick} onKeyPress={onKeyPress}>{label}</button>
      </li>
    );
-  }
+  };

  render () {
    const { timestamp, intl, statusId } = this.props;
--- a/app/javascript/mastodon/components/error_boundary.js
+++ b/app/javascript/mastodon/components/error_boundary.js
@ -64,7 +64,7 @@ export default class ErrorBoundary extends React.PureComponent {

    this.setState({ copied: true });
    setTimeout(() => this.setState({ copied: false }), 700);
-  }
+  };

  render() {
    const { hasError, copied, errorMessage } = this.state;
--- a/app/javascript/mastodon/components/gifv.js
+++ b/app/javascript/mastodon/components/gifv.js
@ -17,7 +17,7 @@ export default class GIFV extends React.PureComponent {

  handleLoadedData = () => {
    this.setState({ loading: false });
-  }
+  };

  componentWillReceiveProps (nextProps) {
    if (nextProps.src !== this.props.src) {
@ -32,7 +32,7 @@ export default class GIFV extends React.PureComponent {
      e.stopPropagation();
      onClick();
    }
-  }
+  };

  render () {
    const { src, width, height, alt } = this.props;
--- a/app/javascript/mastodon/components/icon_button.js
+++ b/app/javascript/mastodon/components/icon_button.js
@ -43,7 +43,7 @@ export default class IconButton extends React.PureComponent {
  state = {
    activate: false,
    deactivate: false,
-  }
+  };

  componentWillReceiveProps (nextProps) {
    if (!nextProps.animate) return;
@ -61,25 +61,25 @@ export default class IconButton extends React.PureComponent {
    if (!this.props.disabled) {
      this.props.onClick(e);
    }
-  }
+  };

  handleKeyPress = (e) => {
    if (this.props.onKeyPress && !this.props.disabled) {
      this.props.onKeyPress(e);
    }
-  }
+  };

  handleMouseDown = (e) => {
    if (!this.props.disabled && this.props.onMouseDown) {
      this.props.onMouseDown(e);
    }
-  }
+  };

  handleKeyDown = (e) => {
    if (!this.props.disabled && this.props.onKeyDown) {
      this.props.onKeyDown(e);
    }
-  }
+  };

  render () {
    const style = {
--- a/app/javascript/mastodon/components/intersection_observer_article.js
+++ b/app/javascript/mastodon/components/intersection_observer_article.js
@ -21,7 +21,7 @@ export default class IntersectionObserverArticle extends React.Component {

  state = {
    isHidden: false, // set to true in requestIdleCallback to trigger un-render
-  }
+  };

  shouldComponentUpdate (nextProps, nextState) {
    const isUnrendered = !this.state.isIntersecting && (this.state.isHidden || this.props.cachedHeight);
@ -62,7 +62,7 @@ export default class IntersectionObserverArticle extends React.Component {

    scheduleIdleTask(this.calculateHeight);
    this.setState(this.updateStateAfterIntersection);
-  }
+  };

  updateStateAfterIntersection = (prevState) => {
    if (prevState.isIntersecting !== false && !this.entry.isIntersecting) {
@ -72,7 +72,7 @@ export default class IntersectionObserverArticle extends React.Component {
      isIntersecting: this.entry.isIntersecting,
      isHidden: false,
    };
-  }
+  };

  calculateHeight = () => {
    const { onHeightChange, saveHeightKey, id } = this.props;
@ -83,7 +83,7 @@ export default class IntersectionObserverArticle extends React.Component {
    if (onHeightChange && saveHeightKey) {
      onHeightChange(saveHeightKey, id, this.height);
    }
-  }
+  };

  hideIfNotIntersecting = () => {
    if (!this.componentMounted) {
@ -95,11 +95,11 @@ export default class IntersectionObserverArticle extends React.Component {
    // this is to save DOM nodes and avoid using up too much memory.
    // See: https://github.com/mastodon/mastodon/issues/2900
    this.setState((prevState) => ({ isHidden: !prevState.isIntersecting }));
-  }
+  };

  handleRef = (node) => {
    this.node = node;
-  }
+  };

  render () {
    const { children, id, index, listLength, cachedHeight } = this.props;
--- a/app/javascript/mastodon/components/load_gap.js
+++ b/app/javascript/mastodon/components/load_gap.js
@ -19,7 +19,7 @@ class LoadGap extends React.PureComponent {

  handleClick = () => {
    this.props.onClick(this.props.maxId);
-  }
+  };

  render () {
    const { disabled, intl } = this.props;
--- a/app/javascript/mastodon/components/load_more.js
+++ b/app/javascript/mastodon/components/load_more.js
@ -8,11 +8,11 @@ export default class LoadMore extends React.PureComponent {
    onClick: PropTypes.func,
    disabled: PropTypes.bool,
    visible: PropTypes.bool,
-  }
+  };

  static defaultProps = {
    visible: true,
-  }
+  };

  render() {
    const { disabled, visible } = this.props;
--- a/app/javascript/mastodon/components/load_pending.js
+++ b/app/javascript/mastodon/components/load_pending.js
@ -7,7 +7,7 @@ export default class LoadPending extends React.PureComponent {
  static propTypes = {
    onClick: PropTypes.func,
    count: PropTypes.number,
-  }
+  };

  render() {
    const { count } = this.props;
--- a/app/javascript/mastodon/components/media_attachments.js
+++ b/app/javascript/mastodon/components/media_attachments.js
@ -29,7 +29,7 @@ export default class MediaAttachments extends ImmutablePureComponent {
    return (
      <div className='media-gallery' style={{ height, width }} />
    );
-  }
+  };

  renderLoadingVideoPlayer = () => {
    const { height, width } = this.props;
@ -37,7 +37,7 @@ export default class MediaAttachments extends ImmutablePureComponent {
    return (
      <div className='video-player' style={{ height, width }} />
    );
-  }
+  };

  renderLoadingAudioPlayer = () => {
    const { height, width } = this.props;
@ -45,7 +45,7 @@ export default class MediaAttachments extends ImmutablePureComponent {
    return (
      <div className='audio-player' style={{ height, width }} />
    );
-  }
+  };

  render () {
    const { status, width, height } = this.props;
--- a/app/javascript/mastodon/components/media_gallery.js
+++ b/app/javascript/mastodon/components/media_gallery.js
@ -40,14 +40,14 @@ class Item extends React.PureComponent {
    if (this.hoverToPlay()) {
      e.target.play();
    }
-  }
+  };

  handleMouseLeave = (e) => {
    if (this.hoverToPlay()) {
      e.target.pause();
      e.target.currentTime = 0;
    }
-  }
+  };

  getAutoPlay() {
    return this.props.autoplay || autoPlayGif;
@ -71,11 +71,11 @@ class Item extends React.PureComponent {
    }

    e.stopPropagation();
-  }
+  };

  handleImageLoad = () => {
    this.setState({ loaded: true });
-  }
+  };

  render () {
    const { attachment, index, size, standalone, displayWidth, visible } = this.props;
@ -277,11 +277,11 @@ class MediaGallery extends React.PureComponent {
    } else {
      this.setState({ visible: !this.state.visible });
    }
-  }
+  };

  handleClick = (index) => {
    this.props.onOpenMedia(this.props.media, index);
-  }
+  };

  handleRef = c => {
    this.node = c;
@ -289,7 +289,7 @@ class MediaGallery extends React.PureComponent {
    if (this.node) {
      this._setDimensions();
    }
-  }
+  };

  _setDimensions () {
    const width = this.node.offsetWidth;
--- a/app/javascript/mastodon/components/modal_root.js
+++ b/app/javascript/mastodon/components/modal_root.js
@ -28,7 +28,7 @@ export default class ModalRoot extends React.PureComponent {
         && !!this.props.children) {
      this.props.onClose();
    }
-  }
+  };

  handleKeyDown = (e) => {
    if (e.key === 'Tab') {
@ -49,7 +49,7 @@ export default class ModalRoot extends React.PureComponent {
        e.preventDefault();
      }
    }
-  }
+  };

  componentDidMount () {
    window.addEventListener('keyup', this.handleKeyUp, false);
@ -122,11 +122,11 @@ export default class ModalRoot extends React.PureComponent {

  getSiblings = () => {
    return Array(...this.node.parentElement.childNodes).filter(node => node !== this.node);
-  }
+  };

  setRef = ref => {
    this.node = ref;
-  }
+  };

  render () {
    const { children, onClose } = this.props;
--- a/app/javascript/mastodon/components/picture_in_picture_placeholder.js
+++ b/app/javascript/mastodon/components/picture_in_picture_placeholder.js
@ -22,7 +22,7 @@ class PictureInPicturePlaceholder extends React.PureComponent {
  handleClick = () => {
    const { dispatch } = this.props;
    dispatch(removePictureInPicture());
-  }
+  };

  setRef = c => {
    this.node = c;
@ -30,7 +30,7 @@ class PictureInPicturePlaceholder extends React.PureComponent {
    if (this.node) {
      this._setDimensions();
    }
-  }
+  };

  _setDimensions () {
    const width  = this.node.offsetWidth;
--- a/app/javascript/mastodon/components/poll.js
+++ b/app/javascript/mastodon/components/poll.js
@ -95,7 +95,7 @@ class Poll extends ImmutablePureComponent {
      tmp[value] = true;
      this.setState({ selected: tmp });
    }
-  }
+  };

  handleOptionChange = ({ target: { value } }) => {
    this._toggleOption(value);
@ -107,7 +107,7 @@ class Poll extends ImmutablePureComponent {
      e.stopPropagation();
      e.preventDefault();
    }
-  }
+  };

  handleVote = () => {
    if (this.props.disabled) {
--- a/app/javascript/mastodon/components/scrollable_list.js
+++ b/app/javascript/mastodon/components/scrollable_list.js
@ -97,7 +97,7 @@ class ScrollableList extends PureComponent {
    } else {
      return this.node;
    }
-  }
+  };

  setScrollTop = newScrollTop => {
    if (this.getScrollTop() !== newScrollTop) {
@ -143,7 +143,7 @@ class ScrollableList extends PureComponent {

    this.mouseMovedRecently = false;
    this.scrollToTopOnMouseIdle = false;
-  }
+  };

  componentDidMount () {
    this.attachScrollListener();
@ -161,25 +161,25 @@ class ScrollableList extends PureComponent {
    } else {
      return null;
    }
-  }
+  };

  getScrollTop = () => {
    return this._getScrollingElement().scrollTop;
-  }
+  };

  getScrollHeight = () => {
    return this._getScrollingElement().scrollHeight;
-  }
+  };

  getClientHeight = () => {
    return this._getScrollingElement().clientHeight;
-  }
+  };

  updateScrollBottom = (snapshot) => {
    const newScrollTop = this.getScrollHeight() - snapshot;

    this.setScrollTop(newScrollTop);
-  }
+  };

  getSnapshotBeforeUpdate (prevProps) {
    const someItemInserted = React.Children.count(prevProps.children) > 0 &&
@ -206,7 +206,7 @@ class ScrollableList extends PureComponent {
    if (width && this.state.cachedMediaWidth !== width) {
      this.setState({ cachedMediaWidth: width });
    }
-  }
+  };

  componentWillUnmount () {
    this.clearMouseIdleTimer();
@ -218,7 +218,7 @@ class ScrollableList extends PureComponent {

  onFullScreenChange = () => {
    this.setState({ fullscreen: isFullscreen() });
-  }
+  };

  attachIntersectionObserver () {
    let nodeOptions = {
@ -269,12 +269,12 @@ class ScrollableList extends PureComponent {

  setRef = (c) => {
    this.node = c;
-  }
+  };

  handleLoadMore = e => {
    e.preventDefault();
    this.props.onLoadMore();
-  }
+  };

  handleLoadPending = e => {
    e.preventDefault();
@ -286,7 +286,7 @@ class ScrollableList extends PureComponent {
    this.clearMouseIdleTimer();
    this.mouseIdleTimer = setTimeout(this.handleMouseIdle, MOUSE_IDLE_DELAY);
    this.mouseMovedRecently = true;
-  }
+  };

  render () {
    const { children, scrollKey, trackScroll, showLoading, isLoading, hasMore, numPending, prepend, alwaysPrepend, append, emptyMessage, onLoadMore } = this.props;
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@ -135,7 +135,7 @@ class Status extends ImmutablePureComponent {

  handleToggleMediaVisibility = () => {
    this.setState({ showMedia: !this.state.showMedia });
-  }
+  };

  handleClick = e => {
    if (e && (e.button !== 0 || e.ctrlKey || e.metaKey)) {
@ -147,11 +147,11 @@ class Status extends ImmutablePureComponent {
    }

    this.handleHotkeyOpen();
-  }
+  };

  handlePrependAccountClick = e => {
    this.handleAccountClick(e, false);
-  }
+  };

  handleAccountClick = (e, proper = true) => {
    if (e && (e.button !== 0 || e.ctrlKey || e.metaKey))  {
@ -163,19 +163,19 @@ class Status extends ImmutablePureComponent {
    }

    this._openProfile(proper);
-  }
+  };

  handleExpandedToggle = () => {
    this.props.onToggleHidden(this._properStatus());
-  }
+  };

  handleCollapsedToggle = isCollapsed => {
    this.props.onToggleCollapsed(this._properStatus(), isCollapsed);
-  }
+  };

  handleTranslate = () => {
    this.props.onTranslate(this._properStatus());
-  }
+  };

  renderLoadingMediaGallery () {
    return <div className='media-gallery' style={{ height: '110px' }} />;
@ -192,11 +192,11 @@ class Status extends ImmutablePureComponent {
  handleOpenVideo = (options) => {
    const status = this._properStatus();
    this.props.onOpenVideo(status.get('id'), status.getIn(['media_attachments', 0]), options);
-  }
+  };

  handleOpenMedia = (media, index) => {
    this.props.onOpenMedia(this._properStatus().get('id'), media, index);
-  }
+  };

  handleHotkeyOpenMedia = e => {
    const { onOpenMedia, onOpenVideo } = this.props;
@ -211,32 +211,32 @@ class Status extends ImmutablePureComponent {
        onOpenMedia(status.get('id'), status.get('media_attachments'), 0);
      }
    }
-  }
+  };

  handleDeployPictureInPicture = (type, mediaProps) => {
    const { deployPictureInPicture } = this.props;
    const status = this._properStatus();

    deployPictureInPicture(status, type, mediaProps);
-  }
+  };

  handleHotkeyReply = e => {
    e.preventDefault();
    this.props.onReply(this._properStatus(), this.context.router.history);
-  }
+  };

  handleHotkeyFavourite = () => {
    this.props.onFavourite(this._properStatus());
-  }
+  };

  handleHotkeyBoost = e => {
    this.props.onReblog(this._properStatus(), e);
-  }
+  };

  handleHotkeyMention = e => {
    e.preventDefault();
    this.props.onMention(this._properStatus().get('account'), this.context.router.history);
-  }
+  };

  handleHotkeyOpen = () => {
    if (this.props.onClick) {
@ -252,11 +252,11 @@ class Status extends ImmutablePureComponent {
    }

    router.history.push(`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`);
-  }
+  };

  handleHotkeyOpenProfile = () => {
    this._openProfile();
-  }
+  };

  _openProfile = (proper = true) => {
    const { router } = this.context;
@ -267,32 +267,32 @@ class Status extends ImmutablePureComponent {
    }

    router.history.push(`/@${status.getIn(['account', 'acct'])}`);
-  }
+  };

  handleHotkeyMoveUp = e => {
    this.props.onMoveUp(this.props.status.get('id'), e.target.getAttribute('data-featured'));
-  }
+  };

  handleHotkeyMoveDown = e => {
    this.props.onMoveDown(this.props.status.get('id'), e.target.getAttribute('data-featured'));
-  }
+  };

  handleHotkeyToggleHidden = () => {
    this.props.onToggleHidden(this._properStatus());
-  }
+  };

  handleHotkeyToggleSensitive = () => {
    this.handleToggleMediaVisibility();
-  }
+  };

  handleUnfilterClick = e => {
    this.setState({ forceFilter: false });
    e.preventDefault();
-  }
+  };

  handleFilterClick = () => {
    this.setState({ forceFilter: true });
-  }
+  };

  _properStatus () {
    const { status } = this.props;
@ -306,7 +306,7 @@ class Status extends ImmutablePureComponent {

  handleRef = c => {
    this.node = c;
-  }
+  };

  render () {
    let media = null;
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@ -97,7 +97,7 @@ class StatusActionBar extends ImmutablePureComponent {
    'status',
    'relationship',
    'withDismiss',
-  ]
+  ];

  handleReplyClick = () => {
    const { signedIn } = this.context.identity;
@ -107,7 +107,7 @@ class StatusActionBar extends ImmutablePureComponent {
    } else {
      this.props.onInteractionModal('reply', this.props.status);
    }
-  }
+  };

  handleShareClick = () => {
    navigator.share({
@ -116,7 +116,7 @@ class StatusActionBar extends ImmutablePureComponent {
    }).catch((e) => {
      if (e.name !== 'AbortError') console.error(e);
    });
-  }
+  };

  handleFavouriteClick = () => {
    const { signedIn } = this.context.identity;
@ -126,7 +126,7 @@ class StatusActionBar extends ImmutablePureComponent {
    } else {
      this.props.onInteractionModal('favourite', this.props.status);
    }
-  }
+  };

  handleReblogClick = e => {
    const { signedIn } = this.context.identity;
@ -136,35 +136,35 @@ class StatusActionBar extends ImmutablePureComponent {
    } else {
      this.props.onInteractionModal('reblog', this.props.status);
    }
-  }
+  };

  handleBookmarkClick = () => {
    this.props.onBookmark(this.props.status);
-  }
+  };

  handleDeleteClick = () => {
    this.props.onDelete(this.props.status, this.context.router.history);
-  }
+  };

  handleRedraftClick = () => {
    this.props.onDelete(this.props.status, this.context.router.history, true);
-  }
+  };

  handleEditClick = () => {
    this.props.onEdit(this.props.status, this.context.router.history);
-  }
+  };

  handlePinClick = () => {
    this.props.onPin(this.props.status);
-  }
+  };

  handleMentionClick = () => {
    this.props.onMention(this.props.status.get('account'), this.context.router.history);
-  }
+  };

  handleDirectClick = () => {
    this.props.onDirect(this.props.status.get('account'), this.context.router.history);
-  }
+  };

  handleMuteClick = () => {
    const { status, relationship, onMute, onUnmute } = this.props;
@ -175,7 +175,7 @@ class StatusActionBar extends ImmutablePureComponent {
    } else {
      onMute(account);
    }
-  }
+  };

  handleBlockClick = () => {
    const { status, relationship, onBlock, onUnblock } = this.props;
@ -186,50 +186,50 @@ class StatusActionBar extends ImmutablePureComponent {
    } else {
      onBlock(status);
    }
-  }
+  };

  handleBlockDomain = () => {
    const { status, onBlockDomain } = this.props;
    const account = status.get('account');

    onBlockDomain(account.get('acct').split('@')[1]);
-  }
+  };

  handleUnblockDomain = () => {
    const { status, onUnblockDomain } = this.props;
    const account = status.get('account');

    onUnblockDomain(account.get('acct').split('@')[1]);
-  }
+  };

  handleOpen = () => {
    this.context.router.history.push(`/@${this.props.status.getIn(['account', 'acct'])}/${this.props.status.get('id')}`);
-  }
+  };

  handleEmbed = () => {
    this.props.onEmbed(this.props.status);
-  }
+  };

  handleReport = () => {
    this.props.onReport(this.props.status);
-  }
+  };

  handleConversationMuteClick = () => {
    this.props.onMuteConversation(this.props.status);
-  }
+  };

  handleFilterClick = () => {
    this.props.onAddFilter(this.props.status);
-  }
+  };

  handleCopy = () => {
    const url = this.props.status.get('url');
    navigator.clipboard.writeText(url);
-  }
+  };

  handleHideClick = () => {
    this.props.onFilter();
-  }
+  };

  render () {
    const { status, relationship, intl, withDismiss, withCounters, scrollKey } = this.props;
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@ -130,7 +130,7 @@ class StatusContent extends React.PureComponent {
      let emoji = emojis[i];
      emoji.src = emoji.getAttribute('data-original');
    }
-  }
+  };

  handleMouseLeave = ({ currentTarget }) => {
    if (autoPlayGif) {
@ -143,7 +143,7 @@ class StatusContent extends React.PureComponent {
      let emoji = emojis[i];
      emoji.src = emoji.getAttribute('data-static');
    }
-  }
+  };

  componentDidMount () {
    this._updateStatusLinks();
@ -158,7 +158,7 @@ class StatusContent extends React.PureComponent {
      e.preventDefault();
      this.context.router.history.push(`/@${mention.get('acct')}`);
    }
-  }
+  };

  onHashtagClick = (hashtag, e) => {
    hashtag = hashtag.replace(/^#/, '');
@ -167,11 +167,11 @@ class StatusContent extends React.PureComponent {
      e.preventDefault();
      this.context.router.history.push(`/tags/${hashtag}`);
    }
-  }
+  };

  handleMouseDown = (e) => {
    this.startXY = [e.clientX, e.clientY];
-  }
+  };

  handleMouseUp = (e) => {
    if (!this.startXY) {
@ -194,7 +194,7 @@ class StatusContent extends React.PureComponent {
    }

    this.startXY = null;
-  }
+  };

  handleSpoilerClick = (e) => {
    e.preventDefault();
@ -205,15 +205,15 @@ class StatusContent extends React.PureComponent {
    } else {
      this.setState({ hidden: !this.state.hidden });
    }
-  }
+  };

  handleTranslate = () => {
    this.props.onTranslate();
-  }
+  };

  setRef = (c) => {
    this.node = c;
-  }
+  };

  render () {
    const { status, intl } = this.props;
--- a/app/javascript/mastodon/components/status_list.js
+++ b/app/javascript/mastodon/components/status_list.js
@ -34,7 +34,7 @@ export default class StatusList extends ImmutablePureComponent {

  getFeaturedStatusCount = () => {
    return this.props.featuredStatusIds ? this.props.featuredStatusIds.size : 0;
-  }
+  };

  getCurrentStatusIndex = (id, featured) => {
    if (featured) {
@ -42,21 +42,21 @@ export default class StatusList extends ImmutablePureComponent {
    } else {
      return this.props.statusIds.indexOf(id) + this.getFeaturedStatusCount();
    }
-  }
+  };

  handleMoveUp = (id, featured) => {
    const elementIndex = this.getCurrentStatusIndex(id, featured) - 1;
    this._selectChild(elementIndex, true);
-  }
+  };

  handleMoveDown = (id, featured) => {
    const elementIndex = this.getCurrentStatusIndex(id, featured) + 1;
    this._selectChild(elementIndex, false);
-  }
+  };

  handleLoadOlder = debounce(() => {
    this.props.onLoadMore(this.props.statusIds.size > 0 ? this.props.statusIds.last() : undefined);
-  }, 300, { leading: true })
+  }, 300, { leading: true });

  _selectChild (index, align_top) {
    const container = this.node.node;
@ -74,7 +74,7 @@ export default class StatusList extends ImmutablePureComponent {

  setRef = c => {
    this.node = c;
-  }
+  };

  render () {
    const { statusIds, featuredStatusIds, onLoadMore, timelineId, ...other }  = this.props;
--- a/app/javascript/mastodon/containers/media_container.js
+++ b/app/javascript/mastodon/containers/media_container.js
@ -39,7 +39,7 @@ export default class MediaContainer extends PureComponent {
    document.documentElement.style.marginRight = `${getScrollbarWidth()}px`;

    this.setState({ media, index });
-  }
+  };

  handleOpenVideo = (options) => {
    const { components } = this.props;
@ -50,7 +50,7 @@ export default class MediaContainer extends PureComponent {
    document.documentElement.style.marginRight = `${getScrollbarWidth()}px`;

    this.setState({ media: mediaList, options });
-  }
+  };

  handleCloseMedia = () => {
    document.body.classList.remove('with-modals--active');
@ -63,11 +63,11 @@ export default class MediaContainer extends PureComponent {
      backgroundColor: null,
      options: null,
    });
-  }
+  };

  setBackgroundColor = color => {
    this.setState({ backgroundColor: color });
-  }
+  };

  render () {
    const { locale, components } = this.props;
--- a/app/javascript/mastodon/extra_polyfills.js
+++ b/app/javascript/mastodon/extra_polyfills.js
@ -1,3 +1,2 @@
 import 'abortcontroller-polyfill/dist/abortcontroller-polyfill-only';
-import 'intersection-observer';
 import 'requestidlecallback';
--- a/app/javascript/mastodon/features/about/index.js
+++ b/app/javascript/mastodon/features/about/index.js
@ -59,7 +59,7 @@ class Section extends React.PureComponent {
    const { collapsed } = this.state;

    this.setState({ collapsed: !collapsed }, () => onOpen && onOpen());
-  }
+  };

  render () {
    const { title, children } = this.props;
@ -106,7 +106,7 @@ class About extends React.PureComponent {
  handleDomainBlocksOpen = () => {
    const { dispatch } = this.props;
    dispatch(fetchDomainBlocks());
-  }
+  };

  render () {
    const { multiColumn, intl, server, extendedDescription, domainBlocks } = this.props;
--- a/app/javascript/mastodon/features/account/components/account_note.js
+++ b/app/javascript/mastodon/features/account/components/account_note.js
@ -90,7 +90,7 @@ class AccountNote extends ImmutablePureComponent {

  setTextareaRef = c => {
    this.textarea = c;
-  }
+  };

  handleChange = e => {
    this.setState({ value: e.target.value, saving: false });
@ -114,13 +114,13 @@ class AccountNote extends ImmutablePureComponent {
        }
      });
    }
-  }
+  };

  handleBlur = () => {
    if (this._isDirty()) {
      this._save();
    }
-  }
+  };

  _save (showMessage = true) {
    this.setState({ saving: true }, () => this.props.onSave(this.state.value));
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@ -109,7 +109,7 @@ class Header extends ImmutablePureComponent {

  openEditProfile = () => {
    window.open('/settings/profile', '_blank');
-  }
+  };

  isStatusesPageActive = (match, location) => {
    if (!match) {
@ -117,7 +117,7 @@ class Header extends ImmutablePureComponent {
    }

    return !location.pathname.match(/\/(followers|following)\/?$/);
-  }
+  };

  handleMouseEnter = ({ currentTarget }) => {
    if (autoPlayGif) {
@ -130,7 +130,7 @@ class Header extends ImmutablePureComponent {
      let emoji = emojis[i];
      emoji.src = emoji.getAttribute('data-original');
    }
-  }
+  };

  handleMouseLeave = ({ currentTarget }) => {
    if (autoPlayGif) {
@ -143,14 +143,14 @@ class Header extends ImmutablePureComponent {
      let emoji = emojis[i];
      emoji.src = emoji.getAttribute('data-static');
    }
-  }
+  };

  handleAvatarClick = e => {
    if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
      e.preventDefault();
      this.props.onOpenAvatar();
    }
-  }
+  };

  handleShare = () => {
    const { account } = this.props;
@ -161,7 +161,7 @@ class Header extends ImmutablePureComponent {
    }).catch((e) => {
      if (e.name !== 'AbortError') console.error(e);
    });
-  }
+  };

  render () {
    const { account, hidden, intl, domain } = this.props;
@ -296,9 +296,9 @@ class Header extends ImmutablePureComponent {
      if ((permissions & PERMISSION_MANAGE_USERS) === PERMISSION_MANAGE_USERS) {
        menu.push({ text: intl.formatMessage(messages.admin_account, { name: account.get('username') }), href: `/admin/accounts/${account.get('id')}` });
      }
-        if (isRemote && (permissions & PERMISSION_MANAGE_FEDERATION) === PERMISSION_MANAGE_FEDERATION) {
-          menu.push({ text: intl.formatMessage(messages.admin_domain, { domain: remoteDomain }), href: `/admin/instances/${remoteDomain}` });
-        }
+      if (isRemote && (permissions & PERMISSION_MANAGE_FEDERATION) === PERMISSION_MANAGE_FEDERATION) {
+        menu.push({ text: intl.formatMessage(messages.admin_domain, { domain: remoteDomain }), href: `/admin/instances/${remoteDomain}` });
+      }
    }

    const content         = { __html: account.get('note_emojified') };
--- a/app/javascript/mastodon/features/account_gallery/components/media_item.js
+++ b/app/javascript/mastodon/features/account_gallery/components/media_item.js
@ -22,20 +22,20 @@ export default class MediaItem extends ImmutablePureComponent {

  handleImageLoad = () => {
    this.setState({ loaded: true });
-  }
+  };

  handleMouseEnter = e => {
    if (this.hoverToPlay()) {
      e.target.play();
    }
-  }
+  };

  handleMouseLeave = e => {
    if (this.hoverToPlay()) {
      e.target.pause();
      e.target.currentTime = 0;
    }
-  }
+  };

  hoverToPlay () {
    return !autoPlayGif && ['gifv', 'video'].indexOf(this.props.attachment.get('type')) !== -1;
@ -51,7 +51,7 @@ export default class MediaItem extends ImmutablePureComponent {
        this.setState({ visible: true });
      }
    }
-  }
+  };

  render () {
    const { attachment, displayWidth } = this.props;
--- a/app/javascript/mastodon/features/account_gallery/index.js
+++ b/app/javascript/mastodon/features/account_gallery/index.js
@ -47,7 +47,7 @@ class LoadMoreMedia extends ImmutablePureComponent {

  handleLoadMore = () => {
    this.props.onLoadMore(this.props.maxId);
-  }
+  };

  render () {
    return (
@ -114,7 +114,7 @@ class AccountGallery extends ImmutablePureComponent {
    if (this.props.hasMore) {
      this.handleLoadMore(this.props.attachments.size > 0 ? this.props.attachments.last().getIn(['status', 'id']) : undefined);
    }
-  }
+  };

  handleScroll = e => {
    const { scrollTop, scrollHeight, clientHeight } = e.target;
@ -123,7 +123,7 @@ class AccountGallery extends ImmutablePureComponent {
    if (150 > offset && !this.props.isLoading) {
      this.handleScrollToBottom();
    }
-  }
+  };

  handleLoadMore = maxId => {
    this.props.dispatch(expandAccountMediaTimeline(this.props.accountId, { maxId }));
@ -132,7 +132,7 @@ class AccountGallery extends ImmutablePureComponent {
  handleLoadOlder = e => {
    e.preventDefault();
    this.handleScrollToBottom();
-  }
+  };

  handleOpenMedia = attachment => {
    const { dispatch } = this.props;
@ -148,13 +148,13 @@ class AccountGallery extends ImmutablePureComponent {

      dispatch(openModal('MEDIA', { media, index, statusId }));
    }
-  }
+  };

  handleRef = c => {
    if (c) {
      this.setState({ width: c.offsetWidth });
    }
-  }
+  };

  render () {
    const { attachments, isLoading, hasMore, isAccount, multiColumn, blockedBy, suspended } = this.props;
--- a/app/javascript/mastodon/features/account_timeline/components/header.js
+++ b/app/javascript/mastodon/features/account_timeline/components/header.js
@ -36,35 +36,35 @@ export default class Header extends ImmutablePureComponent {

  handleFollow = () => {
    this.props.onFollow(this.props.account);
-  }
+  };

  handleBlock = () => {
    this.props.onBlock(this.props.account);
-  }
+  };

  handleMention = () => {
    this.props.onMention(this.props.account, this.context.router.history);
-  }
+  };

  handleDirect = () => {
    this.props.onDirect(this.props.account, this.context.router.history);
-  }
+  };

  handleReport = () => {
    this.props.onReport(this.props.account);
-  }
+  };

  handleReblogToggle = () => {
    this.props.onReblogToggle(this.props.account);
-  }
+  };

  handleNotifyToggle = () => {
    this.props.onNotifyToggle(this.props.account);
-  }
+  };

  handleMute = () => {
    this.props.onMute(this.props.account);
-  }
+  };

  handleBlockDomain = () => {
    const domain = this.props.account.get('acct').split('@')[1];
@ -72,7 +72,7 @@ export default class Header extends ImmutablePureComponent {
    if (!domain) return;

    this.props.onBlockDomain(domain);
-  }
+  };

  handleUnblockDomain = () => {
    const domain = this.props.account.get('acct').split('@')[1];
@ -80,31 +80,31 @@ export default class Header extends ImmutablePureComponent {
    if (!domain) return;

    this.props.onUnblockDomain(domain);
-  }
+  };

  handleEndorseToggle = () => {
    this.props.onEndorseToggle(this.props.account);
-  }
+  };

  handleAddToList = () => {
    this.props.onAddToList(this.props.account);
-  }
+  };

  handleEditAccountNote = () => {
    this.props.onEditAccountNote(this.props.account);
-  }
+  };

  handleChangeLanguages = () => {
    this.props.onChangeLanguages(this.props.account);
-  }
+  };

  handleInteractionModal = () => {
    this.props.onInteractionModal(this.props.account);
-  }
+  };

  handleOpenAvatar = () => {
    this.props.onOpenAvatar(this.props.account);
-  }
+  };

  render () {
    const { account, hidden, hideTabs } = this.props;
--- a/app/javascript/mastodon/features/account_timeline/components/limited_account_hint.js
+++ b/app/javascript/mastodon/features/account_timeline/components/limited_account_hint.js
@ -20,7 +20,7 @@ class LimitedAccountHint extends React.PureComponent {
  static propTypes = {
    accountId: PropTypes.string.isRequired,
    reveal: PropTypes.func,
-  }
+  };

  render () {
    const { reveal } = this.props;
--- a/app/javascript/mastodon/features/account_timeline/index.js
+++ b/app/javascript/mastodon/features/account_timeline/index.js
@ -145,7 +145,7 @@ class AccountTimeline extends ImmutablePureComponent {

  handleLoadMore = maxId => {
    this.props.dispatch(expandAccountTimeline(this.props.accountId, { maxId, withReplies: this.props.withReplies, tagged: this.props.params.tagged }));
-  }
+  };

  render () {
    const { accountId, statusIds, featuredStatusIds, isLoading, hasMore, blockedBy, suspended, isAccount, hidden, multiColumn, remote, remoteUrl } = this.props;
--- a/app/javascript/mastodon/features/audio/index.js
+++ b/app/javascript/mastodon/features/audio/index.js
@ -75,7 +75,7 @@ class Audio extends React.PureComponent {
    if (this.player) {
      this._setDimensions();
    }
-  }
+  };

  _pack() {
    return {
@ -105,11 +105,11 @@ class Audio extends React.PureComponent {

  setSeekRef = c => {
    this.seek = c;
-  }
+  };

  setVolumeRef = c => {
    this.volume = c;
-  }
+  };

  setAudioRef = c => {
    this.audio = c;
@ -118,13 +118,13 @@ class Audio extends React.PureComponent {
      this.audio.volume = 1;
      this.audio.muted = false;
    }
-  }
+  };

  setCanvasRef = c => {
    this.canvas = c;

    this.visualizer.setCanvas(c);
-  }
+  };

  componentDidMount () {
    window.addEventListener('scroll', this.handleScroll);
@ -163,7 +163,7 @@ class Audio extends React.PureComponent {
    } else {
      this.setState({ paused: true }, () => this.audio.pause());
    }
-  }
+  };

  handleResize = debounce(() => {
    if (this.player) {
@ -181,7 +181,7 @@ class Audio extends React.PureComponent {
    }

    this._renderCanvas();
-  }
+  };

  handlePause = () => {
    this.setState({ paused: true });
@ -189,7 +189,7 @@ class Audio extends React.PureComponent {
    if (this.audioContext) {
      this.audioContext.suspend();
    }
-  }
+  };

  handleProgress = () => {
    const lastTimeRange = this.audio.buffered.length - 1;
@ -197,7 +197,7 @@ class Audio extends React.PureComponent {
    if (lastTimeRange > -1) {
      this.setState({ buffer: Math.ceil(this.audio.buffered.end(lastTimeRange) / this.audio.duration * 100) });
    }
-  }
+  };

  toggleMute = () => {
    const muted = !this.state.muted;
@ -207,7 +207,7 @@ class Audio extends React.PureComponent {
        this.gainNode.gain.value = muted ? 0 : this.state.volume;
      }
    });
-  }
+  };

  toggleReveal = () => {
    if (this.props.onToggleVisibility) {
@ -215,7 +215,7 @@ class Audio extends React.PureComponent {
    } else {
      this.setState({ revealed: !this.state.revealed });
    }
-  }
+  };

  handleVolumeMouseDown = e => {
    document.addEventListener('mousemove', this.handleMouseVolSlide, true);
@ -227,14 +227,14 @@ class Audio extends React.PureComponent {

    e.preventDefault();
    e.stopPropagation();
-  }
+  };

  handleVolumeMouseUp = () => {
    document.removeEventListener('mousemove', this.handleMouseVolSlide, true);
    document.removeEventListener('mouseup', this.handleVolumeMouseUp, true);
    document.removeEventListener('touchmove', this.handleMouseVolSlide, true);
    document.removeEventListener('touchend', this.handleVolumeMouseUp, true);
-  }
+  };

  handleMouseDown = e => {
    document.addEventListener('mousemove', this.handleMouseMove, true);
@ -248,7 +248,7 @@ class Audio extends React.PureComponent {

    e.preventDefault();
    e.stopPropagation();
-  }
+  };

  handleMouseUp = () => {
    document.removeEventListener('mousemove', this.handleMouseMove, true);
@ -258,7 +258,7 @@ class Audio extends React.PureComponent {

    this.setState({ dragging: false });
    this.audio.play();
-  }
+  };

  handleMouseMove = throttle(e => {
    const { x } = getPointerPosition(this.seek, e);
@ -276,7 +276,7 @@ class Audio extends React.PureComponent {
      currentTime: this.audio.currentTime,
      duration: this.audio.duration,
    });
-  }
+  };

  handleMouseVolSlide = throttle(e => {
    const { x } = getPointerPosition(this.volume, e);
@ -311,11 +311,11 @@ class Audio extends React.PureComponent {

  handleMouseEnter = () => {
    this.setState({ hovered: true });
-  }
+  };

  handleMouseLeave = () => {
    this.setState({ hovered: false });
-  }
+  };

  handleLoadedData = () => {
    const { autoPlay, currentTime } = this.props;
@ -327,7 +327,7 @@ class Audio extends React.PureComponent {
    if (autoPlay) {
      this.togglePlay();
    }
-  }
+  };

  _initAudioContext () {
    const AudioContext = window.AudioContext || window.webkitAudioContext;
@ -361,7 +361,7 @@ class Audio extends React.PureComponent {
    }).catch(err => {
      console.error(err);
    });
-  }
+  };

  _renderCanvas () {
    requestAnimationFrame(() => {
@ -432,7 +432,7 @@ class Audio extends React.PureComponent {
      e.stopPropagation();
      this.togglePlay();
    }
-  }
+  };

  handleKeyDown = e => {
    switch(e.key) {
@ -457,7 +457,7 @@ class Audio extends React.PureComponent {
      this.seekBy(10);
      break;
    }
-  }
+  };

  render () {
    const { src, intl, alt, editable, autoPlay, sensitive, blurhash } = this.props;
--- a/app/javascript/mastodon/features/bookmarked_statuses/index.js
+++ b/app/javascript/mastodon/features/bookmarked_statuses/index.js
@ -48,24 +48,24 @@ class Bookmarks extends ImmutablePureComponent {
    } else {
      dispatch(addColumn('BOOKMARKS', {}));
    }
-  }
+  };

  handleMove = (dir) => {
    const { columnId, dispatch } = this.props;
    dispatch(moveColumn(columnId, dir));
-  }
+  };

  handleHeaderClick = () => {
    this.column.scrollTop();
-  }
+  };

  setRef = c => {
    this.column = c;
-  }
+  };

  handleLoadMore = debounce(() => {
    this.props.dispatch(expandBookmarkedStatuses());
-  }, 300, { leading: true })
+  }, 300, { leading: true });

  render () {
    const { intl, statusIds, columnId, multiColumn, hasMore, isLoading } = this.props;
--- a/app/javascript/mastodon/features/community_timeline/index.js
+++ b/app/javascript/mastodon/features/community_timeline/index.js
@ -60,16 +60,16 @@ class CommunityTimeline extends React.PureComponent {
    } else {
      dispatch(addColumn('COMMUNITY', { other: { onlyMedia } }));
    }
-  }
+  };

  handleMove = (dir) => {
    const { columnId, dispatch } = this.props;
    dispatch(moveColumn(columnId, dir));
-  }
+  };

  handleHeaderClick = () => {
    this.column.scrollTop();
-  }
+  };

  componentDidMount () {
    const { dispatch, onlyMedia } = this.props;
@ -109,13 +109,13 @@ class CommunityTimeline extends React.PureComponent {

  setRef = c => {
    this.column = c;
-  }
+  };

  handleLoadMore = maxId => {
    const { dispatch, onlyMedia } = this.props;

    dispatch(expandCommunityTimeline({ maxId, onlyMedia }));
-  }
+  };

  render () {
    const { intl, hasUnread, columnId, multiColumn, onlyMedia } = this.props;
--- a/app/javascript/mastodon/features/compose/components/action_bar.js
+++ b/app/javascript/mastodon/features/compose/components/action_bar.js
@ -31,7 +31,7 @@ class ActionBar extends React.PureComponent {

  handleLogout = () => {
    this.props.onLogout();
-  }
+  };

  render () {
    const { intl } = this.props;
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@ -74,17 +74,17 @@ class ComposeForm extends ImmutablePureComponent {

  handleChange = (e) => {
    this.props.onChange(e.target.value);
-  }
+  };

  handleKeyDown = (e) => {
    if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) {
      this.handleSubmit();
    }
-  }
+  };

  getFulltextForCharacterCounting = () => {
    return [this.props.spoiler? this.props.spoilerText: '', countableText(this.props.text)].join('');
-  }
+  };

  canSubmit = () => {
    const { isSubmitting, isChangingUpload, isUploading, anyMedia } = this.props;
@ -92,7 +92,7 @@ class ComposeForm extends ImmutablePureComponent {
    const isOnlyWhitespace = fulltext.length !== 0 && fulltext.trim().length === 0;

    return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > maxChars || (isOnlyWhitespace && !anyMedia));
-  }
+  };

  handleSubmit = (e) => {
    if (this.props.text !== this.autosuggestTextarea.textarea.value) {
@ -110,27 +110,27 @@ class ComposeForm extends ImmutablePureComponent {
    if (e) {
      e.preventDefault();
    }
-  }
+  };

  onSuggestionsClearRequested = () => {
    this.props.onClearSuggestions();
-  }
+  };

  onSuggestionsFetchRequested = (token) => {
    this.props.onFetchSuggestions(token);
-  }
+  };

  onSuggestionSelected = (tokenStart, token, value) => {
    this.props.onSuggestionSelected(tokenStart, token, value, ['text']);
-  }
+  };

  onSpoilerSuggestionSelected = (tokenStart, token, value) => {
    this.props.onSuggestionSelected(tokenStart, token, value, ['spoiler_text']);
-  }
+  };

  handleChangeSpoilerText = (e) => {
    this.props.onChangeSpoilerText(e.target.value);
-  }
+  };

  handleFocus = () => {
    if (this.composeForm && !this.props.singleColumn) {
@ -139,7 +139,7 @@ class ComposeForm extends ImmutablePureComponent {
        this.composeForm.scrollIntoView();
      }
    }
-  }
+  };

  componentDidMount () {
    this._updateFocusAndSelection({ });
@ -185,15 +185,15 @@ class ComposeForm extends ImmutablePureComponent {
        this.autosuggestTextarea.textarea.focus();
      }
    }
-  }
+  };

  setAutosuggestTextarea = (c) => {
    this.autosuggestTextarea = c;
-  }
+  };

  setSpoilerText = (c) => {
    this.spoilerText = c;
-  }
+  };

  setRef = c => {
    this.composeForm = c;
@ -205,7 +205,7 @@ class ComposeForm extends ImmutablePureComponent {
    const needsSpace   = data.custom && position > 0 && !allowedAroundShortCode.includes(text[position - 1]);

    this.props.onPickEmoji(position, data, needsSpace);
-  }
+  };

  render () {
    const { intl, onPaste, autoFocus } = this.props;
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
@ -57,7 +57,7 @@ class ModifierPickerMenu extends React.PureComponent {

  handleClick = e => {
    this.props.onSelect(e.currentTarget.getAttribute('data-index') * 1);
-  }
+  };

  componentWillReceiveProps (nextProps) {
    if (nextProps.active) {
@ -75,7 +75,7 @@ class ModifierPickerMenu extends React.PureComponent {
    if (this.node && !this.node.contains(e.target)) {
      this.props.onClose();
    }
-  }
+  };

  attachListeners () {
    document.addEventListener('click', this.handleDocumentClick, false);
@ -89,7 +89,7 @@ class ModifierPickerMenu extends React.PureComponent {

  setRef = c => {
    this.node = c;
-  }
+  };

  render () {
    const { active } = this.props;
@ -124,12 +124,12 @@ class ModifierPicker extends React.PureComponent {
    } else {
      this.props.onOpen();
    }
-  }
+  };

  handleSelect = modifier => {
    this.props.onChange(modifier);
    this.props.onClose();
-  }
+  };

  render () {
    const { active, modifier } = this.props;
@ -174,7 +174,7 @@ class EmojiPickerMenu extends React.PureComponent {
    if (this.node && !this.node.contains(e.target)) {
      this.props.onClose();
    }
-  }
+  };

  componentDidMount () {
    document.addEventListener('click', this.handleDocumentClick, false);
@ -198,7 +198,7 @@ class EmojiPickerMenu extends React.PureComponent {

  setRef = c => {
    this.node = c;
-  }
+  };

  getI18n = () => {
    const { intl } = this.props;
@ -219,7 +219,7 @@ class EmojiPickerMenu extends React.PureComponent {
        custom: intl.formatMessage(messages.custom),
      },
    };
-  }
+  };

  handleClick = (emoji, event) => {
    if (!emoji.native) {
@ -229,19 +229,19 @@ class EmojiPickerMenu extends React.PureComponent {
      this.props.onClose();
    }
    this.props.onPick(emoji);
-  }
+  };

  handleModifierOpen = () => {
    this.setState({ modifierOpen: true });
-  }
+  };

  handleModifierClose = () => {
    this.setState({ modifierOpen: false });
-  }
+  };

  handleModifierChange = modifier => {
    this.props.onSkinTone(modifier);
-  }
+  };

  render () {
    const { loading, style, intl, custom_emojis, skinTone, frequentlyUsedEmojis } = this.props;
@ -325,7 +325,7 @@ class EmojiPickerDropdown extends React.PureComponent {

  setRef = (c) => {
    this.dropdown = c;
-  }
+  };

  onShowDropdown = () => {
    this.setState({ active: true });
@ -342,11 +342,11 @@ class EmojiPickerDropdown extends React.PureComponent {
        this.setState({ loading: false, active: false });
      });
    }
-  }
+  };

  onHideDropdown = () => {
    this.setState({ active: false });
-  }
+  };

  onToggle = (e) => {
    if (!this.state.loading && (!e.key || e.key === 'Enter')) {
@ -356,21 +356,21 @@ class EmojiPickerDropdown extends React.PureComponent {
        this.onShowDropdown(e);
      }
    }
-  }
+  };

  handleKeyDown = e => {
    if (e.key === 'Escape') {
      this.onHideDropdown();
    }
-  }
+  };

  setTargetRef = c => {
    this.target = c;
-  }
+  };

  findTarget = () => {
    return this.target;
-  }
+  };

  render () {
    const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis, button } = this.props;
--- a/app/javascript/mastodon/features/compose/components/language_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/language_dropdown.js
@ -40,7 +40,7 @@ class LanguageDropdownMenu extends React.PureComponent {
    if (this.node && !this.node.contains(e.target)) {
      this.props.onClose();
    }
-  }
+  };

  componentDidMount () {
    document.addEventListener('click', this.handleDocumentClick, false);
@ -63,15 +63,15 @@ class LanguageDropdownMenu extends React.PureComponent {

  setRef = c => {
    this.node = c;
-  }
+  };

  setListRef = c => {
    this.listNode = c;
-  }
+  };

  handleSearchChange = ({ target }) => {
    this.setState({ searchValue: target.value });
-  }
+  };

  search () {
    const { languages, value, frequentlyUsedLanguages } = this.props;
@ -122,7 +122,7 @@ class LanguageDropdownMenu extends React.PureComponent {

    this.props.onClose();
    this.props.onChange(value);
-  }
+  };

  handleKeyDown = e => {
    const { onClose } = this.props;
@ -163,7 +163,7 @@ class LanguageDropdownMenu extends React.PureComponent {
      e.preventDefault();
      e.stopPropagation();
    }
-  }
+  };

  handleSearchKeyDown = e => {
    const { onChange, onClose } = this.props;
@ -199,11 +199,11 @@ class LanguageDropdownMenu extends React.PureComponent {

      break;
    }
-  }
+  };

  handleClear = () => {
    this.setState({ searchValue: '' });
-  }
+  };

  renderItem = lang => {
    const { value } = this.props;
@ -213,7 +213,7 @@ class LanguageDropdownMenu extends React.PureComponent {
        <span className='language-dropdown__dropdown__results__item__native-name'>{lang[2]}</span> <span className='language-dropdown__dropdown__results__item__common-name'>({lang[1]})</span>
      </div>
    );
-  }
+  };

  render () {
    const { intl } = this.props;
@ -259,7 +259,7 @@ class LanguageDropdown extends React.PureComponent {
    }

    this.setState({ open: !this.state.open });
-  }
+  };

  handleClose = () => {
    const { value, onClose } = this.props;
@ -270,24 +270,24 @@ class LanguageDropdown extends React.PureComponent {

    this.setState({ open: false });
    onClose(value);
-  }
+  };

  handleChange = value => {
    const { onChange } = this.props;
    onChange(value);
-  }
+  };

  setTargetRef = c => {
    this.target = c;
-  }
+  };

  findTarget = () => {
    return this.target;
-  }
+  };

  handleOverlayEnter = (state) => {
    this.setState({ placement: state.placement });
-  }
+  };

  render () {
    const { value, intl, frequentlyUsedLanguages } = this.props;
--- a/app/javascript/mastodon/features/compose/components/poll_button.js
+++ b/app/javascript/mastodon/features/compose/components/poll_button.js
@ -27,7 +27,7 @@ class PollButton extends React.PureComponent {

  handleClick = () => {
    this.props.onClick();
-  }
+  };

  render () {
    const { intl, active, unavailable, disabled } = this.props;
--- a/app/javascript/mastodon/features/compose/components/poll_form.js
+++ b/app/javascript/mastodon/features/compose/components/poll_form.js
@ -25,6 +25,7 @@ class Option extends React.PureComponent {

  static propTypes = {
    title: PropTypes.string.isRequired,
+    lang: PropTypes.string,
    index: PropTypes.number.isRequired,
    isPollMultiple: PropTypes.bool,
    autoFocus: PropTypes.bool,
@ -57,22 +58,22 @@ class Option extends React.PureComponent {
    if (e.key === 'Enter' || e.key === ' ') {
      this.handleToggleMultiple(e);
    }
-  }
+  };

  onSuggestionsClearRequested = () => {
    this.props.onClearSuggestions();
-  }
+  };

  onSuggestionsFetchRequested = (token) => {
    this.props.onFetchSuggestions(token);
-  }
+  };

  onSuggestionSelected = (tokenStart, token, value) => {
    this.props.onSuggestionSelected(tokenStart, token, value, ['poll', 'options', this.props.index]);
-  }
+  };

  render () {
-    const { isPollMultiple, title, index, autoFocus, intl } = this.props;
+    const { isPollMultiple, title, lang, index, autoFocus, intl } = this.props;

    return (
      <li>
@ -91,6 +92,7 @@ class Option extends React.PureComponent {
            placeholder={intl.formatMessage(messages.option_placeholder, { number: index + 1 })}
            maxLength={100}
            value={title}
+            lang={lang}
            onChange={this.handleOptionTitleChange}
            suggestions={this.props.suggestions}
            onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
@ -116,6 +118,7 @@ class PollForm extends ImmutablePureComponent {

  static propTypes = {
    options: ImmutablePropTypes.list,
+    lang: PropTypes.string,
    expiresIn: PropTypes.number,
    isMultiple: PropTypes.bool,
    onChangeOption: PropTypes.func.isRequired,
@ -142,7 +145,7 @@ class PollForm extends ImmutablePureComponent {
  };

  render () {
-    const { options, expiresIn, isMultiple, onChangeOption, onRemoveOption, intl, ...other } = this.props;
+    const { options, lang, expiresIn, isMultiple, onChangeOption, onRemoveOption, intl, ...other } = this.props;

    if (!options) {
      return null;
@ -153,7 +156,7 @@ class PollForm extends ImmutablePureComponent {
    return (
      <div className='compose-form__poll-wrapper'>
        <ul>
-          {options.map((title, i) => <Option title={title} key={i} index={i} onChange={onChangeOption} onRemove={onRemoveOption} isPollMultiple={isMultiple} onToggleMultiple={this.handleToggleMultiple} autoFocus={i === autoFocusIndex} {...other} />)}
+          {options.map((title, i) => <Option title={title} lang={lang} key={i} index={i} onChange={onChangeOption} onRemove={onRemoveOption} isPollMultiple={isMultiple} onToggleMultiple={this.handleToggleMultiple} autoFocus={i === autoFocusIndex} {...other} />)}
        </ul>

        <div className='poll__footer'>
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
@ -35,7 +35,7 @@ class PrivacyDropdownMenu extends React.PureComponent {
    if (this.node && !this.node.contains(e.target)) {
      this.props.onClose();
    }
-  }
+  };

  handleKeyDown = e => {
    const { items } = this.props;
@ -79,7 +79,7 @@ class PrivacyDropdownMenu extends React.PureComponent {
      e.preventDefault();
      e.stopPropagation();
    }
-  }
+  };

  handleClick = e => {
    const value = e.currentTarget.getAttribute('data-index');
@ -88,7 +88,7 @@ class PrivacyDropdownMenu extends React.PureComponent {

    this.props.onClose();
    this.props.onChange(value);
-  }
+  };

  componentDidMount () {
    document.addEventListener('click', this.handleDocumentClick, false);
@ -103,11 +103,11 @@ class PrivacyDropdownMenu extends React.PureComponent {

  setRef = c => {
    this.node = c;
-  }
+  };

  setFocusRef = c => {
    this.focusedItem = c;
-  }
+  };

  render () {
    const { style, items, value } = this.props;
@ -168,7 +168,7 @@ class PrivacyDropdown extends React.PureComponent {
      }
      this.setState({ open: !this.state.open });
    }
-  }
+  };

  handleModalActionClick = (e) => {
    e.preventDefault();
@ -177,7 +177,7 @@ class PrivacyDropdown extends React.PureComponent {

    this.props.onModalClose();
    this.props.onChange(value);
-  }
+  };

  handleKeyDown = e => {
    switch(e.key) {
@ -185,13 +185,13 @@ class PrivacyDropdown extends React.PureComponent {
      this.handleClose();
      break;
    }
-  }
+  };

  handleMouseDown = () => {
    if (!this.state.open) {
      this.activeElement = document.activeElement;
    }
-  }
+  };

  handleButtonKeyDown = (e) => {
    switch(e.key) {
@ -200,18 +200,18 @@ class PrivacyDropdown extends React.PureComponent {
      this.handleMouseDown();
      break;
    }
-  }
+  };

  handleClose = () => {
    if (this.state.open && this.activeElement) {
      this.activeElement.focus({ preventScroll: true });
    }
    this.setState({ open: false });
-  }
+  };

  handleChange = value => {
    this.props.onChange(value);
-  }
+  };

  componentWillMount () {
    const { intl: { formatMessage } } = this.props;
@ -231,15 +231,15 @@ class PrivacyDropdown extends React.PureComponent {

  setTargetRef = c => {
    this.target = c;
-  }
+  };

  findTarget = () => {
    return this.target;
-  }
+  };

  handleOverlayEnter = (state) => {
    this.setState({ placement: state.placement });
-  }
+  };

  render () {
    const { value, container, disabled, intl } = this.props;
--- a/app/javascript/mastodon/features/compose/components/reply_indicator.js
+++ b/app/javascript/mastodon/features/compose/components/reply_indicator.js
@ -27,14 +27,14 @@ class ReplyIndicator extends ImmutablePureComponent {

  handleClick = () => {
    this.props.onCancel();
-  }
+  };

  handleAccountClick = (e) => {
    if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
      e.preventDefault();
      this.context.router.history.push(`/@${this.props.status.getIn(['account', 'acct'])}`);
    }
-  }
+  };

  render () {
    const { status, intl } = this.props;
--- a/app/javascript/mastodon/features/compose/components/search.js
+++ b/app/javascript/mastodon/features/compose/components/search.js
@ -58,11 +58,11 @@ class Search extends React.PureComponent {

  setRef = c => {
    this.searchForm = c;
-  }
+  };

  handleChange = (e) => {
    this.props.onChange(e.target.value);
-  }
+  };

  handleClear = (e) => {
    e.preventDefault();
@ -70,7 +70,7 @@ class Search extends React.PureComponent {
    if (this.props.value.length > 0 || this.props.submitted) {
      this.props.onClear();
    }
-  }
+  };

  handleKeyUp = (e) => {
    if (e.key === 'Enter') {
@ -84,7 +84,7 @@ class Search extends React.PureComponent {
    } else if (e.key === 'Escape') {
      document.querySelector('.ui').parentElement.focus();
    }
-  }
+  };

  handleFocus = () => {
    this.setState({ expanded: true });
@ -96,15 +96,15 @@ class Search extends React.PureComponent {
        this.searchForm.scrollIntoView();
      }
    }
-  }
+  };

  handleBlur = () => {
    this.setState({ expanded: false });
-  }
+  };

  findTarget = () => {
    return this.searchForm;
-  }
+  };

  render () {
    const { intl, value, submitted } = this.props;
--- a/app/javascript/mastodon/features/compose/components/upload.js
+++ b/app/javascript/mastodon/features/compose/components/upload.js
@ -22,12 +22,12 @@ export default class Upload extends ImmutablePureComponent {
  handleUndoClick = e => {
    e.stopPropagation();
    this.props.onUndo(this.props.media.get('id'));
-  }
+  };

  handleFocalPointClick = e => {
    e.stopPropagation();
    this.props.onOpenFocalPoint(this.props.media.get('id'));
-  }
+  };

  render () {
    const { media } = this.props;
--- a/app/javascript/mastodon/features/compose/components/upload_button.js
+++ b/app/javascript/mastodon/features/compose/components/upload_button.js
@ -41,15 +41,15 @@ class UploadButton extends ImmutablePureComponent {
    if (e.target.files.length > 0) {
      this.props.onSelectFile(e.target.files);
    }
-  }
+  };

  handleClick = () => {
    this.fileElement.click();
-  }
+  };

  setRef = (c) => {
    this.fileElement = c;
-  }
+  };

  render () {
    const { intl, resetFileKey, unavailable, disabled, acceptContentTypes } = this.props;
--- a/app/javascript/mastodon/features/compose/containers/poll_form_container.js
+++ b/app/javascript/mastodon/features/compose/containers/poll_form_container.js
@ -10,6 +10,7 @@ import {
 const mapStateToProps = state => ({
  suggestions: state.getIn(['compose', 'suggestions']),
  options: state.getIn(['compose', 'poll', 'options']),
+  lang: state.getIn(['compose', 'language']),
  expiresIn: state.getIn(['compose', 'poll', 'expires_in']),
  isMultiple: state.getIn(['compose', 'poll', 'multiple']),
 });
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@ -74,15 +74,15 @@ class Compose extends React.PureComponent {
    }));

    return false;
-  }
+  };

  onFocus = () => {
    this.props.dispatch(changeComposing(true));
-  }
+  };

  onBlur = () => {
    this.props.dispatch(changeComposing(false));
-  }
+  };

  render () {
    const { multiColumn, showSearch, intl } = this.props;
--- a/app/javascript/mastodon/features/direct_timeline/components/conversation.js
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversation.js
@ -55,7 +55,7 @@ class Conversation extends ImmutablePureComponent {
      let emoji = emojis[i];
      emoji.src = emoji.getAttribute('data-original');
    }
-  }
+  };

  handleMouseLeave = ({ currentTarget }) => {
    if (autoPlayGif) {
@ -68,7 +68,7 @@ class Conversation extends ImmutablePureComponent {
      let emoji = emojis[i];
      emoji.src = emoji.getAttribute('data-static');
    }
-  }
+  };

  handleClick = () => {
    if (!this.context.router) {
@ -82,35 +82,35 @@ class Conversation extends ImmutablePureComponent {
    }

    this.context.router.history.push(`/@${lastStatus.getIn(['account', 'acct'])}/${lastStatus.get('id')}`);
-  }
+  };

  handleMarkAsRead = () => {
    this.props.markRead();
-  }
+  };

  handleReply = () => {
    this.props.reply(this.props.lastStatus, this.context.router.history);
-  }
+  };

  handleDelete = () => {
    this.props.delete();
-  }
+  };

  handleHotkeyMoveUp = () => {
    this.props.onMoveUp(this.props.conversationId);
-  }
+  };

  handleHotkeyMoveDown = () => {
    this.props.onMoveDown(this.props.conversationId);
-  }
+  };

  handleConversationMute = () => {
    this.props.onMute(this.props.lastStatus);
-  }
+  };

  handleShowMore = () => {
    this.props.onToggleHidden(this.props.lastStatus);
-  }
+  };

  render () {
    const { accounts, lastStatus, unread, scrollKey, intl } = this.props;
--- a/app/javascript/mastodon/features/direct_timeline/components/conversations_list.js
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversations_list.js
@ -16,17 +16,17 @@ export default class ConversationsList extends ImmutablePureComponent {
    onLoadMore: PropTypes.func,
  };

-  getCurrentIndex = id => this.props.conversations.findIndex(x => x.get('id') === id)
+  getCurrentIndex = id => this.props.conversations.findIndex(x => x.get('id') === id);

  handleMoveUp = id => {
    const elementIndex = this.getCurrentIndex(id) - 1;
    this._selectChild(elementIndex, true);
-  }
+  };

  handleMoveDown = id => {
    const elementIndex = this.getCurrentIndex(id) + 1;
    this._selectChild(elementIndex, false);
-  }
+  };

  _selectChild (index, align_top) {
    const container = this.node.node;
@ -44,7 +44,7 @@ export default class ConversationsList extends ImmutablePureComponent {

  setRef = c => {
    this.node = c;
-  }
+  };

  handleLoadOlder = debounce(() => {
    const last = this.props.conversations.last();
@ -52,7 +52,7 @@ export default class ConversationsList extends ImmutablePureComponent {
    if (last && last.get('last_status')) {
      this.props.onLoadMore(last.get('last_status'));
    }
-  }, 300, { leading: true })
+  }, 300, { leading: true });

  render () {
    const { conversations, onLoadMore, ...other } = this.props;
--- a/app/javascript/mastodon/features/direct_timeline/index.js
+++ b/app/javascript/mastodon/features/direct_timeline/index.js
@ -34,16 +34,16 @@ class DirectTimeline extends React.PureComponent {
    } else {
      dispatch(addColumn('DIRECT', {}));
    }
-  }
+  };

  handleMove = (dir) => {
    const { columnId, dispatch } = this.props;
    dispatch(moveColumn(columnId, dir));
-  }
+  };

  handleHeaderClick = () => {
    this.column.scrollTop();
-  }
+  };

  componentDidMount () {
    const { dispatch } = this.props;
@ -64,11 +64,11 @@ class DirectTimeline extends React.PureComponent {

  setRef = c => {
    this.column = c;
-  }
+  };

  handleLoadMore = maxId => {
    this.props.dispatch(expandConversations({ maxId }));
-  }
+  };

  render () {
    const { intl, hasUnread, columnId, multiColumn } = this.props;
--- a/app/javascript/mastodon/features/directory/components/account_card.js
+++ b/app/javascript/mastodon/features/directory/components/account_card.js
@ -115,7 +115,7 @@ class AccountCard extends ImmutablePureComponent {
      let emoji = emojis[i];
      emoji.src = emoji.getAttribute('data-original');
    }
-  }
+  };

  handleMouseLeave = ({ currentTarget }) => {
    if (autoPlayGif) {
@ -128,7 +128,7 @@ class AccountCard extends ImmutablePureComponent {
      let emoji = emojis[i];
      emoji.src = emoji.getAttribute('data-static');
    }
-  }
+  };

  handleFollow = () => {
    this.props.onFollow(this.props.account);
@ -140,11 +140,11 @@ class AccountCard extends ImmutablePureComponent {

  handleMute = () => {
    this.props.onMute(this.props.account);
-  }
+  };

  handleEditProfile = () => {
    window.open('/settings/profile', '_blank');
-  }
+  };

  render() {
    const { account, intl } = this.props;
--- a/app/javascript/mastodon/features/directory/index.js
+++ b/app/javascript/mastodon/features/directory/index.js
@ -64,7 +64,7 @@ class Directory extends React.PureComponent {
    } else {
      dispatch(addColumn('DIRECTORY', this.getParams(this.props, this.state)));
    }
-  }
+  };

  getParams = (props, state) => ({
    order: state.order === null ? (props.params.order || 'active') : state.order,
@ -74,11 +74,11 @@ class Directory extends React.PureComponent {
  handleMove = dir => {
    const { columnId, dispatch } = this.props;
    dispatch(moveColumn(columnId, dir));
-  }
+  };

  handleHeaderClick = () => {
    this.column.scrollTop();
-  }
+  };

  componentDidMount () {
    const { dispatch } = this.props;
@ -97,7 +97,7 @@ class Directory extends React.PureComponent {

  setRef = c => {
    this.column = c;
-  }
+  };

  handleChangeOrder = e => {
    const { dispatch, columnId } = this.props;
@ -107,7 +107,7 @@ class Directory extends React.PureComponent {
    } else {
      this.setState({ order: e.target.value });
    }
-  }
+  };

  handleChangeLocal = e => {
    const { dispatch, columnId } = this.props;
@ -117,12 +117,12 @@ class Directory extends React.PureComponent {
    } else {
      this.setState({ local: e.target.value === '1' });
    }
-  }
+  };

  handleLoadMore = () => {
    const { dispatch } = this.props;
    dispatch(expandDirectory(this.getParams(this.props, this.state)));
-  }
+  };

  render () {
    const { isLoading, accountIds, intl, columnId, multiColumn, domain } = this.props;
--- a/app/javascript/mastodon/features/emoji/emoji_utils.js
+++ b/app/javascript/mastodon/features/emoji/emoji_utils.js
@ -135,19 +135,19 @@ function getData(emoji, skin, set) {
      }
    }

-    if (data.short_names.hasOwnProperty(emoji)) {
+    if (Object.prototype.hasOwnProperty.call(data.short_names, emoji)) {
      emoji = data.short_names[emoji];
    }

-    if (data.emojis.hasOwnProperty(emoji)) {
+    if (Object.prototype.hasOwnProperty.call(data.emojis, emoji)) {
      emojiData = data.emojis[emoji];
    }
  } else if (emoji.id) {
-    if (data.short_names.hasOwnProperty(emoji.id)) {
+    if (Object.prototype.hasOwnProperty.call(data.short_names, emoji.id)) {
      emoji.id = data.short_names[emoji.id];
    }

-    if (data.emojis.hasOwnProperty(emoji.id)) {
+    if (Object.prototype.hasOwnProperty.call(data.emojis, emoji.id)) {
      emojiData = data.emojis[emoji.id];
      skin = skin || emoji.skin;
    }
@ -216,7 +216,7 @@ function deepMerge(a, b) {
    let originalValue = a[key],
      value = originalValue;

-    if (b.hasOwnProperty(key)) {
+    if (Object.prototype.hasOwnProperty.call(b, key)) {
      value = b[key];
    }

--- a/app/javascript/mastodon/features/explore/index.js
+++ b/app/javascript/mastodon/features/explore/index.js
@ -41,11 +41,11 @@ class Explore extends React.PureComponent {

  handleHeaderClick = () => {
    this.column.scrollTop();
-  }
+  };

  setRef = c => {
    this.column = c;
-  }
+  };

  render() {
    const { intl, multiColumn, isSearching } = this.props;
--- a/app/javascript/mastodon/features/explore/statuses.js
+++ b/app/javascript/mastodon/features/explore/statuses.js
@ -33,7 +33,7 @@ class Statuses extends React.PureComponent {
  handleLoadMore = debounce(() => {
    const { dispatch } = this.props;
    dispatch(expandTrendingStatuses());
-  }, 300, { leading: true })
+  }, 300, { leading: true });

  render () {
    const { isLoading, hasMore, statusIds, multiColumn } = this.props;
--- a/app/javascript/mastodon/features/favourited_statuses/index.js
+++ b/app/javascript/mastodon/features/favourited_statuses/index.js
@ -48,24 +48,24 @@ class Favourites extends ImmutablePureComponent {
    } else {
      dispatch(addColumn('FAVOURITES', {}));
    }
-  }
+  };

  handleMove = (dir) => {
    const { columnId, dispatch } = this.props;
    dispatch(moveColumn(columnId, dir));
-  }
+  };

  handleHeaderClick = () => {
    this.column.scrollTop();
-  }
+  };

  setRef = c => {
    this.column = c;
-  }
+  };

  handleLoadMore = debounce(() => {
    this.props.dispatch(expandFavouritedStatuses());
-  }, 300, { leading: true })
+  }, 300, { leading: true });

  render () {
    const { intl, statusIds, columnId, multiColumn, hasMore, isLoading } = this.props;
--- a/app/javascript/mastodon/features/favourites/index.js
+++ b/app/javascript/mastodon/features/favourites/index.js
@ -47,7 +47,7 @@ class Favourites extends ImmutablePureComponent {

  handleRefresh = () => {
    this.props.dispatch(fetchFavourites(this.props.params.statusId));
-  }
+  };

  render () {
    const { intl, accountIds, multiColumn } = this.props;
--- a/app/javascript/mastodon/features/filters/select_filter.js
+++ b/app/javascript/mastodon/features/filters/select_filter.js
@ -71,7 +71,7 @@ class SelectFilter extends React.PureComponent {
        <span className='language-dropdown__dropdown__results__item__native-name'>{filter[1]}</span> {warning}
      </div>
    );
-  }
+  };

  renderCreateNew (name) {
    return (
@ -83,11 +83,11 @@ class SelectFilter extends React.PureComponent {

  handleSearchChange = ({ target }) => {
    this.setState({ searchValue: target.value });
-  }
+  };

  setListRef = c => {
    this.listNode = c;
-  }
+  };

  handleKeyDown = e => {
    const index = Array.from(this.listNode.childNodes).findIndex(node => node === e.currentTarget);
@ -125,7 +125,7 @@ class SelectFilter extends React.PureComponent {
      e.preventDefault();
      e.stopPropagation();
    }
-  }
+  };

  handleSearchKeyDown = e => {
    let element = null;
@ -143,11 +143,11 @@ class SelectFilter extends React.PureComponent {

      break;
    }
-  }
+  };

  handleClear = () => {
    this.setState({ searchValue: '' });
-  }
+  };

  handleItemClick = e => {
    const value = e.currentTarget.getAttribute('data-index');
@ -155,7 +155,7 @@ class SelectFilter extends React.PureComponent {
    e.preventDefault();

    this.props.onSelectFilter(value);
-  }
+  };

  handleNewFilterClick = e => {
    e.preventDefault();
--- a/app/javascript/mastodon/features/follow_recommendations/components/account.js
+++ b/app/javascript/mastodon/features/follow_recommendations/components/account.js
@ -50,7 +50,7 @@ class Account extends ImmutablePureComponent {
    } else {
      dispatch(followAccount(account.get('id')));
    }
-  }
+  };

  render () {
    const { account, intl } = this.props;
--- a/app/javascript/mastodon/features/follow_recommendations/index.js
+++ b/app/javascript/mastodon/features/follow_recommendations/index.js
@ -69,7 +69,7 @@ class FollowRecommendations extends ImmutablePureComponent {
    }));

    router.history.push('/home');
-  }
+  };

  render () {
    const { suggestions, isLoading } = this.props;
--- a/app/javascript/mastodon/features/followed_tags/index.js
+++ b/app/javascript/mastodon/features/followed_tags/index.js
@ -38,7 +38,7 @@ class FollowedTags extends ImmutablePureComponent {

  componentDidMount() {
    this.props.dispatch(fetchFollowedHashtags());
-  };
+  }

  handleLoadMore = debounce(() => {
    this.props.dispatch(expandFollowedHashtags());
--- a/app/javascript/mastodon/features/getting_started/components/announcements.js
+++ b/app/javascript/mastodon/features/getting_started/components/announcements.js
@ -35,7 +35,7 @@ class Content extends ImmutablePureComponent {

  setRef = c => {
    this.node = c;
-  }
+  };

  componentDidMount () {
    this._updateLinks();
@ -89,7 +89,7 @@ class Content extends ImmutablePureComponent {
      e.preventDefault();
      this.context.router.history.push(`/@${mention.get('acct')}`);
    }
-  }
+  };

  onHashtagClick = (hashtag, e) => {
    hashtag = hashtag.replace(/^#/, '');
@ -98,14 +98,14 @@ class Content extends ImmutablePureComponent {
      e.preventDefault();
      this.context.router.history.push(`/tags/${hashtag}`);
    }
-  }
+  };

  onStatusClick = (status, e) => {
    if (this.context.router && e.button === 0 && !(e.ctrlKey || e.metaKey)) {
      e.preventDefault();
      this.context.router.history.push(`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`);
    }
-  }
+  };

  handleMouseEnter = ({ currentTarget }) => {
    if (autoPlayGif) {
@ -118,7 +118,7 @@ class Content extends ImmutablePureComponent {
      let emoji = emojis[i];
      emoji.src = emoji.getAttribute('data-original');
    }
-  }
+  };

  handleMouseLeave = ({ currentTarget }) => {
    if (autoPlayGif) {
@ -131,7 +131,7 @@ class Content extends ImmutablePureComponent {
      let emoji = emojis[i];
      emoji.src = emoji.getAttribute('data-static');
    }
-  }
+  };

  render () {
    const { announcement } = this.props;
@ -216,11 +216,11 @@ class Reaction extends ImmutablePureComponent {
    } else {
      addReaction(announcementId, reaction.get('name'));
    }
-  }
+  };

-  handleMouseEnter = () => this.setState({ hovered: true })
+  handleMouseEnter = () => this.setState({ hovered: true });

-  handleMouseLeave = () => this.setState({ hovered: false })
+  handleMouseLeave = () => this.setState({ hovered: false });

  render () {
    const { reaction } = this.props;
@ -254,7 +254,7 @@ class ReactionsBar extends ImmutablePureComponent {
  handleEmojiPick = data => {
    const { addReaction, announcementId } = this.props;
    addReaction(announcementId, data.native.replace(/:/g, ''));
-  }
+  };

  willEnter () {
    return { scale: reduceMotion ? 1 : 0 };
@ -397,15 +397,15 @@ class Announcements extends ImmutablePureComponent {

  handleChangeIndex = index => {
    this.setState({ index: index % this.props.announcements.size });
-  }
+  };

  handleNextClick = () => {
    this.setState({ index: (this.state.index + 1) % this.props.announcements.size });
-  }
+  };

  handlePrevClick = () => {
    this.setState({ index: (this.props.announcements.size + this.state.index - 1) % this.props.announcements.size });
-  }
+  };

  render () {
    const { announcements, intl } = this.props;
--- a/app/javascript/mastodon/features/hashtag_timeline/index.js
+++ b/app/javascript/mastodon/features/hashtag_timeline/index.js
@ -54,7 +54,7 @@ class HashtagTimeline extends React.PureComponent {
    } else {
      dispatch(addColumn('HASHTAG', { id: this.props.params.id }));
    }
-  }
+  };

  title = () => {
    const { id } = this.props.params;
@ -73,7 +73,7 @@ class HashtagTimeline extends React.PureComponent {
    }

    return title;
-  }
+  };

  additionalFor = (mode) => {
    const { tags } = this.props.params;
@ -83,16 +83,16 @@ class HashtagTimeline extends React.PureComponent {
    } else {
      return '';
    }
-  }
+  };

  handleMove = (dir) => {
    const { columnId, dispatch } = this.props;
    dispatch(moveColumn(columnId, dir));
-  }
+  };

  handleHeaderClick = () => {
    this.column.scrollTop();
-  }
+  };

  _subscribe (dispatch, id, tags = {}, local) {
    const { signedIn } = this.context.identity;
@ -157,14 +157,14 @@ class HashtagTimeline extends React.PureComponent {

  setRef = c => {
    this.column = c;
-  }
+  };

  handleLoadMore = maxId => {
    const { dispatch, params } = this.props;
    const { id, tags, local }  = params;

    dispatch(expandHashtagTimeline(id, { maxId, tags, local }));
-  }
+  };

  handleFollow = () => {
    const { dispatch, params, tag } = this.props;
@ -180,7 +180,7 @@ class HashtagTimeline extends React.PureComponent {
    } else {
      dispatch(followHashtag(id));
    }
-  }
+  };

  render () {
    const { hasUnread, columnId, multiColumn, tag, intl } = this.props;
--- a/app/javascript/mastodon/features/home_timeline/index.js
+++ b/app/javascript/mastodon/features/home_timeline/index.js
@ -58,24 +58,24 @@ class HomeTimeline extends React.PureComponent {
    } else {
      dispatch(addColumn('HOME', {}));
    }
-  }
+  };

  handleMove = (dir) => {
    const { columnId, dispatch } = this.props;
    dispatch(moveColumn(columnId, dir));
-  }
+  };

  handleHeaderClick = () => {
    this.column.scrollTop();
-  }
+  };

  setRef = c => {
    this.column = c;
-  }
+  };

  handleLoadMore = maxId => {
    this.props.dispatch(expandHomeTimeline({ maxId }));
-  }
+  };

  componentDidMount () {
    setTimeout(() => this.props.dispatch(fetchAnnouncements()), 700);
@ -114,7 +114,7 @@ class HomeTimeline extends React.PureComponent {
  handleToggleAnnouncementsClick = (e) => {
    e.stopPropagation();
    this.props.dispatch(toggleShowAnnouncements());
-  }
+  };

  render () {
    const { intl, hasUnread, columnId, multiColumn, hasAnnouncements, unreadAnnouncements, showAnnouncements } = this.props;
--- a/app/javascript/mastodon/features/interaction_modal/index.js
+++ b/app/javascript/mastodon/features/interaction_modal/index.js
@ -30,14 +30,14 @@ class Copypaste extends React.PureComponent {

  setRef = c => {
    this.input = c;
-  }
+  };

  handleInputClick = () => {
    this.setState({ copied: false });
    this.input.focus();
    this.input.select();
    this.input.setSelectionRange(0, this.input.value.length);
-  }
+  };

  handleButtonClick = () => {
    const { value } = this.props;
@ -45,7 +45,7 @@ class Copypaste extends React.PureComponent {
    this.input.blur();
    this.setState({ copied: true });
    this.timeout = setTimeout(() => this.setState({ copied: false }), 700);
-  }
+  };

  componentWillUnmount () {
    if (this.timeout) clearTimeout(this.timeout);
@ -86,7 +86,7 @@ class InteractionModal extends React.PureComponent {

  handleSignupClick = () => {
    this.props.onSignupClick();
-  }
+  };

  render () {
    const { url, type, displayNameHtml } = this.props;
--- a/app/javascript/mastodon/features/list_editor/components/edit_list_form.js
+++ b/app/javascript/mastodon/features/list_editor/components/edit_list_form.js
@ -33,16 +33,16 @@ class ListForm extends React.PureComponent {

  handleChange = e => {
    this.props.onChange(e.target.value);
-  }
+  };

  handleSubmit = e => {
    e.preventDefault();
    this.props.onSubmit();
-  }
+  };

  handleClick = () => {
    this.props.onSubmit();
-  }
+  };

  render () {
    const { value, disabled, intl } = this.props;
--- a/app/javascript/mastodon/features/list_editor/components/search.js
+++ b/app/javascript/mastodon/features/list_editor/components/search.js
@ -34,17 +34,17 @@ class Search extends React.PureComponent {

  handleChange = e => {
    this.props.onChange(e.target.value);
-  }
+  };

  handleKeyUp = e => {
    if (e.keyCode === 13) {
      this.props.onSubmit(this.props.value);
    }
-  }
+  };

  handleClear = () => {
    this.props.onClear();
-  }
+  };

  render () {
    const { value, intl } = this.props;
--- a/app/javascript/mastodon/features/list_timeline/index.js
+++ b/app/javascript/mastodon/features/list_timeline/index.js
@ -58,16 +58,16 @@ class ListTimeline extends React.PureComponent {
      dispatch(addColumn('LIST', { id: this.props.params.id }));
      this.context.router.history.push('/');
    }
-  }
+  };

  handleMove = (dir) => {
    const { columnId, dispatch } = this.props;
    dispatch(moveColumn(columnId, dir));
-  }
+  };

  handleHeaderClick = () => {
    this.column.scrollTop();
-  }
+  };

  componentDidMount () {
    const { dispatch } = this.props;
@ -105,16 +105,16 @@ class ListTimeline extends React.PureComponent {

  setRef = c => {
    this.column = c;
-  }
+  };

  handleLoadMore = maxId => {
    const { id } = this.props.params;
    this.props.dispatch(expandListTimeline(id, { maxId }));
-  }
+  };

  handleEditClick = () => {
    this.props.dispatch(openModal('LIST_EDITOR', { listId: this.props.params.id }));
-  }
+  };

  handleDeleteClick = () => {
    const { dispatch, columnId, intl } = this.props;
@ -133,13 +133,13 @@ class ListTimeline extends React.PureComponent {
        }
      },
    }));
-  }
+  };

  handleRepliesPolicyChange = ({ target }) => {
    const { dispatch } = this.props;
    const { id } = this.props.params;
    dispatch(updateList(id, undefined, false, target.value));
-  }
+  };

  render () {
    const { hasUnread, columnId, multiColumn, list, intl } = this.props;
--- a/app/javascript/mastodon/features/lists/components/new_list_form.js
+++ b/app/javascript/mastodon/features/lists/components/new_list_form.js
@ -34,16 +34,16 @@ class NewListForm extends React.PureComponent {

  handleChange = e => {
    this.props.onChange(e.target.value);
-  }
+  };

  handleSubmit = e => {
    e.preventDefault();
    this.props.onSubmit();
-  }
+  };

  handleClick = () => {
    this.props.onSubmit();
-  }
+  };

  render () {
    const { value, disabled, intl } = this.props;
--- a/app/javascript/mastodon/features/notifications/components/column_settings.js
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.js
@ -26,7 +26,7 @@ export default class ColumnSettings extends React.PureComponent {

  onPushChange = (path, checked) => {
    this.props.onChange(['push', ...path], checked);
-  }
+  };

  render () {
    const { settings, pushSettings, onChange, onClear, alertsEnabled, browserSupport, browserPermission, onRequestNotificationPermission } = this.props;
--- a/app/javascript/mastodon/features/notifications/components/notification.js
+++ b/app/javascript/mastodon/features/notifications/components/notification.js
@ -61,12 +61,12 @@ class Notification extends ImmutablePureComponent {
  handleMoveUp = () => {
    const { notification, onMoveUp } = this.props;
    onMoveUp(notification.get('id'));
-  }
+  };

  handleMoveDown = () => {
    const { notification, onMoveDown } = this.props;
    onMoveDown(notification.get('id'));
-  }
+  };

  handleOpen = () => {
    const { notification } = this.props;
@ -76,34 +76,34 @@ class Notification extends ImmutablePureComponent {
    } else {
      this.handleOpenProfile();
    }
-  }
+  };

  handleOpenProfile = () => {
    const { notification } = this.props;
    this.context.router.history.push(`/@${notification.getIn(['account', 'acct'])}`);
-  }
+  };

  handleMention = e => {
    e.preventDefault();

    const { notification, onMention } = this.props;
    onMention(notification.get('account'), this.context.router.history);
-  }
+  };

  handleHotkeyFavourite = () => {
    const { status } = this.props;
    if (status) this.props.onFavourite(status);
-  }
+  };

  handleHotkeyBoost = e => {
    const { status } = this.props;
    if (status) this.props.onReblog(status, e);
-  }
+  };

  handleHotkeyToggleHidden = () => {
    const { status } = this.props;
    if (status) this.props.onToggleHidden(status);
-  }
+  };

  getHandlers () {
    return {
--- a/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.js
+++ b/app/javascript/mastodon/features/notifications/components/notifications_permission_banner.js
@ -23,11 +23,11 @@ class NotificationsPermissionBanner extends React.PureComponent {

  handleClick = () => {
    this.props.dispatch(requestBrowserPermission());
-  }
+  };

  handleClose = () => {
    this.props.dispatch(changeSetting(['notifications', 'dismissPermissionBanner'], true));
-  }
+  };

  render () {
    const { intl } = this.props;
--- a/app/javascript/mastodon/features/notifications/components/setting_toggle.js
+++ b/app/javascript/mastodon/features/notifications/components/setting_toggle.js
@ -13,11 +13,11 @@ export default class SettingToggle extends React.PureComponent {
    onChange: PropTypes.func.isRequired,
    defaultValue: PropTypes.bool,
    disabled: PropTypes.bool,
-  }
+  };

  onChange = ({ target }) => {
    this.props.onChange(this.props.settingPath, target.checked);
-  }
+  };

  render () {
    const { prefix, settings, settingPath, label, defaultValue, disabled } = this.props;
--- a/app/javascript/mastodon/features/notifications/index.js
+++ b/app/javascript/mastodon/features/notifications/index.js
@ -136,30 +136,30 @@ class Notifications extends React.PureComponent {
    } else {
      dispatch(addColumn('NOTIFICATIONS', {}));
    }
-  }
+  };

  handleMove = (dir) => {
    const { columnId, dispatch } = this.props;
    dispatch(moveColumn(columnId, dir));
-  }
+  };

  handleHeaderClick = () => {
    this.column.scrollTop();
-  }
+  };

  setColumnRef = c => {
    this.column = c;
-  }
+  };

  handleMoveUp = id => {
    const elementIndex = this.props.notifications.findIndex(item => item !== null && item.get('id') === id) - 1;
    this._selectChild(elementIndex, true);
-  }
+  };

  handleMoveDown = id => {
    const elementIndex = this.props.notifications.findIndex(item => item !== null && item.get('id') === id) + 1;
    this._selectChild(elementIndex, false);
-  }
+  };

  _selectChild (index, align_top) {
    const container = this.column.node;
--- a/Show More
+++ b/Show More