Merge pull request #2151 from ClearlyClaire/glitch-soc/main

Merge upstream changes
2 years ago · 72a030c14c
parent 148744b14b a73b29e8cc
commit 72a030c14c
293 changed files with 750 additions and 483 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@ -32,10 +32,14 @@ module.exports = {
  parserOptions: {
    sourceType: 'module',
    ecmaFeatures: {
-      experimentalObjectRestSpread: true,
      jsx: true,
    },
    ecmaVersion: 2021,
+    requireConfigFile: false,
+    babelOptions: {
+      configFile: false,
+      presets: ['@babel/react', '@babel/env'],
+    },
  },

  settings: {
@ -214,4 +218,22 @@ module.exports = {
    'promise/no-nesting': 'off',
    'promise/no-promise-in-callback': 'off',
  },
+
+  overrides: [
+    {
+      files: [
+        '*.config.js',
+        '.*rc.js',
+        'ide-helper.js',
+      ],
+
+      env: {
+        commonjs: true,
+      },
+
+      parserOptions: {
+        sourceType: 'script',
+      },
+    },
+  ],
 };
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@ -40,7 +40,7 @@ jobs:
          ruby-version: .ruby-version
          bundler-cache: true

-      - run: yarn install --frozen-lockfile
+      - run: yarn --frozen-lockfile --production
      - name: Precompile assets
        # Previously had set this, but it's not supported
        # export NODE_OPTIONS=--openssl-legacy-provider
--- a/.rubocop.yml
+++ b/.rubocop.yml
@ -59,10 +59,49 @@ Metrics/BlockNesting:
  Exclude:
    - 'lib/mastodon/*_cli.rb'

+# Reason: Some Excluded files would be candidates for refactoring but not currently addressed
+# https://docs.rubocop.org/rubocop/cops_metrics.html#metricsclasslength
 Metrics/ClassLength:
-  CountAsOne: [array, heredoc]
+  CountAsOne: ['array', 'hash', 'heredoc', 'method_call']
  Exclude:
    - 'lib/mastodon/*_cli.rb'
+    - 'app/controllers/admin/accounts_controller.rb'
+    - 'app/controllers/api/base_controller.rb'
+    - 'app/controllers/api/v1/admin/accounts_controller.rb'
+    - 'app/controllers/application_controller.rb'
+    - 'app/controllers/auth/registrations_controller.rb'
+    - 'app/controllers/auth/sessions_controller.rb'
+    - 'app/lib/activitypub/activity.rb'
+    - 'app/lib/activitypub/activity/create.rb'
+    - 'app/lib/activitypub/tag_manager.rb'
+    - 'app/lib/feed_manager.rb'
+    - 'app/lib/link_details_extractor.rb'
+    - 'app/lib/request.rb'
+    - 'app/lib/text_formatter.rb'
+    - 'app/lib/user_settings_decorator.rb'
+    - 'app/mailers/user_mailer.rb'
+    - 'app/models/account.rb'
+    - 'app/models/admin/account_action.rb'
+    - 'app/models/form/account_batch.rb'
+    - 'app/models/media_attachment.rb'
+    - 'app/models/status.rb'
+    - 'app/models/tag.rb'
+    - 'app/models/user.rb'
+    - 'app/serializers/activitypub/actor_serializer.rb'
+    - 'app/serializers/activitypub/note_serializer.rb'
+    - 'app/serializers/rest/status_serializer.rb'
+    - 'app/services/account_search_service.rb'
+    - 'app/services/activitypub/process_account_service.rb'
+    - 'app/services/activitypub/process_status_update_service.rb'
+    - 'app/services/backup_service.rb'
+    - 'app/services/delete_account_service.rb'
+    - 'app/services/fan_out_on_write_service.rb'
+    - 'app/services/fetch_link_card_service.rb'
+    - 'app/services/import_service.rb'
+    - 'app/services/notify_service.rb'
+    - 'app/services/post_status_service.rb'
+    - 'app/services/update_status_service.rb'
+    - 'lib/paperclip/color_extractor.rb'

 Metrics/CyclomaticComplexity:
  Exclude:
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@ -243,10 +243,6 @@ Metrics/BlockNesting:
  Exclude:
    - 'lib/tasks/mastodon.rake'

-# Configuration parameters: CountComments, CountAsOne.
-Metrics/ClassLength:
-  Max: 375
-
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
  Max: 25
--- a/2
+++ b/2
@ -37,7 +37,7 @@ RUN apt-get update && \
    bundle config set --local without 'development test' && \
    bundle config set silence_root_warning true && \
    bundle install -j"$(nproc)" && \
-    yarn install --pure-lockfile --network-timeout 600000 && \
+    yarn install --pure-lockfile --production --network-timeout 600000 && \
    yarn cache clean

 FROM node:${NODE_VERSION}
--- a/app/javascript/flavours/glitch/base_polyfills.js
+++ b/app/javascript/flavours/glitch/base_polyfills.js
@ -4,7 +4,6 @@ import 'es6-symbol/implement';
 import includes from 'array-includes';
 import assign from 'object-assign';
 import values from 'object.values';
-import isNaN from 'is-nan';
 import { decode as decodeBase64 } from './utils/base64';
 import promiseFinally from 'promise.prototype.finally';

@ -20,10 +19,6 @@ if (!Object.values) {
  values.shim();
 }

-if (!Number.isNaN) {
-  Number.isNaN = isNaN;
-}
-
 promiseFinally.shim();

 if (!HTMLCanvasElement.prototype.toBlob) {
--- a/app/javascript/flavours/glitch/components/account.jsx
+++ b/app/javascript/flavours/glitch/components/account.jsx
@ -23,7 +23,6 @@ const messages = defineMessages({
  block: { id: 'account.block', defaultMessage: 'Block @{name}' },
 });

-export default @injectIntl
 class Account extends ImmutablePureComponent {

  static propTypes = {
@ -184,3 +183,5 @@ class Account extends ImmutablePureComponent {
  }

 }
+
+export default injectIntl(Account);
--- a/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx
+++ b/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx
@ -84,7 +84,6 @@ class Rule extends React.PureComponent {

 }

-export default @injectIntl
 class ReportReasonSelector extends React.PureComponent {

  static propTypes = {
@ -157,3 +156,5 @@ class ReportReasonSelector extends React.PureComponent {
  }

 }
+
+export default injectIntl(ReportReasonSelector);
--- a/app/javascript/flavours/glitch/components/column_header.jsx
+++ b/app/javascript/flavours/glitch/components/column_header.jsx
@ -12,7 +12,6 @@ const messages = defineMessages({
  moveRight: { id: 'column_header.moveRight_settings', defaultMessage: 'Move column to the right' },
 });

-export default @injectIntl
 class ColumnHeader extends React.PureComponent {

  static contextTypes = {
@ -218,3 +217,5 @@ class ColumnHeader extends React.PureComponent {
  }

 }
+
+export default injectIntl(ColumnHeader);
--- a/app/javascript/flavours/glitch/components/dismissable_banner.jsx
+++ b/app/javascript/flavours/glitch/components/dismissable_banner.jsx
@ -8,7 +8,6 @@ const messages = defineMessages({
  dismiss: { id: 'dismissable_banner.dismiss', defaultMessage: 'Dismiss' },
 });

-export default @injectIntl
 class DismissableBanner extends React.PureComponent {

  static propTypes = {
@ -49,3 +48,5 @@ class DismissableBanner extends React.PureComponent {
  }

 }
+
+export default injectIntl(DismissableBanner);
--- a/app/javascript/flavours/glitch/components/domain.jsx
+++ b/app/javascript/flavours/glitch/components/domain.jsx
@ -8,7 +8,6 @@ const messages = defineMessages({
  unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
 });

-export default @injectIntl
 class Account extends ImmutablePureComponent {

  static propTypes = {
@ -40,3 +39,5 @@ class Account extends ImmutablePureComponent {
  }

 }
+
+export default injectIntl(Account);
--- a/app/javascript/flavours/glitch/components/edited_timestamp/index.jsx
+++ b/app/javascript/flavours/glitch/components/edited_timestamp/index.jsx
@ -16,8 +16,6 @@ const mapDispatchToProps = (dispatch, { statusId }) => ({

 });

-export default @connect(null, mapDispatchToProps)
-@injectIntl
 class EditedTimestamp extends React.PureComponent {

  static propTypes = {
@ -68,3 +66,5 @@ class EditedTimestamp extends React.PureComponent {
  }

 }
+
+export default connect(null, mapDispatchToProps)(injectIntl(EditedTimestamp));
--- a/app/javascript/flavours/glitch/components/inline_account.jsx
+++ b/app/javascript/flavours/glitch/components/inline_account.jsx
@ -14,7 +14,6 @@ const makeMapStateToProps = () => {
  return mapStateToProps;
 };

-export default @connect(makeMapStateToProps)
 class InlineAccount extends React.PureComponent {

  static propTypes = {
@ -32,3 +31,5 @@ class InlineAccount extends React.PureComponent {
  }

 }
+
+export default connect(makeMapStateToProps)(InlineAccount);
--- a/app/javascript/flavours/glitch/components/load_gap.jsx
+++ b/app/javascript/flavours/glitch/components/load_gap.jsx
@ -7,7 +7,6 @@ const messages = defineMessages({
  load_more: { id: 'status.load_more', defaultMessage: 'Load more' },
 });

-export default @injectIntl
 class LoadGap extends React.PureComponent {

  static propTypes = {
@ -32,3 +31,5 @@ class LoadGap extends React.PureComponent {
  }

 }
+
+export default injectIntl(LoadGap);
--- a/app/javascript/flavours/glitch/components/media_gallery.jsx
+++ b/app/javascript/flavours/glitch/components/media_gallery.jsx
@ -244,7 +244,6 @@ class Item extends React.PureComponent {

 }

-export default @injectIntl
 class MediaGallery extends React.PureComponent {

  static propTypes = {
@ -406,3 +405,5 @@ class MediaGallery extends React.PureComponent {
  }

 }
+
+export default injectIntl(MediaGallery);
--- a/app/javascript/flavours/glitch/components/navigation_portal.jsx
+++ b/app/javascript/flavours/glitch/components/navigation_portal.jsx
@ -15,7 +15,6 @@ const DefaultNavigation = () => (
  </>
 );

-export default @withRouter
 class NavigationPortal extends React.PureComponent {

  render () {
@ -33,3 +32,5 @@ class NavigationPortal extends React.PureComponent {
  }

 }
+
+export default withRouter(NavigationPortal);
--- a/app/javascript/flavours/glitch/components/notification_purge_buttons.jsx
+++ b/app/javascript/flavours/glitch/components/notification_purge_buttons.jsx
@ -19,7 +19,6 @@ const messages = defineMessages({
  btnApply : { id: 'notification_purge.btn_apply', defaultMessage: 'Clear\nselected' },
 });

-export default @injectIntl
 class NotificationPurgeButtons extends ImmutablePureComponent {

  static propTypes = {
@ -57,3 +56,5 @@ class NotificationPurgeButtons extends ImmutablePureComponent {
  }

 }
+
+export default injectIntl(NotificationPurgeButtons);
--- a/app/javascript/flavours/glitch/components/picture_in_picture_placeholder.jsx
+++ b/app/javascript/flavours/glitch/components/picture_in_picture_placeholder.jsx
@ -6,7 +6,6 @@ import { connect } from 'react-redux';
 import { debounce } from 'lodash';
 import { FormattedMessage } from 'react-intl';

-export default @connect()
 class PictureInPicturePlaceholder extends React.PureComponent {

  static propTypes = {
@ -67,3 +66,5 @@ class PictureInPicturePlaceholder extends React.PureComponent {
  }

 }
+
+export default connect()(PictureInPicturePlaceholder);
--- a/app/javascript/flavours/glitch/components/poll.jsx
+++ b/app/javascript/flavours/glitch/components/poll.jsx
@ -31,7 +31,6 @@ const makeEmojiMap = record => record.get('emojis').reduce((obj, emoji) => {
  return obj;
 }, {});

-export default @injectIntl
 class Poll extends ImmutablePureComponent {

  static contextTypes = {
@ -234,3 +233,5 @@ class Poll extends ImmutablePureComponent {
  }

 }
+
+export default injectIntl(Poll);
--- a/app/javascript/flavours/glitch/components/relative_timestamp.jsx
+++ b/app/javascript/flavours/glitch/components/relative_timestamp.jsx
@ -121,7 +121,6 @@ const timeRemainingString = (intl, date, now, timeGiven = true) => {
  return relativeTime;
 };

-export default @injectIntl
 class RelativeTimestamp extends React.Component {

  static propTypes = {
@ -197,3 +196,5 @@ class RelativeTimestamp extends React.Component {
  }

 }
+
+export default injectIntl(RelativeTimestamp);
--- a/app/javascript/flavours/glitch/components/scrollable_list.jsx
+++ b/app/javascript/flavours/glitch/components/scrollable_list.jsx
@ -20,7 +20,6 @@ const mapStateToProps = (state, { scrollKey }) => {
  };
 };

-export default @connect(mapStateToProps, null, null, { forwardRef: true })
 class ScrollableList extends PureComponent {

  static contextTypes = {
@ -352,3 +351,5 @@ class ScrollableList extends PureComponent {
  }

 }
+
+export default connect(mapStateToProps, null, null, { forwardRef: true })(ScrollableList);
--- a/app/javascript/flavours/glitch/components/server_banner.jsx
+++ b/app/javascript/flavours/glitch/components/server_banner.jsx
@ -18,8 +18,6 @@ const mapStateToProps = state => ({
  server: state.getIn(['server', 'server']),
 });

-export default @connect(mapStateToProps)
-@injectIntl
 class ServerBanner extends React.PureComponent {

  static propTypes = {
@ -91,3 +89,5 @@ class ServerBanner extends React.PureComponent {
  }

 }
+
+export default connect(mapStateToProps)(injectIntl(ServerBanner));
--- a/app/javascript/flavours/glitch/components/status.jsx
+++ b/app/javascript/flavours/glitch/components/status.jsx
@ -56,7 +56,6 @@ export const defaultMediaVisibility = (status, settings) => {
  return (displayMedia !== 'hide_all' && !status.get('sensitive') || displayMedia === 'show_all');
 };

-export default @injectIntl
 class Status extends ImmutablePureComponent {

  static contextTypes = {
@ -830,3 +829,5 @@ class Status extends ImmutablePureComponent {
  }

 }
+
+export default injectIntl(Status);
--- a/app/javascript/flavours/glitch/components/status_action_bar.jsx
+++ b/app/javascript/flavours/glitch/components/status_action_bar.jsx
@ -46,7 +46,6 @@ const messages = defineMessages({
  openOriginalPage: { id: 'account.open_original_page', defaultMessage: 'Open original page' },
 });

-export default @injectIntl
 class StatusActionBar extends ImmutablePureComponent {

  static contextTypes = {
@ -339,3 +338,5 @@ class StatusActionBar extends ImmutablePureComponent {
  }

 }
+
+export default injectIntl(StatusActionBar);
--- a/app/javascript/flavours/glitch/components/status_content.jsx
+++ b/app/javascript/flavours/glitch/components/status_content.jsx
@ -104,8 +104,6 @@ const mapStateToProps = state => ({
  languages: state.getIn(['server', 'translationLanguages', 'items']),
 });

-export default @connect(mapStateToProps)
-@injectIntl
 class StatusContent extends React.PureComponent {

  static contextTypes = {
@ -468,3 +466,5 @@ class StatusContent extends React.PureComponent {
  }

 }
+
+export default connect(mapStateToProps)(injectIntl(StatusContent));
--- a/app/javascript/flavours/glitch/components/status_icons.jsx
+++ b/app/javascript/flavours/glitch/components/status_icons.jsx
@ -40,7 +40,6 @@ LanguageIcon.propTypes = {
  language: PropTypes.string.isRequired,
 };

-export default @injectIntl
 class StatusIcons extends React.PureComponent {

  static propTypes = {
@ -143,3 +142,5 @@ class StatusIcons extends React.PureComponent {
  }

 }
+
+export default injectIntl(StatusIcons);
--- a/app/javascript/flavours/glitch/components/status_visibility_icon.jsx
+++ b/app/javascript/flavours/glitch/components/status_visibility_icon.jsx
@ -12,7 +12,6 @@ const messages = defineMessages({
  direct: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
 });

-export default @injectIntl
 class VisibilityIcon extends ImmutablePureComponent {

  static propTypes = {
@ -49,3 +48,5 @@ class VisibilityIcon extends ImmutablePureComponent {
  }

 }
+
+export default injectIntl(VisibilityIcon);
--- a/app/javascript/flavours/glitch/features/about/index.jsx
+++ b/app/javascript/flavours/glitch/features/about/index.jsx
@ -80,8 +80,6 @@ class Section extends React.PureComponent {

 }

-export default @connect(mapStateToProps)
-@injectIntl
 class About extends React.PureComponent {

  static propTypes = {
@ -218,3 +216,5 @@ class About extends React.PureComponent {
  }

 }
+
+export default connect(mapStateToProps)(injectIntl(About));
--- a/app/javascript/flavours/glitch/features/account/components/account_note.jsx
+++ b/app/javascript/flavours/glitch/features/account/components/account_note.jsx
@ -10,7 +10,6 @@ const messages = defineMessages({
  placeholder: { id: 'account_note.glitch_placeholder', defaultMessage: 'No comment provided' },
 });

-export default @injectIntl
 class Header extends ImmutablePureComponent {

  static propTypes = {
@ -102,3 +101,5 @@ class Header extends ImmutablePureComponent {
  }

 }
+
+export default injectIntl(Header);
--- a/app/javascript/flavours/glitch/features/account/components/action_bar.jsx
+++ b/app/javascript/flavours/glitch/features/account/components/action_bar.jsx
@ -8,7 +8,6 @@ import { me, isStaff } from 'flavours/glitch/initial_state';
 import { profileLink, accountAdminLink } from 'flavours/glitch/utils/backend_links';
 import Icon from 'flavours/glitch/components/icon';

-export default @injectIntl
 class ActionBar extends React.PureComponent {

  static propTypes = {
@ -83,3 +82,5 @@ class ActionBar extends React.PureComponent {
  }

 }
+
+export default injectIntl(ActionBar);
--- a/app/javascript/flavours/glitch/features/account/components/featured_tags.jsx
+++ b/app/javascript/flavours/glitch/features/account/components/featured_tags.jsx
@ -10,7 +10,6 @@ const messages = defineMessages({
  empty: { id: 'account.featured_tags.last_status_never', defaultMessage: 'No posts' },
 });

-export default @injectIntl
 class FeaturedTags extends ImmutablePureComponent {

  static contextTypes = {
@ -51,3 +50,5 @@ class FeaturedTags extends ImmutablePureComponent {
  }

 }
+
+export default injectIntl(FeaturedTags);
--- a/app/javascript/flavours/glitch/features/account/components/header.jsx
+++ b/app/javascript/flavours/glitch/features/account/components/header.jsx
@ -76,7 +76,6 @@ const dateFormatOptions = {
  minute: '2-digit',
 };

-export default @injectIntl
 class Header extends ImmutablePureComponent {

  static contextTypes = {
@ -403,3 +402,5 @@ class Header extends ImmutablePureComponent {
  }

 }
+
+export default injectIntl(Header);
--- a/app/javascript/flavours/glitch/features/account/components/profile_column_header.jsx
+++ b/app/javascript/flavours/glitch/features/account/components/profile_column_header.jsx
@ -7,7 +7,6 @@ const messages = defineMessages({
  profile: { id: 'column_header.profile', defaultMessage: 'Profile' },
 });

-export default @injectIntl
 class ProfileColumnHeader extends React.PureComponent {

  static propTypes = {
@ -31,3 +30,5 @@ class ProfileColumnHeader extends React.PureComponent {
  }

 }
+
+export default injectIntl(ProfileColumnHeader);
--- a/app/javascript/flavours/glitch/features/account/navigation.jsx
+++ b/app/javascript/flavours/glitch/features/account/navigation.jsx
@ -19,7 +19,6 @@ const mapStateToProps = (state, { match: { params: { acct } } }) => {
  };
 };

-export default @connect(mapStateToProps)
 class AccountNavigation extends React.PureComponent {

  static propTypes = {
@ -50,3 +49,5 @@ class AccountNavigation extends React.PureComponent {
  }

 }
+
+export default connect(mapStateToProps)(AccountNavigation);
--- a/app/javascript/flavours/glitch/features/account_gallery/index.jsx
+++ b/app/javascript/flavours/glitch/features/account_gallery/index.jsx
@ -58,7 +58,6 @@ class LoadMoreMedia extends ImmutablePureComponent {

 }

-export default @connect(mapStateToProps)
 class AccountGallery extends ImmutablePureComponent {

  static propTypes = {
@ -223,3 +222,5 @@ class AccountGallery extends ImmutablePureComponent {
  }

 }
+
+export default connect(mapStateToProps)(AccountGallery);
--- a/app/javascript/flavours/glitch/features/account_timeline/components/limited_account_hint.jsx
+++ b/app/javascript/flavours/glitch/features/account_timeline/components/limited_account_hint.jsx
@ -14,7 +14,6 @@ const mapDispatchToProps = (dispatch, { accountId }) => ({

 });

-export default @connect(() => {}, mapDispatchToProps)
 class LimitedAccountHint extends React.PureComponent {

  static propTypes = {
@ -34,3 +33,5 @@ class LimitedAccountHint extends React.PureComponent {
  }

 }
+
+export default connect(() => {}, mapDispatchToProps)(LimitedAccountHint);
--- a/app/javascript/flavours/glitch/features/account_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/account_timeline/index.jsx
@ -62,7 +62,6 @@ RemoteHint.propTypes = {
  url: PropTypes.string.isRequired,
 };

-export default @connect(mapStateToProps)
 class AccountTimeline extends ImmutablePureComponent {

  static propTypes = {
@ -207,3 +206,5 @@ class AccountTimeline extends ImmutablePureComponent {
  }

 }
+
+export default connect(mapStateToProps)(AccountTimeline);
--- a/app/javascript/flavours/glitch/features/audio/index.jsx
+++ b/app/javascript/flavours/glitch/features/audio/index.jsx
@ -22,7 +22,6 @@ const messages = defineMessages({
 const TICK_SIZE = 10;
 const PADDING   = 180;

-export default @injectIntl
 class Audio extends React.PureComponent {

  static propTypes = {
@ -575,3 +574,5 @@ class Audio extends React.PureComponent {
  }

 }
+
+export default injectIntl(Audio);
--- a/app/javascript/flavours/glitch/features/blocks/index.jsx
+++ b/app/javascript/flavours/glitch/features/blocks/index.jsx
@ -22,8 +22,6 @@ const mapStateToProps = state => ({
  isLoading: state.getIn(['user_lists', 'blocks', 'isLoading'], true),
 });

-export default @connect(mapStateToProps)
-@injectIntl
 class Blocks extends ImmutablePureComponent {

  static propTypes = {
@ -77,3 +75,5 @@ class Blocks extends ImmutablePureComponent {
  }

 }
+
+export default connect(mapStateToProps)(injectIntl(Blocks));
--- a/app/javascript/flavours/glitch/features/bookmarked_statuses/index.jsx
+++ b/app/javascript/flavours/glitch/features/bookmarked_statuses/index.jsx
@ -22,8 +22,6 @@ const mapStateToProps = state => ({
  hasMore: !!state.getIn(['status_lists', 'bookmarks', 'next']),
 });

-export default @connect(mapStateToProps)
-@injectIntl
 class Bookmarks extends ImmutablePureComponent {

  static propTypes = {
@ -106,3 +104,5 @@ class Bookmarks extends ImmutablePureComponent {
  }

 }
+
+export default connect(mapStateToProps)(injectIntl(Bookmarks));
--- a/app/javascript/flavours/glitch/features/closed_registrations_modal/index.jsx
+++ b/app/javascript/flavours/glitch/features/closed_registrations_modal/index.jsx
@ -9,7 +9,6 @@ const mapStateToProps = state => ({
  message: state.getIn(['server', 'server', 'registrations', 'message']),
 });

-export default @connect(mapStateToProps)
 class ClosedRegistrationsModal extends ImmutablePureComponent {

  componentDidMount () {
@ -73,3 +72,5 @@ class ClosedRegistrationsModal extends ImmutablePureComponent {
  }

 }
+
+export default connect(mapStateToProps)(ClosedRegistrationsModal);
--- a/app/javascript/flavours/glitch/features/community_timeline/components/column_settings.jsx
+++ b/app/javascript/flavours/glitch/features/community_timeline/components/column_settings.jsx
@ -10,7 +10,6 @@ const messages = defineMessages({
  settings: { id: 'home.settings', defaultMessage: 'Column settings' },
 });

-export default @injectIntl
 class ColumnSettings extends React.PureComponent {

  static propTypes = {
@ -39,3 +38,5 @@ class ColumnSettings extends React.PureComponent {
  }

 }
+
+export default injectIntl(ColumnSettings);
--- a/app/javascript/flavours/glitch/features/community_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/community_timeline/index.jsx
@ -32,8 +32,6 @@ const mapStateToProps = (state, { columnId }) => {
  };
 };

-export default @connect(mapStateToProps)
-@injectIntl
 class CommunityTimeline extends React.PureComponent {

  static defaultProps = {
@ -162,3 +160,5 @@ class CommunityTimeline extends React.PureComponent {
  }

 }
+
+export default connect(mapStateToProps)(injectIntl(CommunityTimeline));
--- a/app/javascript/flavours/glitch/features/compose/components/action_bar.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/action_bar.jsx
@ -21,7 +21,6 @@ const messages = defineMessages({
  bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
 });

-export default @injectIntl
 class ActionBar extends React.PureComponent {

  static propTypes = {
@ -66,3 +65,5 @@ class ActionBar extends React.PureComponent {
  }

 }
+
+export default injectIntl(ActionBar);
--- a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
@ -32,7 +32,6 @@ const messages = defineMessages({
  spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Write your warning here' },
 });

-export default @injectIntl
 class ComposeForm extends ImmutablePureComponent {

  static contextTypes = {
@ -389,3 +388,5 @@ class ComposeForm extends ImmutablePureComponent {
  }

 }
+
+export default injectIntl(ComposeForm);
--- a/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
@ -145,8 +145,7 @@ class ModifierPicker extends React.PureComponent {

 }

-@injectIntl
-class EmojiPickerMenu extends React.PureComponent {
+class EmojiPickerMenuImpl extends React.PureComponent {

  static propTypes = {
    custom_emojis: ImmutablePropTypes.list,
@ -307,7 +306,8 @@ class EmojiPickerMenu extends React.PureComponent {

 }

-export default @injectIntl
+const EmojiPickerMenu = injectIntl(EmojiPickerMenuImpl);
+
 class EmojiPickerDropdown extends React.PureComponent {

  static propTypes = {
@ -411,3 +411,5 @@ class EmojiPickerDropdown extends React.PureComponent {
  }

 }
+
+export default injectIntl(EmojiPickerDropdown);
--- a/app/javascript/flavours/glitch/features/compose/components/header.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/header.jsx
@ -45,7 +45,6 @@ const messages = defineMessages({
  },
 });

-export default @injectIntl
 class Header extends ImmutablePureComponent {

  static propTypes = {
@ -134,3 +133,5 @@ class Header extends ImmutablePureComponent {
  }

 }
+
+export default injectIntl(Header);
--- a/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx
@ -237,7 +237,6 @@ class LanguageDropdownMenu extends React.PureComponent {

 }

-export default @injectIntl
 class LanguageDropdown extends React.PureComponent {

  static propTypes = {
@ -325,3 +324,5 @@ class LanguageDropdown extends React.PureComponent {
  }

 }
+
+export default injectIntl(LanguageDropdown);
--- a/app/javascript/flavours/glitch/features/compose/components/options.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/options.jsx
@ -83,8 +83,11 @@ const messages = defineMessages({
  },
 });

-@connect((state, { name }) => ({ checked: state.getIn(['compose', 'advanced_options', name]) }))
-class ToggleOption extends ImmutablePureComponent {
+const mapStateToProps = (state, { name }) => ({
+  checked: state.getIn(['compose', 'advanced_options', name]),
+});
+
+class ToggleOptionImpl extends ImmutablePureComponent {

  static propTypes = {
    name: PropTypes.string.isRequired,
@ -113,7 +116,8 @@ class ToggleOption extends ImmutablePureComponent {

 }

-export default @injectIntl
+const ToggleOption = connect(mapStateToProps)(ToggleOptionImpl);
+
 class ComposerOptions extends ImmutablePureComponent {

  static propTypes = {
@ -315,3 +319,5 @@ class ComposerOptions extends ImmutablePureComponent {
  }

 }
+
+export default injectIntl(ComposerOptions);
--- a/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/poll_form.jsx
@ -21,8 +21,7 @@ const messages = defineMessages({
  days: { id: 'intervals.full.days', defaultMessage: '{number, plural, one {# day} other {# days}}' },
 });

-@injectIntl
-class Option extends React.PureComponent {
+class OptionIntl extends React.PureComponent {

  static propTypes = {
    title: PropTypes.string.isRequired,
@ -92,8 +91,8 @@ class Option extends React.PureComponent {

 }

-export default
-@injectIntl
+const Option = injectIntl(OptionIntl);
+
 class PollForm extends ImmutablePureComponent {

  static propTypes = {
@ -168,3 +167,5 @@ class PollForm extends ImmutablePureComponent {
  }

 }
+
+export default injectIntl(PollForm);
--- a/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx
@ -16,7 +16,6 @@ const messages = defineMessages({
  change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' },
 });

-export default @injectIntl
 class PrivacyDropdown extends React.PureComponent {

  static propTypes = {
@ -86,3 +85,5 @@ class PrivacyDropdown extends React.PureComponent {
  }

 }
+
+export default injectIntl(PrivacyDropdown);
--- a/app/javascript/flavours/glitch/features/compose/components/publisher.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/publisher.jsx
@ -26,7 +26,6 @@ const messages = defineMessages({
  saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Save changes' },
 });

-export default @injectIntl
 class Publisher extends ImmutablePureComponent {

  static propTypes = {
@ -97,3 +96,5 @@ class Publisher extends ImmutablePureComponent {
  }

 }
+
+export default injectIntl(Publisher);
--- a/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx
@ -19,7 +19,6 @@ const messages = defineMessages({
 });


-export default @injectIntl
 class ReplyIndicator extends ImmutablePureComponent {

  static propTypes = {
@ -80,3 +79,5 @@ class ReplyIndicator extends ImmutablePureComponent {
  }

 }
+
+export default injectIntl(ReplyIndicator);
--- a/app/javascript/flavours/glitch/features/compose/components/search.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/search.jsx
@ -45,7 +45,6 @@ class SearchPopout extends React.PureComponent {
 }

 //  The component.
-export default @injectIntl
 class Search extends React.PureComponent {

  static contextTypes = {
@ -166,3 +165,5 @@ class Search extends React.PureComponent {
  }

 }
+
+export default injectIntl(Search);
--- a/app/javascript/flavours/glitch/features/compose/components/search_results.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/search_results.jsx
@ -14,7 +14,6 @@ const messages = defineMessages({
  dismissSuggestion: { id: 'suggestions.dismiss', defaultMessage: 'Dismiss suggestion' },
 });

-export default @injectIntl
 class SearchResults extends ImmutablePureComponent {

  static propTypes = {
@ -139,3 +138,5 @@ class SearchResults extends ImmutablePureComponent {
  }

 }
+
+export default injectIntl(SearchResults);
--- a/app/javascript/flavours/glitch/features/compose/components/textarea_icons.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/textarea_icons.jsx
@ -27,7 +27,6 @@ const iconMap = [
  ['threaded_mode', 'comments', messages.threadedMode],
 ];

-export default @injectIntl
 class TextareaIcons extends ImmutablePureComponent {

  static propTypes = {
@ -58,3 +57,5 @@ class TextareaIcons extends ImmutablePureComponent {
  }

 }
+
+export default injectIntl(TextareaIcons);
--- a/app/javascript/flavours/glitch/features/compose/index.jsx
+++ b/app/javascript/flavours/glitch/features/compose/index.jsx
@ -39,8 +39,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
  },
 });

-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
 class Compose extends React.PureComponent {

  static propTypes = {
@ -114,3 +112,5 @@ class Compose extends React.PureComponent {
  }

 }
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(Compose));
--- a/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.jsx
+++ b/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.jsx
@ -10,7 +10,6 @@ const messages = defineMessages({
  settings: { id: 'home.settings', defaultMessage: 'Column settings' },
 });

-export default @injectIntl
 class ColumnSettings extends React.PureComponent {

  static propTypes = {
@ -40,3 +39,5 @@ class ColumnSettings extends React.PureComponent {
  }

 }
+
+export default injectIntl(ColumnSettings);
--- a/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx
+++ b/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx
@ -24,7 +24,6 @@ const messages = defineMessages({
  unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
 });

-export default @injectIntl
 class Conversation extends ImmutablePureComponent {

  static contextTypes = {
@ -230,3 +229,5 @@ class Conversation extends ImmutablePureComponent {
  }

 }
+
+export default injectIntl(Conversation);
--- a/app/javascript/flavours/glitch/features/direct_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/direct_timeline/index.jsx
@ -22,8 +22,6 @@ const mapStateToProps = state => ({
  conversationsMode: state.getIn(['settings', 'direct', 'conversations']),
 });

-export default @connect(mapStateToProps)
-@injectIntl
 class DirectTimeline extends React.PureComponent {

  static propTypes = {
@ -154,3 +152,5 @@ class DirectTimeline extends React.PureComponent {
  }

 }
+
+export default connect(mapStateToProps)(injectIntl(DirectTimeline));
--- a/app/javascript/flavours/glitch/features/directory/components/account_card.jsx
+++ b/app/javascript/flavours/glitch/features/directory/components/account_card.jsx
@ -93,9 +93,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({

 });

-export default
-@injectIntl
-@connect(makeMapStateToProps, mapDispatchToProps)
 class AccountCard extends ImmutablePureComponent {

  static propTypes = {
@ -246,3 +243,5 @@ class AccountCard extends ImmutablePureComponent {
  }

 }
+
+export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(AccountCard));
--- a/app/javascript/flavours/glitch/features/directory/index.jsx
+++ b/app/javascript/flavours/glitch/features/directory/index.jsx
@ -29,8 +29,6 @@ const mapStateToProps = state => ({
  domain: state.getIn(['meta', 'domain']),
 });

-export default @connect(mapStateToProps)
-@injectIntl
 class Directory extends React.PureComponent {

  static contextTypes = {
@ -176,3 +174,5 @@ class Directory extends React.PureComponent {
  }

 }
+
+export default connect(mapStateToProps)(injectIntl(Directory));
--- a/app/javascript/flavours/glitch/features/domain_blocks/index.jsx
+++ b/app/javascript/flavours/glitch/features/domain_blocks/index.jsx
@ -23,8 +23,6 @@ const mapStateToProps = state => ({
  hasMore: !!state.getIn(['domain_lists', 'blocks', 'next']),
 });

-export default @connect(mapStateToProps)
-@injectIntl
 class Blocks extends ImmutablePureComponent {

  static propTypes = {
@ -81,3 +79,5 @@ class Blocks extends ImmutablePureComponent {
  }

 }
+
+export default connect(mapStateToProps)(injectIntl(Blocks));
--- a/app/javascript/flavours/glitch/features/explore/index.jsx
+++ b/app/javascript/flavours/glitch/features/explore/index.jsx
@ -24,8 +24,6 @@ const mapStateToProps = state => ({
  isSearching: state.getIn(['search', 'submitted']) || !showTrends,
 });

-export default @connect(mapStateToProps)
-@injectIntl
 class Explore extends React.PureComponent {

  static contextTypes = {
@ -105,3 +103,5 @@ class Explore extends React.PureComponent {
  }

 }
+
+export default connect(mapStateToProps)(injectIntl(Explore));
--- a/app/javascript/flavours/glitch/features/explore/links.jsx
+++ b/app/javascript/flavours/glitch/features/explore/links.jsx
@ -13,7 +13,6 @@ const mapStateToProps = state => ({
  isLoading: state.getIn(['trends', 'links', 'isLoading']),
 });

-export default @connect(mapStateToProps)
 class Links extends React.PureComponent {

  static propTypes = {
@ -68,3 +67,5 @@ class Links extends React.PureComponent {
  }

 }
+
+export default connect(mapStateToProps)(Links);
--- a/app/javascript/flavours/glitch/features/explore/results.jsx
+++ b/app/javascript/flavours/glitch/features/explore/results.jsx
@ -42,8 +42,6 @@ const renderStatuses = (results, onLoadMore) => appendLoadMore('statuses', resul
  <Status key={`status-${item}`} id={item} />
 )), onLoadMore);

-export default @connect(mapStateToProps)
-@injectIntl
 class Results extends React.PureComponent {

  static propTypes = {
@ -124,3 +122,5 @@ class Results extends React.PureComponent {
  }

 }
+
+export default connect(mapStateToProps)(injectIntl(Results));
--- a/app/javascript/flavours/glitch/features/explore/statuses.jsx
+++ b/app/javascript/flavours/glitch/features/explore/statuses.jsx
@ -14,7 +14,6 @@ const mapStateToProps = state => ({
  hasMore: !!state.getIn(['status_lists', 'trending', 'next']),
 });

-export default @connect(mapStateToProps)
 class Statuses extends React.PureComponent {

  static propTypes = {
@ -62,3 +61,5 @@ class Statuses extends React.PureComponent {
  }

 }
+
+export default connect(mapStateToProps)(Statuses);
--- a/app/javascript/flavours/glitch/features/explore/suggestions.jsx
+++ b/app/javascript/flavours/glitch/features/explore/suggestions.jsx
@ -12,7 +12,6 @@ const mapStateToProps = state => ({
  isLoading: state.getIn(['suggestions', 'isLoading']),
 });

-export default @connect(mapStateToProps)
 class Suggestions extends React.PureComponent {

  static propTypes = {
@ -54,3 +53,5 @@ class Suggestions extends React.PureComponent {
  }

 }
+
+export default connect(mapStateToProps)(Suggestions);
--- a/app/javascript/flavours/glitch/features/explore/tags.jsx
+++ b/app/javascript/flavours/glitch/features/explore/tags.jsx
@ -13,7 +13,6 @@ const mapStateToProps = state => ({
  isLoadingHashtags: state.getIn(['trends', 'tags', 'isLoading']),
 });

-export default @connect(mapStateToProps)
 class Tags extends React.PureComponent {

  static propTypes = {
@ -60,3 +59,5 @@ class Tags extends React.PureComponent {
  }

 }
+
+export default connect(mapStateToProps)(Tags);
--- a/app/javascript/flavours/glitch/features/favourited_statuses/index.jsx
+++ b/app/javascript/flavours/glitch/features/favourited_statuses/index.jsx
@ -22,8 +22,6 @@ const mapStateToProps = state => ({
  hasMore: !!state.getIn(['status_lists', 'favourites', 'next']),
 });

-export default @connect(mapStateToProps)
-@injectIntl
 class Favourites extends ImmutablePureComponent {

  static propTypes = {
@ -106,3 +104,5 @@ class Favourites extends ImmutablePureComponent {
  }

 }
+
+export default connect(mapStateToProps)(injectIntl(Favourites));
--- a/app/javascript/flavours/glitch/features/favourites/index.jsx
+++ b/app/javascript/flavours/glitch/features/favourites/index.jsx
@ -22,8 +22,6 @@ const mapStateToProps = (state, props) => ({
  accountIds: state.getIn(['user_lists', 'favourited_by', props.params.statusId]),
 });

-export default @connect(mapStateToProps)
-@injectIntl
 class Favourites extends ImmutablePureComponent {

  static propTypes = {
@ -101,3 +99,5 @@ class Favourites extends ImmutablePureComponent {
  }

 }
+
+export default connect(mapStateToProps)(injectIntl(Favourites));
--- a/app/javascript/flavours/glitch/features/filters/added_to_filter.jsx
+++ b/app/javascript/flavours/glitch/features/filters/added_to_filter.jsx
@ -10,7 +10,6 @@ const mapStateToProps = (state, { filterId }) => ({
  filter: state.getIn(['filters', filterId]),
 });

-export default @connect(mapStateToProps)
 class AddedToFilter extends React.PureComponent {

  static propTypes = {
@ -100,3 +99,5 @@ class AddedToFilter extends React.PureComponent {
  }

 }
+
+export default connect(mapStateToProps)(AddedToFilter);
--- a/app/javascript/flavours/glitch/features/filters/select_filter.jsx
+++ b/app/javascript/flavours/glitch/features/filters/select_filter.jsx
@ -22,8 +22,6 @@ const mapStateToProps = (state, { contextType }) => ({
  ]),
 });

-export default @connect(mapStateToProps)
-@injectIntl
 class SelectFilter extends React.PureComponent {

  static propTypes = {
@ -190,3 +188,5 @@ class SelectFilter extends React.PureComponent {
  }

 }
+
+export default connect(mapStateToProps)(injectIntl(SelectFilter));
--- a/app/javascript/flavours/glitch/features/follow_recommendations/components/account.jsx
+++ b/app/javascript/flavours/glitch/features/follow_recommendations/components/account.jsx
@ -32,8 +32,6 @@ const getFirstSentence = str => {
  return arr[0];
 };

-export default @connect(makeMapStateToProps)
-@injectIntl
 class Account extends ImmutablePureComponent {

  static propTypes = {
@ -83,3 +81,5 @@ class Account extends ImmutablePureComponent {
  }

 }
+
+export default connect(makeMapStateToProps)(injectIntl(Account));
--- a/app/javascript/flavours/glitch/features/follow_recommendations/index.jsx
+++ b/app/javascript/flavours/glitch/features/follow_recommendations/index.jsx
@ -19,7 +19,6 @@ const mapStateToProps = state => ({
  isLoading: state.getIn(['suggestions', 'isLoading']),
 });

-export default @connect(mapStateToProps)
 class FollowRecommendations extends ImmutablePureComponent {

  static contextTypes = {
@ -114,3 +113,5 @@ class FollowRecommendations extends ImmutablePureComponent {
  }

 }
+
+export default connect(mapStateToProps)(FollowRecommendations);
--- a/app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.jsx
+++ b/app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.jsx
@ -13,7 +13,6 @@ const messages = defineMessages({
  reject: { id: 'follow_request.reject', defaultMessage: 'Reject' },
 });

-export default @injectIntl
 class AccountAuthorize extends ImmutablePureComponent {

  static propTypes = {
@ -47,3 +46,5 @@ class AccountAuthorize extends ImmutablePureComponent {
  }

 }
+
+export default injectIntl(AccountAuthorize);
--- a/app/javascript/flavours/glitch/features/follow_requests/index.jsx
+++ b/app/javascript/flavours/glitch/features/follow_requests/index.jsx
@ -25,8 +25,6 @@ const mapStateToProps = state => ({
  domain: state.getIn(['meta', 'domain']),
 });

-export default @connect(mapStateToProps)
-@injectIntl
 class FollowRequests extends ImmutablePureComponent {

  static propTypes = {
@ -90,3 +88,5 @@ class FollowRequests extends ImmutablePureComponent {
  }

 }
+
+export default connect(mapStateToProps)(injectIntl(FollowRequests));
--- a/app/javascript/flavours/glitch/features/followed_tags/index.jsx
+++ b/app/javascript/flavours/glitch/features/followed_tags/index.jsx
@ -22,8 +22,6 @@ const mapStateToProps = state => ({
  hasMore: !!state.getIn(['followed_tags', 'next']),
 });

-export default @connect(mapStateToProps)
-@injectIntl
 class FollowedTags extends ImmutablePureComponent {

  static propTypes = {
@ -87,3 +85,5 @@ class FollowedTags extends ImmutablePureComponent {
  }

 }
+
+export default connect(mapStateToProps)(injectIntl(FollowedTags));
--- a/app/javascript/flavours/glitch/features/followers/index.jsx
+++ b/app/javascript/flavours/glitch/features/followers/index.jsx
@ -53,7 +53,6 @@ RemoteHint.propTypes = {
  url: PropTypes.string.isRequired,
 };

-export default @connect(mapStateToProps)
 class Followers extends ImmutablePureComponent {

  static propTypes = {
@ -172,3 +171,5 @@ class Followers extends ImmutablePureComponent {
  }

 }
+
+export default connect(mapStateToProps)(Followers);
--- a/app/javascript/flavours/glitch/features/following/index.jsx
+++ b/app/javascript/flavours/glitch/features/following/index.jsx
@ -53,7 +53,6 @@ RemoteHint.propTypes = {
  url: PropTypes.string.isRequired,
 };

-export default @connect(mapStateToProps)
 class Following extends ImmutablePureComponent {

  static propTypes = {
@ -172,3 +171,5 @@ class Following extends ImmutablePureComponent {
  }

 }
+
+export default connect(mapStateToProps)(Following);
--- a/app/javascript/flavours/glitch/features/getting_started/components/announcements.jsx
+++ b/app/javascript/flavours/glitch/features/getting_started/components/announcements.jsx
@ -355,7 +355,6 @@ class Announcement extends ImmutablePureComponent {

 }

-export default @injectIntl
 class Announcements extends ImmutablePureComponent {

  static propTypes = {
@ -447,3 +446,5 @@ class Announcements extends ImmutablePureComponent {
  }

 }
+
+export default injectIntl(Announcements);
--- a/app/javascript/flavours/glitch/features/getting_started/index.jsx
+++ b/app/javascript/flavours/glitch/features/getting_started/index.jsx
@ -79,8 +79,6 @@ const badgeDisplay = (number, limit) => {

 const NAVIGATION_PANEL_BREAKPOINT = 600 + (285 * 2) + (10 * 2);

-export default @connect(makeMapStateToProps, mapDispatchToProps)
- @injectIntl
 class GettingStarted extends ImmutablePureComponent {

  static contextTypes = {
@ -202,3 +200,5 @@ class GettingStarted extends ImmutablePureComponent {
  }

 }
+
+export default connect(makeMapStateToProps, mapDispatchToProps)(injectIntl(GettingStarted));
--- a/app/javascript/flavours/glitch/features/getting_started_misc/index.jsx
+++ b/app/javascript/flavours/glitch/features/getting_started_misc/index.jsx
@ -22,9 +22,7 @@ const messages = defineMessages({
  featured_users: { id: 'navigation_bar.featured_users', defaultMessage: 'Featured users' },
 });

-export default @connect()
-@injectIntl
-class gettingStartedMisc extends ImmutablePureComponent {
+class GettingStartedMisc extends ImmutablePureComponent {

  static contextTypes = {
    router: PropTypes.object.isRequired,
@ -68,3 +66,5 @@ class gettingStartedMisc extends ImmutablePureComponent {
  }

 }
+
+export default connect()(injectIntl(GettingStartedMisc));
--- a/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.jsx
+++ b/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.jsx
@ -12,7 +12,6 @@ const messages = defineMessages({
  noOptions: { id: 'hashtag.column_settings.select.no_options_message', defaultMessage: 'No suggestions found' },
 });

-export default @injectIntl
 class ColumnSettings extends React.PureComponent {

  static propTypes = {
@ -131,3 +130,5 @@ class ColumnSettings extends React.PureComponent {
  }

 }
+
+export default injectIntl(ColumnSettings);
--- a/app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx
@ -26,8 +26,6 @@ const mapStateToProps = (state, props) => ({
  tag: state.getIn(['tags', props.params.id]),
 });

-export default @connect(mapStateToProps)
-@injectIntl
 class HashtagTimeline extends React.PureComponent {

  disconnects = [];
@ -235,3 +233,5 @@ class HashtagTimeline extends React.PureComponent {
  }

 }
+
+export default connect(mapStateToProps)(injectIntl(HashtagTimeline));
--- a/app/javascript/flavours/glitch/features/home_timeline/components/column_settings.jsx
+++ b/app/javascript/flavours/glitch/features/home_timeline/components/column_settings.jsx
@ -10,7 +10,6 @@ const messages = defineMessages({
  settings: { id: 'home.settings', defaultMessage: 'Column settings' },
 });

-export default @injectIntl
 class ColumnSettings extends React.PureComponent {

  static propTypes = {
@ -48,3 +47,5 @@ class ColumnSettings extends React.PureComponent {
  }

 }
+
+export default injectIntl(ColumnSettings);
--- a/app/javascript/flavours/glitch/features/home_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/home_timeline/index.jsx
@ -31,8 +31,6 @@ const mapStateToProps = state => ({
  regex: state.getIn(['settings', 'home', 'regex', 'body']),
 });

-export default @connect(mapStateToProps)
-@injectIntl
 class HomeTimeline extends React.PureComponent {

  static contextTypes = {
@ -176,3 +174,5 @@ class HomeTimeline extends React.PureComponent {
  }

 }
+
+export default connect(mapStateToProps)(injectIntl(HomeTimeline));
--- a/app/javascript/flavours/glitch/features/interaction_modal/index.jsx
+++ b/app/javascript/flavours/glitch/features/interaction_modal/index.jsx
@ -74,7 +74,6 @@ class Copypaste extends React.PureComponent {

 }

-export default @connect(mapStateToProps, mapDispatchToProps)
 class InteractionModal extends React.PureComponent {

  static propTypes = {
@ -159,3 +158,5 @@ class InteractionModal extends React.PureComponent {
  }

 }
+
+export default connect(mapStateToProps, mapDispatchToProps)(InteractionModal);
--- a/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx
+++ b/app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx
@ -15,8 +15,6 @@ const mapStateToProps = state => ({
  collapseEnabled: state.getIn(['local_settings', 'collapsed', 'enabled']),
 });

-export default @connect(mapStateToProps)
-@injectIntl
 class KeyboardShortcuts extends ImmutablePureComponent {

  static propTypes = {
@ -147,3 +145,5 @@ class KeyboardShortcuts extends ImmutablePureComponent {
  }

 }
+
+export default connect(mapStateToProps)(injectIntl(KeyboardShortcuts));
--- a/app/javascript/flavours/glitch/features/list_adder/components/account.jsx
+++ b/app/javascript/flavours/glitch/features/list_adder/components/account.jsx
@ -18,8 +18,6 @@ const makeMapStateToProps = () => {
 };


-export default @connect(makeMapStateToProps)
-@injectIntl
 class Account extends ImmutablePureComponent {

  static propTypes = {
@ -41,3 +39,5 @@ class Account extends ImmutablePureComponent {
  }

 }
+
+export default connect(makeMapStateToProps)(injectIntl(Account));
--- a/app/javascript/flavours/glitch/features/list_adder/components/list.jsx
+++ b/app/javascript/flavours/glitch/features/list_adder/components/list.jsx
@ -13,7 +13,7 @@ const messages = defineMessages({
  add: { id: 'lists.account.add', defaultMessage: 'Add to list' },
 });

-const MapStateToProps = (state, { listId, added }) => ({
+const mapStateToProps = (state, { listId, added }) => ({
  list: state.get('lists').get(listId),
  added: typeof added === 'undefined' ? state.getIn(['listAdder', 'lists', 'items']).includes(listId) : added,
 });
@ -23,8 +23,6 @@ const mapDispatchToProps = (dispatch, { listId }) => ({
  onAdd: () => dispatch(addToListAdder(listId)),
 });

-export default @connect(MapStateToProps, mapDispatchToProps)
-@injectIntl
 class List extends ImmutablePureComponent {

  static propTypes = {
@ -67,3 +65,5 @@ class List extends ImmutablePureComponent {
  }

 }
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(List));
--- a/app/javascript/flavours/glitch/features/list_adder/index.jsx
+++ b/app/javascript/flavours/glitch/features/list_adder/index.jsx
@ -28,8 +28,6 @@ const mapDispatchToProps = dispatch => ({
  onReset: () => dispatch(resetListAdder()),
 });

-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
 class ListAdder extends ImmutablePureComponent {

  static propTypes = {
@ -71,3 +69,5 @@ class ListAdder extends ImmutablePureComponent {
  }

 }
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(ListAdder));
--- a/app/javascript/flavours/glitch/features/list_editor/components/edit_list_form.jsx
+++ b/app/javascript/flavours/glitch/features/list_editor/components/edit_list_form.jsx
@ -19,8 +19,6 @@ const mapDispatchToProps = dispatch => ({
  onSubmit: () => dispatch(submitListEditor(false)),
 });

-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
 class ListForm extends React.PureComponent {

  static propTypes = {
@ -68,3 +66,5 @@ class ListForm extends React.PureComponent {
  }

 }
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(ListForm));
--- a/app/javascript/flavours/glitch/features/list_editor/index.jsx
+++ b/app/javascript/flavours/glitch/features/list_editor/index.jsx
@ -22,8 +22,6 @@ const mapDispatchToProps = dispatch => ({
  onReset: () => dispatch(resetListEditor()),
 });

-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
 class ListEditor extends ImmutablePureComponent {

  static propTypes = {
@ -77,3 +75,5 @@ class ListEditor extends ImmutablePureComponent {
  }

 }
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(ListEditor));
--- a/app/javascript/flavours/glitch/features/list_timeline/index.jsx
+++ b/app/javascript/flavours/glitch/features/list_timeline/index.jsx
@ -31,8 +31,6 @@ const mapStateToProps = (state, props) => ({
  hasUnread: state.getIn(['timelines', `list:${props.params.id}`, 'unread']) > 0,
 });

-export default @connect(mapStateToProps)
-@injectIntl
 class ListTimeline extends React.PureComponent {

  static contextTypes = {
@ -222,3 +220,5 @@ class ListTimeline extends React.PureComponent {
  }

 }
+
+export default connect(mapStateToProps)(injectIntl(ListTimeline));
--- a/app/javascript/flavours/glitch/features/lists/components/new_list_form.jsx
+++ b/app/javascript/flavours/glitch/features/lists/components/new_list_form.jsx
@ -20,8 +20,6 @@ const mapDispatchToProps = dispatch => ({
  onSubmit: () => dispatch(submitListEditor(true)),
 });

-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
 class NewListForm extends React.PureComponent {

  static propTypes = {
@ -76,3 +74,5 @@ class NewListForm extends React.PureComponent {
  }

 }
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(NewListForm));
--- a/app/javascript/flavours/glitch/features/lists/index.jsx
+++ b/app/javascript/flavours/glitch/features/lists/index.jsx
@ -32,8 +32,6 @@ const mapStateToProps = state => ({
  lists: getOrderedLists(state),
 });

-export default @connect(mapStateToProps)
-@injectIntl
 class Lists extends ImmutablePureComponent {

  static propTypes = {
@ -87,3 +85,5 @@ class Lists extends ImmutablePureComponent {
  }

 }
+
+export default connect(mapStateToProps)(injectIntl(Lists));
--- a/app/javascript/flavours/glitch/features/local_settings/navigation/index.jsx
+++ b/app/javascript/flavours/glitch/features/local_settings/navigation/index.jsx
@ -19,7 +19,6 @@ const messages = defineMessages({
  close: { id: 'settings.close', defaultMessage: 'Close' },
 });

-export default @injectIntl
 class LocalSettingsNavigation extends React.PureComponent {

  static propTypes = {
@ -90,3 +89,5 @@ class LocalSettingsNavigation extends React.PureComponent {
  }

 }
+
+export default injectIntl(LocalSettingsNavigation);
--- a/app/javascript/flavours/glitch/features/local_settings/page/index.jsx
+++ b/app/javascript/flavours/glitch/features/local_settings/page/index.jsx
@ -31,7 +31,6 @@ const messages = defineMessages({
  pop_in_right: { id: 'settings.pop_in_right', defaultMessage:  'Right' },
 });

-export default @injectIntl
 class LocalSettingsPage extends React.PureComponent {

  static propTypes = {
@ -513,3 +512,5 @@ class LocalSettingsPage extends React.PureComponent {
  }

 }
+
+export default injectIntl(LocalSettingsPage);
--- a/app/javascript/flavours/glitch/features/mutes/index.jsx
+++ b/app/javascript/flavours/glitch/features/mutes/index.jsx
@ -23,8 +23,6 @@ const mapStateToProps = state => ({
  isLoading: state.getIn(['user_lists', 'mutes', 'isLoading'], true),
 });

-export default @connect(mapStateToProps)
-@injectIntl
 class Mutes extends ImmutablePureComponent {

  static propTypes = {
@ -82,3 +80,5 @@ class Mutes extends ImmutablePureComponent {
  }

 }
+
+export default connect(mapStateToProps)(injectIntl(Mutes));
--- a/Show More
+++ b/Show More