Merge branch 'organize-soapbox' into 'develop'

Cleanup file names

See merge request soapbox-pub/soapbox!1894

app/application.ts

@@ -1,4 +1,4 @@
-import loadPolyfills from './soapbox/load_polyfills';
+import loadPolyfills from './soapbox/load-polyfills';
 
 // Load iframe event listener
 require('./soapbox/iframe');

app/soapbox/actions/__tests__/account-notes.test.ts

@@ -2,7 +2,7 @@ import { Map as ImmutableMap } from 'immutable';
 
 import { __stub } from 'soapbox/api';
 import { mockStore, rootState } from 'soapbox/jest/test-helpers';
-import { ReducerRecord, EditRecord } from 'soapbox/reducers/account_notes';
+import { ReducerRecord, EditRecord } from 'soapbox/reducers/account-notes';
 
 import { normalizeAccount, normalizeRelationship } from '../../normalizers';
 import { changeAccountNoteComment, initAccountNoteModal, submitAccountNote } from '../account-notes';

app/soapbox/actions/__tests__/accounts.test.ts

@@ -2,7 +2,7 @@ import { Map as ImmutableMap } from 'immutable';
 
 import { __stub } from 'soapbox/api';
 import { mockStore, rootState } from 'soapbox/jest/test-helpers';
