Merge remote-tracking branch 'origin/develop' into account-endorsements

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>

.eslintrc.js

@@ -223,6 +223,23 @@ module.exports = {
     ],
     'import/no-unresolved': 'error',
     'import/no-webpack-loader-syntax': 'error',
+    'import/order': [
+      'error',
+      {
+        groups: [
+          'builtin',
+          'external',
+          'internal',
+          'parent',
+          'sibling',
+          'index',
+          'object',
+          'type',
+        ],
+        'newlines-between': 'always',
+        alphabetize: { order: 'asc' },
+      },
+    ],
 
     'promise/catch-or-return': 'error',
 

app/soapbox/actions/__tests__/about-test.js

@@ -1,13 +1,15 @@
+import MockAdapter from 'axios-mock-adapter';
+import { Map as ImmutableMap } from 'immutable';
+
+import { staticClient } from 'soapbox/api';
+import { mockStore } from 'soapbox/test_helpers';
+
 import {
   FETCH_ABOUT_PAGE_REQUEST,
   FETCH_ABOUT_PAGE_SUCCESS,
   FETCH_ABOUT_PAGE_FAIL,
   fetchAboutPage,
 } from '../about';
-import { Map as ImmutableMap } from 'immutable';
-import MockAdapter from 'axios-mock-adapter';
-import { staticClient } from 'soapbox/api';
-import { mockStore } from 'soapbox/test_helpers';
 
 describe('fetchAboutPage()', () => {
   it('creates the expected actions on success', () => {

app/soapbox/actions/__tests__/preload-test.js

@@ -1,12 +1,14 @@
+import { Map as ImmutableMap } from 'immutable';
+
+import { __stub } from 'soapbox/api';
+import { mockStore } from 'soapbox/test_helpers';
+
+import { VERIFY_CREDENTIALS_REQUEST } from '../auth';
+import { ACCOUNTS_IMPORT } from '../importer';
 import {
   MASTODON_PRELOAD_IMPORT,
   preloadMastodon,
 } from '../preload';
-import { VERIFY_CREDENTIALS_REQUEST } from '../auth';
-import { ACCOUNTS_IMPORT } from '../importer';
-import { Map as ImmutableMap } from 'immutable';
-import { __stub } from 'soapbox/api';
-import { mockStore } from 'soapbox/test_helpers';
 
 describe('preloadMastodon()', () => {
   it('creates the expected actions', () => {

app/soapbox/actions/accounts.js

@@ -1,11 +1,13 @@
+import { isLoggedIn } from 'soapbox/utils/auth';
+import { getFeatures } from 'soapbox/utils/features';
+
 import api, { getLinks } from '../api';
+
 import {
   importFetchedAccount,
   importFetchedAccounts,
   importErrorWhileFetchingAccountByUsername,
 } from './importer';
-import { isLoggedIn } from 'soapbox/utils/auth';
-import { getFeatures } from 'soapbox/utils/features';
 
 export const ACCOUNT_CREATE_REQUEST = 'ACCOUNT_CREATE_REQUEST';
 export const ACCOUNT_CREATE_SUCCESS = 'ACCOUNT_CREATE_SUCCESS';

app/soapbox/actions/admin.js

@@ -1,6 +1,7 @@
-import api from '../api';
-import { importFetchedAccount, importFetchedStatuses } from 'soapbox/actions/importer';
 import { fetchRelationships } from 'soapbox/actions/accounts';
+import { importFetchedAccount, importFetchedStatuses } from 'soapbox/actions/importer';
+
+import api from '../api';
 
 export const ADMIN_CONFIG_FETCH_REQUEST = 'ADMIN_CONFIG_FETCH_REQUEST';
 export const ADMIN_CONFIG_FETCH_SUCCESS = 'ADMIN_CONFIG_FETCH_SUCCESS';

app/soapbox/actions/aliases.js

@@ -1,10 +1,13 @@
 import { defineMessages } from 'react-intl';
-import api from '../api';
-import { importFetchedAccount, importFetchedAccounts } from './importer';
-import { showAlertForError } from './alerts';
-import snackbar from './snackbar';
+
 import { isLoggedIn } from 'soapbox/utils/auth';
+
+import api from '../api';
+
+import { showAlertForError } from './alerts';
+import { importFetchedAccount, importFetchedAccounts } from './importer';
 import { ME_PATCH_SUCCESS } from './me';
+import snackbar from './snackbar';
 
 export const ALIASES_SUGGESTIONS_CHANGE = 'ALIASES_SUGGESTIONS_CHANGE';
 export const ALIASES_SUGGESTIONS_READY  = 'ALIASES_SUGGESTIONS_READY';

app/soapbox/actions/auth.js

@@ -8,18 +8,21 @@
  */
 
 import { defineMessages } from 'react-intl';
-import api, { baseClient } from '../api';
-import { importFetchedAccount } from './importer';
-import snackbar from 'soapbox/actions/snackbar';
+
 import { createAccount } from 'soapbox/actions/accounts';
-import { fetchMeSuccess, fetchMeFail } from 'soapbox/actions/me';
-import { getLoggedInAccount, parseBaseURL } from 'soapbox/utils/auth';
 import { createApp } from 'soapbox/actions/apps';
+import { fetchMeSuccess, fetchMeFail } from 'soapbox/actions/me';
 import { obtainOAuthToken, revokeOAuthToken } from 'soapbox/actions/oauth';
+import snackbar from 'soapbox/actions/snackbar';
+import KVStore from 'soapbox/storage/kv_store';
+import { getLoggedInAccount, parseBaseURL } from 'soapbox/utils/auth';
 import sourceCode from 'soapbox/utils/code';
 import { getFeatures } from 'soapbox/utils/features';
 import { isStandalone } from 'soapbox/utils/state';
-import KVStore from 'soapbox/storage/kv_store';
+
+import api, { baseClient } from '../api';
+
+import { importFetchedAccount } from './importer';
 
 export const SWITCH_ACCOUNT = 'SWITCH_ACCOUNT';
 
@@ -140,6 +143,7 @@ export function otpVerify(code, mfa_token) {
       code: code,
       challenge_type: 'totp',
       redirect_uri: 'urn:ietf:wg:oauth:2.0:oob',
+      scope: getScopes(getState()),
     }).then(({ data: token }) => dispatch(authLoggedIn(token)));
   };
 }

app/soapbox/actions/blocks.js

@@ -1,9 +1,11 @@
-import api, { getLinks } from '../api';
-import { fetchRelationships } from './accounts';
-import { importFetchedAccounts } from './importer';
 import { isLoggedIn } from 'soapbox/utils/auth';
 import { getNextLinkName } from 'soapbox/utils/quirks';
 
+import api, { getLinks } from '../api';
+
+import { fetchRelationships } from './accounts';
+import { importFetchedAccounts } from './importer';
+
 export const BLOCKS_FETCH_REQUEST = 'BLOCKS_FETCH_REQUEST';
 export const BLOCKS_FETCH_SUCCESS = 'BLOCKS_FETCH_SUCCESS';
 export const BLOCKS_FETCH_FAIL    = 'BLOCKS_FETCH_FAIL';

app/soapbox/actions/bookmarks.js

@@ -1,4 +1,5 @@
 import api, { getLinks } from '../api';
+
 import { importFetchedStatuses } from './importer';
 
 export const BOOKMARKED_STATUSES_FETCH_REQUEST = 'BOOKMARKED_STATUSES_FETCH_REQUEST';

app/soapbox/actions/chats.js

@@ -1,8 +1,10 @@
-import api, { getLinks } from '../api';
+import { Map as ImmutableMap } from 'immutable';
+import { v4 as uuidv4 } from 'uuid';
+
 import { getSettings, changeSetting } from 'soapbox/actions/settings';
 import { getFeatures } from 'soapbox/utils/features';
-import { v4 as uuidv4 } from 'uuid';
-import { Map as ImmutableMap } from 'immutable';
+
+import api, { getLinks } from '../api';
 
 export const CHATS_FETCH_REQUEST = 'CHATS_FETCH_REQUEST';
 export const CHATS_FETCH_SUCCESS = 'CHATS_FETCH_SUCCESS';

app/soapbox/actions/compose.js

@@ -1,20 +1,23 @@
-import api from '../api';
 import { CancelToken, isCancel } from 'axios';
 import { throttle } from 'lodash';
+import { defineMessages } from 'react-intl';
+
+import snackbar from 'soapbox/actions/snackbar';
+import { isLoggedIn } from 'soapbox/utils/auth';
+import { getFeatures } from 'soapbox/utils/features';
+
+import api from '../api';
 import { search as emojiSearch } from '../features/emoji/emoji_mart_search_light';
 import { tagHistory } from '../settings';
-import { useEmoji } from './emojis';
 import resizeImage from '../utils/resize_image';
-import { importFetchedAccounts } from './importer';
+
 import { showAlert, showAlertForError } from './alerts';
-import { defineMessages } from 'react-intl';
+import { useEmoji } from './emojis';
+import { importFetchedAccounts } from './importer';
+import { uploadMedia, fetchMedia, updateMedia } from './media';
 import { openModal, closeModal } from './modal';
 import { getSettings } from './settings';
-import { getFeatures } from 'soapbox/utils/features';
-import { uploadMedia, fetchMedia, updateMedia } from './media';
-import { isLoggedIn } from 'soapbox/utils/auth';
 import { createStatus } from './statuses';
-import snackbar from 'soapbox/actions/snackbar';
 
 let cancelFetchComposeSuggestionsAccounts;
 

app/soapbox/actions/conversations.js

@@ -1,10 +1,12 @@
+import { isLoggedIn } from 'soapbox/utils/auth';
+
 import api, { getLinks } from '../api';
+
 import {
   importFetchedAccounts,
   importFetchedStatuses,
   importFetchedStatus,
 } from './importer';
-import { isLoggedIn } from 'soapbox/utils/auth';
 
 export const CONVERSATIONS_MOUNT   = 'CONVERSATIONS_MOUNT';
 export const CONVERSATIONS_UNMOUNT = 'CONVERSATIONS_UNMOUNT';

app/soapbox/actions/directory.js

@@ -1,6 +1,7 @@
 import api from '../api';
-import { importFetchedAccounts } from './importer';
+
 import { fetchRelationships } from './accounts';
+import { importFetchedAccounts } from './importer';
 
 export const DIRECTORY_FETCH_REQUEST = 'DIRECTORY_FETCH_REQUEST';
 export const DIRECTORY_FETCH_SUCCESS = 'DIRECTORY_FETCH_SUCCESS';

app/soapbox/actions/domain_blocks.js

@@ -1,6 +1,7 @@
-import api, { getLinks } from '../api';
 import { isLoggedIn } from 'soapbox/utils/auth';
 
+import api, { getLinks } from '../api';
+
 export const DOMAIN_BLOCK_REQUEST = 'DOMAIN_BLOCK_REQUEST';
 export const DOMAIN_BLOCK_SUCCESS = 'DOMAIN_BLOCK_SUCCESS';
 export const DOMAIN_BLOCK_FAIL    = 'DOMAIN_BLOCK_FAIL';

app/soapbox/actions/emoji_reacts.js

@@ -1,8 +1,11 @@
+import { List as ImmutableList } from 'immutable';
+
+import { isLoggedIn } from 'soapbox/utils/auth';
+
 import api from '../api';
+
 import { importFetchedAccounts, importFetchedStatus } from './importer';
 import { favourite, unfavourite } from './interactions';
-import { isLoggedIn } from 'soapbox/utils/auth';
-import { List as ImmutableList } from 'immutable';
 
 export const EMOJI_REACT_REQUEST = 'EMOJI_REACT_REQUEST';
 export const EMOJI_REACT_SUCCESS = 'EMOJI_REACT_SUCCESS';

app/soapbox/actions/export_data.js

@@ -1,5 +1,7 @@
 import { defineMessages } from 'react-intl';
+
 import snackbar from 'soapbox/actions/snackbar';
+
 import api, { getLinks } from '../api';
 
 export const EXPORT_FOLLOWS_REQUEST = 'EXPORT_FOLLOWS_REQUEST';

app/soapbox/actions/external_auth.js

@@ -6,15 +6,17 @@
  * @see module:soapbox/actions/oauth
  */
 
-import { baseClient } from '../api';
-import { createApp } from 'soapbox/actions/apps';
-import { obtainOAuthToken } from 'soapbox/actions/oauth';
-import { authLoggedIn, verifyCredentials, switchAccount } from 'soapbox/actions/auth';
-import { parseBaseURL } from 'soapbox/utils/auth';
-import { getFeatures } from 'soapbox/utils/features';
-import sourceCode from 'soapbox/utils/code';
 import { Map as ImmutableMap, fromJS } from 'immutable';
 
+import { createApp } from 'soapbox/actions/apps';
+import { authLoggedIn, verifyCredentials, switchAccount } from 'soapbox/actions/auth';
+import { obtainOAuthToken } from 'soapbox/actions/oauth';
+import { parseBaseURL } from 'soapbox/utils/auth';
+import sourceCode from 'soapbox/utils/code';
+import { getFeatures } from 'soapbox/utils/features';
+
+import { baseClient } from '../api';
+
 const fetchExternalInstance = baseURL => {
   return baseClient(null, baseURL)
     .get('/api/v1/instance')

app/soapbox/actions/favourites.js

@@ -1,7 +1,9 @@
-import api, { getLinks } from '../api';
-import { importFetchedStatuses } from './importer';
 import { isLoggedIn } from 'soapbox/utils/auth';
 
+import api, { getLinks } from '../api';
+
+import { importFetchedStatuses } from './importer';
+
 export const FAVOURITED_STATUSES_FETCH_REQUEST = 'FAVOURITED_STATUSES_FETCH_REQUEST';
 export const FAVOURITED_STATUSES_FETCH_SUCCESS = 'FAVOURITED_STATUSES_FETCH_SUCCESS';
 export const FAVOURITED_STATUSES_FETCH_FAIL    = 'FAVOURITED_STATUSES_FETCH_FAIL';

app/soapbox/actions/filters.js

@@ -1,8 +1,10 @@
 import { defineMessages } from 'react-intl';
-import api from '../api';
+
 import snackbar from 'soapbox/actions/snackbar';
 import { isLoggedIn } from 'soapbox/utils/auth';
 
+import api from '../api';
+
 export const FILTERS_FETCH_REQUEST = 'FILTERS_FETCH_REQUEST';
 export const FILTERS_FETCH_SUCCESS = 'FILTERS_FETCH_SUCCESS';
 export const FILTERS_FETCH_FAIL    = 'FILTERS_FETCH_FAIL';

app/soapbox/actions/group_editor.js

@@ -1,6 +1,7 @@
-import api from '../api';
 import { isLoggedIn } from 'soapbox/utils/auth';
 
+import api from '../api';
+
 export const GROUP_CREATE_REQUEST      = 'GROUP_CREATE_REQUEST';
 export const GROUP_CREATE_SUCCESS      = 'GROUP_CREATE_SUCCESS';
 export const GROUP_CREATE_FAIL         = 'GROUP_CREATE_FAIL';

app/soapbox/actions/groups.js

@@ -1,8 +1,10 @@
-import api, { getLinks } from '../api';
-import { importFetchedAccounts } from './importer';
-import { fetchRelationships } from './accounts';
 import { isLoggedIn } from 'soapbox/utils/auth';
 
+import api, { getLinks } from '../api';
+
+import { fetchRelationships } from './accounts';
+import { importFetchedAccounts } from './importer';
+
 export const GROUP_FETCH_REQUEST = 'GROUP_FETCH_REQUEST';
 export const GROUP_FETCH_SUCCESS = 'GROUP_FETCH_SUCCESS';
 export const GROUP_FETCH_FAIL    = 'GROUP_FETCH_FAIL';

app/soapbox/actions/import_data.js

@@ -1,7 +1,9 @@
 import { defineMessages } from 'react-intl';
-import api from '../api';
+
 import snackbar from 'soapbox/actions/snackbar';
 
+import api from '../api';
+
 export const IMPORT_FOLLOWS_REQUEST = 'IMPORT_FOLLOWS_REQUEST';
 export const IMPORT_FOLLOWS_SUCCESS = 'IMPORT_FOLLOWS_SUCCESS';
 export const IMPORT_FOLLOWS_FAIL    = 'IMPORT_FOLLOWS_FAIL';

app/soapbox/actions/importer/index.js

@@ -1,4 +1,5 @@
 import { getSettings } from '../settings';
+
 import {
   normalizeAccount,
   normalizeStatus,

app/soapbox/actions/importer/normalizer.js

@@ -1,4 +1,5 @@
 import escapeTextContentForBrowser from 'escape-html';
+
 import emojify from '../../features/emoji/emoji';
 import { unescapeHTML } from '../../utils/html';
 

app/soapbox/actions/instance.js

@@ -1,8 +1,10 @@
-import api from '../api';
 import { get } from 'lodash';
-import { parseVersion } from 'soapbox/utils/features';
-import { getAuthUserUrl } from 'soapbox/utils/auth';
+
 import KVStore from 'soapbox/storage/kv_store';
+import { getAuthUserUrl } from 'soapbox/utils/auth';
+import { parseVersion } from 'soapbox/utils/features';
+
+import api from '../api';
 
 export const INSTANCE_FETCH_REQUEST = 'INSTANCE_FETCH_REQUEST';
 export const INSTANCE_FETCH_SUCCESS = 'INSTANCE_FETCH_SUCCESS';

app/soapbox/actions/interactions.js

@@ -1,9 +1,12 @@
 import { defineMessages } from 'react-intl';
-import api from '../api';
-import { importFetchedAccounts, importFetchedStatus } from './importer';
+
 import snackbar from 'soapbox/actions/snackbar';
 import { isLoggedIn } from 'soapbox/utils/auth';
 
+import api from '../api';
+
+import { importFetchedAccounts, importFetchedStatus } from './importer';
+
 export const REBLOG_REQUEST = 'REBLOG_REQUEST';
 export const REBLOG_SUCCESS = 'REBLOG_SUCCESS';
 export const REBLOG_FAIL    = 'REBLOG_FAIL';

app/soapbox/actions/lists.js

@@ -1,8 +1,10 @@
-import api from '../api';
-import { importFetchedAccounts } from './importer';
-import { showAlertForError } from './alerts';
 import { isLoggedIn } from 'soapbox/utils/auth';
 
+import api from '../api';
+
+import { showAlertForError } from './alerts';
+import { importFetchedAccounts } from './importer';
+
 export const LIST_FETCH_REQUEST = 'LIST_FETCH_REQUEST';
 export const LIST_FETCH_SUCCESS = 'LIST_FETCH_SUCCESS';
 export const LIST_FETCH_FAIL    = 'LIST_FETCH_FAIL';

app/soapbox/actions/me.js

@@ -1,8 +1,10 @@
-import api from '../api';
-import { importFetchedAccount } from './importer';
-import { loadCredentials } from './auth';
 import { getAuthUserId, getAuthUserUrl } from 'soapbox/utils/auth';
 
+import api from '../api';
+
+import { loadCredentials } from './auth';
+import { importFetchedAccount } from './importer';
+
 export const ME_FETCH_REQUEST = 'ME_FETCH_REQUEST';
 export const ME_FETCH_SUCCESS = 'ME_FETCH_SUCCESS';
 export const ME_FETCH_FAIL    = 'ME_FETCH_FAIL';

app/soapbox/actions/media.js

@@ -1,6 +1,7 @@
-import api from '../api';
 import { getFeatures } from 'soapbox/utils/features';
 
+import api from '../api';
+
 const noOp = () => {};
 
 export function fetchMedia(mediaId) {

app/soapbox/actions/mfa.js

@@ -60,10 +60,12 @@ export function confirmMfa(method, code, password) {
   return (dispatch, getState) => {
     const params = { code, password };
     dispatch({ type: MFA_CONFIRM_REQUEST, method, code });
-    return api(getState).post(`/api/pleroma/accounts/mfa/confirm/${method}`, params).then(() => {
+    return api(getState).post(`/api/pleroma/accounts/mfa/confirm/${method}`, params).then(({ data }) => {
       dispatch({ type: MFA_CONFIRM_SUCCESS, method, code });
+      return data;
     }).catch(error => {
-      dispatch({ type: MFA_CONFIRM_FAIL, method, code, error });
+      dispatch({ type: MFA_CONFIRM_FAIL, method, code, error, skipAlert: true });
+      throw error;
     });
   };
 }
@@ -71,10 +73,12 @@ export function confirmMfa(method, code, password) {
 export function disableMfa(method, password) {
   return (dispatch, getState) => {
     dispatch({ type: MFA_DISABLE_REQUEST, method });
-    return api(getState).delete(`/api/pleroma/accounts/mfa/${method}`, { data: { password } }).then(response => {
+    return api(getState).delete(`/api/pleroma/accounts/mfa/${method}`, { data: { password } }).then(({ data }) => {
       dispatch({ type: MFA_DISABLE_SUCCESS, method });
+      return data;
     }).catch(error => {
-      dispatch({ type: MFA_DISABLE_FAIL, method });
+      dispatch({ type: MFA_DISABLE_FAIL, method, skipAlert: true });
+      throw error;
     });
   };
 }

app/soapbox/actions/moderation.js

@@ -1,8 +1,9 @@
 import React from 'react';
 import { defineMessages } from 'react-intl';
-import { openModal } from 'soapbox/actions/modal';
-import { deactivateUsers, deleteUsers, deleteStatus, toggleStatusSensitivity } from 'soapbox/actions/admin';
+
 import { fetchAccountByUsername } from 'soapbox/actions/accounts';
+import { deactivateUsers, deleteUsers, deleteStatus, toggleStatusSensitivity } from 'soapbox/actions/admin';
+import { openModal } from 'soapbox/actions/modal';
 import snackbar from 'soapbox/actions/snackbar';
 import AccountContainer from 'soapbox/containers/account_container';
 import { isLocal } from 'soapbox/utils/accounts';

app/soapbox/actions/mrf.js

@@ -1,7 +1,9 @@
-import { fetchConfig, updateConfig } from './admin';
 import { Set as ImmutableSet } from 'immutable';
+
 import ConfigDB from 'soapbox/utils/config_db';
 
+import { fetchConfig, updateConfig } from './admin';
+
 const simplePolicyMerge = (simplePolicy, host, restrictions) => {
   return simplePolicy.map((hosts, key) => {
     const isRestricted = restrictions.get(key);

app/soapbox/actions/mutes.js

@@ -1,9 +1,11 @@
+import { isLoggedIn } from 'soapbox/utils/auth';
+import { getNextLinkName } from 'soapbox/utils/quirks';
+
 import api, { getLinks } from '../api';
+
 import { fetchRelationships } from './accounts';
 import { importFetchedAccounts } from './importer';
 import { openModal } from './modal';
-import { isLoggedIn } from 'soapbox/utils/auth';
-import { getNextLinkName } from 'soapbox/utils/quirks';
 
 export const MUTES_FETCH_REQUEST = 'MUTES_FETCH_REQUEST';
 export const MUTES_FETCH_SUCCESS = 'MUTES_FETCH_SUCCESS';

app/soapbox/actions/notifications.js

@@ -1,6 +1,20 @@
-import api, { getLinks } from '../api';
+import {
+  List as ImmutableList,
+  Map as ImmutableMap,
+  OrderedMap as ImmutableOrderedMap,
+} from 'immutable';
 import IntlMessageFormat from 'intl-messageformat';
 import 'intl-pluralrules';
+import { defineMessages } from 'react-intl';
+
+import { isLoggedIn } from 'soapbox/utils/auth';
+import { parseVersion, PLEROMA } from 'soapbox/utils/features';
+import { joinPublicPath } from 'soapbox/utils/static';
+
+import api, { getLinks } from '../api';
+import { getFilters, regexFromFilters } from '../selectors';
+import { unescapeHTML } from '../utils/html';
+
 import { fetchRelationships } from './accounts';
 import {
   importFetchedAccount,
@@ -10,17 +24,6 @@ import {
 } from './importer';
 import { saveMarker } from './markers';
 import { getSettings, saveSettings } from './settings';
-import { defineMessages } from 'react-intl';
-import {
-  List as ImmutableList,
-  Map as ImmutableMap,
-  OrderedMap as ImmutableOrderedMap,
-} from 'immutable';
-import { unescapeHTML } from '../utils/html';
-import { getFilters, regexFromFilters } from '../selectors';
-import { isLoggedIn } from 'soapbox/utils/auth';
-import { parseVersion, PLEROMA } from 'soapbox/utils/features';
-import { joinPublicPath } from 'soapbox/utils/static';
 
 export const NOTIFICATIONS_UPDATE      = 'NOTIFICATIONS_UPDATE';
 export const NOTIFICATIONS_UPDATE_NOOP = 'NOTIFICATIONS_UPDATE_NOOP';

app/soapbox/actions/pin_statuses.js

@@ -1,7 +1,9 @@
-import api from '../api';
-import { importFetchedStatuses } from './importer';
 import { isLoggedIn } from 'soapbox/utils/auth';
 
+import api from '../api';
+
+import { importFetchedStatuses } from './importer';
+
 export const PINNED_STATUSES_FETCH_REQUEST = 'PINNED_STATUSES_FETCH_REQUEST';
 export const PINNED_STATUSES_FETCH_SUCCESS = 'PINNED_STATUSES_FETCH_SUCCESS';
 export const PINNED_STATUSES_FETCH_FAIL = 'PINNED_STATUSES_FETCH_FAIL';

app/soapbox/actions/polls.js

@@ -1,4 +1,5 @@
 import api from '../api';
+
 import { importFetchedPoll } from './importer';
 
 export const POLL_VOTE_REQUEST = 'POLL_VOTE_REQUEST';

app/soapbox/actions/preload.js

@@ -1,6 +1,7 @@
 import { mapValues } from 'lodash';
-import { importFetchedAccounts } from './importer';
+
 import { verifyCredentials } from './auth';
+import { importFetchedAccounts } from './importer';
 
 export const PLEROMA_PRELOAD_IMPORT  = 'PLEROMA_PRELOAD_IMPORT';
 export const MASTODON_PRELOAD_IMPORT = 'MASTODON_PRELOAD_IMPORT';

app/soapbox/actions/push_notifications/index.js

@@ -1,3 +1,4 @@
+import { register, saveSettings } from './registerer';
 import {
   SET_BROWSER_SUPPORT,
   SET_SUBSCRIPTION,
@@ -5,7 +6,6 @@ import {
   SET_ALERTS,
   setAlerts,
 } from './setter';
-import { register, saveSettings } from './registerer';
 
 export {
   SET_BROWSER_SUPPORT,

app/soapbox/actions/push_notifications/registerer.js

@@ -1,9 +1,11 @@
-import { decode as decodeBase64 } from '../../utils/base64';
-import { pushNotificationsSetting } from '../../settings';
-import { setBrowserSupport, setSubscription, clearSubscription } from './setter';
 import { createPushSubsription, updatePushSubscription } from 'soapbox/actions/push_subscriptions';
 import { getVapidKey } from 'soapbox/utils/auth';
 
+import { pushNotificationsSetting } from '../../settings';
+import { decode as decodeBase64 } from '../../utils/base64';
+
+import { setBrowserSupport, setSubscription, clearSubscription } from './setter';
+
 // Taken from https://www.npmjs.com/package/web-push
 const urlBase64ToUint8Array = (base64String) => {
   const padding = '='.repeat((4 - base64String.length % 4) % 4);

app/soapbox/actions/reports.js

@@ -1,4 +1,5 @@
 import api from '../api';
+
 import { openModal, closeModal } from './modal';
 
 export const REPORT_INIT   = 'REPORT_INIT';

app/soapbox/actions/search.js

@@ -1,4 +1,5 @@
 import api from '../api';
+
 import { fetchRelationships } from './accounts';
 import { importFetchedAccounts, importFetchedStatuses } from './importer';
 

app/soapbox/actions/security.js

@@ -4,9 +4,11 @@
  * @see module:soapbox/actions/auth
  */
 
-import api from '../api';
-import { getLoggedInAccount } from 'soapbox/utils/auth';
 import snackbar from 'soapbox/actions/snackbar';
+import { getLoggedInAccount } from 'soapbox/utils/auth';
+
+import api from '../api';
+
 import { AUTH_LOGGED_OUT, messages } from './auth';
 
 export const FETCH_TOKENS_REQUEST = 'FETCH_TOKENS_REQUEST';

app/soapbox/actions/settings.js

@@ -1,11 +1,14 @@
-import { debounce } from 'lodash';
-import { showAlertForError } from './alerts';
-import { patchMe } from 'soapbox/actions/me';
 import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet } from 'immutable';
-import { isLoggedIn } from 'soapbox/utils/auth';
-import uuid from '../uuid';
+import { debounce } from 'lodash';
 import { createSelector } from 'reselect';
 
+import { patchMe } from 'soapbox/actions/me';
+import { isLoggedIn } from 'soapbox/utils/auth';
+
+import uuid from '../uuid';
+
+import { showAlertForError } from './alerts';
+
 export const SETTING_CHANGE = 'SETTING_CHANGE';
 export const SETTING_SAVE   = 'SETTING_SAVE';
 export const SETTINGS_UPDATE = 'SETTINGS_UPDATE';
@@ -165,6 +168,18 @@ export const getSettings = createSelector([
     .mergeDeep(settings);
 });
 
+export function changeSettingImmediate(path, value) {
+  return dispatch => {
+    dispatch({
+      type: SETTING_CHANGE,
+      path,
+      value,
+    });
+
+    dispatch(saveSettingsImmediate());
+  };
+}
+
 export function changeSetting(path, value) {
   return dispatch => {
     dispatch({
@@ -177,23 +192,29 @@ export function changeSetting(path, value) {
   };
 }
 
+export function saveSettingsImmediate() {
+  return (dispatch, getState) => {
+    if (!isLoggedIn(getState)) return;
+
+    const state = getState();
+    if (getSettings(state).getIn(['saved'])) return;
+
+    const data = state.get('settings').delete('saved').toJS();
+
+    dispatch(patchMe({
+      pleroma_settings_store: {
+        [FE_NAME]: data,
+      },
+    })).then(response => {
+      dispatch({ type: SETTING_SAVE });
+    }).catch(error => {
+      dispatch(showAlertForError(error));
+    });
+  };
+}
+
 const debouncedSave = debounce((dispatch, getState) => {
-  if (!isLoggedIn(getState)) return;
-
-  const state = getState();
-  if (getSettings(state).getIn(['saved'])) return;
-
-  const data = state.get('settings').delete('saved').toJS();
-
-  dispatch(patchMe({
-    pleroma_settings_store: {
-      [FE_NAME]: data,
-    },
-  })).then(response => {
-    dispatch({ type: SETTING_SAVE });
-  }).catch(error => {
-    dispatch(showAlertForError(error));
-  });
+  dispatch(saveSettingsImmediate());
 }, 5000, { trailing: true });
 
 export function saveSettings() {

app/soapbox/actions/soapbox.js

@@ -1,9 +1,11 @@
-import api, { staticClient } from '../api';
 import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
-import { getFeatures } from 'soapbox/utils/features';
 import { createSelector } from 'reselect';
+
 import { getHost } from 'soapbox/actions/instance';
 import KVStore from 'soapbox/storage/kv_store';
+import { getFeatures } from 'soapbox/utils/features';
+
+import api, { staticClient } from '../api';
 
 export const SOAPBOX_CONFIG_REQUEST_SUCCESS = 'SOAPBOX_CONFIG_REQUEST_SUCCESS';
 export const SOAPBOX_CONFIG_REQUEST_FAIL    = 'SOAPBOX_CONFIG_REQUEST_FAIL';

app/soapbox/actions/statuses.js

@@ -1,11 +1,13 @@
-import api from '../api';
-import { deleteFromTimelines } from './timelines';
-import { importFetchedStatus, importFetchedStatuses } from './importer';
-import { openModal } from './modal';
 import { isLoggedIn } from 'soapbox/utils/auth';
 import { getFeatures } from 'soapbox/utils/features';
 import { shouldHaveCard } from 'soapbox/utils/status';
 
+import api from '../api';
+
+import { importFetchedStatus, importFetchedStatuses } from './importer';
+import { openModal } from './modal';
+import { deleteFromTimelines } from './timelines';
+
 export const STATUS_CREATE_REQUEST = 'STATUS_CREATE_REQUEST';
 export const STATUS_CREATE_SUCCESS = 'STATUS_CREATE_SUCCESS';
 export const STATUS_CREATE_FAIL    = 'STATUS_CREATE_FAIL';

app/soapbox/actions/streaming.js

@@ -1,4 +1,11 @@
+import { getSettings } from 'soapbox/actions/settings';
+import messages from 'soapbox/locales/messages';
+
 import { connectStream } from '../stream';
+
+import { updateConversations } from './conversations';
+import { fetchFilters } from './filters';
+import { updateNotificationsQueue, expandNotifications } from './notifications';
 import {
   deleteFromTimelines,
   expandHomeTimeline,
@@ -6,11 +13,6 @@ import {
   disconnectTimeline,
   processTimelineUpdate,
 } from './timelines';
-import { updateNotificationsQueue, expandNotifications } from './notifications';
-import { updateConversations } from './conversations';
-import { fetchFilters } from './filters';
-import { getSettings } from 'soapbox/actions/settings';
-import messages from 'soapbox/locales/messages';
 
 export const STREAMING_CHAT_UPDATE = 'STREAMING_CHAT_UPDATE';
 export const STREAMING_FOLLOW_RELATIONSHIPS_UPDATE = 'STREAMING_FOLLOW_RELATIONSHIPS_UPDATE';

app/soapbox/actions/suggestions.js

@@ -1,8 +1,10 @@
-import api from '../api';
-import { importFetchedAccounts } from './importer';
 import { isLoggedIn } from 'soapbox/utils/auth';
 import { getFeatures } from 'soapbox/utils/features';
+
+import api from '../api';
+
 import { fetchRelationships } from './accounts';
+import { importFetchedAccounts } from './importer';
 
 export const SUGGESTIONS_FETCH_REQUEST = 'SUGGESTIONS_FETCH_REQUEST';
 export const SUGGESTIONS_FETCH_SUCCESS = 'SUGGESTIONS_FETCH_SUCCESS';

app/soapbox/actions/timelines.js

@@ -1,9 +1,12 @@
-import { importFetchedStatus, importFetchedStatuses } from './importer';
-import api, { getLinks } from '../api';
 import { Map as ImmutableMap, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable';
+
 import { getSettings } from 'soapbox/actions/settings';
 import { shouldFilter } from 'soapbox/utils/timelines';
 
+import api, { getLinks } from '../api';
+
+import { importFetchedStatus, importFetchedStatuses } from './importer';
+
 export const TIMELINE_UPDATE  = 'TIMELINE_UPDATE';
 export const TIMELINE_DELETE  = 'TIMELINE_DELETE';
 export const TIMELINE_CLEAR   = 'TIMELINE_CLEAR';

app/soapbox/api.js

@@ -7,9 +7,10 @@
 
 import axios from 'axios';
 import LinkHeader from 'http-link-header';
-import { getAccessToken, getAppToken, parseBaseURL } from 'soapbox/utils/auth';
 import { createSelector } from 'reselect';
+
 import { BACKEND_URL, FE_SUBDIRECTORY } from 'soapbox/build_config';
+import { getAccessToken, getAppToken, parseBaseURL } from 'soapbox/utils/auth';
 import { isURL } from 'soapbox/utils/auth';
 
 /**

app/soapbox/base_polyfills.js

@@ -4,9 +4,10 @@ import 'intl';
 import 'intl/locale-data/jsonp/en';
 import 'es6-symbol/implement';
 import includes from 'array-includes';
+import isNaN from 'is-nan';
 import assign from 'object-assign';
 import values from 'object.values';
-import isNaN from 'is-nan';
+
 import { decode as decodeBase64 } from './utils/base64';
 
 if (!Array.prototype.includes) {

app/soapbox/components/__mocks__/react-inlinesvg.js

@@ -1,5 +1,5 @@
-import React from 'react';
 import PropTypes from 'prop-types';
+import React from 'react';
 
 export default function InlineSVG({ src }) {
   return <svg id={src} />;

app/soapbox/components/__tests__/autosuggest_emoji-test.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import renderer from 'react-test-renderer';
+
 import AutosuggestEmoji from '../autosuggest_emoji';
 
 describe('<AutosuggestEmoji />', () => {

app/soapbox/components/__tests__/avatar-test.js

@@ -1,6 +1,8 @@
-import React from 'react';
 import { fromJS } from 'immutable';
+import React from 'react';
+
 import { createComponent } from 'soapbox/test_helpers';
+
 import Avatar from '../avatar';
 
 describe('<Avatar />', () => {

app/soapbox/components/__tests__/avatar_overlay-test.js

@@ -1,6 +1,8 @@
-import React from 'react';
 import { fromJS } from 'immutable';
+import React from 'react';
+
 import { createComponent } from 'soapbox/test_helpers';
+
 import AvatarOverlay from '../avatar_overlay';
 
 describe('<AvatarOverlay', () => {

app/soapbox/components/__tests__/badge-test.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import renderer from 'react-test-renderer';
+
 import Badge from '../badge';
 
 describe('<Badge />', () => {

app/soapbox/components/__tests__/button-test.js

@@ -1,6 +1,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 import renderer from 'react-test-renderer';
+
 import Button from '../button';
 
 describe('<Button />', () => {

app/soapbox/components/__tests__/column-test.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import renderer from 'react-test-renderer';
+
 import Column from '../column';
 
 describe('<Column />', () => {

app/soapbox/components/__tests__/column_back_button-test.js

@@ -1,7 +1,9 @@
 import React from 'react';
-import ColumnBackButton from '../column_back_button';
+
 import { createComponent } from 'soapbox/test_helpers';
 
+import ColumnBackButton from '../column_back_button';
+
 describe('<ColumnBackButton />', () => {
   it('renders correctly', () => {
     const component = createComponent(<ColumnBackButton />);

app/soapbox/components/__tests__/display_name-test.js

@@ -1,8 +1,10 @@
-import React from 'react';
 import { fromJS }  from 'immutable';
-import DisplayName from '../display_name';
+import React from 'react';
+
 import { createComponent } from 'soapbox/test_helpers';
 
+import DisplayName from '../display_name';
+
 describe('<DisplayName />', () => {
   it('renders display name + account name', () => {
     const account = fromJS({

app/soapbox/components/__tests__/emoji_selector-test.js

@@ -1,5 +1,7 @@
 import React from 'react';
+
 import { createComponent } from 'soapbox/test_helpers';
+
 import EmojiSelector from '../emoji_selector';
 
 describe('<EmojiSelector />', () => {

app/soapbox/components/__tests__/timeline_queue_button_header-test.js

@@ -1,8 +1,10 @@
 import React from 'react';
-import TimelineQueueButtonHeader from '../timeline_queue_button_header';
-import { createComponent } from 'soapbox/test_helpers';
 import { defineMessages } from 'react-intl';
 
+import { createComponent } from 'soapbox/test_helpers';
+
+import TimelineQueueButtonHeader from '../timeline_queue_button_header';
+
 const messages = defineMessages({
   queue: { id: 'status_list.queue_label', defaultMessage: 'Click to see {count} new {count, plural, one {post} other {posts}}' },
 });

app/soapbox/components/account.js

@@ -1,18 +1,20 @@
-import React, { Fragment } from 'react';
-import { connect } from 'react-redux';
-import ImmutablePropTypes from 'react-immutable-proptypes';
+import classNames from 'classnames';
 import PropTypes from 'prop-types';
+import React, { Fragment } from 'react';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
 import { FormattedMessage } from 'react-intl';
+import { connect } from 'react-redux';
+
+import emojify from 'soapbox/features/emoji/emoji';
+import ActionButton from 'soapbox/features/ui/components/action_button';
+
 import Avatar from './avatar';
 import DisplayName from './display_name';
-import Permalink from './permalink';
 import Icon from './icon';
 import IconButton from './icon_button';
-import ActionButton from 'soapbox/features/ui/components/action_button';
+import Permalink from './permalink';
 import RelativeTimestamp from './relative_timestamp';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import classNames from 'classnames';
-import emojify from 'soapbox/features/emoji/emoji';
 
 const mapStateToProps = state => {
   return {

app/soapbox/components/account_search.js

@@ -1,9 +1,10 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { defineMessages, injectIntl } from 'react-intl';
-import Icon from 'soapbox/components/icon';
-import AutosuggestAccountInput from 'soapbox/components/autosuggest_account_input';
 import classNames from 'classnames';
+import PropTypes from 'prop-types';
+import React from 'react';
+import { defineMessages, injectIntl } from 'react-intl';
+
+import AutosuggestAccountInput from 'soapbox/components/autosuggest_account_input';
+import Icon from 'soapbox/components/icon';
 
 const messages = defineMessages({
   placeholder: { id: 'account_search.placeholder', defaultMessage: 'Search for an account' },

app/soapbox/components/attachment_list.js

@@ -1,7 +1,8 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import PropTypes from 'prop-types';
 import ImmutablePureComponent from 'react-immutable-pure-component';
+
 import Icon from 'soapbox/components/icon';
 
 const filename = url => url.split('/').pop().split('#')[0].split('?')[0];

app/soapbox/components/attachment_thumbs.js

@@ -1,11 +1,12 @@
-import React from 'react';
-import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
+import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-import { MediaGallery } from 'soapbox/features/ui/util/async-components';
+import { connect } from 'react-redux';
+
 import { openModal } from 'soapbox/actions/modal';
 import Bundle from 'soapbox/features/ui/components/bundle';
+import { MediaGallery } from 'soapbox/features/ui/util/async-components';
 
 export default @connect()
 class AttachmentThumbs extends ImmutablePureComponent {

app/soapbox/components/autosuggest_account_input.js

@@ -1,12 +1,14 @@
-import React from 'react';
-import AutosuggestInput from './autosuggest_input';
-import PropTypes from 'prop-types';
 import { CancelToken } from 'axios';
+import { OrderedSet as ImmutableOrderedSet } from 'immutable';
+import { throttle } from 'lodash';
+import PropTypes from 'prop-types';
+import React from 'react';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
-import { OrderedSet as ImmutableOrderedSet } from 'immutable';
+
 import { accountSearch } from 'soapbox/actions/accounts';
-import { throttle } from 'lodash';
+
+import AutosuggestInput from './autosuggest_input';
 
 const noOp = () => {};
 

app/soapbox/components/autosuggest_emoji.js

@@ -1,8 +1,10 @@
-import React from 'react';
 import PropTypes from 'prop-types';
-import unicodeMapping from '../features/emoji/emoji_unicode_mapping_light';
+import React from 'react';
+
 import { joinPublicPath } from 'soapbox/utils/static';
 
+import unicodeMapping from '../features/emoji/emoji_unicode_mapping_light';
+
 export default class AutosuggestEmoji extends React.PureComponent {
 
   static propTypes = {

app/soapbox/components/autosuggest_input.js

@@ -1,14 +1,17 @@
-import React from 'react';
-import AutosuggestAccountContainer from '../features/compose/containers/autosuggest_account_container';
-import AutosuggestEmoji from './autosuggest_emoji';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import PropTypes from 'prop-types';
-import { isRtl } from '../rtl';
-import ImmutablePureComponent from 'react-immutable-pure-component';
 import classNames from 'classnames';
 import { List as ImmutableList } from 'immutable';
+import PropTypes from 'prop-types';
+import React from 'react';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+
 import Icon from 'soapbox/components/icon';
 
+import AutosuggestAccountContainer from '../features/compose/containers/autosuggest_account_container';
+import { isRtl } from '../rtl';
+
+import AutosuggestEmoji from './autosuggest_emoji';
+
 const textAtCursorMatchesToken = (str, caretPosition, searchTokens) => {
   let word;
 

app/soapbox/components/autosuggest_textarea.js

@@ -1,12 +1,14 @@
-import React from 'react';
-import AutosuggestAccountContainer from '../features/compose/containers/autosuggest_account_container';
-import AutosuggestEmoji from './autosuggest_emoji';
-import ImmutablePropTypes from 'react-immutable-proptypes';
+import classNames from 'classnames';
 import PropTypes from 'prop-types';
-import { isRtl } from '../rtl';
+import React from 'react';
+import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import Textarea from 'react-textarea-autosize';
-import classNames from 'classnames';
+
+import AutosuggestAccountContainer from '../features/compose/containers/autosuggest_account_container';
+import { isRtl } from '../rtl';
+
+import AutosuggestEmoji from './autosuggest_emoji';
 
 const textAtCursorMatchesToken = (str, caretPosition) => {
   let word;

app/soapbox/components/avatar.js

@@ -1,7 +1,8 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import ImmutablePropTypes from 'react-immutable-proptypes';
 import classNames from 'classnames';
+import PropTypes from 'prop-types';
+import React from 'react';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+
 import StillImage from 'soapbox/components/still_image';
 
 export default class Avatar extends React.PureComponent {

app/soapbox/components/avatar_composite.js

@@ -1,6 +1,7 @@
-import React from 'react';
 import PropTypes from 'prop-types';
+import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
+
 import StillImage from 'soapbox/components/still_image';
 
 export default class AvatarComposite extends React.PureComponent {

app/soapbox/components/avatar_overlay.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
+
 import StillImage from 'soapbox/components/still_image';
 
 export default class AvatarOverlay extends React.PureComponent {

app/soapbox/components/badge.js

@@ -1,5 +1,5 @@
-import React from 'react';
 import PropTypes from 'prop-types';
+import React from 'react';
 
 const Badge = (props) => (
   <span className={'badge badge--' + props.slug}>{props.title}</span>

app/soapbox/components/blurhash.js

@@ -1,8 +1,8 @@
 // @ts-check
 
 import { decode } from 'blurhash';
-import React, { useRef, useEffect } from 'react';
 import PropTypes from 'prop-types';
+import React, { useRef, useEffect } from 'react';
 
 /**
  * @typedef BlurhashPropsBase

app/soapbox/components/button.js

@@ -1,12 +1,14 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
+import PropTypes from 'prop-types';
+import React from 'react';
 import { Link } from 'react-router-dom';
+
 import Icon from './icon';
 
 export default class Button extends React.PureComponent {
 
   static propTypes = {
+    type: PropTypes.string,
     text: PropTypes.node,
     onClick: PropTypes.func,
     to: PropTypes.string,
@@ -53,6 +55,7 @@ export default class Button extends React.PureComponent {
 
     const btn = (
       <button
+        type={this.props.type}
         className={className}
         disabled={this.props.disabled}
         onClick={this.handleClick}

app/soapbox/components/column.js

@@ -1,6 +1,6 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 export default class Column extends React.PureComponent {
 

app/soapbox/components/column_back_button.js

@@ -1,6 +1,7 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
-import PropTypes from 'prop-types';
+
 import Icon from 'soapbox/components/icon';
 
 export default class ColumnBackButton extends React.PureComponent {

app/soapbox/components/column_header.js

@@ -1,7 +1,8 @@
 'use strict';
 
-import React from 'react';
 import PropTypes from 'prop-types';
+import React from 'react';
+
 // import classNames from 'classnames';
 // import { injectIntl, defineMessages } from 'react-intl';
 // import Icon from 'soapbox/components/icon';

app/soapbox/components/display_name.js

@@ -1,14 +1,17 @@
-import React from 'react';
 import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
+import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import VerificationBadge from './verification_badge';
-import { getAcct } from '../utils/accounts';
+import { connect } from 'react-redux';
+
 import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper';
+import { isVerified } from 'soapbox/utils/accounts';
+import { displayFqn } from 'soapbox/utils/state';
+
+import { getAcct } from '../utils/accounts';
+
 import Icon from './icon';
 import RelativeTimestamp from './relative_timestamp';
-import { displayFqn } from 'soapbox/utils/state';
-import { isVerified } from 'soapbox/utils/accounts';
+import VerificationBadge from './verification_badge';
 
 const mapStateToProps = state => {
   return {

app/soapbox/components/domain.js

@@ -1,8 +1,9 @@
-import React from 'react';
 import PropTypes from 'prop-types';
-import IconButton from './icon_button';
-import { defineMessages, injectIntl } from 'react-intl';
+import React from 'react';
 import ImmutablePureComponent from 'react-immutable-pure-component';
+import { defineMessages, injectIntl } from 'react-intl';
+
+import IconButton from './icon_button';
 
 const messages = defineMessages({
   unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },

app/soapbox/components/dropdown_menu.js

@@ -1,14 +1,17 @@
-import React from 'react';
 import classNames from 'classnames';
-import PropTypes from 'prop-types';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import IconButton from './icon_button';
-import Overlay from 'react-overlays/lib/Overlay';
-import Motion from '../features/ui/util/optional_motion';
-import spring from 'react-motion/lib/spring';
 import { supportsPassiveEvents } from 'detect-passive-events';
+import PropTypes from 'prop-types';
+import React from 'react';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import spring from 'react-motion/lib/spring';
+import Overlay from 'react-overlays/lib/Overlay';
+
 import Icon from 'soapbox/components/icon';
 
+import Motion from '../features/ui/util/optional_motion';
+
+import IconButton from './icon_button';
+
 const listenerOptions = supportsPassiveEvents ? { passive: true } : false;
 let id = 0;
 

app/soapbox/components/emoji_selector.js

@@ -1,11 +1,12 @@
-import React from 'react';
+import classNames from 'classnames';
 import PropTypes from 'prop-types';
+import React from 'react';
 import { HotKeys } from 'react-hotkeys';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
-import emojify from 'soapbox/features/emoji/emoji';
+
 import { getSoapboxConfig } from 'soapbox/actions/soapbox';
-import classNames from 'classnames';
+import emojify from 'soapbox/features/emoji/emoji';
 
 const mapStateToProps = state => ({
   allowedEmoji: getSoapboxConfig(state).get('allowedEmoji'),

app/soapbox/components/error_boundary.js

@@ -1,8 +1,9 @@
-import React from 'react';
 import PropTypes from 'prop-types';
+import React from 'react';
 import { FormattedMessage } from 'react-intl';
-import { captureException } from 'soapbox/monitoring';
+
 import Icon from 'soapbox/components/icon';
+import { captureException } from 'soapbox/monitoring';
 
 export default class ErrorBoundary extends React.PureComponent {
 

app/soapbox/components/extended_video_player.js

@@ -1,5 +1,6 @@
-import React from 'react';
 import PropTypes from 'prop-types';
+import React from 'react';
+
 import { isIOS } from 'soapbox/is_mobile';
 
 export default class ExtendedVideoPlayer extends React.PureComponent {

app/soapbox/components/filter_bar.js

@@ -1,7 +1,7 @@
-import React from 'react';
 import classNames from 'classnames';
-import PropTypes from 'prop-types';
 import { debounce } from 'lodash';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 export default class FilterBar extends React.PureComponent {
 
@@ -20,7 +20,7 @@ export default class FilterBar extends React.PureComponent {
   };
 
   componentDidMount() {
-    document.addEventListener('keydown', this.handleKeyDown, false);
+    this.node.addEventListener('keydown', this.handleKeyDown, false);
     window.addEventListener('resize', this.handleResize, { passive: true });
 
     const { left, width } = this.getActiveTabIndicationSize();
@@ -28,7 +28,7 @@ export default class FilterBar extends React.PureComponent {
   }
 
   componentWillUnmount() {
-    document.removeEventListener('keydown', this.handleKeyDown, false);
+    this.node.removeEventListener('keydown', this.handleKeyDown, false);
     document.removeEventListener('resize', this.handleResize, false);
   }
 

app/soapbox/components/fork_awesome_icon.js

@@ -5,9 +5,9 @@
  * @see soapbox/components/icon
  */
 
-import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 export default class ForkAwesomeIcon extends React.PureComponent {
 

app/soapbox/components/hashtag.js

@@ -1,10 +1,12 @@
 import React from 'react';
-import { Sparklines, SparklinesCurve } from 'react-sparklines';
-import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import Permalink from './permalink';
+import { FormattedMessage } from 'react-intl';
+import { Sparklines, SparklinesCurve } from 'react-sparklines';
+
 import { shortNumberFormat } from '../utils/numbers';
 
+import Permalink from './permalink';
+
 const Hashtag = ({ hashtag }) => {
   const count = Number(hashtag.getIn(['history', 0, 'accounts']));
 

app/soapbox/components/helmet.js

@@ -1,8 +1,9 @@
-import React from 'react';
-import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
-import { withRouter } from 'react-router-dom';
+import React from 'react';
 import { Helmet } from'react-helmet';
+import { connect } from 'react-redux';
+import { withRouter } from 'react-router-dom';
+
 import { getSettings } from 'soapbox/actions/settings';
 import sourceCode from 'soapbox/utils/code';
 import FaviconService from 'soapbox/utils/favicon_service';

app/soapbox/components/hover_ref_wrapper.js

@@ -1,11 +1,12 @@
-import React, { useRef } from 'react';
+import { debounce } from 'lodash';
 import PropTypes from 'prop-types';
+import React, { useRef } from 'react';
+import { useDispatch } from 'react-redux';
+
 import {
   openProfileHoverCard,
   closeProfileHoverCard,
 } from 'soapbox/actions/profile_hover_card';
-import { useDispatch } from 'react-redux';
-import { debounce } from 'lodash';
 import { isMobile } from 'soapbox/is_mobile';
 
 const showProfileHoverCard = debounce((dispatch, ref, accountId) => {

app/soapbox/components/icon.js

@@ -5,8 +5,9 @@
  * @see soapbox/components/svg_icon
  */
 
-import React from 'react';
 import PropTypes from 'prop-types';
+import React from 'react';
+
 import ForkAwesomeIcon from './fork_awesome_icon';
 import SvgIcon from './svg_icon';
 

app/soapbox/components/icon_button.js

@@ -1,11 +1,13 @@
-import React from 'react';
-import Motion from '../features/ui/util/optional_motion';
-import spring from 'react-motion/lib/spring';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
+import PropTypes from 'prop-types';
+import React from 'react';
+import spring from 'react-motion/lib/spring';
+
 import Icon from 'soapbox/components/icon';
 import emojify from 'soapbox/features/emoji/emoji';
 
+import Motion from '../features/ui/util/optional_motion';
+
 export default class IconButton extends React.PureComponent {
 
   static propTypes = {

app/soapbox/components/icon_with_counter.js

@@ -1,5 +1,6 @@
-import React from 'react';
 import PropTypes from 'prop-types';
+import React from 'react';
+
 import Icon from 'soapbox/components/icon';
 import { shortNumberFormat } from 'soapbox/utils/numbers';
 

app/soapbox/components/intersection_observer_article.js

@@ -1,8 +1,9 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import scheduleIdleTask from '../features/ui/util/schedule_idle_task';
-import getRectFromEntry from '../features/ui/util/get_rect_from_entry';
 import { is } from 'immutable';
+import PropTypes from 'prop-types';
+import React from 'react';
+
+import getRectFromEntry from '../features/ui/util/get_rect_from_entry';
+import scheduleIdleTask from '../features/ui/util/schedule_idle_task';
 
 // Diff these props in the "rendered" state
 const updateOnPropsForRendered = ['id', 'index', 'listLength'];

app/soapbox/components/load_gap.js

@@ -1,6 +1,7 @@
-import React from 'react';
 import PropTypes from 'prop-types';
+import React from 'react';
 import { injectIntl, defineMessages } from 'react-intl';
+
 import Icon from 'soapbox/components/icon';
 
 const messages = defineMessages({

app/soapbox/components/load_more.js

@@ -1,6 +1,6 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
-import PropTypes from 'prop-types';
 
 export default class LoadMore extends React.PureComponent {
 

app/soapbox/components/loading_spinner.js

@@ -2,13 +2,13 @@
  * iOS style loading spinner.
  * It's mostly CSS, adapted from: https://loading.io/css/
  */
-import React from 'react';
 import PropTypes from 'prop-types';
+import React from 'react';
 
 const LoadingSpinner = ({ size = 30 }) => (
-  <div class='lds-spinner' style={{ width: size, height: size }}>
-    {Array(12).fill().map(i => (
-      <div />
+  <div className='lds-spinner' style={{ width: size, height: size }}>
+    {[...Array(12).keys()].map(i => (
+      <div key={i} />
     ))}
   </div>
 );

app/soapbox/components/material_status.js

@@ -2,8 +2,9 @@
  * MaterialStatus: like a Status, but with gaps and rounded corners.
  */
 
-import React from 'react';
 import PropTypes from 'prop-types';
+import React from 'react';
+
 import StatusContainer from 'soapbox/containers/status_container';
 
 export default class MaterialStatus extends React.Component {

app/soapbox/components/media_gallery.js

@@ -1,19 +1,22 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import PropTypes from 'prop-types';
-import { is } from 'immutable';
-import IconButton from './icon_button';
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import { isIOS } from '../is_mobile';
-import { truncateFilename } from 'soapbox/utils/media';
 import classNames from 'classnames';
-import { isPanoramic, isPortrait, isNonConformingRatio, minimumAspectRatio, maximumAspectRatio } from '../utils/media_aspect_ratio';
+import { is } from 'immutable';
 import { Map as ImmutableMap } from 'immutable';
+import PropTypes from 'prop-types';
+import React from 'react';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { connect } from 'react-redux';
+
 import { getSettings } from 'soapbox/actions/settings';
+import Blurhash from 'soapbox/components/blurhash';
 import Icon from 'soapbox/components/icon';
 import StillImage from 'soapbox/components/still_image';
-import Blurhash from 'soapbox/components/blurhash';
+import { truncateFilename } from 'soapbox/utils/media';
+
+import { isIOS } from '../is_mobile';
+import { isPanoramic, isPortrait, isNonConformingRatio, minimumAspectRatio, maximumAspectRatio } from '../utils/media_aspect_ratio';
+
+import IconButton from './icon_button';
 
 const ATTACHMENT_LIMIT = 4;
 const MAX_FILENAME_LENGTH = 45;

app/soapbox/components/modal_root.js

@@ -1,11 +1,12 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import 'wicg-inert';
 import { createBrowserHistory } from 'history';
+import PropTypes from 'prop-types';
+import React from 'react';
+import 'wicg-inert';
 import { injectIntl, FormattedMessage, defineMessages } from 'react-intl';
 import { connect } from 'react-redux';
-import { openModal } from '../actions/modal';
+
 import { cancelReplyCompose } from '../actions/compose';
+import { openModal } from '../actions/modal';
 
 const messages = defineMessages({
   confirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },

app/soapbox/components/more_follows.js

@@ -1,7 +1,8 @@
-import React from 'react';
 import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
+import React from 'react';
 import { defineMessages, injectIntl } from 'react-intl';
+import { connect } from 'react-redux';
+
 import { getFeatures } from 'soapbox/utils/features';
 
 const messages = defineMessages({