Reduce differences with upstream due to import style (#2465)

Fix relative / VS absolute style imports, and fix whitespace discrepancies

app/javascript/flavours/glitch/actions/importer/normalizer.js

@@ -1,8 +1,8 @@
 import escapeTextContentForBrowser from 'escape-html';
 
-import emojify from 'flavours/glitch/features/emoji/emoji';
+import emojify from '../../features/emoji/emoji';
-import { autoHideCW } from 'flavours/glitch/utils/content_warning';
+import { autoHideCW } from '../../utils/content_warning';
-import { unescapeHTML } from 'flavours/glitch/utils/html';
+import { unescapeHTML } from '../../utils/html';
 
 const domParser = new DOMParser();
 

app/javascript/flavours/glitch/actions/mutes.js

@@ -1,9 +1,8 @@
-import { openModal } from 'flavours/glitch/actions/modal';
-
 import api, { getLinks } from '../api';
 
 import { fetchRelationships } from './accounts';
 import { importFetchedAccounts } from './importer';
+import { openModal } from './modal';
 
 export const MUTES_FETCH_REQUEST = 'MUTES_FETCH_REQUEST';
 export const MUTES_FETCH_SUCCESS = 'MUTES_FETCH_SUCCESS';

app/javascript/flavours/glitch/actions/notifications.js

@@ -5,10 +5,10 @@ import { List as ImmutableList } from 'immutable';
 
 import { compareId } from 'flavours/glitch/compare_id';
 import { usePendingItems as preferPendingItems } from 'flavours/glitch/initial_state';
-import { unescapeHTML } from 'flavours/glitch/utils/html';
-import { requestNotificationPermission } from 'flavours/glitch/utils/notifications';
 
 import api, { getLinks } from '../api';
+import { unescapeHTML } from '../utils/html';
+import { requestNotificationPermission } from '../utils/notifications';
 
 import { fetchFollowRequests, fetchRelationships } from './accounts';
 import {

app/javascript/flavours/glitch/actions/pin_statuses.js

@@ -1,10 +1,8 @@
-import { me } from 'flavours/glitch/initial_state';
-
 import api from '../api';
+import { me } from '../initial_state';
 
 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/javascript/flavours/glitch/actions/streaming.js

@@ -1,7 +1,6 @@
 // @ts-check
 
-import { getLocale } from 'flavours/glitch/locales';
+import { getLocale } from '../locales';
-
 import { connectStream } from '../stream';
 
 import {

app/javascript/flavours/glitch/components/autosuggest_emoji.jsx

@@ -1,9 +1,10 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { unicodeMapping } from 'flavours/glitch/features/emoji/emoji_unicode_mapping_light';
 import { assetHost } from 'flavours/glitch/utils/config';
 
+import { unicodeMapping } from '../features/emoji/emoji_unicode_mapping_light';
+
 export default class AutosuggestEmoji extends PureComponent {
 
   static propTypes = {

app/javascript/flavours/glitch/components/autosuggest_input.jsx

@@ -5,7 +5,7 @@ import classNames from 'classnames';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import AutosuggestAccountContainer from 'flavours/glitch/features/compose/containers/autosuggest_account_container';
+import AutosuggestAccountContainer from '../features/compose/containers/autosuggest_account_container';
 
 import AutosuggestEmoji from './autosuggest_emoji';
 import { AutosuggestHashtag } from './autosuggest_hashtag';

app/javascript/flavours/glitch/components/autosuggest_textarea.jsx

@@ -7,7 +7,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import Textarea from 'react-textarea-autosize';
 
-import AutosuggestAccountContainer from 'flavours/glitch/features/compose/containers/autosuggest_account_container';
+import AutosuggestAccountContainer from '../features/compose/containers/autosuggest_account_container';
 
 import AutosuggestEmoji from './autosuggest_emoji';
 import { AutosuggestHashtag } from './autosuggest_hashtag';

app/javascript/flavours/glitch/components/avatar.tsx

@@ -2,9 +2,9 @@ import * as React from 'react';
 
 import classNames from 'classnames';
 
-import { useHovering } from 'flavours/glitch/hooks/useHovering';
+import { useHovering } from '../hooks/useHovering';
-import { autoPlayGif } from 'flavours/glitch/initial_state';
+import { autoPlayGif } from '../initial_state';
-import type { Account } from 'flavours/glitch/types/resources';
+import type { Account } from '../types/resources';
 
 interface Props {
   account: Account | undefined;

app/javascript/flavours/glitch/components/avatar_composite.jsx

@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-import { autoPlayGif } from 'flavours/glitch/initial_state';
+import { autoPlayGif } from '../initial_state';
 
 export default class AvatarComposite extends PureComponent {
 

app/javascript/flavours/glitch/components/display_name.tsx

@@ -4,9 +4,8 @@ import classNames from 'classnames';
 
 import type { List } from 'immutable';
 
-import type { Account } from 'flavours/glitch/types/resources';
-
 import { autoPlayGif } from '../initial_state';
+import type { Account } from '../types/resources';
 
 import { Skeleton } from './skeleton';
 

app/javascript/flavours/glitch/components/intersection_observer_article.jsx

@@ -3,6 +3,7 @@ import { cloneElement, Component } 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 "unrendered" state
 const updateOnPropsForUnrendered = ['id', 'index', 'listLength', 'cachedHeight'];
 
@@ -38,7 +39,6 @@ export default class IntersectionObserverArticle extends Component {
     return true;
   }
 
-
   componentDidMount () {
     const { intersectionObserverWrapper, id } = this.props;
 

app/javascript/flavours/glitch/components/media_gallery.jsx

@@ -11,7 +11,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { debounce } from 'lodash';
 
 import { Blurhash } from 'flavours/glitch/components/blurhash';
-import { autoPlayGif, displayMedia, useBlurhash } from 'flavours/glitch/initial_state';
+
+import { autoPlayGif, displayMedia, useBlurhash } from '../initial_state';
 
 import { IconButton } from './icon_button';
 

app/javascript/flavours/glitch/components/poll.jsx

@@ -10,13 +10,12 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import escapeTextContentForBrowser from 'escape-html';
 import spring from 'react-motion/lib/spring';
 
-import { Icon } from 'flavours/glitch/components/icon';
+import { Icon }  from 'flavours/glitch/components/icon';
 import emojify from 'flavours/glitch/features/emoji/emoji';
 import Motion from 'flavours/glitch/features/ui/util/optional_motion';
 
 import { RelativeTimestamp } from './relative_timestamp';
 
-
 const messages = defineMessages({
   closed: {
     id: 'poll.closed',

app/javascript/flavours/glitch/components/scrollable_list.jsx

@@ -10,11 +10,11 @@ import { connect } from 'react-redux';
 import { supportsPassiveEvents } from 'detect-passive-events';
 import { throttle } from 'lodash';
 
-import IntersectionObserverArticleContainer from 'flavours/glitch/containers/intersection_observer_article_container';
 import ScrollContainer from 'flavours/glitch/containers/scroll_container';
-import IntersectionObserverWrapper from 'flavours/glitch/features/ui/util/intersection_observer_wrapper';
 
+import IntersectionObserverArticleContainer from '../containers/intersection_observer_article_container';
 import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../features/ui/util/fullscreen';
+import IntersectionObserverWrapper from '../features/ui/util/intersection_observer_wrapper';
 
 import { LoadMore } from './load_more';
 import { LoadPending } from './load_pending';

app/javascript/flavours/glitch/components/status.jsx

@@ -12,13 +12,13 @@ import { HotKeys } from 'react-hotkeys';
 import PictureInPicturePlaceholder from 'flavours/glitch/components/picture_in_picture_placeholder';
 import PollContainer from 'flavours/glitch/containers/poll_container';
 import NotificationOverlayContainer from 'flavours/glitch/features/notifications/containers/overlay_container';
-import { displayMedia } from 'flavours/glitch/initial_state';
 import { autoUnfoldCW } from 'flavours/glitch/utils/content_warning';
 import { withOptionalRouter, WithOptionalRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
 import Card from '../features/status/components/card';
 import Bundle from '../features/ui/components/bundle';
 import { MediaGallery, Video, Audio } from '../features/ui/util/async-components';
+import { displayMedia } from '../initial_state';
 
 import AttachmentList from './attachment_list';
 import StatusActionBar from './status_action_bar';

app/javascript/flavours/glitch/components/status_action_bar.jsx

@@ -8,12 +8,13 @@ import { withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import DropdownMenuContainer from 'flavours/glitch/containers/dropdown_menu_container';
-import { me } from 'flavours/glitch/initial_state';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'flavours/glitch/permissions';
 import { accountAdminLink, statusAdminLink } from 'flavours/glitch/utils/backend_links';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
+import DropdownMenuContainer from '../containers/dropdown_menu_container';
+import { me } from '../initial_state';
+
 import { IconButton } from './icon_button';
 import { RelativeTimestamp } from './relative_timestamp';
 

app/javascript/flavours/glitch/components/status_list.jsx

@@ -6,7 +6,8 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import { debounce } from 'lodash';
 
 import RegenerationIndicator from 'flavours/glitch/components/regeneration_indicator';
-import StatusContainer from 'flavours/glitch/containers/status_container';
+
+import StatusContainer from '../containers/status_container';
 
 import { LoadGap } from './load_gap';
 import ScrollableList from './scrollable_list';

app/javascript/flavours/glitch/containers/account_container.jsx

@@ -9,12 +9,12 @@ import {
   unblockAccount,
   muteAccount,
   unmuteAccount,
-} from 'flavours/glitch/actions/accounts';
+} from '../actions/accounts';
-import { openModal } from 'flavours/glitch/actions/modal';
+import { openModal } from '../actions/modal';
-import { initMuteModal } from 'flavours/glitch/actions/mutes';
+import { initMuteModal } from '../actions/mutes';
-import Account from 'flavours/glitch/components/account';
+import Account from '../components/account';
-import { unfollowModal } from 'flavours/glitch/initial_state';
+import { unfollowModal } from '../initial_state';
-import { makeGetAccount } from 'flavours/glitch/selectors';
+import { makeGetAccount } from '../selectors';
 
 const messages = defineMessages({
   unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },

app/javascript/flavours/glitch/containers/compose_container.jsx

@@ -2,12 +2,13 @@ import { PureComponent } from 'react';
 
 import { Provider } from 'react-redux';
 
-import { fetchCustomEmojis } from 'flavours/glitch/actions/custom_emojis';
+import { fetchCustomEmojis } from '../actions/custom_emojis';
-import { hydrateStore } from 'flavours/glitch/actions/store';
+import { hydrateStore } from '../actions/store';
-import Compose from 'flavours/glitch/features/standalone/compose';
+import Compose from '../features/standalone/compose';
-import initialState from 'flavours/glitch/initial_state';
+import initialState from '../initial_state';
-import { IntlProvider } from 'flavours/glitch/locales';
+import { IntlProvider } from '../locales';
-import { store } from 'flavours/glitch/store';
+import { store } from '../store';
+
 
 if (initialState) {
   store.dispatch(hydrateStore(initialState));

app/javascript/flavours/glitch/containers/dropdown_menu_container.js

@@ -1,9 +1,8 @@
 import { connect } from 'react-redux';
 
-import { openDropdownMenu, closeDropdownMenu } from 'flavours/glitch/actions/dropdown_menu';
+import { openDropdownMenu, closeDropdownMenu } from '../actions/dropdown_menu';
-import { openModal, closeModal } from 'flavours/glitch/actions/modal';
+import { openModal, closeModal } from '../actions/modal';
-import DropdownMenu from 'flavours/glitch/components/dropdown_menu';
+import DropdownMenu from '../components/dropdown_menu';
-
 import { isUserTouching } from '../is_mobile';
 
 /**

app/javascript/flavours/glitch/containers/intersection_observer_article_container.js

@@ -1,7 +1,7 @@
 import { connect } from 'react-redux';
 
-import { setHeight } from 'flavours/glitch/actions/height_cache';
+import { setHeight } from '../actions/height_cache';
-import IntersectionObserverArticle from 'flavours/glitch/components/intersection_observer_article';
+import IntersectionObserverArticle from '../components/intersection_observer_article';
 
 const makeMapStateToProps = (state, props) => ({
   cachedHeight: state.getIn(['height_cache', props.saveHeightKey, props.id]),

app/javascript/flavours/glitch/features/about/index.jsx

@@ -10,9 +10,9 @@ import { List as ImmutableList } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import { fetchServer, fetchExtendedDescription, fetchDomainBlocks } from 'flavours/glitch/actions/server';
+import { fetchServer, fetchExtendedDescription, fetchDomainBlocks  } from 'flavours/glitch/actions/server';
 import Column from 'flavours/glitch/components/column';
-import { Icon } from 'flavours/glitch/components/icon';
+import { Icon  }  from 'flavours/glitch/components/icon';
 import { ServerHeroImage } from 'flavours/glitch/components/server_hero_image';
 import { Skeleton } from 'flavours/glitch/components/skeleton';
 import Account from 'flavours/glitch/containers/account_container';

app/javascript/flavours/glitch/features/account_gallery/index.jsx

@@ -8,17 +8,18 @@ import { connect } from 'react-redux';
 
 import { lookupAccount, fetchAccount } from 'flavours/glitch/actions/accounts';
 import { openModal } from 'flavours/glitch/actions/modal';
-import { expandAccountMediaTimeline } from 'flavours/glitch/actions/timelines';
 import { LoadMore } from 'flavours/glitch/components/load_more';
 import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
 import ScrollContainer from 'flavours/glitch/containers/scroll_container';
 import ProfileColumnHeader from 'flavours/glitch/features/account/components/profile_column_header';
-import HeaderContainer from 'flavours/glitch/features/account_timeline/containers/header_container';
 import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error';
-import Column from 'flavours/glitch/features/ui/components/column';
 import { normalizeForLookup } from 'flavours/glitch/reducers/accounts_map';
 import { getAccountGallery } from 'flavours/glitch/selectors';
 
+import { expandAccountMediaTimeline } from '../../actions/timelines';
+import HeaderContainer from '../account_timeline/containers/header_container';
+import Column from '../ui/components/column';
+
 import MediaItem from './components/media_item';
 
 const mapStateToProps = (state, { params: { acct, id } }) => {

app/javascript/flavours/glitch/features/account_timeline/components/header.jsx

@@ -7,10 +7,11 @@ import { NavLink, withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import ActionBar from 'flavours/glitch/features/account/components/action_bar';
-import InnerHeader from 'flavours/glitch/features/account/components/header';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
+import ActionBar from '../../account/components/action_bar';
+import InnerHeader from '../../account/components/header';
+
 import MemorialNote from './memorial_note';
 import MovedNote from './moved_note';
 

app/javascript/flavours/glitch/features/account_timeline/containers/header_container.jsx

@@ -2,7 +2,7 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import { initEditAccountNote } from 'flavours/glitch/actions/account_notes';
+import { initEditAccountNote } from '../../../actions/account_notes';
 import {
   followAccount,
   unfollowAccount,
@@ -10,19 +10,18 @@ import {
   unmuteAccount,
   pinAccount,
   unpinAccount,
-} from 'flavours/glitch/actions/accounts';
+} from '../../../actions/accounts';
-import { initBlockModal } from 'flavours/glitch/actions/blocks';
+import { initBlockModal } from '../../../actions/blocks';
 import {
   mentionCompose,
   directCompose,
-} from 'flavours/glitch/actions/compose';
+} from '../../../actions/compose';
-import { blockDomain, unblockDomain } from 'flavours/glitch/actions/domain_blocks';
+import { blockDomain, unblockDomain } from '../../../actions/domain_blocks';
-import { openModal } from 'flavours/glitch/actions/modal';
+import { openModal } from '../../../actions/modal';
-import { initMuteModal } from 'flavours/glitch/actions/mutes';
+import { initMuteModal } from '../../../actions/mutes';
-import { initReport } from 'flavours/glitch/actions/reports';
+import { initReport } from '../../../actions/reports';
-import { unfollowModal } from 'flavours/glitch/initial_state';
+import { unfollowModal } from '../../../initial_state';
-import { makeGetAccount, getAccountHidden } from 'flavours/glitch/selectors';
+import { makeGetAccount, getAccountHidden } from '../../../selectors';
-
 import Header from '../components/header';
 
 const messages = defineMessages({

app/javascript/flavours/glitch/features/account_timeline/index.jsx

@@ -7,13 +7,13 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { lookupAccount, fetchAccount } from 'flavours/glitch/actions/accounts';
 import { TimelineHint } from 'flavours/glitch/components/timeline_hint';
 import ProfileColumnHeader from 'flavours/glitch/features/account/components/profile_column_header';
 import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error';
 import { normalizeForLookup } from 'flavours/glitch/reducers/accounts_map';
 import { getAccountHidden } from 'flavours/glitch/selectors';
 
+import { lookupAccount, fetchAccount } from '../../actions/accounts';
 import { fetchFeaturedTags } from '../../actions/featured_tags';
 import { expandAccountFeaturedTimeline, expandAccountTimeline } from '../../actions/timelines';
 import { LoadingIndicator } from '../../components/loading_indicator';
@@ -23,13 +23,6 @@ import Column from '../ui/components/column';
 import LimitedAccountHint from './components/limited_account_hint';
 import HeaderContainer from './containers/header_container';
 
-
-
-
-
-
-
-
 const emptyList = ImmutableList();
 
 const mapStateToProps = (state, { params: { acct, id, tagged }, withReplies = false }) => {

app/javascript/flavours/glitch/features/audio/index.jsx

@@ -9,15 +9,14 @@ import { is } from 'immutable';
 
 import { throttle, debounce } from 'lodash';
 
-import { Blurhash } from 'flavours/glitch/components/blurhash';
 import { Icon } from 'flavours/glitch/components/icon';
 import { formatTime, getPointerPosition, fileNameFromURL } from 'flavours/glitch/features/video';
-import { displayMedia, useBlurhash } from 'flavours/glitch/initial_state';
+
+import { Blurhash } from '../../components/blurhash';
+import { displayMedia, useBlurhash } from '../../initial_state';
 
 import Visualizer from './visualizer';
 
-
-
 const messages = defineMessages({
   play: { id: 'video.play', defaultMessage: 'Play' },
   pause: { id: 'video.pause', defaultMessage: 'Pause' },

app/javascript/flavours/glitch/features/blocks/index.jsx

@@ -8,13 +8,12 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import { fetchBlocks, expandBlocks } from 'flavours/glitch/actions/blocks';
+import { fetchBlocks, expandBlocks } from '../../actions/blocks';
-import ColumnBackButtonSlim from 'flavours/glitch/components/column_back_button_slim';
+import ColumnBackButtonSlim from '../../components/column_back_button_slim';
-import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
+import { LoadingIndicator } from '../../components/loading_indicator';
-import AccountContainer from 'flavours/glitch/containers/account_container';
-import Column from 'flavours/glitch/features/ui/components/column';
-
 import ScrollableList from '../../components/scrollable_list';
+import AccountContainer from '../../containers/account_container';
+import Column from '../ui/components/column';
 
 const messages = defineMessages({
   heading: { id: 'column.blocks', defaultMessage: 'Blocked users' },

app/javascript/flavours/glitch/features/community_timeline/containers/column_settings_container.js

@@ -1,8 +1,7 @@
 import { connect } from 'react-redux';
 
-import { changeColumnParams } from 'flavours/glitch/actions/columns';
+import { changeColumnParams } from '../../../actions/columns';
-import { changeSetting } from 'flavours/glitch/actions/settings';
+import { changeSetting } from '../../../actions/settings';
-
 import ColumnSettings from '../components/column_settings';
 
 const mapStateToProps = (state, { columnId }) => {

app/javascript/flavours/glitch/features/community_timeline/index.jsx

@@ -7,15 +7,16 @@ import { Helmet } from 'react-helmet';
 
 import { connect } from 'react-redux';
 
-import { addColumn, removeColumn, moveColumn } from 'flavours/glitch/actions/columns';
-import { connectCommunityStream } from 'flavours/glitch/actions/streaming';
-import { expandCommunityTimeline } from 'flavours/glitch/actions/timelines';
-import Column from 'flavours/glitch/components/column';
-import ColumnHeader from 'flavours/glitch/components/column_header';
 import { DismissableBanner } from 'flavours/glitch/components/dismissable_banner';
-import StatusListContainer from 'flavours/glitch/features/ui/containers/status_list_container';
 import { domain } from 'flavours/glitch/initial_state';
 
+import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
+import { connectCommunityStream } from '../../actions/streaming';
+import { expandCommunityTimeline } from '../../actions/timelines';
+import Column from '../../components/column';
+import ColumnHeader from '../../components/column_header';
+import StatusListContainer from '../ui/containers/status_list_container';
+
 import ColumnSettingsContainer from './containers/column_settings_container';
 
 const messages = defineMessages({

app/javascript/flavours/glitch/features/compose/components/autosuggest_account.jsx

@@ -1,8 +1,8 @@
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { Avatar } from 'flavours/glitch/components/avatar';
+import { Avatar } from '../../../components/avatar';
-import { DisplayName } from 'flavours/glitch/components/display_name';
+import { DisplayName } from '../../../components/display_name';
 
 export default class AutosuggestAccount extends ImmutablePureComponent {
 

app/javascript/flavours/glitch/features/compose/components/navigation_bar.jsx

@@ -5,10 +5,11 @@ import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { Avatar } from 'flavours/glitch/components/avatar';
 import Permalink from 'flavours/glitch/components/permalink';
 import { profileLink } from 'flavours/glitch/utils/backend_links';
 
+import { Avatar } from '../../../components/avatar';
+
 import ActionBar from './action_bar';
 
 export default class NavigationBar extends ImmutablePureComponent {

app/javascript/flavours/glitch/features/compose/components/poll_form.jsx

@@ -9,7 +9,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import AutosuggestInput from 'flavours/glitch/components/autosuggest_input';
-import { Icon } from 'flavours/glitch/components/icon';
+import { Icon }  from 'flavours/glitch/components/icon';
 import { IconButton } from 'flavours/glitch/components/icon_button';
 import { pollLimits } from 'flavours/glitch/initial_state';
 

app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import { PureComponent } from 'react';
 
-import { defineMessages, injectIntl } from 'react-intl';
+import { injectIntl, defineMessages } from 'react-intl';
 
 import Dropdown from './dropdown';
 

app/javascript/flavours/glitch/features/compose/components/search_results.jsx

@@ -5,13 +5,14 @@ import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { ImmutableHashtag as Hashtag } from 'flavours/glitch/components/hashtag';
 import { Icon } from 'flavours/glitch/components/icon';
 import { LoadMore } from 'flavours/glitch/components/load_more';
-import AccountContainer from 'flavours/glitch/containers/account_container';
-import StatusContainer from 'flavours/glitch/containers/status_container';
 import { SearchSection } from 'flavours/glitch/features/explore/components/search_section';
 
+import { ImmutableHashtag as Hashtag } from '../../../components/hashtag';
+import AccountContainer from '../../../containers/account_container';
+import StatusContainer from '../../../containers/status_container';
+
 const INITIAL_PAGE_LIMIT = 10;
 
 const withoutLastResult = list => {

app/javascript/flavours/glitch/features/compose/components/upload.jsx

@@ -7,7 +7,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import spring from 'react-motion/lib/spring';
 
-import { Icon } from 'flavours/glitch/components/icon';
+import { Icon }  from 'flavours/glitch/components/icon';
 
 import Motion from '../../ui/util/optional_motion';
 

app/javascript/flavours/glitch/features/compose/containers/autosuggest_account_container.js

@@ -1,7 +1,6 @@
 import { connect } from 'react-redux';
 
-import { makeGetAccount } from 'flavours/glitch/selectors';
+import { makeGetAccount } from '../../../selectors';
-
 import AutosuggestAccount from '../components/autosuggest_account';
 
 const makeMapStateToProps = () => {

app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js

@@ -2,24 +2,24 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
+import { privacyPreference } from 'flavours/glitch/utils/privacy_preference';
+
 import {
   changeCompose,
+  submitCompose,
+  clearComposeSuggestions,
+  fetchComposeSuggestions,
+  selectComposeSuggestion,
   changeComposeSpoilerText,
   changeComposeSpoilerness,
   changeComposeVisibility,
-  clearComposeSuggestions,
-  fetchComposeSuggestions,
   insertEmojiCompose,
-  selectComposeSuggestion,
-  submitCompose,
   uploadCompose,
-} from 'flavours/glitch/actions/compose';
+} from '../../../actions/compose';
-import { changeLocalSetting } from 'flavours/glitch/actions/local_settings';
+import { changeLocalSetting } from '../../../actions/local_settings';
 import {
   openModal,
-} from 'flavours/glitch/actions/modal';
+} from '../../../actions/modal';
-import { privacyPreference } from 'flavours/glitch/utils/privacy_preference';
-
 import ComposeForm from '../components/compose_form';
 
 const messages = defineMessages({

app/javascript/flavours/glitch/features/compose/containers/emoji_picker_dropdown_container.js

@@ -2,9 +2,8 @@ import { Map as ImmutableMap } from 'immutable';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 
-import { useEmoji } from 'flavours/glitch/actions/emojis';
+import { useEmoji } from '../../../actions/emojis';
-import { changeSetting } from 'flavours/glitch/actions/settings';
+import { changeSetting } from '../../../actions/settings';
-
 import EmojiPickerDropdown from '../components/emoji_picker_dropdown';
 
 const perLine = 8;

app/javascript/flavours/glitch/features/compose/containers/navigation_container.js

@@ -3,9 +3,9 @@ import { defineMessages, injectIntl } from 'react-intl';
 import { connect }   from 'react-redux';
 
 import { openModal } from 'flavours/glitch/actions/modal';
-import { me } from 'flavours/glitch/initial_state';
 import { logOut } from 'flavours/glitch/utils/log_out';
 
+import { me } from '../../../initial_state';
 import NavigationBar from '../components/navigation_bar';
 
 const messages = defineMessages({

app/javascript/flavours/glitch/features/compose/containers/poll_form_container.js

@@ -8,8 +8,7 @@ import {
   clearComposeSuggestions,
   fetchComposeSuggestions,
   selectComposeSuggestion,
-} from 'flavours/glitch/actions/compose';
+} from '../../../actions/compose';
-
 import PollForm from '../components/poll_form';
 
 const mapStateToProps = state => ({

app/javascript/flavours/glitch/features/compose/containers/privacy_dropdown_container.js

@@ -1,9 +1,8 @@
 import { connect } from 'react-redux';
 
-import { changeComposeVisibility } from 'flavours/glitch/actions/compose';
+import { changeComposeVisibility } from '../../../actions/compose';
-import { openModal, closeModal } from 'flavours/glitch/actions/modal';
+import { openModal, closeModal } from '../../../actions/modal';
-import { isUserTouching } from 'flavours/glitch/is_mobile';
+import { isUserTouching } from '../../../is_mobile';
-
 import PrivacyDropdown from '../components/privacy_dropdown';
 
 const mapStateToProps = state => ({

app/javascript/flavours/glitch/features/compose/containers/reply_indicator_container.js

@@ -1,7 +1,6 @@
 import { connect } from 'react-redux';
 
-import { cancelReplyCompose } from 'flavours/glitch/actions/compose';
+import { cancelReplyCompose } from '../../../actions/compose';
-
 import ReplyIndicator from '../components/reply_indicator';
 
 const makeMapStateToProps = () => {

app/javascript/flavours/glitch/features/compose/containers/upload_container.js

@@ -1,7 +1,6 @@
 import { connect } from 'react-redux';
 
-import { undoUploadCompose, initMediaEditModal, submitCompose } from 'flavours/glitch/actions/compose';
+import { undoUploadCompose, initMediaEditModal, submitCompose } from '../../../actions/compose';
-
 import Upload from '../components/upload';
 
 const mapStateToProps = (state, { id }) => ({

app/javascript/flavours/glitch/features/compose/containers/warning_container.jsx

@@ -10,7 +10,6 @@ import { HASHTAG_PATTERN_REGEX } from 'flavours/glitch/utils/hashtags';
 
 import Warning from '../components/warning';
 
-
 const mapStateToProps = state => ({
   needsLockWarning: state.getIn(['compose', 'privacy']) === 'private' && !state.getIn(['accounts', me, 'locked']),
   hashtagWarning: state.getIn(['compose', 'privacy']) !== 'public' && HASHTAG_PATTERN_REGEX.test(state.getIn(['compose', 'text'])),

app/javascript/flavours/glitch/features/compose/index.jsx

@@ -12,8 +12,8 @@ import spring from 'react-motion/lib/spring';
 
 import { mountCompose, unmountCompose, cycleElefriendCompose } from 'flavours/glitch/actions/compose';
 import Column from 'flavours/glitch/components/column';
-import { mascot } from 'flavours/glitch/initial_state';
 
+import { mascot } from '../../initial_state';
 import Motion from '../ui/util/optional_motion';
 
 import ComposeFormContainer from './containers/compose_form_container';

app/javascript/flavours/glitch/features/direct_timeline/components/conversations_list.jsx

@@ -5,8 +5,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { debounce } from 'lodash';
 
-import ScrollableList from 'flavours/glitch/components/scrollable_list';
+import ScrollableList from '../../../components/scrollable_list';
-
 import ConversationContainer from '../containers/conversation_container';
 
 export default class ConversationsList extends ImmutablePureComponent {

app/javascript/flavours/glitch/features/direct_timeline/containers/conversations_list_container.js

@@ -1,7 +1,6 @@
 import { connect } from 'react-redux';
 
-import { expandConversations } from 'flavours/glitch/actions/conversations';
+import { expandConversations } from '../../../actions/conversations';
-
 import ConversationsList from '../components/conversations_list';
 
 const mapStateToProps = state => ({

app/javascript/flavours/glitch/features/domain_blocks/index.jsx

@@ -10,18 +10,13 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import ScrollableList from 'flavours/glitch/components/scrollable_list';
-
 import { fetchDomainBlocks, expandDomainBlocks } from '../../actions/domain_blocks';
 import ColumnBackButtonSlim from '../../components/column_back_button_slim';
 import { LoadingIndicator } from '../../components/loading_indicator';
+import ScrollableList from '../../components/scrollable_list';
 import DomainContainer from '../../containers/domain_container';
 import Column from '../ui/components/column';
 
-
-
-
-
 const messages = defineMessages({
   heading: { id: 'column.domain_blocks', defaultMessage: 'Blocked domains' },
   unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },

app/javascript/flavours/glitch/features/emoji/emoji.js

@@ -1,8 +1,9 @@
 import Trie from 'substring-trie';
 
-import { autoPlayGif, useSystemEmojiFont } from 'flavours/glitch/initial_state';
 import { assetHost } from 'flavours/glitch/utils/config';
 
+import { autoPlayGif, useSystemEmojiFont } from '../../initial_state';
+
 import { unicodeMapping } from './emoji_unicode_mapping_light';
 
 const trie = new Trie(Object.keys(unicodeMapping));

app/javascript/flavours/glitch/features/explore/index.jsx

@@ -19,8 +19,6 @@ import Statuses from './statuses';
 import Suggestions from './suggestions';
 import Tags from './tags';
 
-
-
 const messages = defineMessages({
   title: { id: 'explore.title', defaultMessage: 'Explore' },
   searchResults: { id: 'explore.search_results', defaultMessage: 'Search results' },

app/javascript/flavours/glitch/features/favourites/index.jsx

@@ -12,7 +12,7 @@ import { debounce } from 'lodash';
 
 import { fetchFavourites, expandFavourites } from 'flavours/glitch/actions/interactions';
 import ColumnHeader from 'flavours/glitch/components/column_header';
-import { Icon } from 'flavours/glitch/components/icon';
+import { Icon }  from 'flavours/glitch/components/icon';
 import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
 import ScrollableList from 'flavours/glitch/components/scrollable_list';
 import AccountContainer from 'flavours/glitch/containers/account_container';

app/javascript/flavours/glitch/features/filters/select_filter.jsx

@@ -7,7 +7,7 @@ import { connect } from 'react-redux';
 
 import fuzzysort from 'fuzzysort';
 
-import { Icon } from 'flavours/glitch/components/icon';
+import { Icon }  from 'flavours/glitch/components/icon';
 import { toServerSideType } from 'flavours/glitch/utils/filters';
 import { loupeIcon, deleteIcon } from 'flavours/glitch/utils/icons';
 

app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.jsx

@@ -5,10 +5,10 @@ import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { Avatar } from 'flavours/glitch/components/avatar';
+import { Avatar } from '../../../components/avatar';
-import { DisplayName } from 'flavours/glitch/components/display_name';
+import { DisplayName } from '../../../components/display_name';
-import { IconButton } from 'flavours/glitch/components/icon_button';
+import { IconButton } from '../../../components/icon_button';
-import Permalink from 'flavours/glitch/components/permalink';
+import Permalink from '../../../components/permalink';
 
 const messages = defineMessages({
   authorize: { id: 'follow_request.authorize', defaultMessage: 'Authorize' },

app/javascript/flavours/glitch/features/follow_requests/containers/account_authorize_container.js

@@ -1,8 +1,7 @@
 import { connect } from 'react-redux';
 
-import { authorizeFollowRequest, rejectFollowRequest } from 'flavours/glitch/actions/accounts';
+import { authorizeFollowRequest, rejectFollowRequest } from '../../../actions/accounts';
-import { makeGetAccount } from 'flavours/glitch/selectors';
+import { makeGetAccount } from '../../../selectors';
-
 import AccountAuthorize from '../components/account_authorize';
 
 const makeMapStateToProps = () => {

app/javascript/flavours/glitch/features/follow_requests/index.jsx

@@ -10,19 +10,14 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import { fetchFollowRequests, expandFollowRequests } from 'flavours/glitch/actions/accounts';
+import { fetchFollowRequests, expandFollowRequests } from '../../actions/accounts';
-import ColumnBackButtonSlim from 'flavours/glitch/components/column_back_button_slim';
+import ColumnBackButtonSlim from '../../components/column_back_button_slim';
-import ScrollableList from 'flavours/glitch/components/scrollable_list';
+import ScrollableList from '../../components/scrollable_list';
-import Column from 'flavours/glitch/features/ui/components/column';
+import { me } from '../../initial_state';
-import { me } from 'flavours/glitch/initial_state';
+import Column from '../ui/components/column';
 
 import AccountAuthorizeContainer from './containers/account_authorize_container';
 
-
-
-
-
-
 const messages = defineMessages({
   heading: { id: 'column.follow_requests', defaultMessage: 'Follow requests' },
 });

app/javascript/flavours/glitch/features/followers/index.jsx

@@ -8,24 +8,24 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
+import { TimelineHint } from 'flavours/glitch/components/timeline_hint';
+import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error';
+import { normalizeForLookup } from 'flavours/glitch/reducers/accounts_map';
+import { getAccountHidden } from 'flavours/glitch/selectors';
+
 import {
   lookupAccount,
   fetchAccount,
   fetchFollowers,
   expandFollowers,
-} from 'flavours/glitch/actions/accounts';
+} from '../../actions/accounts';
-import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
+import { LoadingIndicator } from '../../components/loading_indicator';
-import ScrollableList from 'flavours/glitch/components/scrollable_list';
+import ScrollableList from '../../components/scrollable_list';
-import { TimelineHint } from 'flavours/glitch/components/timeline_hint';
+import AccountContainer from '../../containers/account_container';
-import AccountContainer from 'flavours/glitch/containers/account_container';
+import ProfileColumnHeader from '../account/components/profile_column_header';
-import ProfileColumnHeader from 'flavours/glitch/features/account/components/profile_column_header';
-import HeaderContainer from 'flavours/glitch/features/account_timeline/containers/header_container';
-import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error';
-import Column from 'flavours/glitch/features/ui/components/column';
-import { normalizeForLookup } from 'flavours/glitch/reducers/accounts_map';
-import { getAccountHidden } from 'flavours/glitch/selectors';
-
 import LimitedAccountHint from '../account_timeline/components/limited_account_hint';
+import HeaderContainer from '../account_timeline/containers/header_container';
+import Column from '../ui/components/column';
 
 const mapStateToProps = (state, { params: { acct, id } }) => {
   const accountId = id || state.getIn(['accounts_map', normalizeForLookup(acct)]);

app/javascript/flavours/glitch/features/following/index.jsx

@@ -8,24 +8,24 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
+import { TimelineHint } from 'flavours/glitch/components/timeline_hint';
+import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error';
+import { normalizeForLookup } from 'flavours/glitch/reducers/accounts_map';
+import { getAccountHidden } from 'flavours/glitch/selectors';
+
 import {
   lookupAccount,
   fetchAccount,
   fetchFollowing,
   expandFollowing,
-} from 'flavours/glitch/actions/accounts';
+} from '../../actions/accounts';
-import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
+import { LoadingIndicator } from '../../components/loading_indicator';
-import ScrollableList from 'flavours/glitch/components/scrollable_list';
+import ScrollableList from '../../components/scrollable_list';
-import { TimelineHint } from 'flavours/glitch/components/timeline_hint';
+import AccountContainer from '../../containers/account_container';
-import AccountContainer from 'flavours/glitch/containers/account_container';
+import ProfileColumnHeader from '../account/components/profile_column_header';
-import ProfileColumnHeader from 'flavours/glitch/features/account/components/profile_column_header';
-import HeaderContainer from 'flavours/glitch/features/account_timeline/containers/header_container';
-import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error';
-import Column from 'flavours/glitch/features/ui/components/column';
-import { normalizeForLookup } from 'flavours/glitch/reducers/accounts_map';
-import { getAccountHidden } from 'flavours/glitch/selectors';
-
 import LimitedAccountHint from '../account_timeline/components/limited_account_hint';
+import HeaderContainer from '../account_timeline/containers/header_container';
+import Column from '../ui/components/column';
 
 const mapStateToProps = (state, { params: { acct, id } }) => {
   const accountId = id || state.getIn(['accounts_map', normalizeForLookup(acct)]);

app/javascript/flavours/glitch/features/getting_started/index.jsx

@@ -14,17 +14,16 @@ import { fetchFollowRequests } from 'flavours/glitch/actions/accounts';
 import { fetchLists } from 'flavours/glitch/actions/lists';
 import { openModal } from 'flavours/glitch/actions/modal';
 import Column from 'flavours/glitch/features/ui/components/column';
-import ColumnLink from 'flavours/glitch/features/ui/components/column_link';
-import ColumnSubheading from 'flavours/glitch/features/ui/components/column_subheading';
 import LinkFooter from 'flavours/glitch/features/ui/components/link_footer';
-import { me, showTrends } from 'flavours/glitch/initial_state';
 import { preferencesLink } from 'flavours/glitch/utils/backend_links';
 
+import { me, showTrends } from '../../initial_state';
 import NavigationBar from '../compose/components/navigation_bar';
+import ColumnLink from '../ui/components/column_link';
+import ColumnSubheading from '../ui/components/column_subheading';
 
 import TrendsContainer from './containers/trends_container';
 
-
 const messages = defineMessages({
   heading: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
   home_timeline: { id: 'tabs_bar.home', defaultMessage: 'Home' },

app/javascript/flavours/glitch/features/hashtag_timeline/containers/column_settings_container.js

@@ -1,8 +1,7 @@
 import { connect } from 'react-redux';
 
-import { changeColumnParams } from 'flavours/glitch/actions/columns';
+import { changeColumnParams } from '../../../actions/columns';
-import api from 'flavours/glitch/api';
+import api from '../../../api';
-
 import ColumnSettings from '../components/column_settings';
 
 const mapStateToProps = (state, { columnId }) => {

app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx

@@ -16,7 +16,8 @@ import { fetchHashtag, followHashtag, unfollowHashtag } from 'flavours/glitch/ac
 import { expandHashtagTimeline, clearTimeline } from 'flavours/glitch/actions/timelines';
 import Column from 'flavours/glitch/components/column';
 import ColumnHeader from 'flavours/glitch/components/column_header';
-import StatusListContainer from 'flavours/glitch/features/ui/containers/status_list_container';
+
+import StatusListContainer from '../ui/containers/status_list_container';
 
 import { HashtagHeader } from './components/hashtag_header';
 import ColumnSettingsContainer from './containers/column_settings_container';

app/javascript/flavours/glitch/features/interaction_modal/index.jsx

@@ -12,7 +12,7 @@ import { throttle, escapeRegExp } from 'lodash';
 import { openModal, closeModal } from 'flavours/glitch/actions/modal';
 import api from 'flavours/glitch/api';
 import { Button } from 'flavours/glitch/components/button';
-import { Icon } from 'flavours/glitch/components/icon';
+import { Icon }  from 'flavours/glitch/components/icon';
 import { registrationsOpen, sso_redirect } from 'flavours/glitch/initial_state';
 
 const messages = defineMessages({

app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx

@@ -10,7 +10,6 @@ import { connect } from 'react-redux';
 import Column from 'flavours/glitch/components/column';
 import ColumnHeader from 'flavours/glitch/components/column_header';
 
-
 const messages = defineMessages({
   heading: { id: 'keyboard_shortcuts.heading', defaultMessage: 'Keyboard Shortcuts' },
 });

app/javascript/flavours/glitch/features/list_adder/components/account.jsx

@@ -8,7 +8,6 @@ import { Avatar } from '../../../components/avatar';
 import { DisplayName } from '../../../components/display_name';
 import { makeGetAccount } from '../../../selectors';
 
-
 const makeMapStateToProps = () => {
   const getAccount = makeGetAccount();
 
@@ -19,7 +18,6 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
-
 class Account extends ImmutablePureComponent {
 
   static propTypes = {

app/javascript/flavours/glitch/features/list_adder/components/list.jsx

@@ -9,7 +9,7 @@ import { connect } from 'react-redux';
 import { Icon } from 'flavours/glitch/components/icon';
 
 import { removeFromListAdder, addToListAdder } from '../../../actions/lists';
-import { IconButton } from '../../../components/icon_button';
+import { IconButton }  from '../../../components/icon_button';
 
 const messages = defineMessages({
   remove: { id: 'lists.account.remove', defaultMessage: 'Remove from list' },

app/javascript/flavours/glitch/features/list_editor/components/account.jsx

@@ -5,10 +5,9 @@ import { defineMessages } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { Avatar } from 'flavours/glitch/components/avatar';
+import { Avatar } from '../../../components/avatar';
-import { DisplayName } from 'flavours/glitch/components/display_name';
+import { DisplayName } from '../../../components/display_name';
-import { IconButton } from 'flavours/glitch/components/icon_button';
+import { IconButton } from '../../../components/icon_button';
-
 
 const messages = defineMessages({
   remove: { id: 'lists.account.remove', defaultMessage: 'Remove from list' },

app/javascript/flavours/glitch/features/list_editor/components/edit_list_form.jsx

@@ -5,8 +5,8 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import { changeListEditorTitle, submitListEditor } from 'flavours/glitch/actions/lists';
+import { changeListEditorTitle, submitListEditor } from '../../../actions/lists';
-import { IconButton } from 'flavours/glitch/components/icon_button';
+import { IconButton } from '../../../components/icon_button';
 
 const messages = defineMessages({
   title: { id: 'lists.edit.submit', defaultMessage: 'Change title' },

app/javascript/flavours/glitch/features/list_editor/index.jsx

@@ -8,8 +8,7 @@ import { connect } from 'react-redux';
 
 import spring from 'react-motion/lib/spring';
 
-import { setupListEditor, clearListSuggestions, resetListEditor } from 'flavours/glitch/actions/lists';
+import { setupListEditor, clearListSuggestions, resetListEditor } from '../../actions/lists';
-
 import Motion from '../ui/util/optional_motion';
 
 import EditListForm from './components/edit_list_form';

app/javascript/flavours/glitch/features/mutes/index.jsx

@@ -10,15 +10,12 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import { fetchMutes, expandMutes } from 'flavours/glitch/actions/mutes';
+import { fetchMutes, expandMutes } from '../../actions/mutes';
-import ColumnBackButtonSlim from 'flavours/glitch/components/column_back_button_slim';
+import ColumnBackButtonSlim from '../../components/column_back_button_slim';
-import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
+import { LoadingIndicator } from '../../components/loading_indicator';
-import ScrollableList from 'flavours/glitch/components/scrollable_list';
+import ScrollableList from '../../components/scrollable_list';
-import AccountContainer from 'flavours/glitch/containers/account_container';
+import AccountContainer from '../../containers/account_container';
-import Column from 'flavours/glitch/features/ui/components/column';
+import Column from '../ui/components/column';
-
-
-
 
 const messages = defineMessages({
   heading: { id: 'column.mutes', defaultMessage: 'Muted users' },

app/javascript/flavours/glitch/features/notifications/components/notifications_permission_banner.jsx

@@ -8,11 +8,9 @@ import { connect } from 'react-redux';
 import { requestBrowserPermission } from 'flavours/glitch/actions/notifications';
 import { changeSetting } from 'flavours/glitch/actions/settings';
 import { Button } from 'flavours/glitch/components/button';
-import { Icon } from 'flavours/glitch/components/icon';
+import { Icon }  from 'flavours/glitch/components/icon';
 import { IconButton } from 'flavours/glitch/components/icon_button';
 
-
-
 const messages = defineMessages({
   close: { id: 'lightbox.close', defaultMessage: 'Close' },
 });

app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js

@@ -2,12 +2,11 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import { showAlert } from 'flavours/glitch/actions/alerts';
+import { showAlert } from '../../../actions/alerts';
-import { openModal } from 'flavours/glitch/actions/modal';
+import { openModal } from '../../../actions/modal';
-import { setFilter, clearNotifications, requestBrowserPermission } from 'flavours/glitch/actions/notifications';
+import { setFilter, clearNotifications, requestBrowserPermission } from '../../../actions/notifications';
-import { changeAlerts as changePushNotifications } from 'flavours/glitch/actions/push_notifications';
+import { changeAlerts as changePushNotifications } from '../../../actions/push_notifications';
-import { changeSetting } from 'flavours/glitch/actions/settings';
+import { changeSetting } from '../../../actions/settings';
-
 import ColumnSettings from '../components/column_settings';
 
 const messages = defineMessages({

app/javascript/flavours/glitch/features/notifications/index.jsx

@@ -13,8 +13,12 @@ import { createSelector } from 'reselect';
 
 import { debounce } from 'lodash';
 
-import { addColumn, removeColumn, moveColumn } from 'flavours/glitch/actions/columns';
+import { compareId } from 'flavours/glitch/compare_id';
-import { submitMarkers } from 'flavours/glitch/actions/markers';
+import { Icon }  from 'flavours/glitch/components/icon';
+import { NotSignedInIndicator } from 'flavours/glitch/components/not_signed_in_indicator';
+
+import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
+import { submitMarkers } from '../../actions/markers';
 import {
   enterNotificationClearingMode,
   expandNotifications,
@@ -23,26 +27,18 @@ import {
   mountNotifications,
   unmountNotifications,
   markNotificationsAsRead,
-} from 'flavours/glitch/actions/notifications';
+} from '../../actions/notifications';
-import { compareId } from 'flavours/glitch/compare_id';
+import Column from '../../components/column';
-import Column from 'flavours/glitch/components/column';
+import ColumnHeader from '../../components/column_header';
-import ColumnHeader from 'flavours/glitch/components/column_header';
+import { LoadGap } from '../../components/load_gap';
-import { Icon } from 'flavours/glitch/components/icon';
+import ScrollableList from '../../components/scrollable_list';
-import { LoadGap } from 'flavours/glitch/components/load_gap';
+import NotificationPurgeButtonsContainer from '../../containers/notification_purge_buttons_container';
-import { NotSignedInIndicator } from 'flavours/glitch/components/not_signed_in_indicator';
-import ScrollableList from 'flavours/glitch/components/scrollable_list';
-import NotificationPurgeButtonsContainer from 'flavours/glitch/containers/notification_purge_buttons_container';
 
 import NotificationsPermissionBanner from './components/notifications_permission_banner';
 import ColumnSettingsContainer from './containers/column_settings_container';
 import FilterBarContainer from './containers/filter_bar_container';
 import NotificationContainer from './containers/notification_container';
 
-
-
-
-
-
 const messages = defineMessages({
   title: { id: 'column.notifications', defaultMessage: 'Notifications' },
   enterNotifCleaning : { id: 'notification_purge.start', defaultMessage: 'Enter notification cleaning mode' },

app/javascript/flavours/glitch/features/picture_in_picture/components/header.jsx

@@ -12,8 +12,6 @@ import { Avatar } from 'flavours/glitch/components/avatar';
 import { DisplayName } from 'flavours/glitch/components/display_name';
 import { IconButton } from 'flavours/glitch/components/icon_button';
 
-
-
 const messages = defineMessages({
   close: { id: 'lightbox.close', defaultMessage: 'Close' },
 });

app/javascript/flavours/glitch/features/public_timeline/containers/column_settings_container.js

@@ -1,8 +1,7 @@
 import { connect } from 'react-redux';
 
-import { changeColumnParams } from 'flavours/glitch/actions/columns';
+import { changeColumnParams } from '../../../actions/columns';
-import { changeSetting } from 'flavours/glitch/actions/settings';
+import { changeSetting } from '../../../actions/settings';
-
 import ColumnSettings from '../components/column_settings';
 
 const mapStateToProps = (state, { columnId }) => {

app/javascript/flavours/glitch/features/public_timeline/index.jsx

@@ -7,15 +7,16 @@ import { Helmet } from 'react-helmet';
 
 import { connect } from 'react-redux';
 
-import { addColumn, removeColumn, moveColumn } from 'flavours/glitch/actions/columns';
-import { connectPublicStream } from 'flavours/glitch/actions/streaming';
-import { expandPublicTimeline } from 'flavours/glitch/actions/timelines';
-import Column from 'flavours/glitch/components/column';
-import ColumnHeader from 'flavours/glitch/components/column_header';
 import { DismissableBanner } from 'flavours/glitch/components/dismissable_banner';
-import StatusListContainer from 'flavours/glitch/features/ui/containers/status_list_container';
 import { domain } from 'flavours/glitch/initial_state';
 
+import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
+import { connectPublicStream } from '../../actions/streaming';
+import { expandPublicTimeline } from '../../actions/timelines';
+import Column from '../../components/column';
+import ColumnHeader from '../../components/column_header';
+import StatusListContainer from '../ui/containers/status_list_container';
+
 import ColumnSettingsContainer from './containers/column_settings_container';
 
 const messages = defineMessages({

app/javascript/flavours/glitch/features/reblogs/index.jsx

@@ -10,13 +10,14 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
-import { fetchReblogs, expandReblogs } from 'flavours/glitch/actions/interactions';
+import { Icon }  from 'flavours/glitch/components/icon';
-import ColumnHeader from 'flavours/glitch/components/column_header';
+
-import { Icon } from 'flavours/glitch/components/icon';
+import { fetchReblogs, expandReblogs } from '../../actions/interactions';
-import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
+import ColumnHeader from '../../components/column_header';
-import ScrollableList from 'flavours/glitch/components/scrollable_list';
+import { LoadingIndicator } from '../../components/loading_indicator';
-import AccountContainer from 'flavours/glitch/containers/account_container';
+import ScrollableList from '../../components/scrollable_list';
-import Column from 'flavours/glitch/features/ui/components/column';
+import AccountContainer from '../../containers/account_container';
+import Column from '../ui/components/column';
 
 const messages = defineMessages({
   heading: { id: 'column.reblogged_by', defaultMessage: 'Boosted by' },

app/javascript/flavours/glitch/features/standalone/compose/index.jsx

@@ -1,9 +1,9 @@
 import { PureComponent } from 'react';
 
-import ComposeFormContainer from 'flavours/glitch/features/compose/containers/compose_form_container';
+import ComposeFormContainer from '../../compose/containers/compose_form_container';
-import LoadingBarContainer from 'flavours/glitch/features/ui/containers/loading_bar_container';
+import LoadingBarContainer from '../../ui/containers/loading_bar_container';
-import ModalContainer from 'flavours/glitch/features/ui/containers/modal_container';
+import ModalContainer from '../../ui/containers/modal_container';
-import NotificationsContainer from 'flavours/glitch/features/ui/containers/notifications_container';
+import NotificationsContainer from '../../ui/containers/notifications_container';
 
 export default class Compose extends PureComponent {
 

app/javascript/flavours/glitch/features/status/components/detailed_status.jsx

@@ -10,20 +10,20 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { AnimatedNumber } from 'flavours/glitch/components/animated_number';
 import AttachmentList from 'flavours/glitch/components/attachment_list';
-import { Avatar } from 'flavours/glitch/components/avatar';
-import { DisplayName } from 'flavours/glitch/components/display_name';
 import EditedTimestamp from 'flavours/glitch/components/edited_timestamp';
 import { Icon } from 'flavours/glitch/components/icon';
-import MediaGallery from 'flavours/glitch/components/media_gallery';
 import PictureInPicturePlaceholder from 'flavours/glitch/components/picture_in_picture_placeholder';
-import StatusContent from 'flavours/glitch/components/status_content';
 import VisibilityIcon from 'flavours/glitch/components/status_visibility_icon';
 import PollContainer from 'flavours/glitch/containers/poll_container';
-import Audio from 'flavours/glitch/features/audio';
-import Video from 'flavours/glitch/features/video';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
+import { Avatar } from '../../../components/avatar';
+import { DisplayName } from '../../../components/display_name';
+import MediaGallery from '../../../components/media_gallery';
+import StatusContent from '../../../components/status_content';
+import Audio from '../../audio';
 import scheduleIdleTask from '../../ui/util/schedule_idle_task';
+import Video from '../../video';
 
 import Card from './card';
 

app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js

@@ -2,14 +2,14 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import { connect } from 'react-redux';
 
-import { showAlertForError } from 'flavours/glitch/actions/alerts';
+import { showAlertForError } from '../../../actions/alerts';
-import { initBlockModal } from 'flavours/glitch/actions/blocks';
+import { initBlockModal } from '../../../actions/blocks';
-import { initBoostModal } from 'flavours/glitch/actions/boosts';
+import { initBoostModal } from '../../../actions/boosts';
 import {
   replyCompose,
   mentionCompose,
   directCompose,
-} from 'flavours/glitch/actions/compose';
+} from '../../../actions/compose';
 import {
   reblog,
   favourite,
@@ -17,18 +17,17 @@ import {
   unfavourite,
   pin,
   unpin,
-} from 'flavours/glitch/actions/interactions';
+} from '../../../actions/interactions';
-import { openModal } from 'flavours/glitch/actions/modal';
+import { openModal } from '../../../actions/modal';
-import { initMuteModal } from 'flavours/glitch/actions/mutes';
+import { initMuteModal } from '../../../actions/mutes';
-import { initReport } from 'flavours/glitch/actions/reports';
+import { initReport } from '../../../actions/reports';
 import {
   muteStatus,
   unmuteStatus,
   deleteStatus,
-} from 'flavours/glitch/actions/statuses';
+} from '../../../actions/statuses';
-import { boostModal, deleteModal } from 'flavours/glitch/initial_state';
+import { boostModal, deleteModal } from '../../../initial_state';
-import { makeGetStatus } from 'flavours/glitch/selectors';
+import { makeGetStatus } from '../../../selectors';
-
 import DetailedStatus from '../components/detailed_status';
 
 const messages = defineMessages({

app/javascript/flavours/glitch/features/status/index.jsx

@@ -14,13 +14,20 @@ import { createSelector } from 'reselect';
 
 import { HotKeys } from 'react-hotkeys';
 
-import { initBlockModal } from 'flavours/glitch/actions/blocks';
+import { Icon }  from 'flavours/glitch/components/icon';
-import { initBoostModal } from 'flavours/glitch/actions/boosts';
+import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
+import ScrollContainer from 'flavours/glitch/containers/scroll_container';
+import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error';
+import { autoUnfoldCW } from 'flavours/glitch/utils/content_warning';
+import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
+
+import { initBlockModal } from '../../actions/blocks';
+import { initBoostModal } from '../../actions/boosts';
 import {
   replyCompose,
   mentionCompose,
   directCompose,
-} from 'flavours/glitch/actions/compose';
+} from '../../actions/compose';
 import {
   favourite,
   unfavourite,
@@ -30,11 +37,11 @@ import {
   unreblog,
   pin,
   unpin,
-} from 'flavours/glitch/actions/interactions';
+} from '../../actions/interactions';
-import { changeLocalSetting } from 'flavours/glitch/actions/local_settings';
+import { changeLocalSetting } from '../../actions/local_settings';
-import { openModal } from 'flavours/glitch/actions/modal';
+import { openModal } from '../../actions/modal';
-import { initMuteModal } from 'flavours/glitch/actions/mutes';
+import { initMuteModal } from '../../actions/mutes';
-import { initReport } from 'flavours/glitch/actions/reports';
+import { initReport } from '../../actions/reports';
 import {
   fetchStatus,
   muteStatus,
@@ -45,20 +52,13 @@ import {
   revealStatus,
   translateStatus,
   undoStatusTranslation,
-} from 'flavours/glitch/actions/statuses';
+} from '../../actions/statuses';
-import { Icon } from 'flavours/glitch/components/icon';
-import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
-import { textForScreenReader, defaultMediaVisibility } from 'flavours/glitch/components/status';
-import ScrollContainer from 'flavours/glitch/containers/scroll_container';
-import StatusContainer from 'flavours/glitch/containers/status_container';
-import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error';
-import Column from 'flavours/glitch/features/ui/components/column';
-import { boostModal, favouriteModal, deleteModal } from 'flavours/glitch/initial_state';
-import { makeGetStatus, makeGetPictureInPicture } from 'flavours/glitch/selectors';
-import { autoUnfoldCW } from 'flavours/glitch/utils/content_warning';
-import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
-
 import ColumnHeader from '../../components/column_header';
+import { textForScreenReader, defaultMediaVisibility } from '../../components/status';
+import StatusContainer from '../../containers/status_container';
+import { boostModal, favouriteModal, deleteModal } from '../../initial_state';
+import { makeGetStatus, makeGetPictureInPicture } from '../../selectors';
+import Column from '../ui/components/column';
 import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../ui/util/fullscreen';
 
 import ActionBar from './components/action_bar';

app/javascript/flavours/glitch/features/ui/components/block_modal.jsx

@@ -11,7 +11,6 @@ import { initReport } from '../../../actions/reports';
 import { Button } from '../../../components/button';
 import { makeGetAccount } from '../../../selectors';
 
-
 const makeMapStateToProps = () => {
   const getAccount = makeGetAccount();
 

app/javascript/flavours/glitch/features/ui/components/boost_modal.jsx

@@ -11,16 +11,17 @@ import { connect } from 'react-redux';
 
 import { changeBoostPrivacy } from 'flavours/glitch/actions/boosts';
 import AttachmentList from 'flavours/glitch/components/attachment_list';
-import { Avatar } from 'flavours/glitch/components/avatar';
+import { Icon }  from 'flavours/glitch/components/icon';
-import { Button } from 'flavours/glitch/components/button';
-import { DisplayName } from 'flavours/glitch/components/display_name';
-import { Icon } from 'flavours/glitch/components/icon';
-import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
-import StatusContent from 'flavours/glitch/components/status_content';
 import VisibilityIcon from 'flavours/glitch/components/status_visibility_icon';
 import PrivacyDropdown from 'flavours/glitch/features/compose/components/privacy_dropdown';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
+import { Avatar } from '../../../components/avatar';
+import { Button } from '../../../components/button';
+import { DisplayName } from '../../../components/display_name';
+import { RelativeTimestamp } from '../../../components/relative_timestamp';
+import StatusContent from '../../../components/status_content';
+
 const messages = defineMessages({
   cancel_reblog: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
   reblog: { id: 'status.reblog', defaultMessage: 'Boost' },

app/javascript/flavours/glitch/features/ui/components/bundle_modal_error.jsx

@@ -3,7 +3,7 @@ import { Component } from 'react';
 
 import { defineMessages, injectIntl } from 'react-intl';
 
-import { IconButton } from 'flavours/glitch/components/icon_button';
+import { IconButton } from '../../../components/icon_button';
 
 const messages = defineMessages({
   error: { id: 'bundle_modal_error.message', defaultMessage: 'Something went wrong while loading this component.' },

app/javascript/flavours/glitch/features/ui/components/column.jsx

@@ -3,8 +3,8 @@ import { PureComponent } from 'react';
 
 import { debounce } from 'lodash';
 
-import { isMobile } from 'flavours/glitch/is_mobile';
+import { isMobile } from '../../../is_mobile';
-import { scrollTop } from 'flavours/glitch/scroll';
+import { scrollTop } from '../../../scroll';
 
 import ColumnHeader from './column_header';
 

app/javascript/flavours/glitch/features/ui/components/column_header.jsx

@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import classNames from 'classnames';
 
-import { Icon } from 'flavours/glitch/components/icon';
+import { Icon }  from 'flavours/glitch/components/icon';
 
 export default class ColumnHeader extends PureComponent {
 

app/javascript/flavours/glitch/features/ui/components/columns_area.jsx

@@ -6,8 +6,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { supportsPassiveEvents } from 'detect-passive-events';
 
-import { scrollRight } from 'flavours/glitch/scroll';
+import { scrollRight } from '../../../scroll';
-
 import BundleContainer from '../containers/bundle_container';
 import {
   Compose,

app/javascript/flavours/glitch/features/ui/components/confirmation_modal.jsx

@@ -3,7 +3,7 @@ import { PureComponent } from 'react';
 
 import { injectIntl, FormattedMessage } from 'react-intl';
 
-import { Button } from 'flavours/glitch/components/button';
+import { Button } from '../../../components/button';
 
 class ConfirmationModal extends PureComponent {
 

app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx

@@ -23,11 +23,11 @@ import Audio from 'flavours/glitch/features/audio';
 import CharacterCounter from 'flavours/glitch/features/compose/components/character_counter';
 import UploadProgress from 'flavours/glitch/features/compose/components/upload_progress';
 import { Tesseract as fetchTesseract } from 'flavours/glitch/features/ui/util/async-components';
-import Video, { getPointerPosition } from 'flavours/glitch/features/video';
 import { me } from 'flavours/glitch/initial_state';
 import { assetHost } from 'flavours/glitch/utils/config';
 
 import { changeUploadCompose, uploadThumbnail, onChangeMediaDescription, onChangeMediaFocus } from '../../../actions/compose';
+import Video, { getPointerPosition } from '../../video';
 
 const messages = defineMessages({
   close: { id: 'lightbox.close', defaultMessage: 'Close' },

app/javascript/flavours/glitch/features/ui/components/modal_loading.jsx

@@ -1,4 +1,4 @@
-import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
+import { LoadingIndicator } from '../../../components/loading_indicator';
 
 // Keep the markup in sync with <BundleModalError />
 // (make sure they have the same dimensions)

app/javascript/flavours/glitch/features/ui/components/mute_modal.jsx

@@ -7,10 +7,10 @@ import { connect } from 'react-redux';
 
 import Toggle from 'react-toggle';
 
-import { muteAccount } from 'flavours/glitch/actions/accounts';
+import { muteAccount } from '../../../actions/accounts';
-import { closeModal } from 'flavours/glitch/actions/modal';
+import { closeModal } from '../../../actions/modal';
-import { toggleHideNotifications, changeMuteDuration } from 'flavours/glitch/actions/mutes';
+import { toggleHideNotifications, changeMuteDuration } from '../../../actions/mutes';
-import { Button } from 'flavours/glitch/components/button';
+import { Button } from '../../../components/button';
 
 const messages = defineMessages({
   minutes: { id: 'intervals.full.minutes', defaultMessage: '{number, plural, one {# minute} other {# minutes}}' },

app/javascript/flavours/glitch/features/ui/components/upload_area.jsx

@@ -7,8 +7,6 @@ import spring from 'react-motion/lib/spring';
 
 import Motion from '../util/optional_motion';
 
-
-
 export default class UploadArea extends PureComponent {
 
   static propTypes = {

app/javascript/flavours/glitch/features/ui/containers/bundle_container.js

@@ -1,10 +1,8 @@
 import { connect } from 'react-redux';
 
-import { fetchBundleRequest, fetchBundleSuccess, fetchBundleFail } from 'flavours/glitch/actions/bundles';
+import { fetchBundleRequest, fetchBundleSuccess, fetchBundleFail } from '../../../actions/bundles';
-
 import Bundle from '../components/bundle';
 
-
 const mapDispatchToProps = dispatch => ({
   onFetch () {
     dispatch(fetchBundleRequest());

app/javascript/flavours/glitch/features/ui/containers/modal_container.js

@@ -1,7 +1,6 @@
 import { connect } from 'react-redux';
 
-import { openModal, closeModal } from 'flavours/glitch/actions/modal';
+import { openModal, closeModal } from '../../../actions/modal';
-
 import ModalRoot from '../components/modal_root';
 
 const mapStateToProps = state => ({

app/javascript/flavours/glitch/features/ui/containers/notifications_container.js

@@ -4,8 +4,8 @@ import { connect } from 'react-redux';
 
 import { NotificationStack } from 'react-notification';
 
-import { dismissAlert } from 'flavours/glitch/actions/alerts';
+import { dismissAlert } from '../../../actions/alerts';
-import { getAlerts } from 'flavours/glitch/selectors';
+import { getAlerts } from '../../../selectors';
 
 const mapStateToProps = (state, { intl }) => {
   const notifications = getAlerts(state);

app/javascript/flavours/glitch/features/ui/containers/status_list_container.js

@@ -4,9 +4,9 @@ import { createSelector } from 'reselect';
 
 import { debounce } from 'lodash';
 
-import { scrollTopTimeline, loadPending } from 'flavours/glitch/actions/timelines';
+import { scrollTopTimeline, loadPending } from '../../../actions/timelines';
-import StatusList from 'flavours/glitch/components/status_list';
+import StatusList from '../../../components/status_list';
-import { me } from 'flavours/glitch/initial_state';
+import { me } from '../../../initial_state';
 
 const getRegex = createSelector([
   (state, { regex }) => regex,

app/javascript/flavours/glitch/features/ui/index.jsx

@@ -13,17 +13,17 @@ import { debounce } from 'lodash';
 import { HotKeys } from 'react-hotkeys';
 
 import { changeLayout } from 'flavours/glitch/actions/app';
-import { uploadCompose, resetCompose, changeComposeSpoilerness } from 'flavours/glitch/actions/compose';
-import { clearHeight } from 'flavours/glitch/actions/height_cache';
 import { synchronouslySubmitMarkers, submitMarkers, fetchMarkers } from 'flavours/glitch/actions/markers';
-import { expandNotifications, notificationsSetVisibility } from 'flavours/glitch/actions/notifications';
-import { fetchServer, fetchServerTranslationLanguages } from 'flavours/glitch/actions/server';
-import { expandHomeTimeline } from 'flavours/glitch/actions/timelines';
 import PermaLink from 'flavours/glitch/components/permalink';
 import PictureInPicture from 'flavours/glitch/features/picture_in_picture';
 import { layoutFromWindow } from 'flavours/glitch/is_mobile';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
+import { uploadCompose, resetCompose, changeComposeSpoilerness } from '../../actions/compose';
+import { clearHeight } from '../../actions/height_cache';
+import { expandNotifications, notificationsSetVisibility } from '../../actions/notifications';
+import { fetchServer, fetchServerTranslationLanguages } from '../../actions/server';
+import { expandHomeTimeline } from '../../actions/timelines';
 import initialState, { me, owner, singleUserMode, trendsEnabled, trendsAsLanding } from '../../initial_state';
 
 import BundleColumnError from './components/bundle_column_error';

app/javascript/flavours/glitch/features/ui/util/optional_motion.js

@@ -1,6 +1,6 @@
 import Motion from 'react-motion/lib/Motion';
 
-import { reduceMotion } from 'flavours/glitch/initial_state';
+import { reduceMotion } from '../../../initial_state';
 
 import ReducedMotion from './reduced_motion';
 

app/javascript/flavours/glitch/features/ui/util/react_router_helpers.jsx

@@ -5,9 +5,9 @@ import { Switch, Route, useLocation } from 'react-router-dom';
 
 import StackTrace from 'stacktrace-js';
 
-import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error';
+import BundleColumnError from '../components/bundle_column_error';
-import ColumnLoading from 'flavours/glitch/features/ui/components/column_loading';
+import ColumnLoading from '../components/column_loading';
-import BundleContainer from 'flavours/glitch/features/ui/containers/bundle_container';
+import BundleContainer from '../containers/bundle_container';
 
 // Small wrapper to pass multiColumn to the route components
 export const WrappedSwitch = ({ multiColumn, children }) => {

app/javascript/flavours/glitch/features/video/index.jsx

@@ -10,9 +10,9 @@ import { is } from 'immutable';
 import { throttle } from 'lodash';
 
 import { Blurhash } from 'flavours/glitch/components/blurhash';
-import { Icon } from 'flavours/glitch/components/icon';
+import { Icon }  from 'flavours/glitch/components/icon';
-import { displayMedia, useBlurhash } from 'flavours/glitch/initial_state';
 
+import { displayMedia, useBlurhash } from '../../initial_state';
 import { isFullscreen, requestFullscreen, exitFullscreen } from '../ui/util/fullscreen';
 
 const messages = defineMessages({