-import { ListRecord, ReducerRecord } from 'soapbox/reducers/user_lists';
+import { ListRecord, ReducerRecord } from 'soapbox/reducers/user-lists';
 
 import { normalizeAccount, normalizeInstance, normalizeRelationship } from '../../normalizers';
 import {

app/soapbox/actions/__tests__/blocks.test.ts

@@ -1,6 +1,6 @@
 import { __stub } from 'soapbox/api';
 import { mockStore, rootState } from 'soapbox/jest/test-helpers';
-import { ListRecord, ReducerRecord as UserListsRecord } from 'soapbox/reducers/user_lists';
+import { ListRecord, ReducerRecord as UserListsRecord } from 'soapbox/reducers/user-lists';
 
 import { expandBlocks, fetchBlocks } from '../blocks';
 

app/soapbox/actions/__tests__/me.test.ts

@@ -7,7 +7,7 @@ import {
   fetchMe, patchMe,
 } from '../me';
 
-jest.mock('../../storage/kv_store', () => ({
+jest.mock('../../storage/kv-store', () => ({
   __esModule: true,
   default: {
     getItemOrError: jest.fn().mockReturnValue(Promise.resolve({})),

app/soapbox/actions/auth.ts

@@ -16,7 +16,7 @@ import { obtainOAuthToken, revokeOAuthToken } from 'soapbox/actions/oauth';
 import { startOnboarding } from 'soapbox/actions/onboarding';
 import snackbar from 'soapbox/actions/snackbar';
 import { custom } from 'soapbox/custom';
-import KVStore from 'soapbox/storage/kv_store';
+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';

app/soapbox/actions/compose.ts

@@ -5,12 +5,12 @@ import { defineMessages, IntlShape } from 'react-intl';
 
 import snackbar from 'soapbox/actions/snackbar';
 import api from 'soapbox/api';
-import { search as emojiSearch } from 'soapbox/features/emoji/emoji_mart_search_light';
+import { search as emojiSearch } from 'soapbox/features/emoji/emoji-mart-search-light';
 import { tagHistory } from 'soapbox/settings';
 import { isLoggedIn } from 'soapbox/utils/auth';
 import { getFeatures, parseVersion } from 'soapbox/utils/features';
 import { formatBytes, getVideoDuration } from 'soapbox/utils/media';
-import resizeImage from 'soapbox/utils/resize_image';
+import resizeImage from 'soapbox/utils/resize-image';
 
 import { showAlert, showAlertForError } from './alerts';
 import { useEmoji } from './emojis';
@@ -21,8 +21,8 @@ import { getSettings } from './settings';
 import { createStatus } from './statuses';
 
 import type { History } from 'history';
-import type { Emoji } from 'soapbox/components/autosuggest_emoji';
-import type { AutoSuggestion } from 'soapbox/components/autosuggest_input';
+import type { Emoji } from 'soapbox/components/autosuggest-emoji';
+import type { AutoSuggestion } from 'soapbox/components/autosuggest-input';
 import type { AppDispatch, RootState } from 'soapbox/store';
 import type { Account, APIEntity, Status, Tag } from 'soapbox/types/entities';
 

app/soapbox/actions/consumer-auth.ts

@@ -1,6 +1,6 @@
 import axios from 'axios';
 
-import * as BuildConfig from 'soapbox/build_config';
+import * as BuildConfig from 'soapbox/build-config';
 import { isURL } from 'soapbox/utils/auth';
 import sourceCode from 'soapbox/utils/code';
 import { getFeatures } from 'soapbox/utils/features';

app/soapbox/actions/dropdown-menu.ts

@@ -1,4 +1,4 @@
-import type { DropdownPlacement } from 'soapbox/components/dropdown_menu';
+import type { DropdownPlacement } from 'soapbox/components/dropdown-menu';
 
 const DROPDOWN_MENU_OPEN = 'DROPDOWN_MENU_OPEN';
 const DROPDOWN_MENU_CLOSE = 'DROPDOWN_MENU_CLOSE';

app/soapbox/actions/emojis.ts

@@ -1,6 +1,6 @@
 import { saveSettings } from './settings';
 
-import type { Emoji } from 'soapbox/components/autosuggest_emoji';
+import type { Emoji } from 'soapbox/components/autosuggest-emoji';
 import type { AppDispatch } from 'soapbox/store';
 
 const EMOJI_USE = 'EMOJI_USE';

app/soapbox/actions/instance.ts

@@ -1,7 +1,7 @@
 import { createAsyncThunk } from '@reduxjs/toolkit';
 import get from 'lodash/get';
 
-import KVStore from 'soapbox/storage/kv_store';
+import KVStore from 'soapbox/storage/kv-store';
 import { RootState } from 'soapbox/store';
 import { getAuthUserUrl } from 'soapbox/utils/auth';
 import { parseVersion } from 'soapbox/utils/features';

app/soapbox/actions/me.ts

@@ -1,4 +1,4 @@
-import KVStore from 'soapbox/storage/kv_store';
+import KVStore from 'soapbox/storage/kv-store';
 import { getAuthUserId, getAuthUserUrl } from 'soapbox/utils/auth';
 
 import api from '../api';

app/soapbox/actions/modals.ts

@@ -1,4 +1,4 @@
-import type { ModalType } from 'soapbox/features/ui/components/modal_root';
+import type { ModalType } from 'soapbox/features/ui/components/modal-root';
 
 export const MODAL_OPEN  = 'MODAL_OPEN';
 export const MODAL_CLOSE = 'MODAL_CLOSE';

app/soapbox/actions/moderation.tsx

@@ -7,7 +7,7 @@ import { openModal } from 'soapbox/actions/modals';
 import snackbar from 'soapbox/actions/snackbar';
 import OutlineBox from 'soapbox/components/outline-box';
 import { Stack, Text } from 'soapbox/components/ui';
-import AccountContainer from 'soapbox/containers/account_container';
+import AccountContainer from 'soapbox/containers/account-container';
 import { isLocal } from 'soapbox/utils/accounts';
 
 import type { AppDispatch, RootState } from 'soapbox/store';

app/soapbox/actions/mrf.ts

@@ -1,11 +1,11 @@
 import { Map as ImmutableMap, Set as ImmutableSet } from 'immutable';
 
-import ConfigDB from 'soapbox/utils/config_db';
+import ConfigDB from 'soapbox/utils/config-db';
 
 import { fetchConfig, updateConfig } from './admin';
 
 import type { AppDispatch, RootState } from 'soapbox/store';
-import type { Policy } from 'soapbox/utils/config_db';
+import type { Policy } from 'soapbox/utils/config-db';
 
 const simplePolicyMerge = (simplePolicy: Policy, host: string, restrictions: ImmutableMap<string, any>) => {
   return simplePolicy.map((hosts, key) => {

app/soapbox/actions/notifications.ts

@@ -3,9 +3,9 @@ import 'intl-pluralrules';
 import { defineMessages } from 'react-intl';
 
 import api, { getLinks } from 'soapbox/api';
-import compareId from 'soapbox/compare_id';
 import { getFilters, regexFromFilters } from 'soapbox/selectors';
 import { isLoggedIn } from 'soapbox/utils/auth';
+import { compareId } from 'soapbox/utils/comparators';
 import { getFeatures, parseVersion, PLEROMA } from 'soapbox/utils/features';
 import { unescapeHTML } from 'soapbox/utils/html';
 import { EXCLUDE_TYPES, NOTIFICATION_TYPES } from 'soapbox/utils/notification';

app/soapbox/actions/push-notifications/registerer.ts

@@ -1,4 +1,4 @@
-import { createPushSubscription, updatePushSubscription } from 'soapbox/actions/push_subscriptions';
+import { createPushSubscription, updatePushSubscription } from 'soapbox/actions/push-subscriptions';
 import { pushNotificationsSetting } from 'soapbox/settings';
 import { getVapidKey } from 'soapbox/utils/auth';
 import { decode as decodeBase64 } from 'soapbox/utils/base64';

app/soapbox/actions/soapbox.ts

@@ -2,7 +2,7 @@ import { createSelector } from 'reselect';
 
 import { getHost } from 'soapbox/actions/instance';
 import { normalizeSoapboxConfig } from 'soapbox/normalizers';
-import KVStore from 'soapbox/storage/kv_store';
+import KVStore from 'soapbox/storage/kv-store';
 import { removeVS16s } from 'soapbox/utils/emoji';
 import { getFeatures } from 'soapbox/utils/features';
 

app/soapbox/api/__mocks__/index.ts

@@ -4,7 +4,7 @@ import LinkHeader from 'http-link-header';
 
 import type { AxiosInstance, AxiosResponse } from 'axios';
 
-const api = jest.requireActual('../api') as Record<string, Function>;
+const api = jest.requireActual('../index') as Record<string, Function>;
 let mocks: Array<Function> = [];
 
 export const __stub = (func: (mock: MockAdapter) => void) => mocks.push(func);

app/soapbox/api/index.ts

@@ -9,7 +9,7 @@ import axios, { AxiosInstance, AxiosResponse } from 'axios';
 import LinkHeader from 'http-link-header';
 import { createSelector } from 'reselect';
 
-import * as BuildConfig from 'soapbox/build_config';
+import * as BuildConfig from 'soapbox/build-config';
 import { RootState } from 'soapbox/store';
 import { getAccessToken, getAppToken, isURL, parseBaseURL } from 'soapbox/utils/auth';
 

app/soapbox/build-config.js

@@ -1,7 +1,7 @@
 // @preval
 /**
  * Build config: configuration set at build time.
- * @module soapbox/build_config
+ * @module soapbox/build-config
  */
 
 const trim = require('lodash/trim');

app/soapbox/components/__tests__/autosuggest-emoji.test.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { render, screen } from '../../jest/test-helpers';
-import AutosuggestEmoji from '../autosuggest_emoji';
+import AutosuggestEmoji from '../autosuggest-emoji';
 
 describe('<AutosuggestEmoji />', () => {
   it('renders native emoji', () => {

app/soapbox/components/__tests__/avatar-overlay.test.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import { normalizeAccount } from 'soapbox/normalizers';
 
 import { render, screen } from '../../jest/test-helpers';
-import AvatarOverlay from '../avatar_overlay';
+import AvatarOverlay from '../avatar-overlay';
 
 import type { ReducerAccount } from 'soapbox/reducers/accounts';
 

app/soapbox/components/__tests__/emoji-selector.test.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { render, screen } from '../../jest/test-helpers';
-import EmojiSelector from '../emoji_selector';
+import EmojiSelector from '../emoji-selector';
 
 describe('<EmojiSelector />', () => {
   it('renders correctly', () => {

app/soapbox/components/account-search.tsx

@@ -2,7 +2,7 @@ import classNames from 'clsx';
 import React, { useState } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 
-import AutosuggestAccountInput from 'soapbox/components/autosuggest_account_input';
+import AutosuggestAccountInput from 'soapbox/components/autosuggest-account-input';
 import Icon from 'soapbox/components/icon';
 
 const messages = defineMessages({

app/soapbox/components/account.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { Link, useHistory } from 'react-router-dom';
 
-import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper';
-import VerificationBadge from 'soapbox/components/verification_badge';
+import HoverRefWrapper from 'soapbox/components/hover-ref-wrapper';
+import VerificationBadge from 'soapbox/components/verification-badge';
 import ActionButton from 'soapbox/features/ui/components/action-button';
 import { useAppSelector, useOnScreen } from 'soapbox/hooks';
 import { getAcct } from 'soapbox/utils/accounts';

app/soapbox/components/announcements/emoji.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import unicodeMapping from 'soapbox/features/emoji/emoji_unicode_mapping_light';
+import unicodeMapping from 'soapbox/features/emoji/emoji-unicode-mapping-light';
 import { useSettings } from 'soapbox/hooks';
 import { joinPublicPath } from 'soapbox/utils/static';
 

app/soapbox/components/announcements/reaction.tsx

@@ -2,7 +2,7 @@ import classNames from 'clsx';
 import React, { useState } from 'react';
 
 import AnimatedNumber from 'soapbox/components/animated-number';
-import unicodeMapping from 'soapbox/features/emoji/emoji_unicode_mapping_light';
+import unicodeMapping from 'soapbox/features/emoji/emoji-unicode-mapping-light';
 
 import Emoji from './emoji';
 

app/soapbox/components/announcements/reactions-bar.tsx

@@ -9,7 +9,7 @@ import { useSettings } from 'soapbox/hooks';
 import Reaction from './reaction';
 
 import type { List as ImmutableList, Map as ImmutableMap } from 'immutable';
-import type { Emoji } from 'soapbox/components/autosuggest_emoji';
+import type { Emoji } from 'soapbox/components/autosuggest-emoji';
 import type { AnnouncementReaction } from 'soapbox/types/entities';
 
 interface IReactionsBar {

app/soapbox/components/attachment_list.tsx

@@ -1,54 +0,0 @@
-import React from 'react';
-
-import Icon from 'soapbox/components/icon';
-
-import type { Attachment as AttachmentEntity } from 'soapbox/types/entities';
-
-const filename = (url: string) => url.split('/').pop()!.split('#')[0].split('?')[0];
-
-interface IAttachmentList {
-  media: AttachmentEntity[],
-  compact?: boolean,
-}
-
-const AttachmentList: React.FC<IAttachmentList> = ({ media, compact }) => {
-  if (compact) {
-    return (
-      <div className='attachment-list compact'>
-        <ul className='attachment-list__list'>
-          {media.map(attachment => {
-            const displayUrl = attachment.get('remote_url') || attachment.get('url');
-
-            return (
-              <li key={attachment.get('id')}>
-                <a href={displayUrl} target='_blank' rel='noopener'><Icon id='link' /> {filename(displayUrl)}</a>
-              </li>
-            );
-          })}
-        </ul>
-      </div>
-    );
-  }
-
-  return (
-    <div className='attachment-list'>
-      <div className='attachment-list__icon'>
-        <Icon id='link' />
-      </div>
-
-      <ul className='attachment-list__list'>
-        {media.map(attachment => {
-          const displayUrl = attachment.get('remote_url') || attachment.get('url');
-
-          return (
-            <li key={attachment.get('id')}>
-              <a href={displayUrl} target='_blank' rel='noopener'>{filename(displayUrl)}</a>
-            </li>
-          );
-        })}
-      </ul>
-    </div>
-  );
-};
-
-export default AttachmentList;

app/soapbox/components/autosuggest-account-input.tsx

@@ -3,13 +3,13 @@ import throttle from 'lodash/throttle';
 import React, { useState, useRef, useCallback, useEffect } from 'react';
 
 import { accountSearch } from 'soapbox/actions/accounts';
-import AutosuggestInput, { AutoSuggestion } from 'soapbox/components/autosuggest_input';
+import AutosuggestInput, { AutoSuggestion } from 'soapbox/components/autosuggest-input';
 import { useAppDispatch } from 'soapbox/hooks';
 
-import type { Menu } from 'soapbox/components/dropdown_menu';
+import type { Menu } from 'soapbox/components/dropdown-menu';
 import type { InputThemes } from 'soapbox/components/ui/input/input';
 
-const noOp = () => {};
+const noOp = () => { };
 
 interface IAutosuggestAccountInput {
   onChange: React.ChangeEventHandler<HTMLInputElement>,

app/soapbox/components/autosuggest-emoji.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import unicodeMapping from 'soapbox/features/emoji/emoji_unicode_mapping_light';
+import unicodeMapping from 'soapbox/features/emoji/emoji-unicode-mapping-light';
 import { joinPublicPath } from 'soapbox/utils/static';
 
 export type Emoji = {

app/soapbox/components/autosuggest-input.tsx

@@ -4,13 +4,13 @@ import { List as ImmutableList } from 'immutable';
 import React from 'react';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import AutosuggestEmoji, { Emoji } from 'soapbox/components/autosuggest_emoji';
+import AutosuggestEmoji, { Emoji } from 'soapbox/components/autosuggest-emoji';
 import Icon from 'soapbox/components/icon';
 import { Input } from 'soapbox/components/ui';
-import AutosuggestAccount from 'soapbox/features/compose/components/autosuggest_account';
+import AutosuggestAccount from 'soapbox/features/compose/components/autosuggest-account';
 import { isRtl } from 'soapbox/rtl';
 
-import type { Menu, MenuItem } from 'soapbox/components/dropdown_menu';
+import type { Menu, MenuItem } from 'soapbox/components/dropdown-menu';
 import type { InputThemes } from 'soapbox/components/ui/input/input';
 
 type CursorMatch = [

app/soapbox/components/autosuggest-textarea.tsx

@@ -4,10 +4,10 @@ import React from 'react';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import Textarea from 'react-textarea-autosize';
 
-import AutosuggestAccount from '../features/compose/components/autosuggest_account';
+import AutosuggestAccount from '../features/compose/components/autosuggest-account';
 import { isRtl } from '../rtl';
 
-import AutosuggestEmoji, { Emoji } from './autosuggest_emoji';
+import AutosuggestEmoji, { Emoji } from './autosuggest-emoji';
 
 import type { List as ImmutableList } from 'immutable';
 

app/soapbox/components/avatar-overlay.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import StillImage from 'soapbox/components/still_image';
+import StillImage from 'soapbox/components/still-image';
 
 import type { Account as AccountEntity } from 'soapbox/types/entities';
 

app/soapbox/components/avatar.tsx

@@ -1,7 +1,7 @@
 import classNames from 'clsx';
 import React from 'react';
 
-import StillImage from 'soapbox/components/still_image';
+import StillImage from 'soapbox/components/still-image';
 
 import type { Account } from 'soapbox/types/entities';
 

app/soapbox/components/birthday-input.tsx

@@ -1,8 +1,8 @@
 import React, { useMemo } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 
-import IconButton from 'soapbox/components/icon_button';
-import BundleContainer from 'soapbox/features/ui/containers/bundle_container';
+import IconButton from 'soapbox/components/icon-button';
+import BundleContainer from 'soapbox/features/ui/containers/bundle-container';
 import { DatePicker } from 'soapbox/features/ui/util/async-components';
 import { useAppSelector, useFeatures } from 'soapbox/hooks';
 

app/soapbox/components/birthday-panel.tsx

@@ -4,7 +4,7 @@ import { FormattedMessage } from 'react-intl';
 
 import { fetchBirthdayReminders } from 'soapbox/actions/accounts';
 import { Widget } from 'soapbox/components/ui';
-import AccountContainer from 'soapbox/containers/account_container';
+import AccountContainer from 'soapbox/containers/account-container';
 import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
 
 const timeToMidnight = () => {

app/soapbox/components/column-header.js

@@ -7,7 +7,7 @@ import { withRouter } from 'react-router-dom';
 // import classNames from 'clsx';
 // import { injectIntl, defineMessages } from 'react-intl';
 // import Icon from 'soapbox/components/icon';
-import SubNavigation from 'soapbox/components/sub_navigation';
+import SubNavigation from 'soapbox/components/sub-navigation';
 
 // const messages = defineMessages({
 //   show: { id: 'column_header.show_settings', defaultMessage: 'Show settings' },

app/soapbox/components/display-name.tsx

@@ -1,13 +1,13 @@
 import * as React from 'react';
 
-import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper';
+import HoverRefWrapper from 'soapbox/components/hover-ref-wrapper';
 import { useSoapboxConfig } from 'soapbox/hooks';
 
 import { getAcct } from '../utils/accounts';
 
 import Icon from './icon';
 import RelativeTimestamp from './relative-timestamp';
-import VerificationBadge from './verification_badge';
+import VerificationBadge from './verification-badge';
 
 import type { Account } from 'soapbox/types/entities';
 

app/soapbox/components/domain.tsx

@@ -2,9 +2,9 @@ import React from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import { useDispatch } from 'react-redux';
 
-import { unblockDomain } from 'soapbox/actions/domain_blocks';
+import { unblockDomain } from 'soapbox/actions/domain-blocks';
 
-import IconButton from './icon_button';
+import IconButton from './icon-button';
 
 const messages = defineMessages({
   blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Hide entire domain' },

app/soapbox/components/dropdown-menu.tsx

@@ -8,7 +8,7 @@ import { withRouter, RouteComponentProps } from 'react-router-dom';
 
 import { IconButton, Counter } from 'soapbox/components/ui';
 import SvgIcon from 'soapbox/components/ui/icon/svg-icon';
-import Motion from 'soapbox/features/ui/util/optional_motion';
+import Motion from 'soapbox/features/ui/util/optional-motion';
 
 import type { Status } from 'soapbox/types/entities';
 

app/soapbox/components/emoji-button-wrapper.tsx

@@ -3,12 +3,12 @@ import React, { useState, useEffect, useRef } from 'react';
 import { usePopper } from 'react-popper';
 import { useDispatch } from 'react-redux';
 
-import { simpleEmojiReact } from 'soapbox/actions/emoji_reacts';
+import { simpleEmojiReact } from 'soapbox/actions/emoji-reacts';
 import { openModal } from 'soapbox/actions/modals';
 import EmojiSelector from 'soapbox/components/ui/emoji-selector/emoji-selector';
 import { useAppSelector, useOwnAccount, useSoapboxConfig } from 'soapbox/hooks';
-import { isUserTouching } from 'soapbox/is_mobile';
-import { getReactForStatus } from 'soapbox/utils/emoji_reacts';
+import { isUserTouching } from 'soapbox/is-mobile';
+import { getReactForStatus } from 'soapbox/utils/emoji-reacts';
 
 interface IEmojiButtonWrapper {
   statusId: string,

app/soapbox/components/error-boundary.tsx

@@ -3,10 +3,10 @@ import { FormattedMessage } from 'react-intl';
 import { connect } from 'react-redux';
 
 import { getSoapboxConfig } from 'soapbox/actions/soapbox';
-import * as BuildConfig from 'soapbox/build_config';
+import * as BuildConfig from 'soapbox/build-config';
 import { Text, Stack } from 'soapbox/components/ui';
 import { captureException } from 'soapbox/monitoring';
-import KVStore from 'soapbox/storage/kv_store';
+import KVStore from 'soapbox/storage/kv-store';
 import sourceCode from 'soapbox/utils/code';
 import { unregisterSw } from 'soapbox/utils/sw';
 

app/soapbox/components/extended-video-player.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useRef } from 'react';
 
-import { isIOS } from 'soapbox/is_mobile';
+import { isIOS } from 'soapbox/is-mobile';
 
 interface IExtendedVideoPlayer {
   src: string,

app/soapbox/components/helmet.tsx

@@ -3,7 +3,7 @@ import { Helmet as ReactHelmet } from 'react-helmet';
 
 import { useAppSelector, useSettings } from 'soapbox/hooks';
 import { RootState } from 'soapbox/store';
-import FaviconService from 'soapbox/utils/favicon_service';
+import FaviconService from 'soapbox/utils/favicon-service';
 
 FaviconService.initFaviconService();
 

app/soapbox/components/hover-ref-wrapper.tsx

@@ -6,9 +6,9 @@ import { fetchAccount } from 'soapbox/actions/accounts';
 import {
   openProfileHoverCard,
   closeProfileHoverCard,
-} from 'soapbox/actions/profile_hover_card';
+} from 'soapbox/actions/profile-hover-card';
 import { useAppDispatch } from 'soapbox/hooks';
-import { isMobile } from 'soapbox/is_mobile';
+import { isMobile } from 'soapbox/is-mobile';
 
 const showProfileHoverCard = debounce((dispatch, ref, accountId) => {
   dispatch(openProfileHoverCard(ref, accountId));

app/soapbox/components/hover-status-wrapper.tsx

@@ -7,7 +7,7 @@ import {
   openStatusHoverCard,
   closeStatusHoverCard,
 } from 'soapbox/actions/status-hover-card';
-import { isMobile } from 'soapbox/is_mobile';
+import { isMobile } from 'soapbox/is-mobile';
 
 const showStatusHoverCard = debounce((dispatch, ref, statusId) => {
   dispatch(openStatusHoverCard(ref, statusId));

app/soapbox/components/icon-button.js

@@ -6,7 +6,7 @@ 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';
+import Motion from '../features/ui/util/optional-motion';
 
 export default class IconButton extends React.PureComponent {
 

app/soapbox/components/icon.tsx

@@ -7,8 +7,8 @@
 
 import React from 'react';
 
-import ForkAwesomeIcon, { IForkAwesomeIcon } from './fork_awesome_icon';
-import SvgIcon, { ISvgIcon } from './svg_icon';
+import ForkAwesomeIcon, { IForkAwesomeIcon } from './fork-awesome-icon';
+import SvgIcon, { ISvgIcon } from './svg-icon';
 
 export type IIcon = IForkAwesomeIcon | ISvgIcon;
 

app/soapbox/components/media-gallery.tsx

@@ -3,14 +3,14 @@ import React, { useState, useRef, useEffect } from 'react';
 
 import Blurhash from 'soapbox/components/blurhash';
 import Icon from 'soapbox/components/icon';
-import StillImage from 'soapbox/components/still_image';
+import StillImage from 'soapbox/components/still-image';
 import { MIMETYPE_ICONS } from 'soapbox/features/compose/components/upload';
 import { useSettings } from 'soapbox/hooks';
 import { Attachment } from 'soapbox/types/entities';
 import { truncateFilename } from 'soapbox/utils/media';
 
-import { isIOS } from '../is_mobile';
-import { isPanoramic, isPortrait, isNonConformingRatio, minimumAspectRatio, maximumAspectRatio } from '../utils/media_aspect_ratio';
+import { isIOS } from '../is-mobile';
+import { isPanoramic, isPortrait, isNonConformingRatio, minimumAspectRatio, maximumAspectRatio } from '../utils/media-aspect-ratio';
 
 import type { Property } from 'csstype';
 import type { List as ImmutableList } from 'immutable';

app/soapbox/components/modal-root.tsx

@@ -9,7 +9,7 @@ import { openModal, closeModal } from 'soapbox/actions/modals';
 import { useAppDispatch, useAppSelector, usePrevious } from 'soapbox/hooks';
 
 import type { UnregisterCallback } from 'history';
-import type { ModalType } from 'soapbox/features/ui/components/modal_root';
+import type { ModalType } from 'soapbox/features/ui/components/modal-root';
 import type { ReducerCompose } from 'soapbox/reducers/compose';
 
 const messages = defineMessages({

app/soapbox/components/more_follows.tsx

@@ -1,48 +0,0 @@
-import React from 'react';
-import { defineMessages, useIntl } from 'react-intl';
-
-import { useAppSelector } from 'soapbox/hooks';
-import { getFeatures } from 'soapbox/utils/features';
-
-const messages = defineMessages({
-  following: {
-    id: 'morefollows.following_label',
-    defaultMessage: '…and {count} more {count, plural, one {follow} other {follows}} on remote sites.',
-  },
-  followers: {
-    id: 'morefollows.followers_label',
-    defaultMessage: '…and {count} more {count, plural, one {follower} other {followers}} on remote sites.',
-  },
-});
-
-interface IMoreFollows {
-  visible?: Boolean,
-  count?: number,
-  type: 'following' | 'followers',
-}
-
-const MoreFollows: React.FC<IMoreFollows> = ({ visible = true, count, type }) => {
-  const intl = useIntl();
-  const features = useAppSelector((state) => getFeatures(state.instance));
-
-  const getMessage = () => {
-    return intl.formatMessage(messages[type], { count });
-  };
-
-  // If the instance isn't federating, there are no remote followers
-  if (!features.federating) {
-    return null;
-  }
-
-  return (
-    <div className='morefollows-indicator'>
-      <div>
-        <div className='morefollows-indicator__label' style={{ visibility: visible ? 'visible' : 'hidden' }}>
-          {getMessage()}
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default MoreFollows;

app/soapbox/components/profile-hover-card.tsx

@@ -8,16 +8,16 @@ import { fetchRelationships } from 'soapbox/actions/accounts';
 import {
   closeProfileHoverCard,
   updateProfileHoverCard,
-} from 'soapbox/actions/profile_hover_card';
+} from 'soapbox/actions/profile-hover-card';
 import Badge from 'soapbox/components/badge';
 import ActionButton from 'soapbox/features/ui/components/action-button';
-import BundleContainer from 'soapbox/features/ui/containers/bundle_container';
+import BundleContainer from 'soapbox/features/ui/containers/bundle-container';
 import { UserPanel } from 'soapbox/features/ui/util/async-components';
 import { useAppSelector, useAppDispatch } from 'soapbox/hooks';
 import { makeGetAccount } from 'soapbox/selectors';
 import { isLocal } from 'soapbox/utils/accounts';
 
-import { showProfileHoverCard } from './hover_ref_wrapper';
+import { showProfileHoverCard } from './hover-ref-wrapper';
 import { Card, CardBody, HStack, Icon, Stack, Text } from './ui';
 
 import type { AppDispatch } from 'soapbox/store';

app/soapbox/components/quoted-status.tsx

@@ -5,13 +5,13 @@ import { useHistory } from 'react-router-dom';
 
 import StatusMedia from 'soapbox/components/status-media';
 import { Stack } from 'soapbox/components/ui';
-import AccountContainer from 'soapbox/containers/account_container';
+import AccountContainer from 'soapbox/containers/account-container';
 import { useSettings } from 'soapbox/hooks';
 import { defaultMediaVisibility } from 'soapbox/utils/status';
 
 import OutlineBox from './outline-box';
+import StatusContent from './status-content';
 import StatusReplyMentions from './status-reply-mentions';
-import StatusContent from './status_content';
 import SensitiveContentOverlay from './statuses/sensitive-content-overlay';
 
 import type { Account as AccountEntity, Status as StatusEntity } from 'soapbox/types/entities';

app/soapbox/components/scrollable-list.tsx

@@ -5,7 +5,7 @@ import { Virtuoso, Components, VirtuosoProps, VirtuosoHandle, ListRange, IndexLo
 
 import { useSettings } from 'soapbox/hooks';
 
-import LoadMore from './load_more';
+import LoadMore from './load-more';
 import { Card, Spinner } from './ui';
 
 /** Custom Viruoso component context. */

app/soapbox/components/sidebar-menu.tsx

@@ -9,7 +9,7 @@ import { getSettings } from 'soapbox/actions/settings';
 import { closeSidebar } from 'soapbox/actions/sidebar';
 import Account from 'soapbox/components/account';
 import { Stack } from 'soapbox/components/ui';
-import ProfileStats from 'soapbox/features/ui/components/profile_stats';
+import ProfileStats from 'soapbox/features/ui/components/profile-stats';
 import { useAppSelector, useFeatures } from 'soapbox/hooks';
 import { makeGetAccount, makeGetOtherAccounts } from 'soapbox/selectors';
 

app/soapbox/components/sidebar-navigation.tsx

@@ -2,14 +2,14 @@ import React from 'react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
 import { getSettings } from 'soapbox/actions/settings';
-import DropdownMenu from 'soapbox/containers/dropdown_menu_container';
+import DropdownMenu from 'soapbox/containers/dropdown-menu-container';
 import ComposeButton from 'soapbox/features/ui/components/compose-button';
 import { useAppSelector, useOwnAccount } from 'soapbox/hooks';
 import { getFeatures } from 'soapbox/utils/features';
 
 import SidebarNavigationLink from './sidebar-navigation-link';
 
-import type { Menu } from 'soapbox/components/dropdown_menu';
+import type { Menu } from 'soapbox/components/dropdown-menu';
 
 const messages = defineMessages({
   follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },

app/soapbox/components/status-action-bar.tsx

@@ -16,12 +16,12 @@ import { initReport } from 'soapbox/actions/reports';
 import { deleteStatus, editStatus, toggleMuteStatus } from 'soapbox/actions/statuses';
 import EmojiButtonWrapper from 'soapbox/components/emoji-button-wrapper';
 import StatusActionButton from 'soapbox/components/status-action-button';
-import DropdownMenuContainer from 'soapbox/containers/dropdown_menu_container';
+import DropdownMenuContainer from 'soapbox/containers/dropdown-menu-container';
 import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount, useSettings, useSoapboxConfig } from 'soapbox/hooks';
 import { isLocal } from 'soapbox/utils/accounts';
-import { getReactForStatus, reduceEmoji } from 'soapbox/utils/emoji_reacts';
+import { getReactForStatus, reduceEmoji } from 'soapbox/utils/emoji-reacts';
 
-import type { Menu } from 'soapbox/components/dropdown_menu';
+import type { Menu } from 'soapbox/components/dropdown-menu';
 import type { Account, Status } from 'soapbox/types/entities';
 
 const messages = defineMessages({

app/soapbox/components/status-content.tsx

@@ -6,7 +6,7 @@ import { useHistory } from 'react-router-dom';
 import Icon from 'soapbox/components/icon';
 import { useSoapboxConfig } from 'soapbox/hooks';
 import { addGreentext } from 'soapbox/utils/greentext';
-import { onlyEmoji as isOnlyEmoji } from 'soapbox/utils/rich_content';
+import { onlyEmoji as isOnlyEmoji } from 'soapbox/utils/rich-content';
 
 import { isRtl } from '../rtl';
 

app/soapbox/components/status-hover-card.tsx

@@ -8,7 +8,7 @@ import {
   updateStatusHoverCard,
 } from 'soapbox/actions/status-hover-card';
 import { fetchStatus } from 'soapbox/actions/statuses';
-import StatusContainer from 'soapbox/containers/status_container';
+import StatusContainer from 'soapbox/containers/status-container';
 import { useAppSelector, useAppDispatch } from 'soapbox/hooks';
 
 import { showStatusHoverCard } from './hover-status-wrapper';

app/soapbox/components/status-list.tsx

@@ -5,20 +5,20 @@ import React, { useRef, useCallback } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { v4 as uuidv4 } from 'uuid';
 
-import LoadGap from 'soapbox/components/load_gap';
-import ScrollableList from 'soapbox/components/scrollable_list';
-import StatusContainer from 'soapbox/containers/status_container';
+import LoadGap from 'soapbox/components/load-gap';
+import ScrollableList from 'soapbox/components/scrollable-list';
+import StatusContainer from 'soapbox/containers/status-container';
 import Ad from 'soapbox/features/ads/components/ad';
 import FeedSuggestions from 'soapbox/features/feed-suggestions/feed-suggestions';
-import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder_status';
+import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder-status';
 import { ALGORITHMS } from 'soapbox/features/timeline-insertion';
-import PendingStatus from 'soapbox/features/ui/components/pending_status';
+import PendingStatus from 'soapbox/features/ui/components/pending-status';
 import { useSoapboxConfig } from 'soapbox/hooks';
 import useAds from 'soapbox/queries/ads';
 
 import type { OrderedSet as ImmutableOrderedSet } from 'immutable';
 import type { VirtuosoHandle } from 'react-virtuoso';
-import type { IScrollableList } from 'soapbox/components/scrollable_list';
+import type { IScrollableList } from 'soapbox/components/scrollable-list';
 import type { Ad as AdEntity } from 'soapbox/types/soapbox';
 
 interface IStatusList extends Omit<IScrollableList, 'onLoadMore' | 'children'> {

app/soapbox/components/status-media.tsx

@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 
 import { openModal } from 'soapbox/actions/modals';
 import AttachmentThumbs from 'soapbox/components/attachment-thumbs';
-import PlaceholderCard from 'soapbox/features/placeholder/components/placeholder_card';
+import PlaceholderCard from 'soapbox/features/placeholder/components/placeholder-card';
 import Card from 'soapbox/features/status/components/card';
 import Bundle from 'soapbox/features/ui/components/bundle';
 import { MediaGallery, Video, Audio } from 'soapbox/features/ui/util/async-components';

app/soapbox/components/status-reply-mentions.tsx

@@ -3,8 +3,8 @@ import { FormattedList, FormattedMessage } from 'react-intl';
 import { Link } from 'react-router-dom';
 
 import { openModal } from 'soapbox/actions/modals';
+import HoverRefWrapper from 'soapbox/components/hover-ref-wrapper';
 import HoverStatusWrapper from 'soapbox/components/hover-status-wrapper';
-import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper';
 import { useAppDispatch } from 'soapbox/hooks';
 
 import type { Account, Status } from 'soapbox/types/entities';

app/soapbox/components/status.tsx

@@ -10,15 +10,15 @@ import { openModal } from 'soapbox/actions/modals';
 import { toggleStatusHidden } from 'soapbox/actions/statuses';
 import Icon from 'soapbox/components/icon';
 import TranslateButton from 'soapbox/components/translate-button';
-import AccountContainer from 'soapbox/containers/account_container';
-import QuotedStatus from 'soapbox/features/status/containers/quoted_status_container';
+import AccountContainer from 'soapbox/containers/account-container';
+import QuotedStatus from 'soapbox/features/status/containers/quoted-status-container';
 import { useAppDispatch, useSettings } from 'soapbox/hooks';
 import { defaultMediaVisibility, textForScreenReader, getActualStatus } from 'soapbox/utils/status';
 
 import StatusActionBar from './status-action-bar';
+import StatusContent from './status-content';
 import StatusMedia from './status-media';
 import StatusReplyMentions from './status-reply-mentions';
-import StatusContent from './status_content';
 import SensitiveContentOverlay from './statuses/sensitive-content-overlay';
 import { Card, HStack, Stack, Text } from './ui';
 

app/soapbox/components/thumb-navigation-link.tsx

@@ -2,7 +2,7 @@ import classNames from 'clsx';
 import React from 'react';
 import { NavLink, useLocation } from 'react-router-dom';
 
-import IconWithCounter from 'soapbox/components/icon_with_counter';
+import IconWithCounter from 'soapbox/components/icon-with-counter';
 import { Icon, Text } from 'soapbox/components/ui';
 
 interface IThumbNavigationLink {

app/soapbox/components/thumb-navigation.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
 
-import ThumbNavigationLink from 'soapbox/components/thumb_navigation-link';
+import ThumbNavigationLink from 'soapbox/components/thumb-navigation-link';
 import { useAppSelector, useOwnAccount } from 'soapbox/hooks';
 import { getFeatures } from 'soapbox/utils/features';
 

app/soapbox/components/ui/avatar/avatar.tsx

@@ -1,7 +1,7 @@
 import classNames from 'clsx';
 import * as React from 'react';
 
-import StillImage from 'soapbox/components/still_image';
+import StillImage from 'soapbox/components/still-image';
 
 const AVATAR_SIZE = 42;
 

app/soapbox/components/upload-progress.tsx

@@ -3,7 +3,7 @@ import { FormattedMessage } from 'react-intl';
 import { spring } from 'react-motion';
 
 import { HStack, Icon, Stack, Text } from 'soapbox/components/ui';
-import Motion from 'soapbox/features/ui/util/optional_motion';
+import Motion from 'soapbox/features/ui/util/optional-motion';
 
 interface IUploadProgress {
   /** Number between 0 and 1 to represent the percentage complete. */