treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream

th-new
Claire 2024-01-16 12:04:11 +01:00
parent dee561604b 01b6c83c36
commit e4d07c7bcc
110 changed files with 255 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -730,7 +730,7 @@ GEM
simplecov-lcov (0.8.0)
simplecov_json_formatter (0.1.4)
smart_properties (1.17.0)
stackprof (0.2.25)
stackprof (0.2.26)
statsd-ruby (1.5.0)
stoplight (3.0.2)
redlock (~> 1.0)

2
app/javascript/mastodon/components/attachment_list.jsx
View File

@ -7,7 +7,7 @@ import classNames from 'classnames';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import LinkIcon from 'mastodon/../material-icons/400-24px/link.svg?react';
import LinkIcon from '@/material-icons/400-24px/link.svg?react';
import { Icon } from 'mastodon/components/icon';
const filename = url => url.split('/').pop().split('#')[0].split('?')[0];

6
app/javascript/mastodon/components/badge.jsx
View File

@ -2,9 +2,9 @@ import PropTypes from 'prop-types';
import { FormattedMessage } from 'react-intl';
import GroupsIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
import PersonIcon from 'mastodon/../material-icons/400-24px/person.svg?react';
import SmartToyIcon from 'mastodon/../material-icons/400-24px/smart_toy.svg?react';
import GroupsIcon from '@/material-icons/400-24px/group.svg?react';
import PersonIcon from '@/material-icons/400-24px/person.svg?react';
import SmartToyIcon from '@/material-icons/400-24px/smart_toy.svg?react';
export const Badge = ({ icon, label, domain }) => (

2
app/javascript/mastodon/components/column_back_button.tsx
View File

@ -2,7 +2,7 @@ import { useCallback } from 'react';
import { FormattedMessage } from 'react-intl';
import ArrowBackIcon from 'mastodon/../material-icons/400-24px/arrow_back.svg?react';
import ArrowBackIcon from '@/material-icons/400-24px/arrow_back.svg?react';
import { Icon } from 'mastodon/components/icon';
import { ButtonInTabsBar } from 'mastodon/features/ui/util/columns_context';

12
app/javascript/mastodon/components/column_header.jsx
View File

@ -6,12 +6,12 @@ import { FormattedMessage, injectIntl, defineMessages } from 'react-intl';
import classNames from 'classnames';
import { withRouter } from 'react-router-dom';
import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
import ArrowBackIcon from 'mastodon/../material-icons/400-24px/arrow_back.svg?react';
import ChevronLeftIcon from 'mastodon/../material-icons/400-24px/chevron_left.svg?react';
import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import TuneIcon from 'mastodon/../material-icons/400-24px/tune.svg?react';
import AddIcon from '@/material-icons/400-24px/add.svg?react';
import ArrowBackIcon from '@/material-icons/400-24px/arrow_back.svg?react';
import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import TuneIcon from '@/material-icons/400-24px/tune.svg?react';
import { Icon } from 'mastodon/components/icon';
import { ButtonInTabsBar, useColumnsContext } from 'mastodon/features/ui/util/columns_context';
import { WithRouterPropTypes } from 'mastodon/utils/react_router';

2
app/javascript/mastodon/components/copy_icon_button.jsx
View File

@ -7,7 +7,7 @@ import classNames from 'classnames';
import { useDispatch } from 'react-redux';
import ContentCopyIcon from 'mastodon/../material-icons/400-24px/content_copy.svg?react';
import ContentCopyIcon from '@/material-icons/400-24px/content_copy.svg?react';
import { showAlert } from 'mastodon/actions/alerts';
import { IconButton } from 'mastodon/components/icon_button';

2
app/javascript/mastodon/components/dismissable_banner.tsx
View File

@ -8,7 +8,7 @@ import { useCallback, useState, useEffect } from 'react';
import { defineMessages, useIntl } from 'react-intl';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import { changeSetting } from 'mastodon/actions/settings';
import { bannerSettings } from 'mastodon/settings';
import { useAppSelector, useAppDispatch } from 'mastodon/store';

2
app/javascript/mastodon/components/domain.tsx
View File

@ -2,7 +2,7 @@ import { useCallback } from 'react';
import { defineMessages, useIntl } from 'react-intl';
import LockOpenIcon from 'mastodon/../material-icons/400-24px/lock_open.svg?react';
import LockOpenIcon from '@/material-icons/400-24px/lock_open.svg?react';
import { IconButton } from './icon_button';

2
app/javascript/mastodon/components/dropdown_menu.jsx
View File

@ -9,7 +9,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import { supportsPassiveEvents } from 'detect-passive-events';
import Overlay from 'react-overlays/Overlay';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import { CircularProgress } from 'mastodon/components/circular_progress';
import { WithRouterPropTypes } from 'mastodon/utils/react_router';

2
app/javascript/mastodon/components/edited_timestamp/index.jsx
View File

@ -5,7 +5,7 @@ import { FormattedMessage, injectIntl } from 'react-intl';
import { connect } from 'react-redux';
import ArrowDropDownIcon from 'mastodon/../material-icons/400-24px/arrow_drop_down.svg?react';
import ArrowDropDownIcon from '@/material-icons/400-24px/arrow_drop_down.svg?react';
import { openModal } from 'mastodon/actions/modal';
import { Icon } from 'mastodon/components/icon';
import InlineAccount from 'mastodon/components/inline_account';

2
app/javascript/mastodon/components/icon.tsx
View File

@ -1,6 +1,6 @@
import classNames from 'classnames';
import CheckBoxOutlineBlankIcon from 'mastodon/../material-icons/400-24px/check_box_outline_blank.svg?react';
import CheckBoxOutlineBlankIcon from '@/material-icons/400-24px/check_box_outline_blank.svg?react';
import { isProduction } from 'mastodon/utils/environment';
interface SVGPropsWithTitle extends React.SVGProps<SVGSVGElement> {

2
app/javascript/mastodon/components/load_gap.tsx
View File

@ -2,7 +2,7 @@ import { useCallback } from 'react';
import { useIntl, defineMessages } from 'react-intl';
import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
import { Icon } from 'mastodon/components/icon';
const messages = defineMessages({

2
app/javascript/mastodon/components/logo.tsx
View File

@ -1,4 +1,4 @@
import logo from 'mastodon/../images/logo.svg';
import logo from '@/images/logo.svg';
export const WordmarkLogo: React.FC = () => (
<svg viewBox='0 0 261 66' className='logo logo--wordmark' role='img'>

2
app/javascript/mastodon/components/media_gallery.jsx
View File

@ -10,7 +10,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import { debounce } from 'lodash';
import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
import { Blurhash } from 'mastodon/components/blurhash';
import { autoPlayGif, displayMedia, useBlurhash } from '../initial_state';

2
app/javascript/mastodon/components/picture_in_picture_placeholder.jsx
View File

@ -5,7 +5,7 @@ import { FormattedMessage } from 'react-intl';
import { connect } from 'react-redux';
import CancelPresentationIcon from 'mastodon/../material-icons/400-24px/cancel_presentation.svg?react';
import CancelPresentationIcon from '@/material-icons/400-24px/cancel_presentation.svg?react';
import { removePictureInPicture } from 'mastodon/actions/picture_in_picture';
import { Icon } from 'mastodon/components/icon';

2
app/javascript/mastodon/components/poll.jsx
View File

@ -10,7 +10,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import escapeTextContentForBrowser from 'escape-html';
import spring from 'react-motion/lib/spring';
import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
import CheckIcon from '@/material-icons/400-24px/check.svg?react';
import { Icon } from 'mastodon/components/icon';
import emojify from 'mastodon/features/emoji/emoji';
import Motion from 'mastodon/features/ui/util/optional_motion';

2
app/javascript/mastodon/components/regeneration_indicator.jsx
View File

@ -1,6 +1,6 @@
import { FormattedMessage } from 'react-intl';
import illustration from 'mastodon/../images/elephant_ui_working.svg';
import illustration from '@/images/elephant_ui_working.svg';
const RegenerationIndicator = () => (
<div className='regeneration-indicator'>

8
app/javascript/mastodon/components/status.jsx
View File

@ -9,10 +9,10 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { HotKeys } from 'react-hotkeys';
import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
import PushPinIcon from 'mastodon/../material-icons/400-24px/push_pin.svg?react';
import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
import PushPinIcon from '@/material-icons/400-24px/push_pin.svg?react';
import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
import { Icon } from 'mastodon/components/icon';
import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';
import { withOptionalRouter, WithOptionalRouterPropTypes } from 'mastodon/utils/react_router';

22
app/javascript/mastodon/components/status_action_bar.jsx
View File

@ -9,17 +9,17 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import BookmarkIcon from 'mastodon/../material-icons/400-24px/bookmark-fill.svg';
import BookmarkBorderIcon from 'mastodon/../material-icons/400-24px/bookmark.svg?react';
import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react';
import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
import StarBorderIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
import VisibilityIcon from 'mastodon/../material-icons/400-24px/visibility.svg?react';
import RepeatDisabledIcon from 'mastodon/../svg-icons/repeat_disabled.svg?react';
import RepeatPrivateIcon from 'mastodon/../svg-icons/repeat_private.svg?react';
import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg';
import BookmarkBorderIcon from '@/material-icons/400-24px/bookmark.svg?react';
import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
import StarBorderIcon from '@/material-icons/400-24px/star.svg?react';
import VisibilityIcon from '@/material-icons/400-24px/visibility.svg?react';
import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
import { WithRouterPropTypes } from 'mastodon/utils/react_router';

2
app/javascript/mastodon/components/status_content.jsx
View File

@ -9,7 +9,7 @@ import { Link, withRouter } from 'react-router-dom';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { connect } from 'react-redux';
import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react';
import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
import { Icon } from 'mastodon/components/icon';
import PollContainer from 'mastodon/containers/poll_container';
import { autoPlayGif, languages as preloadedLanguages } from 'mastodon/initial_state';

2
app/javascript/mastodon/components/verified_badge.tsx
View File

@ -1,4 +1,4 @@
import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
import CheckIcon from '@/material-icons/400-24px/check.svg?react';
import { Icon } from './icon';

8
app/javascript/mastodon/components/visibility_icon.tsx
View File

@ -1,9 +1,9 @@
import { defineMessages, useIntl } from 'react-intl';
import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
import LockOpenIcon from 'mastodon/../material-icons/400-24px/lock_open.svg?react';
import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
import LockIcon from '@/material-icons/400-24px/lock.svg?react';
import LockOpenIcon from '@/material-icons/400-24px/lock_open.svg?react';
import PublicIcon from '@/material-icons/400-24px/public.svg?react';
import { Icon } from './icon';

4
app/javascript/mastodon/features/about/index.jsx
View File

@ -10,8 +10,8 @@ import { List as ImmutableList } from 'immutable';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { connect } from 'react-redux';
import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react';
import ExpandMoreIcon from 'mastodon/../material-icons/400-24px/expand_more.svg?react';
import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
import ExpandMoreIcon from '@/material-icons/400-24px/expand_more.svg?react';
import { fetchServer, fetchExtendedDescription, fetchDomainBlocks } from 'mastodon/actions/server';
import Column from 'mastodon/components/column';
import { Icon } from 'mastodon/components/icon';

4
app/javascript/mastodon/features/account/components/follow_request_note.jsx
View File

@ -3,8 +3,8 @@ import { FormattedMessage } from 'react-intl';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import CheckIcon from '@/material-icons/400-24px/check.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import { Icon } from 'mastodon/components/icon';
export default class FollowRequestNote extends ImmutablePureComponent {

12
app/javascript/mastodon/features/account/components/header.jsx
View File

@ -9,12 +9,12 @@ import { NavLink, withRouter } from 'react-router-dom';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
import NotificationsIcon from 'mastodon/../material-icons/400-24px/notifications.svg?react';
import NotificationsActiveIcon from 'mastodon/../material-icons/400-24px/notifications_active-fill.svg?react';
import ShareIcon from 'mastodon/../material-icons/400-24px/share.svg?react';
import CheckIcon from '@/material-icons/400-24px/check.svg?react';
import LockIcon from '@/material-icons/400-24px/lock.svg?react';
import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
import NotificationsIcon from '@/material-icons/400-24px/notifications.svg?react';
import NotificationsActiveIcon from '@/material-icons/400-24px/notifications_active-fill.svg?react';
import ShareIcon from '@/material-icons/400-24px/share.svg?react';
import { Avatar } from 'mastodon/components/avatar';
import { Badge, AutomatedBadge, GroupBadge } from 'mastodon/components/badge';
import { Button } from 'mastodon/components/button';

6
app/javascript/mastodon/features/account_gallery/components/media_item.jsx
View File

@ -5,9 +5,9 @@ import classNames from 'classnames';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import AudiotrackIcon from 'mastodon/../material-icons/400-24px/music_note.svg?react';
import PlayArrowIcon from 'mastodon/../material-icons/400-24px/play_arrow.svg?react';
import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
import AudiotrackIcon from '@/material-icons/400-24px/music_note.svg?react';
import PlayArrowIcon from '@/material-icons/400-24px/play_arrow.svg?react';
import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
import { Blurhash } from 'mastodon/components/blurhash';
import { Icon } from 'mastodon/components/icon';
import { autoPlayGif, displayMedia, useBlurhash } from 'mastodon/initial_state';

12
app/javascript/mastodon/features/audio/index.jsx
View File

@ -9,12 +9,12 @@ import { is } from 'immutable';
import { throttle, debounce } from 'lodash';
import DownloadIcon from 'mastodon/../material-icons/400-24px/download.svg?react';
import PauseIcon from 'mastodon/../material-icons/400-24px/pause.svg?react';
import PlayArrowIcon from 'mastodon/../material-icons/400-24px/play_arrow-fill.svg?react';
import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
import VolumeOffIcon from 'mastodon/../material-icons/400-24px/volume_off-fill.svg?react';
import VolumeUpIcon from 'mastodon/../material-icons/400-24px/volume_up-fill.svg?react';
import DownloadIcon from '@/material-icons/400-24px/download.svg?react';
import PauseIcon from '@/material-icons/400-24px/pause.svg?react';
import PlayArrowIcon from '@/material-icons/400-24px/play_arrow-fill.svg?react';
import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
import VolumeOffIcon from '@/material-icons/400-24px/volume_off-fill.svg?react';
import VolumeUpIcon from '@/material-icons/400-24px/volume_up-fill.svg?react';
import { Icon } from 'mastodon/components/icon';
import { formatTime, getPointerPosition, fileNameFromURL } from 'mastodon/features/video';

2
app/javascript/mastodon/features/blocks/index.jsx
View File

@ -8,7 +8,7 @@ import { connect } from 'react-redux';
import { debounce } from 'lodash';
import BlockIcon from 'mastodon/../material-icons/400-24px/block-fill.svg?react';
import BlockIcon from '@/material-icons/400-24px/block-fill.svg?react';
import { fetchBlocks, expandBlocks } from '../../actions/blocks';
import { LoadingIndicator } from '../../components/loading_indicator';

2
app/javascript/mastodon/features/bookmarked_statuses/index.jsx
View File

@ -10,7 +10,7 @@ import { connect } from 'react-redux';
import { debounce } from 'lodash';
import BookmarksIcon from 'mastodon/../material-icons/400-24px/bookmarks-fill.svg?react';
import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
import { fetchBookmarkedStatuses, expandBookmarkedStatuses } from 'mastodon/actions/bookmarks';
import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
import ColumnHeader from 'mastodon/components/column_header';

2
app/javascript/mastodon/features/community_timeline/index.jsx
View File

@ -7,7 +7,7 @@ import { Helmet } from 'react-helmet';
import { connect } from 'react-redux';
import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
import { DismissableBanner } from 'mastodon/components/dismissable_banner';
import { domain } from 'mastodon/initial_state';

2
app/javascript/mastodon/features/compose/components/action_bar.jsx
View File

@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
import ImmutablePropTypes from 'react-immutable-proptypes';
import MenuIcon from 'mastodon/../material-icons/400-24px/menu.svg?react';
import MenuIcon from '@/material-icons/400-24px/menu.svg?react';
import DropdownMenuContainer from '../../../containers/dropdown_menu_container';

2
app/javascript/mastodon/features/compose/components/compose_form.jsx
View File

@ -10,7 +10,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { length } from 'stringz';
import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
import LockIcon from '@/material-icons/400-24px/lock.svg?react';
import { Icon } from 'mastodon/components/icon';
import { WithOptionalRouterPropTypes, withOptionalRouter } from 'mastodon/utils/react_router';

2
app/javascript/mastodon/features/compose/components/poll_button.jsx
View File

@ -3,7 +3,7 @@ import { PureComponent } from 'react';
import { defineMessages, injectIntl } from 'react-intl';
import InsertChartIcon from 'mastodon/../material-icons/400-24px/insert_chart.svg?react';
import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
import { IconButton } from '../../../components/icon_button';

4
app/javascript/mastodon/features/compose/components/poll_form.jsx
View File

@ -8,8 +8,8 @@ import classNames from 'classnames';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import AddIcon from '@/material-icons/400-24px/add.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import AutosuggestInput from 'mastodon/components/autosuggest_input';
import { Icon } from 'mastodon/components/icon';
import { IconButton } from 'mastodon/components/icon_button';

8
app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
View File

@ -9,10 +9,10 @@ import classNames from 'classnames';
import { supportsPassiveEvents } from 'detect-passive-events';
import Overlay from 'react-overlays/Overlay';
import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
import LockOpenIcon from 'mastodon/../material-icons/400-24px/lock_open.svg?react';
import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
import LockIcon from '@/material-icons/400-24px/lock.svg?react';
import LockOpenIcon from '@/material-icons/400-24px/lock_open.svg?react';
import PublicIcon from '@/material-icons/400-24px/public.svg?react';
import { Icon } from 'mastodon/components/icon';
import { IconButton } from '../../../components/icon_button';

2
app/javascript/mastodon/features/compose/components/reply_indicator.jsx
View File

@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import AttachmentList from 'mastodon/components/attachment_list';
import { WithOptionalRouterPropTypes, withOptionalRouter } from 'mastodon/utils/react_router';

6
app/javascript/mastodon/features/compose/components/search.jsx
View File

@ -8,9 +8,9 @@ import { withRouter } from 'react-router-dom';
import ImmutablePropTypes from 'react-immutable-proptypes';
import CancelIcon from 'mastodon/../material-icons/400-24px/cancel-fill.svg?react';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
import CancelIcon from '@/material-icons/400-24px/cancel-fill.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import SearchIcon from '@/material-icons/400-24px/search.svg?react';
import { Icon } from 'mastodon/components/icon';
import { domain, searchEnabled } from 'mastodon/initial_state';
import { HASHTAG_REGEX } from 'mastodon/utils/hashtags';

8
app/javascript/mastodon/features/compose/components/search_results.jsx
View File

@ -5,10 +5,10 @@ import { FormattedMessage } from 'react-intl';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import FindInPageIcon from 'mastodon/../material-icons/400-24px/find_in_page.svg?react';
import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
import FindInPageIcon from '@/material-icons/400-24px/find_in_page.svg?react';
import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
import SearchIcon from '@/material-icons/400-24px/search.svg?react';
import TagIcon from '@/material-icons/400-24px/tag.svg?react';
import { Icon } from 'mastodon/components/icon';
import { LoadMore } from 'mastodon/components/load_more';
import { SearchSection } from 'mastodon/features/explore/components/search_section';

6
app/javascript/mastodon/features/compose/components/upload.jsx
View File

@ -7,9 +7,9 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import spring from 'react-motion/lib/spring';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
import InfoIcon from 'mastodon/../material-icons/400-24px/info.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import EditIcon from '@/material-icons/400-24px/edit.svg?react';
import InfoIcon from '@/material-icons/400-24px/info.svg?react';
import { Icon } from 'mastodon/components/icon';
import Motion from '../../ui/util/optional_motion';

2
app/javascript/mastodon/features/compose/components/upload_button.jsx
View File

@ -6,7 +6,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import AddPhotoAlternateIcon from 'mastodon/../material-icons/400-24px/add_photo_alternate.svg?react';
import AddPhotoAlternateIcon from '@/material-icons/400-24px/add_photo_alternate.svg?react';
import { IconButton } from '../../../components/icon_button';

2
app/javascript/mastodon/features/compose/components/upload_progress.jsx
View File

@ -5,7 +5,7 @@ import { FormattedMessage } from 'react-intl';
import spring from 'react-motion/lib/spring';
import UploadFileIcon from 'mastodon/../material-icons/400-24px/upload_file.svg?react';
import UploadFileIcon from '@/material-icons/400-24px/upload_file.svg?react';
import { Icon } from 'mastodon/components/icon';
import Motion from '../../ui/util/optional_motion';

14
app/javascript/mastodon/features/compose/index.jsx
View File

@ -11,13 +11,13 @@ import { connect } from 'react-redux';
import spring from 'react-motion/lib/spring';
import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
import LogoutIcon from 'mastodon/../material-icons/400-24px/logout.svg?react';
import MenuIcon from 'mastodon/../material-icons/400-24px/menu.svg?react';
import NotificationsIcon from 'mastodon/../material-icons/400-24px/notifications-fill.svg?react';
import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
import SettingsIcon from 'mastodon/../material-icons/400-24px/settings-fill.svg?react';
import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
import LogoutIcon from '@/material-icons/400-24px/logout.svg?react';
import MenuIcon from '@/material-icons/400-24px/menu.svg?react';
import NotificationsIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
import PublicIcon from '@/material-icons/400-24px/public.svg?react';
import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
import { openModal } from 'mastodon/actions/modal';
import Column from 'mastodon/components/column';
import { Icon } from 'mastodon/components/icon';

4
app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
View File

@ -10,8 +10,8 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { HotKeys } from 'react-hotkeys';
import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
import AttachmentList from 'mastodon/components/attachment_list';
import AvatarComposite from 'mastodon/components/avatar_composite';
import { IconButton } from 'mastodon/components/icon_button';

2
app/javascript/mastodon/features/direct_timeline/index.jsx
View File

@ -7,7 +7,7 @@ import { Helmet } from 'react-helmet';
import { connect } from 'react-redux';
import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
import { mountConversations, unmountConversations, expandConversations } from 'mastodon/actions/conversations';
import { connectDirectStream } from 'mastodon/actions/streaming';

2
app/javascript/mastodon/features/directory/index.jsx
View File

@ -9,7 +9,7 @@ import { List as ImmutableList } from 'immutable';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { connect } from 'react-redux';
import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
import { addColumn, removeColumn, moveColumn, changeColumnParams } from 'mastodon/actions/columns';
import { fetchDirectory, expandDirectory } from 'mastodon/actions/directory';
import Column from 'mastodon/components/column';

2
app/javascript/mastodon/features/domain_blocks/index.jsx
View File

@ -10,7 +10,7 @@ import { connect } from 'react-redux';
import { debounce } from 'lodash';
import BlockIcon from 'mastodon/../material-icons/400-24px/block-fill.svg?react';
import BlockIcon from '@/material-icons/400-24px/block-fill.svg?react';
import { fetchDomainBlocks, expandDomainBlocks } from '../../actions/domain_blocks';
import { LoadingIndicator } from '../../components/loading_indicator';

4
app/javascript/mastodon/features/explore/index.jsx
View File

@ -8,8 +8,8 @@ import { NavLink, Switch, Route } from 'react-router-dom';
import { connect } from 'react-redux';
import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
import SearchIcon from '@/material-icons/400-24px/search.svg?react';
import TagIcon from '@/material-icons/400-24px/tag.svg?react';
import Column from 'mastodon/components/column';
import ColumnHeader from 'mastodon/components/column_header';
import Search from 'mastodon/features/compose/containers/search_container';

6
app/javascript/mastodon/features/explore/results.jsx
View File

@ -9,9 +9,9 @@ import { List as ImmutableList } from 'immutable';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { connect } from 'react-redux';
import FindInPageIcon from 'mastodon/../material-icons/400-24px/find_in_page.svg?react';
import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
import FindInPageIcon from '@/material-icons/400-24px/find_in_page.svg?react';
import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
import TagIcon from '@/material-icons/400-24px/tag.svg?react';
import { submitSearch, expandSearch } from 'mastodon/actions/search';
import { ImmutableHashtag as Hashtag } from 'mastodon/components/hashtag';
import { Icon } from 'mastodon/components/icon';

2
app/javascript/mastodon/features/favourited_statuses/index.jsx
View File

@ -10,7 +10,7 @@ import { connect } from 'react-redux';
import { debounce } from 'lodash';
import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
import { fetchFavouritedStatuses, expandFavouritedStatuses } from 'mastodon/actions/favourites';
import ColumnHeader from 'mastodon/components/column_header';

2
app/javascript/mastodon/features/favourites/index.jsx
View File

@ -10,7 +10,7 @@ import { connect } from 'react-redux';
import { debounce } from 'lodash';
import RefreshIcon from 'mastodon/../material-icons/400-24px/refresh.svg?react';
import RefreshIcon from '@/material-icons/400-24px/refresh.svg?react';
import { fetchFavourites, expandFavourites } from 'mastodon/actions/interactions';
import ColumnHeader from 'mastodon/components/column_header';
import { Icon } from 'mastodon/components/icon';

2
app/javascript/mastodon/features/filters/select_filter.jsx
View File

@ -7,7 +7,7 @@ import { connect } from 'react-redux';
import fuzzysort from 'fuzzysort';
import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
import AddIcon from '@/material-icons/400-24px/add.svg?react';
import { Icon } from 'mastodon/components/icon';
import { toServerSideType } from 'mastodon/utils/filters';
import { loupeIcon, deleteIcon } from 'mastodon/utils/icons';

2
app/javascript/mastodon/features/firehose/index.jsx
View File

@ -6,7 +6,7 @@ import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
import { Helmet } from 'react-helmet';
import { NavLink } from 'react-router-dom';
import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
import PublicIcon from '@/material-icons/400-24px/public.svg?react';
import { addColumn } from 'mastodon/actions/columns';
import { changeSetting } from 'mastodon/actions/settings';
import { connectPublicStream, connectCommunityStream } from 'mastodon/actions/streaming';

4
app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx
View File

@ -7,8 +7,8 @@ import { Link } from 'react-router-dom';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import CheckIcon from '@/material-icons/400-24px/check.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import { Avatar } from '../../../components/avatar';
import { DisplayName } from '../../../components/display_name';

2
app/javascript/mastodon/features/follow_requests/index.jsx
View File

@ -10,7 +10,7 @@ import { connect } from 'react-redux';
import { debounce } from 'lodash';
import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
import { fetchFollowRequests, expandFollowRequests } from '../../actions/accounts';
import ScrollableList from '../../components/scrollable_list';

2
app/javascript/mastodon/features/followed_tags/index.jsx
View File

@ -10,7 +10,7 @@ import { connect } from 'react-redux';
import { debounce } from 'lodash';
import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
import TagIcon from '@/material-icons/400-24px/tag.svg?react';
import { expandFollowedHashtags, fetchFollowedHashtags } from 'mastodon/actions/tags';
import ColumnHeader from 'mastodon/components/column_header';
import { Hashtag } from 'mastodon/components/hashtag';

8
app/javascript/mastodon/features/getting_started/components/announcements.jsx
View File

@ -13,10 +13,10 @@ import TransitionMotion from 'react-motion/lib/TransitionMotion';
import spring from 'react-motion/lib/spring';
import ReactSwipeableViews from 'react-swipeable-views';
import elephantUIPlane from 'mastodon/../images/elephant_ui_plane.svg';
import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
import ChevronLeftIcon from 'mastodon/../material-icons/400-24px/chevron_left.svg?react';
import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react';
import elephantUIPlane from '@/images/elephant_ui_plane.svg';
import AddIcon from '@/material-icons/400-24px/add.svg?react';
import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
import { AnimatedNumber } from 'mastodon/components/animated_number';
import { Icon } from 'mastodon/components/icon';
import { IconButton } from 'mastodon/components/icon_button';

22
app/javascript/mastodon/features/getting_started/index.jsx
View File

@ -9,17 +9,17 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
import BookmarksIcon from 'mastodon/../material-icons/400-24px/bookmarks-fill.svg?react';
import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
import MenuIcon from 'mastodon/../material-icons/400-24px/menu.svg?react';
import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
import SettingsIcon from 'mastodon/../material-icons/400-24px/settings-fill.svg?react';
import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
import MenuIcon from '@/material-icons/400-24px/menu.svg?react';
import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
import PublicIcon from '@/material-icons/400-24px/public.svg?react';
import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
import StarIcon from '@/material-icons/400-24px/star.svg?react';
import TagIcon from '@/material-icons/400-24px/tag.svg?react';
import { fetchFollowRequests } from 'mastodon/actions/accounts';
import Column from 'mastodon/components/column';
import ColumnHeader from 'mastodon/components/column_header';

2
app/javascript/mastodon/features/hashtag_timeline/index.jsx
View File

@ -10,7 +10,7 @@ import { connect } from 'react-redux';
import { isEqual } from 'lodash';
import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
import TagIcon from '@/material-icons/400-24px/tag.svg?react';
import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
import { connectHashtagStream } from 'mastodon/actions/streaming';
import { fetchHashtag, followHashtag, unfollowHashtag } from 'mastodon/actions/tags';

2
app/javascript/mastodon/features/home_timeline/components/explore_prompt.tsx
View File

@ -2,7 +2,7 @@ import { FormattedMessage } from 'react-intl';
import { Link } from 'react-router-dom';
import background from 'mastodon/../images/friends-cropped.png';
import background from '@/images/friends-cropped.png';
import { DismissableBanner } from 'mastodon/components/dismissable_banner';
export const ExplorePrompt = () => (

4
app/javascript/mastodon/features/home_timeline/index.jsx
View File

@ -10,8 +10,8 @@ import { createSelector } from '@reduxjs/toolkit';
import { List as ImmutableList } from 'immutable';
import { connect } from 'react-redux';
import CampaignIcon from 'mastodon/../material-icons/400-24px/campaign.svg?react';
import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
import CampaignIcon from '@/material-icons/400-24px/campaign.svg?react';
import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
import { fetchAnnouncements, toggleShowAnnouncements } from 'mastodon/actions/announcements';
import { IconWithBadge } from 'mastodon/components/icon_with_badge';
import { NotSignedInIndicator } from 'mastodon/components/not_signed_in_indicator';

8
app/javascript/mastodon/features/interaction_modal/index.jsx
View File

@ -9,10 +9,10 @@ import { connect } from 'react-redux';
import { throttle, escapeRegExp } from 'lodash';
import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
import StarIcon from '@/material-icons/400-24px/star.svg?react';
import { openModal, closeModal } from 'mastodon/actions/modal';
import api from 'mastodon/api';
import { Button } from 'mastodon/components/button';

2
app/javascript/mastodon/features/keyboard_shortcuts/index.jsx
View File

@ -6,7 +6,7 @@ import { Helmet } from 'react-helmet';
import ImmutablePureComponent from 'react-immutable-pure-component';
import InfoIcon from 'mastodon/../material-icons/400-24px/info.svg?react';
import InfoIcon from '@/material-icons/400-24px/info.svg?react';
import Column from 'mastodon/components/column';
import ColumnHeader from 'mastodon/components/column_header';

6
app/javascript/mastodon/features/list_adder/components/list.jsx
View File

@ -6,9 +6,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
import AddIcon from '@/material-icons/400-24px/add.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
import { Icon } from 'mastodon/components/icon';
import { removeFromListAdder, addToListAdder } from '../../../actions/lists';

4
app/javascript/mastodon/features/list_editor/components/account.jsx
View File

@ -6,8 +6,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import AddIcon from '@/material-icons/400-24px/add.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import { removeFromListEditor, addToListEditor } from '../../../actions/lists';
import { Avatar } from '../../../components/avatar';

2
app/javascript/mastodon/features/list_editor/components/edit_list_form.jsx
View File

@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
import { connect } from 'react-redux';
import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
import CheckIcon from '@/material-icons/400-24px/check.svg?react';
import { changeListEditorTitle, submitListEditor } from '../../../actions/lists';
import { IconButton } from '../../../components/icon_button';

4
app/javascript/mastodon/features/list_editor/components/search.jsx
View File

@ -7,8 +7,8 @@ import classNames from 'classnames';
import { connect } from 'react-redux';
import CancelIcon from 'mastodon/../material-icons/400-24px/cancel.svg?react';
import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
import CancelIcon from '@/material-icons/400-24px/cancel.svg?react';
import SearchIcon from '@/material-icons/400-24px/search.svg?react';
import { Icon } from 'mastodon/components/icon';
import { fetchListSuggestions, clearListSuggestions, changeListSuggestions } from '../../../actions/lists';

6
app/javascript/mastodon/features/list_timeline/index.jsx
View File

@ -11,9 +11,9 @@ import { connect } from 'react-redux';
import Toggle from 'react-toggle';
import DeleteIcon from 'mastodon/../material-icons/400-24px/delete.svg?react';
import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
import EditIcon from '@/material-icons/400-24px/edit.svg?react';
import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
import { fetchList, deleteList, updateList } from 'mastodon/actions/lists';
import { openModal } from 'mastodon/actions/modal';

2
app/javascript/mastodon/features/lists/index.jsx
View File

@ -9,7 +9,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
import { fetchLists } from 'mastodon/actions/lists';
import Column from 'mastodon/components/column';
import ColumnHeader from 'mastodon/components/column_header';

2
app/javascript/mastodon/features/mutes/index.jsx
View File

@ -10,7 +10,7 @@ import { connect } from 'react-redux';
import { debounce } from 'lodash';
import VolumeOffIcon from 'mastodon/../material-icons/400-24px/volume_off.svg?react';
import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react';
import { fetchMutes, expandMutes } from '../../actions/mutes';
import { LoadingIndicator } from '../../components/loading_indicator';

2
app/javascript/mastodon/features/notifications/components/clear_column_button.jsx
View File

@ -3,7 +3,7 @@ import { PureComponent } from 'react';
import { FormattedMessage } from 'react-intl';
import DeleteForeverIcon from 'mastodon/../material-icons/400-24px/delete_forever.svg?react';
import DeleteForeverIcon from '@/material-icons/400-24px/delete_forever.svg?react';
import { Icon } from 'mastodon/components/icon';
export default class ClearColumnButton extends PureComponent {

12
app/javascript/mastodon/features/notifications/components/filter_bar.jsx
View File

@ -3,12 +3,12 @@ import { PureComponent } from 'react';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
import InsertChartIcon from 'mastodon/../material-icons/400-24px/insert_chart.svg?react';
import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react';
import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
import StarIcon from '@/material-icons/400-24px/star.svg?react';
import { Icon } from 'mastodon/components/icon';
const tooltips = defineMessages({

4
app/javascript/mastodon/features/notifications/components/follow_request.jsx
View File

@ -7,8 +7,8 @@ import { Link } from 'react-router-dom';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import CheckIcon from '@/material-icons/400-24px/check.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import { Avatar } from 'mastodon/components/avatar';
import { DisplayName } from 'mastodon/components/display_name';
import { IconButton } from 'mastodon/components/icon_button';

16
app/javascript/mastodon/features/notifications/components/notification.jsx
View File

@ -10,14 +10,14 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { HotKeys } from 'react-hotkeys';
import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
import FlagIcon from 'mastodon/../material-icons/400-24px/flag-fill.svg?react';
import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
import InsertChartIcon from 'mastodon/../material-icons/400-24px/insert_chart.svg?react';
import PersonIcon from 'mastodon/../material-icons/400-24px/person-fill.svg?react';
import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add-fill.svg?react';
import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
import EditIcon from '@/material-icons/400-24px/edit.svg?react';
import FlagIcon from '@/material-icons/400-24px/flag-fill.svg?react';
import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
import PersonIcon from '@/material-icons/400-24px/person-fill.svg?react';
import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
import { Icon } from 'mastodon/components/icon';
import AccountContainer from 'mastodon/containers/account_container';
import StatusContainer from 'mastodon/containers/status_container';

4
app/javascript/mastodon/features/notifications/components/notifications_permission_banner.jsx
View File

@ -5,8 +5,8 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import { connect } from 'react-redux';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import TuneIcon from 'mastodon/../material-icons/400-24px/tune.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import TuneIcon from '@/material-icons/400-24px/tune.svg?react';
import { requestBrowserPermission } from 'mastodon/actions/notifications';
import { changeSetting } from 'mastodon/actions/settings';
import { Button } from 'mastodon/components/button';

4
app/javascript/mastodon/features/notifications/index.jsx
View File

@ -12,8 +12,8 @@ import { connect } from 'react-redux';
import { debounce } from 'lodash';
import DoneAllIcon from 'mastodon/../material-icons/400-24px/done_all.svg?react';
import NotificationsIcon from 'mastodon/../material-icons/400-24px/notifications-fill.svg?react';
import DoneAllIcon from '@/material-icons/400-24px/done_all.svg?react';
import NotificationsIcon from '@/material-icons/400-24px/notifications-fill.svg?react';
import { compareId } from 'mastodon/compare_id';
import { Icon } from 'mastodon/components/icon';
import { NotSignedInIndicator } from 'mastodon/components/not_signed_in_indicator';

4
app/javascript/mastodon/features/onboarding/components/step.jsx
View File

@ -2,8 +2,8 @@ import PropTypes from 'prop-types';
import { Link } from 'react-router-dom';
import ArrowRightAltIcon from 'mastodon/../material-icons/400-24px/arrow_right_alt.svg?react';
import CheckIcon from 'mastodon/../material-icons/400-24px/done.svg?react';
import ArrowRightAltIcon from '@/material-icons/400-24px/arrow_right_alt.svg?react';
import CheckIcon from '@/material-icons/400-24px/done.svg?react';
import { Icon } from 'mastodon/components/icon';
export const Step = ({ label, description, icon, iconComponent, completed, onClick, href, to }) => {

12
app/javascript/mastodon/features/onboarding/index.jsx
View File

@ -8,12 +8,12 @@ import { Link, Switch, Route, useHistory } from 'react-router-dom';
import { useDispatch } from 'react-redux';
import illustration from 'mastodon/../images/elephant_ui_conversation.svg';
import AccountCircleIcon from 'mastodon/../material-icons/400-24px/account_circle.svg?react';
import ArrowRightAltIcon from 'mastodon/../material-icons/400-24px/arrow_right_alt.svg?react';
import ContentCopyIcon from 'mastodon/../material-icons/400-24px/content_copy.svg?react';
import EditNoteIcon from 'mastodon/../material-icons/400-24px/edit_note.svg?react';
import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
import illustration from '@/images/elephant_ui_conversation.svg';
import AccountCircleIcon from '@/material-icons/400-24px/account_circle.svg?react';
import ArrowRightAltIcon from '@/material-icons/400-24px/arrow_right_alt.svg?react';
import ContentCopyIcon from '@/material-icons/400-24px/content_copy.svg?react';
import EditNoteIcon from '@/material-icons/400-24px/edit_note.svg?react';
import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
import { focusCompose } from 'mastodon/actions/compose';
import { Icon } from 'mastodon/components/icon';
import Column from 'mastodon/features/ui/components/column';

4
app/javascript/mastodon/features/onboarding/profile.jsx
View File

@ -10,8 +10,8 @@ import { useDispatch } from 'react-redux';
import Toggle from 'react-toggle';
import AddPhotoAlternateIcon from 'mastodon/../material-icons/400-24px/add_photo_alternate.svg?react';
import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
import AddPhotoAlternateIcon from '@/material-icons/400-24px/add_photo_alternate.svg?react';
import EditIcon from '@/material-icons/400-24px/edit.svg?react';
import { updateAccount } from 'mastodon/actions/accounts';
import { Button } from 'mastodon/components/button';
import { ColumnBackButton } from 'mastodon/components/column_back_button';

4
app/javascript/mastodon/features/onboarding/share.jsx
View File

@ -9,8 +9,8 @@ import { Link } from 'react-router-dom';
import SwipeableViews from 'react-swipeable-views';
import ArrowRightAltIcon from 'mastodon/../material-icons/400-24px/arrow_right_alt.svg?react';
import ContentCopyIcon from 'mastodon/../material-icons/400-24px/content_copy.svg?react';
import ArrowRightAltIcon from '@/material-icons/400-24px/arrow_right_alt.svg?react';
import ContentCopyIcon from '@/material-icons/400-24px/content_copy.svg?react';
import { ColumnBackButton } from 'mastodon/components/column_back_button';
import { Icon } from 'mastodon/components/icon';
import { me, domain } from 'mastodon/initial_state';

10
app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
View File

@ -9,11 +9,11 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import OpenInNewIcon from 'mastodon/../material-icons/400-24px/open_in_new.svg?react';
import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react';
import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
import OpenInNewIcon from '@/material-icons/400-24px/open_in_new.svg?react';
import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
import StarIcon from '@/material-icons/400-24px/star.svg?react';
import { initBoostModal } from 'mastodon/actions/boosts';
import { replyCompose } from 'mastodon/actions/compose';
import { reblog, favourite, unreblog, unfavourite } from 'mastodon/actions/interactions';

2
app/javascript/mastodon/features/picture_in_picture/components/header.jsx
View File

@ -8,7 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import { Avatar } from 'mastodon/components/avatar';
import { DisplayName } from 'mastodon/components/display_name';
import { IconButton } from 'mastodon/components/icon_button';

2
app/javascript/mastodon/features/pinned_statuses/index.jsx
View File

@ -8,7 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import PushPinIcon from 'mastodon/../material-icons/400-24px/push_pin.svg?react';
import PushPinIcon from '@/material-icons/400-24px/push_pin.svg?react';
import { getStatusList } from 'mastodon/selectors';
import { fetchPinnedStatuses } from '../../actions/pin_statuses';

2
app/javascript/mastodon/features/public_timeline/index.jsx
View File

@ -7,7 +7,7 @@ import { Helmet } from 'react-helmet';
import { connect } from 'react-redux';
import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
import PublicIcon from '@/material-icons/400-24px/public.svg?react';
import { DismissableBanner } from 'mastodon/components/dismissable_banner';
import { domain } from 'mastodon/initial_state';

2
app/javascript/mastodon/features/reblogs/index.jsx
View File

@ -10,7 +10,7 @@ import { connect } from 'react-redux';
import { debounce } from 'lodash';
import RefreshIcon from 'mastodon/../material-icons/400-24px/refresh.svg?react';
import RefreshIcon from '@/material-icons/400-24px/refresh.svg?react';
import { Icon } from 'mastodon/components/icon';
import { fetchReblogs, expandReblogs } from '../../actions/interactions';

2
app/javascript/mastodon/features/report/components/option.jsx
View File

@ -3,7 +3,7 @@ import { PureComponent } from 'react';
import classNames from 'classnames';
import CheckIcon from 'mastodon/../material-icons/400-24px/done.svg?react';
import CheckIcon from '@/material-icons/400-24px/done.svg?react';
import { Icon } from 'mastodon/components/icon';
export default class Option extends PureComponent {

20
app/javascript/mastodon/features/status/components/action_bar.jsx
View File

@ -9,16 +9,16 @@ import { withRouter } from 'react-router-dom';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { connect } from 'react-redux';
import BookmarkIcon from 'mastodon/../material-icons/400-24px/bookmark-fill.svg?react';
import BookmarkBorderIcon from 'mastodon/../material-icons/400-24px/bookmark.svg?react';
import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react';
import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
import StarBorderIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
import RepeatDisabledIcon from 'mastodon/../svg-icons/repeat_disabled.svg?react';
import RepeatPrivateIcon from 'mastodon/../svg-icons/repeat_private.svg?react';
import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg?react';
import BookmarkBorderIcon from '@/material-icons/400-24px/bookmark.svg?react';
import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
import StarBorderIcon from '@/material-icons/400-24px/star.svg?react';
import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
import { WithRouterPropTypes } from 'mastodon/utils/react_router';

6
app/javascript/mastodon/features/status/components/card.jsx
View File

@ -10,9 +10,9 @@ import classNames from 'classnames';
import Immutable from 'immutable';
import ImmutablePropTypes from 'react-immutable-proptypes';
import DescriptionIcon from 'mastodon/../material-icons/400-24px/description-fill.svg?react';
import OpenInNewIcon from 'mastodon/../material-icons/400-24px/open_in_new.svg?react';
import PlayArrowIcon from 'mastodon/../material-icons/400-24px/play_arrow-fill.svg?react';
import DescriptionIcon from '@/material-icons/400-24px/description-fill.svg?react';
import OpenInNewIcon from '@/material-icons/400-24px/open_in_new.svg?react';
import PlayArrowIcon from '@/material-icons/400-24px/play_arrow-fill.svg?react';
import { Blurhash } from 'mastodon/components/blurhash';
import { Icon } from 'mastodon/components/icon';
import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';

6
app/javascript/mastodon/features/status/components/detailed_status.jsx
View File

@ -8,9 +8,9 @@ import { Link, withRouter } from 'react-router-dom';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
import { AnimatedNumber } from 'mastodon/components/animated_number';
import EditedTimestamp from 'mastodon/components/edited_timestamp';
import { getHashtagBarForStatus } from 'mastodon/components/hashtag_bar';

4
app/javascript/mastodon/features/status/index.jsx
View File

@ -14,8 +14,8 @@ import { connect } from 'react-redux';
import { HotKeys } from 'react-hotkeys';
import VisibilityIcon from 'mastodon/../material-icons/400-24px/visibility.svg?react';
import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
import VisibilityIcon from '@/material-icons/400-24px/visibility.svg?react';
import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
import { Icon } from 'mastodon/components/icon';
import { LoadingIndicator } from 'mastodon/components/loading_indicator';
import ScrollContainer from 'mastodon/containers/scroll_container';

2
app/javascript/mastodon/features/subscribed_languages_modal/index.jsx
View File

@ -8,7 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import { followAccount } from 'mastodon/actions/accounts';
import { Button } from 'mastodon/components/button';
import { IconButton } from 'mastodon/components/icon_button';

2
app/javascript/mastodon/features/ui/components/boost_modal.jsx
View File

@ -9,7 +9,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
import { changeBoostPrivacy } from 'mastodon/actions/boosts';
import AttachmentList from 'mastodon/components/attachment_list';
import { Icon } from 'mastodon/components/icon';

2
app/javascript/mastodon/features/ui/components/bundle_modal_error.jsx
View File

@ -3,7 +3,7 @@ import { PureComponent } from 'react';
import { defineMessages, injectIntl } from 'react-intl';
import RefreshIcon from 'mastodon/../material-icons/400-24px/refresh.svg?react';
import RefreshIcon from '@/material-icons/400-24px/refresh.svg?react';
import { IconButton } from '../../../components/icon_button';

2
app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
View File

@ -8,7 +8,7 @@ import { connect } from 'react-redux';
import escapeTextContentForBrowser from 'escape-html';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import { closeModal } from 'mastodon/actions/modal';
import { IconButton } from 'mastodon/components/icon_button';
import InlineAccount from 'mastodon/components/inline_account';

2
app/javascript/mastodon/features/ui/components/embed_modal.jsx
View File

@ -4,7 +4,7 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import api from 'mastodon/api';
import { IconButton } from 'mastodon/components/icon_button';

2
app/javascript/mastodon/features/ui/components/filter_modal.jsx
View File

@ -5,7 +5,7 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import { fetchFilters, createFilter, createFilterStatus } from 'mastodon/actions/filters';
import { fetchStatus } from 'mastodon/actions/statuses';
import { IconButton } from 'mastodon/components/icon_button';

2
app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
View File

@ -16,7 +16,7 @@ import tesseractWorkerPath from 'tesseract.js/dist/worker.min.js';
// eslint-disable-next-line import/no-extraneous-dependencies
import tesseractCorePath from 'tesseract.js-core/tesseract-core.wasm.js';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import { Button } from 'mastodon/components/button';
import { GIFV } from 'mastodon/components/gifv';
import { IconButton } from 'mastodon/components/icon_button';

2
app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx
View File

@ -6,7 +6,7 @@ import { injectIntl, defineMessages } from 'react-intl';
import { List as ImmutableList } from 'immutable';
import { connect } from 'react-redux';
import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
import { fetchFollowRequests } from 'mastodon/actions/accounts';
import { IconWithBadge } from 'mastodon/components/icon_with_badge';
import ColumnLink from 'mastodon/features/ui/components/column_link';

2
app/javascript/mastodon/features/ui/components/header.jsx
View File

@ -7,7 +7,7 @@ import { Link, withRouter } from 'react-router-dom';
import { connect } from 'react-redux';
import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
import SearchIcon from '@/material-icons/400-24px/search.svg?react';
import { openModal } from 'mastodon/actions/modal';
import { fetchServer } from 'mastodon/actions/server';
import { Avatar } from 'mastodon/components/avatar';

2
app/javascript/mastodon/features/ui/components/image_modal.jsx
View File

@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
import classNames from 'classnames';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import { IconButton } from 'mastodon/components/icon_button';
import ImageLoader from './image_loader';

2
app/javascript/mastodon/features/ui/components/list_panel.jsx
View File

@ -5,7 +5,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
import { fetchLists } from 'mastodon/actions/lists';
import ColumnLink from './column_link';

Some files were not shown because too many files have changed in this diff Show More