gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'parent/main' into upstream-20240118

Browse source
This commit is contained in:
KMY 2024-01-18 09:17:39 +09:00
commit 2b51fabe9c
397 changed files with 2899 additions and 3252 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
app/javascript/fonts/inter/inter-variable-font-slnt-wght.woff2 Normal file
View file

Binary file not shown.

BIN
app/javascript/images/mailer-new/common/header-bg-end.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
app/javascript/images/mailer-new/common/header-bg-start.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
app/javascript/images/mailer-new/common/logo-footer.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
app/javascript/images/mailer-new/common/logo-header.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
app/javascript/images/mailer-new/heading/2fa-disabled.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/javascript/images/mailer-new/heading/2fa-enabled.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/javascript/images/mailer-new/heading/2fa-recovery.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
app/javascript/images/mailer-new/heading/appeal-approved.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/javascript/images/mailer-new/heading/appeal-rejected.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
app/javascript/images/mailer-new/heading/archive.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
app/javascript/images/mailer-new/heading/boost.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
app/javascript/images/mailer-new/heading/email.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
app/javascript/images/mailer-new/heading/favorite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
app/javascript/images/mailer-new/heading/follow.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
app/javascript/images/mailer-new/heading/key-added.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

BIN
app/javascript/images/mailer-new/heading/key-deleted.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/javascript/images/mailer-new/heading/key-disabled.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/javascript/images/mailer-new/heading/key-enabled.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/javascript/images/mailer-new/heading/login.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/javascript/images/mailer-new/heading/mention.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
app/javascript/images/mailer-new/heading/password.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
app/javascript/images/mailer-new/heading/user.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
app/javascript/images/mailer-new/heading/warning.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/javascript/images/mailer-new/welcome/checkbox-off.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 954 B

BIN
app/javascript/images/mailer-new/welcome/checkbox-on.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

BIN
app/javascript/images/mailer-new/welcome/step1-on.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

BIN
app/javascript/images/mailer-new/welcome/step2-off.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 505 B

BIN
app/javascript/images/mailer-new/welcome/step3-off.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 688 B

BIN
app/javascript/images/mailer-new/welcome/step4-off.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 709 B

BIN
app/javascript/images/mailer-new/welcome/step5-off.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 547 B

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/no_encryption.svg?react';
import LockOpenIcon from '@/material-icons/400-24px/no_encryption.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'>

4
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, displayMediaExpand, useBlurhash } from '../initial_state';
@ -119,7 +119,7 @@ class Item extends PureComponent {
}
if (attachment.get('description')?.length > 0) {
badges.push(<span key='alt' className='media-gallery__gifv__label'>ALT</span>);
badges.push(<span key='alt' className='media-gallery__alt__label'>ALT</span>);
}
const description = attachment.getIn(['translation', 'description']) || attachment.get('description');

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'>

10
app/javascript/mastodon/components/searchability_icon.tsx
View file

@ -1,10 +1,10 @@
import { defineMessages, useIntl } from 'react-intl';
import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
import PublicUnlistedIcon from 'mastodon/../material-icons/400-24px/cloud.svg?react';
import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
import LockOpenIcon from 'mastodon/../material-icons/400-24px/no_encryption.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 PublicUnlistedIcon from '@/material-icons/400-24px/cloud.svg?react';
import LockIcon from '@/material-icons/400-24px/lock.svg?react';
import LockOpenIcon from '@/material-icons/400-24px/no_encryption.svg?react';
import PublicIcon from '@/material-icons/400-24px/public.svg?react';
import { Icon } from './icon';

16
app/javascript/mastodon/components/status.jsx
View file

@ -9,14 +9,14 @@ 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 QuoteIcon from 'mastodon/../material-icons/400-24px/format_quote.svg?react';
import ReferenceIcon from 'mastodon/../material-icons/400-24px/link.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 LimitedIcon from 'mastodon/../material-icons/400-24px/shield.svg?react';
import TimerIcon from 'mastodon/../material-icons/400-24px/timer.svg?react';
import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
import QuoteIcon from '@/material-icons/400-24px/format_quote.svg?react';
import ReferenceIcon from '@/material-icons/400-24px/link.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 LimitedIcon from '@/material-icons/400-24px/shield.svg?react';
import TimerIcon from '@/material-icons/400-24px/timer.svg?react';
import AttachmentList from 'mastodon/components/attachment_list';
import { Icon } from 'mastodon/components/icon';
import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';

20
app/javascript/mastodon/components/status_action_bar.jsx
View file

@ -9,16 +9,16 @@ 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 EmojiReactionIcon from 'mastodon/../material-icons/400-24px/mood.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 BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg';
import BookmarkBorderIcon from '@/material-icons/400-24px/bookmark.svg?react';
import EmojiReactionIcon from '@/material-icons/400-24px/mood.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 'mastodon/../svg-icons/repeat_disabled.svg?react';
import RepeatPrivateIcon from 'mastodon/../svg-icons/repeat_private.svg?react';
import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';

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';

22
app/javascript/mastodon/components/visibility_icon.tsx
View file

@ -1,16 +1,16 @@
import { defineMessages, useIntl } from 'react-intl';
import CircleIcon from 'mastodon/../material-icons/400-24px/account_circle.svg?react';
import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
import PublicUnlistedIcon from 'mastodon/../material-icons/400-24px/cloud.svg?react';
import MutualIcon from 'mastodon/../material-icons/400-24px/compare_arrows.svg?react';
import LoginIcon from 'mastodon/../material-icons/400-24px/key.svg?react';
import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
import LockOpenIcon from 'mastodon/../material-icons/400-24px/no_encryption.svg?react';
import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
import LimitedIcon from 'mastodon/../material-icons/400-24px/shield.svg?react';
import PersonalIcon from 'mastodon/../material-icons/400-24px/sticky_note.svg?react';
import CircleIcon from '@/material-icons/400-24px/account_circle.svg?react';
import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
import PublicUnlistedIcon from '@/material-icons/400-24px/cloud.svg?react';
import MutualIcon from '@/material-icons/400-24px/compare_arrows.svg?react';
import LoginIcon from '@/material-icons/400-24px/key.svg?react';
import LockIcon from '@/material-icons/400-24px/lock.svg?react';
import LockOpenIcon from '@/material-icons/400-24px/no_encryption.svg?react';
import PublicIcon from '@/material-icons/400-24px/public.svg?react';
import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
import LimitedIcon from '@/material-icons/400-24px/shield.svg?react';
import PersonalIcon from '@/material-icons/400-24px/sticky_note.svg?react';
import { Icon } from './icon';

8
app/javascript/mastodon/features/about/index.jsx
View file

@ -10,10 +10,10 @@ 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 DisabledIcon from 'mastodon/../material-icons/400-24px/close-fill.svg?react';
import EnabledIcon from 'mastodon/../material-icons/400-24px/done-fill.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 DisabledIcon from '@/material-icons/400-24px/close-fill.svg?react';
import EnabledIcon from '@/material-icons/400-24px/done-fill.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';

6
app/javascript/mastodon/features/antenna_adder/components/antenna.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 AntennaIcon from 'mastodon/../material-icons/400-24px/wifi.svg?react';
import AddIcon from '@/material-icons/400-24px/add.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import AntennaIcon from '@/material-icons/400-24px/wifi.svg?react';
import { Icon } from 'mastodon/components/icon';
import { removeFromAntennaAdder, addToAntennaAdder, removeExcludeFromAntennaAdder, addExcludeToAntennaAdder } from '../../../actions/antennas';

4
app/javascript/mastodon/features/antenna_editor/components/account.jsx
View file

@ -7,8 +7,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 { removeFromAntennaEditor, addToAntennaEditor, removeExcludeFromAntennaEditor, addExcludeToAntennaEditor } from '../../../actions/antennas';
import { Avatar } from '../../../components/avatar';

2
app/javascript/mastodon/features/antenna_editor/components/edit_antenna_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 { changeAntennaEditorTitle, submitAntennaEditor } from '../../../actions/antennas';
import { IconButton } from '../../../components/icon_button';

4
app/javascript/mastodon/features/antenna_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-fill.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 SearchIcon from '@/material-icons/400-24px/search.svg?react';
import { Icon } from 'mastodon/components/icon';
import { fetchAntennaSuggestions, clearAntennaSuggestions, changeAntennaSuggestions } from '../../../actions/antennas';

2
app/javascript/mastodon/features/antenna_setting/components/text_list.jsx
View file

@ -6,7 +6,7 @@ import { injectIntl } from 'react-intl';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { connect } from 'react-redux';
import DeleteIcon from 'mastodon/../material-icons/400-24px/delete.svg?react';
import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
import { Button } from 'mastodon/components/button';
import { Icon } from 'mastodon/components/icon';
import { IconButton } from 'mastodon/components/icon_button';

12
app/javascript/mastodon/features/antenna_setting/index.jsx
View file

@ -14,12 +14,12 @@ import { connect } from 'react-redux';
import Select, { NonceProvider } from 'react-select';
import Toggle from 'react-toggle';
import DeleteIcon from 'mastodon/../material-icons/400-24px/delete.svg?react';
import DomainIcon from 'mastodon/../material-icons/400-24px/dns.svg?react';
import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
import HashtagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
import KeywordIcon from 'mastodon/../material-icons/400-24px/title.svg?react';
import AntennaIcon from 'mastodon/../material-icons/400-24px/wifi.svg?react';
import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
import DomainIcon from '@/material-icons/400-24px/dns.svg?react';
import EditIcon from '@/material-icons/400-24px/edit.svg?react';
import HashtagIcon from '@/material-icons/400-24px/tag.svg?react';
import KeywordIcon from '@/material-icons/400-24px/title.svg?react';
import AntennaIcon from '@/material-icons/400-24px/wifi.svg?react';
import {
fetchAntenna,
deleteAntenna,

6
app/javascript/mastodon/features/antenna_timeline/index.jsx
View file

@ -10,9 +10,9 @@ import { withRouter } from 'react-router-dom';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { connect } from 'react-redux';
import DeleteIcon from 'mastodon/../material-icons/400-24px/delete.svg?react';
import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
import AntennaIcon from 'mastodon/../material-icons/400-24px/wifi.svg?react';
import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
import EditIcon from '@/material-icons/400-24px/edit.svg?react';
import AntennaIcon from '@/material-icons/400-24px/wifi.svg?react';
import { fetchAntenna, deleteAntenna } from 'mastodon/actions/antennas';
import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
import { openModal } from 'mastodon/actions/modal';

2
app/javascript/mastodon/features/antennas/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 AntennaIcon from 'mastodon/../material-icons/400-24px/wifi.svg?react';
import AntennaIcon from '@/material-icons/400-24px/wifi.svg?react';
import { fetchAntennas } from 'mastodon/actions/antennas';
import Column from 'mastodon/components/column';
import ColumnHeader from 'mastodon/components/column_header';

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';

4
app/javascript/mastodon/features/bookmark_categories/index.jsx
View file

@ -10,8 +10,8 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import BookmarkIcon from 'mastodon/../material-icons/400-24px/bookmark-fill.svg';
import BookmarksIcon from 'mastodon/../material-icons/400-24px/bookmarks-fill.svg?react';
import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg';
import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
import { fetchBookmarkCategories } from 'mastodon/actions/bookmark_categories';
import Column from 'mastodon/components/column';
import ColumnHeader from 'mastodon/components/column_header';

6
app/javascript/mastodon/features/bookmark_category_adder/components/bookmark_category.jsx
View file

@ -7,9 +7,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 BookmarkIcon from 'mastodon/../material-icons/400-24px/bookmark-fill.svg?react';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import AddIcon from '@/material-icons/400-24px/add.svg?react';
import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import { Icon } from 'mastodon/components/icon';
import { removeFromBookmarkCategoryAdder, addToBookmarkCategoryAdder } from '../../../actions/bookmark_categories';

2
app/javascript/mastodon/features/bookmark_category_statuses/components/edit_bookmark_category_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 { changeBookmarkCategoryEditorTitle, submitBookmarkCategoryEditor } from '../../../actions/bookmark_categories';
import { IconButton } from '../../../components/icon_button';

6
app/javascript/mastodon/features/bookmark_category_statuses/index.jsx
View file

@ -13,9 +13,9 @@ import { connect } from 'react-redux';
import { debounce } from 'lodash';
import BookmarkIcon from 'mastodon/../material-icons/400-24px/bookmark-fill.svg';
import DeleteIcon from 'mastodon/../material-icons/400-24px/delete.svg?react';
import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg';
import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
import EditIcon from '@/material-icons/400-24px/edit.svg?react';
import { deleteBookmarkCategory, expandBookmarkCategoryStatuses, fetchBookmarkCategory, fetchBookmarkCategoryStatuses , setupBookmarkCategoryEditor } from 'mastodon/actions/bookmark_categories';
import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
import { openModal } from 'mastodon/actions/modal';

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

@ -12,7 +12,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 Column from 'mastodon/components/column';

6
app/javascript/mastodon/features/circle_adder/components/circle.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 CircleIcon from 'mastodon/../material-icons/400-24px/account_circle.svg?react';
import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import CircleIcon from '@/material-icons/400-24px/account_circle.svg?react';
import AddIcon from '@/material-icons/400-24px/add.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import { Icon } from 'mastodon/components/icon';
import { removeFromCircleAdder, addToCircleAdder } from '../../../actions/circles';

4
app/javascript/mastodon/features/circle_editor/components/account.jsx
View file

@ -7,8 +7,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 { removeFromCircleEditor, addToCircleEditor } from '../../../actions/circles';
import { Avatar } from '../../../components/avatar';

2
app/javascript/mastodon/features/circle_editor/components/edit_circle_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 { changeCircleEditorTitle, submitCircleEditor } from '../../../actions/circles';
import { IconButton } from '../../../components/icon_button';

4
app/javascript/mastodon/features/circle_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-fill.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 SearchIcon from '@/material-icons/400-24px/search.svg?react';
import { Icon } from 'mastodon/components/icon';
import { fetchCircleSuggestions, clearCircleSuggestions, changeCircleSuggestions } from '../../../actions/circles';

6
app/javascript/mastodon/features/circle_statuses/index.jsx
View file

@ -13,9 +13,9 @@ import { connect } from 'react-redux';
import { debounce } from 'lodash';
import CircleIcon from 'mastodon/../material-icons/400-24px/account_circle.svg?react';
import DeleteIcon from 'mastodon/../material-icons/400-24px/delete.svg?react';
import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
import CircleIcon from '@/material-icons/400-24px/account_circle.svg?react';
import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
import EditIcon from '@/material-icons/400-24px/edit.svg?react';
import { deleteCircle, expandCircleStatuses, fetchCircle, fetchCircleStatuses } from 'mastodon/actions/circles';
import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
import { openModal } from 'mastodon/actions/modal';

4
app/javascript/mastodon/features/circles/index.jsx
View file

@ -10,8 +10,8 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import CirclesIcon from 'mastodon/../material-icons/400-24px/account_circle-fill.svg?react';
import CircleIcon from 'mastodon/../material-icons/400-24px/account_circle.svg?react';
import CirclesIcon from '@/material-icons/400-24px/account_circle-fill.svg?react';
import CircleIcon from '@/material-icons/400-24px/account_circle.svg?react';
import { fetchCircles, deleteCircle } from 'mastodon/actions/circles';
import { openModal } from 'mastodon/actions/modal';
import Column from 'mastodon/components/column';

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';

4
app/javascript/mastodon/features/compose/components/compose_form.jsx
View file

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

2
app/javascript/mastodon/features/compose/components/expiration_dropdown.jsx
View file

@ -8,7 +8,7 @@ import classNames from 'classnames';
import { supportsPassiveEvents } from 'detect-passive-events';
import Overlay from 'react-overlays/Overlay';
import TimerIcon from 'mastodon/../material-icons/400-24px/timer.svg?react';
import TimerIcon from '@/material-icons/400-24px/timer.svg?react';
import { IconButton } from '../../../components/icon_button';

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';

18
app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
View file

@ -9,15 +9,15 @@ import classNames from 'classnames';
import { supportsPassiveEvents } from 'detect-passive-events';
import Overlay from 'react-overlays/Overlay';
import CircleIcon from 'mastodon/../material-icons/400-24px/account_circle.svg?react';
import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
import PublicUnlistedIcon from 'mastodon/../material-icons/400-24px/cloud.svg?react';
import MutualIcon from 'mastodon/../material-icons/400-24px/compare_arrows.svg?react';
import LoginIcon from 'mastodon/../material-icons/400-24px/key.svg?react';
import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
import LockOpenIcon from 'mastodon/../material-icons/400-24px/no_encryption.svg?react';
import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
import CircleIcon from '@/material-icons/400-24px/account_circle.svg?react';
import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
import PublicUnlistedIcon from '@/material-icons/400-24px/cloud.svg?react';
import MutualIcon from '@/material-icons/400-24px/compare_arrows.svg?react';
import LoginIcon from '@/material-icons/400-24px/key.svg?react';
import LockIcon from '@/material-icons/400-24px/lock.svg?react';
import LockOpenIcon from '@/material-icons/400-24px/no_encryption.svg?react';
import PublicIcon from '@/material-icons/400-24px/public.svg?react';
import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
import { Icon } from 'mastodon/components/icon';
import { enableLoginPrivacy, enableLocalPrivacy } from 'mastodon/initial_state';

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';

12
app/javascript/mastodon/features/compose/components/searchability_dropdown.jsx
View file

@ -8,12 +8,12 @@ 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 PublicUnlistedIcon from 'mastodon/../material-icons/400-24px/cloud.svg?react';
import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
import LockOpenIcon from 'mastodon/../material-icons/400-24px/no_encryption.svg?react';
import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
import PublicUnlistedIcon from '@/material-icons/400-24px/cloud.svg?react';
import LockIcon from '@/material-icons/400-24px/lock.svg?react';
import LockOpenIcon from '@/material-icons/400-24px/no_encryption.svg?react';
import PublicIcon from '@/material-icons/400-24px/public.svg?react';
import SearchIcon from '@/material-icons/400-24px/search.svg?react';
import { Icon } from 'mastodon/components/icon';
import { enableLocalPrivacy } from 'mastodon/initial_state';

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';

2
app/javascript/mastodon/features/emoji_reacted_statuses/index.jsx
View file

@ -10,7 +10,7 @@ import { connect } from 'react-redux';
import { debounce } from 'lodash';
import EmojiReactionIcon from 'mastodon/../material-icons/400-24px/mood.svg?react';
import EmojiReactionIcon from '@/material-icons/400-24px/mood.svg?react';
import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
import { fetchEmojiReactedStatuses, expandEmojiReactedStatuses } from 'mastodon/actions/emoji_reactions';
import Column from 'mastodon/components/column';

2
app/javascript/mastodon/features/emoji_reactions/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 { fetchEmojiReactions, expandEmojiReactions } from 'mastodon/actions/interactions';
import ColumnHeader from 'mastodon/components/column_header';
import { Icon } from 'mastodon/components/icon';

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';

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