mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Glitch] Add a new `@/` alias for the root frontend directory and use it where possible 

Port 01b6c83c36 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
pull/2573/head
Renaud Chaput 2024-01-16 11:27:26 +01:00 committed by Claire
parent e4d07c7bcc
commit 5b67389bba
115 changed files with 291 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/components/attachment_list.jsx
View File

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

6
app/javascript/flavours/glitch/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/flavours/glitch/components/column_back_button.tsx
View File

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

12
app/javascript/flavours/glitch/components/column_header.jsx
View File

@ -6,15 +6,15 @@ import { FormattedMessage, injectIntl, defineMessages } from 'react-intl';
import classNames from 'classnames';
import { withRouter } from 'react-router-dom';
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 'flavours/glitch/components/icon';
import { ButtonInTabsBar, useColumnsContext } from 'flavours/glitch/features/ui/util/columns_context';
import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
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 { useAppHistory } from './router';

2
app/javascript/flavours/glitch/components/dismissable_banner.tsx
View File

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

2
app/javascript/flavours/glitch/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/flavours/glitch/components/dropdown_menu.jsx
View File

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

2
app/javascript/flavours/glitch/components/edited_timestamp/index.jsx
View File

@ -6,11 +6,11 @@ import { FormattedMessage, injectIntl } from 'react-intl';
import { connect } from 'react-redux';
import ArrowDropDownIcon from '@/material-icons/400-24px/arrow_drop_down.svg?react';
import { openModal } from 'flavours/glitch/actions/modal';
import { Icon } from 'flavours/glitch/components/icon';
import InlineAccount from 'flavours/glitch/components/inline_account';
import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
import ArrowDropDownIcon from 'mastodon/../material-icons/400-24px/arrow_drop_down.svg?react';
import DropdownMenu from './containers/dropdown_menu_container';

2
app/javascript/flavours/glitch/components/icon.tsx
View File

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

2
app/javascript/flavours/glitch/components/load_gap.tsx
View File

@ -2,8 +2,8 @@ import { useCallback } from 'react';
import { useIntl, defineMessages } from 'react-intl';
import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
import { Icon } from 'flavours/glitch/components/icon';
import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
const messages = defineMessages({
load_more: { id: 'status.load_more', defaultMessage: 'Load more' },

2
app/javascript/flavours/glitch/components/logo.jsx
View File

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

2
app/javascript/flavours/glitch/components/media_gallery.jsx
View File

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

2
app/javascript/flavours/glitch/components/notification_purge_buttons.jsx
View File

@ -12,8 +12,8 @@ import classNames from 'classnames';
import ImmutablePureComponent from 'react-immutable-pure-component';
import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
import { Icon } from 'flavours/glitch/components/icon';
import DeleteIcon from 'mastodon/../material-icons/400-24px/delete.svg?react';
const messages = defineMessages({

2
app/javascript/flavours/glitch/components/picture_in_picture_placeholder.jsx
View File

@ -6,9 +6,9 @@ import { FormattedMessage } from 'react-intl';
import { connect } from 'react-redux';
import CancelPresentationIcon from '@/material-icons/400-24px/cancel_presentation.svg?react';
import { removePictureInPicture } from 'flavours/glitch/actions/picture_in_picture';
import { Icon } from 'flavours/glitch/components/icon';
import CancelPresentationIcon from 'mastodon/../material-icons/400-24px/cancel_presentation.svg?react';
class PictureInPicturePlaceholder extends PureComponent {

2
app/javascript/flavours/glitch/components/poll.jsx
View File

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

22
app/javascript/flavours/glitch/components/status_action_bar.jsx
View File

@ -8,20 +8,20 @@ import { withRouter } from 'react-router-dom';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
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 VisibilityIcon from '@/material-icons/400-24px/visibility.svg?react';
import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg';
import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg';
import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'flavours/glitch/permissions';
import { accountAdminLink, statusAdminLink } from 'flavours/glitch/utils/backend_links';
import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
import 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 VisibilityIcon from 'mastodon/../material-icons/400-24px/visibility.svg?react';
import RepeatDisabledIcon from 'mastodon/../svg-icons/repeat_disabled.svg';
import RepeatPrivateIcon from 'mastodon/../svg-icons/repeat_private.svg';
import DropdownMenuContainer from '../containers/dropdown_menu_container';
import { me } from '../initial_state';

10
app/javascript/flavours/glitch/components/status_content.jsx
View File

@ -9,14 +9,14 @@ import { withRouter } from 'react-router-dom';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { connect } from 'react-redux';
import ImageIcon from '@/material-icons/400-24px/image.svg?react';
import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
import LinkIcon from '@/material-icons/400-24px/link.svg?react';
import MovieIcon from '@/material-icons/400-24px/movie.svg?react';
import MusicNoteIcon from '@/material-icons/400-24px/music_note.svg?react';
import { Icon } from 'flavours/glitch/components/icon';
import { autoPlayGif, languages as preloadedLanguages } from 'flavours/glitch/initial_state';
import { decode as decodeIDNA } from 'flavours/glitch/utils/idna';
import ImageIcon from 'mastodon/../material-icons/400-24px/image.svg?react';
import InsertChartIcon from 'mastodon/../material-icons/400-24px/insert_chart.svg?react';
import LinkIcon from 'mastodon/../material-icons/400-24px/link.svg?react';
import MovieIcon from 'mastodon/../material-icons/400-24px/movie.svg?react';
import MusicNoteIcon from 'mastodon/../material-icons/400-24px/music_note.svg?react';
import { Permalink } from './permalink';

16
app/javascript/flavours/glitch/components/status_icons.jsx
View File

@ -6,16 +6,16 @@ import { defineMessages, injectIntl } from 'react-intl';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ExpandLessIcon from '@/material-icons/400-24px/expand_less.svg?react';
import ForumIcon from '@/material-icons/400-24px/forum.svg?react';
import HomeIcon from '@/material-icons/400-24px/home.svg?react';
import ImageIcon from '@/material-icons/400-24px/image.svg?react';
import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
import LinkIcon from '@/material-icons/400-24px/link.svg?react';
import MovieIcon from '@/material-icons/400-24px/movie.svg?react';
import MusicNoteIcon from '@/material-icons/400-24px/music_note.svg?react';
import { Icon } from 'flavours/glitch/components/icon';
import { languages } from 'flavours/glitch/initial_state';
import ExpandLessIcon from 'mastodon/../material-icons/400-24px/expand_less.svg?react';
import ForumIcon from 'mastodon/../material-icons/400-24px/forum.svg?react';
import HomeIcon from 'mastodon/../material-icons/400-24px/home.svg?react';
import ImageIcon from 'mastodon/../material-icons/400-24px/image.svg?react';
import InsertChartIcon from 'mastodon/../material-icons/400-24px/insert_chart.svg?react';
import LinkIcon from 'mastodon/../material-icons/400-24px/link.svg?react';
import MovieIcon from 'mastodon/../material-icons/400-24px/movie.svg?react';
import MusicNoteIcon from 'mastodon/../material-icons/400-24px/music_note.svg?react';
import { IconButton } from './icon_button';

12
app/javascript/flavours/glitch/components/status_prepend.jsx
View File

@ -6,14 +6,14 @@ import { FormattedMessage } from 'react-intl';
import ImmutablePropTypes from 'react-immutable-proptypes';
import EditIcon from '@/material-icons/400-24px/edit.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 PushPinIcon from '@/material-icons/400-24px/push_pin.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 'flavours/glitch/components/icon';
import { me } from 'flavours/glitch/initial_state';
import EditIcon from 'mastodon/../material-icons/400-24px/edit.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 PushPinIcon from 'mastodon/../material-icons/400-24px/push_pin.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';
export default class StatusPrepend extends PureComponent {

2
app/javascript/flavours/glitch/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/flavours/glitch/components/visibility_icon.tsx
View File

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

4
app/javascript/flavours/glitch/features/about/index.jsx
View File

@ -11,6 +11,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import { connect } from 'react-redux';
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 'flavours/glitch/actions/server';
import Column from 'flavours/glitch/components/column';
import { Icon } from 'flavours/glitch/components/icon';
@ -18,8 +20,6 @@ import { ServerHeroImage } from 'flavours/glitch/components/server_hero_image';
import { Skeleton } from 'flavours/glitch/components/skeleton';
import Account from 'flavours/glitch/containers/account_container';
import LinkFooter from 'flavours/glitch/features/ui/components/link_footer';
import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react';
import ExpandMoreIcon from 'mastodon/../material-icons/400-24px/expand_more.svg?react';
const messages = defineMessages({
title: { id: 'column.about', defaultMessage: 'About' },

2
app/javascript/flavours/glitch/features/account/components/action_bar.jsx
View File

@ -6,8 +6,8 @@ import { NavLink } from 'react-router-dom';
import ImmutablePropTypes from 'react-immutable-proptypes';
import InfoIcon from '@/material-icons/400-24px/info.svg?react';
import { Icon } from 'flavours/glitch/components/icon';
import InfoIcon from 'mastodon/../material-icons/400-24px/info.svg?react';
class ActionBar extends PureComponent {

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

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

10
app/javascript/flavours/glitch/features/account/components/header.jsx
View File

@ -10,6 +10,11 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
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 { Avatar } from 'flavours/glitch/components/avatar';
import { Badge, AutomatedBadge, GroupBadge } from 'flavours/glitch/components/badge';
import { Button } from 'flavours/glitch/components/button';
@ -20,11 +25,6 @@ import { autoPlayGif, me, domain } from 'flavours/glitch/initial_state';
import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'flavours/glitch/permissions';
import { preferencesLink, profileLink, accountAdminLink } from 'flavours/glitch/utils/backend_links';
import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
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 AccountNoteContainer from '../containers/account_note_container';
import FollowRequestNoteContainer from '../containers/follow_request_note_container';

2
app/javascript/flavours/glitch/features/account/components/profile_column_header.jsx
View File

@ -3,7 +3,7 @@ import { PureComponent } from 'react';
import { injectIntl, defineMessages } from 'react-intl';
import PersonIcon from 'mastodon/../material-icons/400-24px/person.svg?react';
import PersonIcon from '@/material-icons/400-24px/person.svg?react';
import ColumnHeader from '../../../components/column_header';

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

@ -5,12 +5,12 @@ import classNames from 'classnames';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
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 'flavours/glitch/components/blurhash';
import { Icon } from 'flavours/glitch/components/icon';
import { autoPlayGif, displayMedia, useBlurhash } from 'flavours/glitch/initial_state';
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';
export default class MediaItem extends ImmutablePureComponent {

2
app/javascript/flavours/glitch/features/account_timeline/components/moved_note.jsx
View File

@ -6,9 +6,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import TripIcon from '@/material-icons/400-24px/trip.svg?react';
import { Icon } from 'flavours/glitch/components/icon';
import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
import TripIcon from 'mastodon/../material-icons/400-24px/trip.svg?react';
import { AvatarOverlay } from '../../../components/avatar_overlay';
import { DisplayName } from '../../../components/display_name';

12
app/javascript/flavours/glitch/features/audio/index.jsx
View File

@ -9,14 +9,14 @@ import { is } from 'immutable';
import { throttle, debounce } from 'lodash';
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 'flavours/glitch/components/icon';
import { formatTime, getPointerPosition, fileNameFromURL } from 'flavours/glitch/features/video';
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 { Blurhash } from '../../components/blurhash';

2
app/javascript/flavours/glitch/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/flavours/glitch/features/bookmarked_statuses/index.jsx
View File

@ -10,13 +10,13 @@ import { connect } from 'react-redux';
import { debounce } from 'lodash';
import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
import { fetchBookmarkedStatuses, expandBookmarkedStatuses } from 'flavours/glitch/actions/bookmarks';
import { addColumn, removeColumn, moveColumn } from 'flavours/glitch/actions/columns';
import ColumnHeader from 'flavours/glitch/components/column_header';
import StatusList from 'flavours/glitch/components/status_list';
import Column from 'flavours/glitch/features/ui/components/column';
import { getStatusList } from 'flavours/glitch/selectors';
import BookmarksIcon from 'mastodon/../material-icons/400-24px/bookmarks-fill.svg?react';
const messages = defineMessages({
heading: { id: 'column.bookmarks', defaultMessage: 'Bookmarks' },

2
app/javascript/flavours/glitch/features/community_timeline/index.jsx
View File

@ -8,9 +8,9 @@ import { Helmet } from 'react-helmet';
import { connect } from 'react-redux';
import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
import { DismissableBanner } from 'flavours/glitch/components/dismissable_banner';
import { domain } from 'flavours/glitch/initial_state';
import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
import { connectCommunityStream } from '../../actions/streaming';

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

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

14
app/javascript/flavours/glitch/features/compose/components/header.jsx
View File

@ -7,16 +7,16 @@ import { Link } from 'react-router-dom';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
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 ManufacturingIcon from '@/material-icons/400-24px/manufacturing.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 { Icon } from 'flavours/glitch/components/icon';
import { signOutLink } from 'flavours/glitch/utils/backend_links';
import { conditionalRender } from 'flavours/glitch/utils/react_helpers';
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 ManufacturingIcon from 'mastodon/../material-icons/400-24px/manufacturing.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';
const messages = defineMessages({

16
app/javascript/flavours/glitch/features/compose/components/options.jsx
View File

@ -8,16 +8,16 @@ import { connect } from 'react-redux';
import Toggle from 'react-toggle';
import AttachFileIcon from '@/material-icons/400-24px/attach_file.svg?react';
import BrushIcon from '@/material-icons/400-24px/brush.svg?react';
import CodeIcon from '@/material-icons/400-24px/code.svg?react';
import DescriptionIcon from '@/material-icons/400-24px/description.svg?react';
import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
import MarkdownIcon from '@/material-icons/400-24px/markdown.svg?react';
import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
import UploadFileIcon from '@/material-icons/400-24px/upload_file.svg?react';
import { IconButton } from 'flavours/glitch/components/icon_button';
import { pollLimits } from 'flavours/glitch/initial_state';
import AttachFileIcon from 'mastodon/../material-icons/400-24px/attach_file.svg?react';
import BrushIcon from 'mastodon/../material-icons/400-24px/brush.svg?react';
import CodeIcon from 'mastodon/../material-icons/400-24px/code.svg?react';
import DescriptionIcon from 'mastodon/../material-icons/400-24px/description.svg?react';
import InsertChartIcon from 'mastodon/../material-icons/400-24px/insert_chart.svg?react';
import MarkdownIcon from 'mastodon/../material-icons/400-24px/markdown.svg?react';
import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
import UploadFileIcon from 'mastodon/../material-icons/400-24px/upload_file.svg?react';
import DropdownContainer from '../containers/dropdown_container';

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

@ -9,12 +9,12 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import AddIcon from '@/material-icons/400-24px/add.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import AutosuggestInput from 'flavours/glitch/components/autosuggest_input';
import { Icon } from 'flavours/glitch/components/icon';
import { IconButton } from 'flavours/glitch/components/icon_button';
import { pollLimits } from 'flavours/glitch/initial_state';
import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
const messages = defineMessages({
option_placeholder: { id: 'compose_form.poll.option_placeholder', defaultMessage: 'Choice {number}' },

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

@ -3,10 +3,10 @@ import { PureComponent } from 'react';
import { injectIntl, defineMessages } from 'react-intl';
import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
import LockOpenIcon from 'mastodon/../material-icons/400-24px/lock_open.svg?react';
import MailIcon from 'mastodon/../material-icons/400-24px/mail.svg?react';
import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
import LockIcon from '@/material-icons/400-24px/lock.svg?react';
import LockOpenIcon from '@/material-icons/400-24px/lock_open.svg?react';
import MailIcon from '@/material-icons/400-24px/mail.svg?react';
import PublicIcon from '@/material-icons/400-24px/public.svg?react';
import Dropdown from './dropdown';

8
app/javascript/flavours/glitch/features/compose/components/publisher.jsx
View File

@ -4,12 +4,12 @@ import { defineMessages, injectIntl } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component';
import LockIcon from '@/material-icons/400-24px/lock.svg?react';
import LockOpenIcon from '@/material-icons/400-24px/lock_open.svg?react';
import MailIcon from '@/material-icons/400-24px/mail.svg?react';
import PublicIcon from '@/material-icons/400-24px/public.svg?react';
import { Button } from 'flavours/glitch/components/button';
import { Icon } from 'flavours/glitch/components/icon';
import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
import LockOpenIcon from 'mastodon/../material-icons/400-24px/lock_open.svg?react';
import MailIcon from 'mastodon/../material-icons/400-24px/mail.svg?react';
import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
const messages = defineMessages({

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

@ -6,9 +6,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import AttachmentList from 'flavours/glitch/components/attachment_list';
import { WithOptionalRouterPropTypes, withOptionalRouter } from 'flavours/glitch/utils/react_router';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import { Avatar } from '../../../components/avatar';
import { DisplayName } from '../../../components/display_name';

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

@ -9,13 +9,13 @@ import { withRouter } from 'react-router-dom';
import ImmutablePropTypes from 'react-immutable-proptypes';
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 'flavours/glitch/components/icon';
import { domain, searchEnabled } from 'flavours/glitch/initial_state';
import { HASHTAG_REGEX } from 'flavours/glitch/utils/hashtags';
import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
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';
const messages = defineMessages({
placeholder: { id: 'search.placeholder', defaultMessage: 'Search' },

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

@ -5,13 +5,13 @@ import { FormattedMessage } from 'react-intl';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
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 'flavours/glitch/components/icon';
import { LoadMore } from 'flavours/glitch/components/load_more';
import { SearchSection } from 'flavours/glitch/features/explore/components/search_section';
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 { ImmutableHashtag as Hashtag } from '../../../components/hashtag';

4
app/javascript/flavours/glitch/features/compose/components/textarea_icons.jsx
View File

@ -5,9 +5,9 @@ import { defineMessages, injectIntl } from 'react-intl';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import ForumIcon from '@/material-icons/400-24px/forum.svg?react';
import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
import { Icon } from 'flavours/glitch/components/icon';
import ForumIcon from 'mastodon/../material-icons/400-24px/forum.svg?react';
import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
const messages = defineMessages({

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

@ -7,10 +7,10 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import spring from 'react-motion/lib/spring';
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 'flavours/glitch/components/icon';
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 Motion from '../../ui/util/optional_motion';

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

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

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

@ -10,6 +10,8 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { HotKeys } from 'react-hotkeys';
import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
import AttachmentList from 'flavours/glitch/components/attachment_list';
import AvatarComposite from 'flavours/glitch/components/avatar_composite';
import { IconButton } from 'flavours/glitch/components/icon_button';
@ -19,8 +21,6 @@ import StatusContent from 'flavours/glitch/components/status_content';
import DropdownMenuContainer from 'flavours/glitch/containers/dropdown_menu_container';
import { autoPlayGif } from 'flavours/glitch/initial_state';
import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
const messages = defineMessages({
more: { id: 'status.more', defaultMessage: 'More' },

2
app/javascript/flavours/glitch/features/direct_timeline/index.jsx
View File

@ -8,6 +8,7 @@ import { Helmet } from 'react-helmet';
import { connect } from 'react-redux';
import MailIcon from '@/material-icons/400-24px/mail.svg?react';
import { addColumn, removeColumn, moveColumn } from 'flavours/glitch/actions/columns';
import { mountConversations, unmountConversations, expandConversations } from 'flavours/glitch/actions/conversations';
import { connectDirectStream } from 'flavours/glitch/actions/streaming';
@ -15,7 +16,6 @@ import { expandDirectTimeline } from 'flavours/glitch/actions/timelines';
import Column from 'flavours/glitch/components/column';
import ColumnHeader from 'flavours/glitch/components/column_header';
import StatusListContainer from 'flavours/glitch/features/ui/containers/status_list_container';
import MailIcon from 'mastodon/../material-icons/400-24px/mail.svg?react';
import ColumnSettingsContainer from './containers/column_settings_container';
import ConversationsListContainer from './containers/conversations_list_container';

2
app/javascript/flavours/glitch/features/directory/index.jsx
View File

@ -10,6 +10,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import { connect } from 'react-redux';
import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
import { addColumn, removeColumn, moveColumn, changeColumnParams } from 'flavours/glitch/actions/columns';
import { fetchDirectory, expandDirectory } from 'flavours/glitch/actions/directory';
import Column from 'flavours/glitch/components/column';
@ -18,7 +19,6 @@ import { LoadMore } from 'flavours/glitch/components/load_more';
import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
import { RadioButton } from 'flavours/glitch/components/radio_button';
import ScrollContainer from 'flavours/glitch/containers/scroll_container';
import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
import AccountCard from './components/account_card';

2
app/javascript/flavours/glitch/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/flavours/glitch/features/explore/index.jsx
View File

@ -9,12 +9,12 @@ import { NavLink, Switch, Route } from 'react-router-dom';
import { connect } from 'react-redux';
import SearchIcon from '@/material-icons/400-24px/search.svg?react';
import TagIcon from '@/material-icons/400-24px/tag.svg?react';
import Column from 'flavours/glitch/components/column';
import ColumnHeader from 'flavours/glitch/components/column_header';
import Search from 'flavours/glitch/features/compose/containers/search_container';
import { trendsEnabled } from 'flavours/glitch/initial_state';
import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
import Links from './links';
import SearchResults from './results';

6
app/javascript/flavours/glitch/features/explore/results.jsx
View File

@ -10,15 +10,15 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import { connect } from 'react-redux';
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 'flavours/glitch/actions/search';
import { ImmutableHashtag as Hashtag } from 'flavours/glitch/components/hashtag';
import { Icon } from 'flavours/glitch/components/icon';
import ScrollableList from 'flavours/glitch/components/scrollable_list';
import Account from 'flavours/glitch/containers/account_container';
import Status from 'flavours/glitch/containers/status_container';
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 { SearchSection } from './components/search_section';

2
app/javascript/flavours/glitch/features/favourited_statuses/index.jsx
View File

@ -10,13 +10,13 @@ import { connect } from 'react-redux';
import { debounce } from 'lodash';
import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
import { addColumn, removeColumn, moveColumn } from 'flavours/glitch/actions/columns';
import { fetchFavouritedStatuses, expandFavouritedStatuses } from 'flavours/glitch/actions/favourites';
import ColumnHeader from 'flavours/glitch/components/column_header';
import StatusList from 'flavours/glitch/components/status_list';
import Column from 'flavours/glitch/features/ui/components/column';
import { getStatusList } from 'flavours/glitch/selectors';
import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
const messages = defineMessages({
heading: { id: 'column.favourites', defaultMessage: 'Favorites' },

4
app/javascript/flavours/glitch/features/favourites/index.jsx
View File

@ -10,6 +10,8 @@ import { connect } from 'react-redux';
import { debounce } from 'lodash';
import RefreshIcon from '@/material-icons/400-24px/refresh.svg?react';
import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
import { fetchFavourites, expandFavourites } from 'flavours/glitch/actions/interactions';
import ColumnHeader from 'flavours/glitch/components/column_header';
import { Icon } from 'flavours/glitch/components/icon';
@ -17,8 +19,6 @@ import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
import ScrollableList from 'flavours/glitch/components/scrollable_list';
import AccountContainer from 'flavours/glitch/containers/account_container';
import Column from 'flavours/glitch/features/ui/components/column';
import RefreshIcon from 'mastodon/../material-icons/400-24px/refresh.svg?react';
import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
const messages = defineMessages({
heading: { id: 'column.favourited_by', defaultMessage: 'Favourited by' },

2
app/javascript/flavours/glitch/features/filters/select_filter.jsx
View File

@ -7,10 +7,10 @@ import { connect } from 'react-redux';
import fuzzysort from 'fuzzysort';
import AddIcon from '@/material-icons/400-24px/add.svg?react';
import { Icon } from 'flavours/glitch/components/icon';
import { toServerSideType } from 'flavours/glitch/utils/filters';
import { loupeIcon, deleteIcon } from 'flavours/glitch/utils/icons';
import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
const messages = defineMessages({
search: { id: 'filter_modal.select_filter.search', defaultMessage: 'Search or create' },

2
app/javascript/flavours/glitch/features/firehose/index.jsx
View File

@ -7,6 +7,7 @@ import { Helmet } from 'react-helmet';
import { NavLink } from 'react-router-dom';
import PublicIcon from '@/material-icons/400-24px/public.svg?react';
import { addColumn } from 'flavours/glitch/actions/columns';
import { changeSetting } from 'flavours/glitch/actions/settings';
import { connectPublicStream, connectCommunityStream } from 'flavours/glitch/actions/streaming';
@ -15,7 +16,6 @@ import { DismissableBanner } from 'flavours/glitch/components/dismissable_banner
import SettingText from 'flavours/glitch/components/setting_text';
import initialState, { domain } from 'flavours/glitch/initial_state';
import { useAppDispatch, useAppSelector } from 'flavours/glitch/store';
import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
import Column from '../../components/column';
import ColumnHeader from '../../components/column_header';

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

@ -5,8 +5,8 @@ import { defineMessages, injectIntl } 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 { Avatar } from '../../../components/avatar';
import { DisplayName } from '../../../components/display_name';

2
app/javascript/flavours/glitch/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/flavours/glitch/features/followed_tags/index.jsx
View File

@ -10,12 +10,12 @@ import { connect } from 'react-redux';
import { debounce } from 'lodash';
import TagIcon from '@/material-icons/400-24px/tag.svg?react';
import { expandFollowedHashtags, fetchFollowedHashtags } from 'flavours/glitch/actions/tags';
import ColumnHeader from 'flavours/glitch/components/column_header';
import { Hashtag } from 'flavours/glitch/components/hashtag';
import ScrollableList from 'flavours/glitch/components/scrollable_list';
import Column from 'flavours/glitch/features/ui/components/column';
import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
const messages = defineMessages({
heading: { id: 'followed_tags', defaultMessage: 'Followed hashtags' },

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

@ -13,6 +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 '@/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 'flavours/glitch/components/animated_number';
import { Icon } from 'flavours/glitch/components/icon';
import { IconButton } from 'flavours/glitch/components/icon_button';
@ -21,10 +25,6 @@ import { unicodeMapping } from 'flavours/glitch/features/emoji/emoji_unicode_map
import { autoPlayGif, reduceMotion, disableSwiping, mascot } from 'flavours/glitch/initial_state';
import { assetHost } from 'flavours/glitch/utils/config';
import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
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';
const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },

26
app/javascript/flavours/glitch/features/getting_started/index.jsx
View File

@ -10,25 +10,25 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
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 MailIcon from '@/material-icons/400-24px/mail.svg?react';
import ManufacturingIcon from '@/material-icons/400-24px/manufacturing.svg?react';
import MenuIcon from '@/material-icons/400-24px/menu.svg?react';
import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
import NotificationsIcon from '@/material-icons/400-24px/notifications.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 TagIcon from '@/material-icons/400-24px/tag.svg?react';
import { fetchFollowRequests } from 'flavours/glitch/actions/accounts';
import { fetchLists } from 'flavours/glitch/actions/lists';
import { openModal } from 'flavours/glitch/actions/modal';
import Column from 'flavours/glitch/features/ui/components/column';
import LinkFooter from 'flavours/glitch/features/ui/components/link_footer';
import { preferencesLink } from 'flavours/glitch/utils/backend_links';
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 MailIcon from 'mastodon/../material-icons/400-24px/mail.svg?react';
import ManufacturingIcon from 'mastodon/../material-icons/400-24px/manufacturing.svg?react';
import MenuIcon from 'mastodon/../material-icons/400-24px/menu.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 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 TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
import { me, showTrends } from '../../initial_state';

12
app/javascript/flavours/glitch/features/getting_started_misc/index.jsx
View File

@ -5,16 +5,16 @@ import { defineMessages, injectIntl } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import BlockIcon from '@/material-icons/400-24px/block.svg?react';
import InfoIcon from '@/material-icons/400-24px/info.svg?react';
import PersonCheckIcon from '@/material-icons/400-24px/person_check.svg?react';
import PushPinIcon from '@/material-icons/400-24px/push_pin.svg?react';
import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
import VolumeOffIcon from '@/material-icons/400-24px/volume_off.svg?react';
import { openModal } from 'flavours/glitch/actions/modal';
import Column from 'flavours/glitch/features/ui/components/column';
import ColumnLink from 'flavours/glitch/features/ui/components/column_link';
import ColumnSubheading from 'flavours/glitch/features/ui/components/column_subheading';
import BlockIcon from 'mastodon/../material-icons/400-24px/block.svg?react';
import InfoIcon from 'mastodon/../material-icons/400-24px/info.svg?react';
import PersonCheckIcon from 'mastodon/../material-icons/400-24px/person_check.svg?react';
import PushPinIcon from 'mastodon/../material-icons/400-24px/push_pin.svg?react';
import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
import VolumeOffIcon from 'mastodon/../material-icons/400-24px/volume_off.svg?react';
const messages = defineMessages({

2
app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx
View File

@ -10,13 +10,13 @@ import { connect } from 'react-redux';
import { isEqual } from 'lodash';
import TagIcon from '@/material-icons/400-24px/tag.svg?react';
import { addColumn, removeColumn, moveColumn } from 'flavours/glitch/actions/columns';
import { connectHashtagStream } from 'flavours/glitch/actions/streaming';
import { fetchHashtag, followHashtag, unfollowHashtag } from 'flavours/glitch/actions/tags';
import { expandHashtagTimeline, clearTimeline } from 'flavours/glitch/actions/timelines';
import Column from 'flavours/glitch/components/column';
import ColumnHeader from 'flavours/glitch/components/column_header';
import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
import StatusListContainer from '../ui/containers/status_list_container';

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

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

4
app/javascript/flavours/glitch/features/home_timeline/index.jsx
View File

@ -11,13 +11,13 @@ import { List as ImmutableList } from 'immutable';
import { connect } from 'react-redux';
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 'flavours/glitch/actions/announcements';
import { IconWithBadge } from 'flavours/glitch/components/icon_with_badge';
import { NotSignedInIndicator } from 'flavours/glitch/components/not_signed_in_indicator';
import AnnouncementsContainer from 'flavours/glitch/features/getting_started/containers/announcements_container';
import { me, criticalUpdatesPending } from 'flavours/glitch/initial_state';
import CampaignIcon from 'mastodon/../material-icons/400-24px/campaign.svg?react';
import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
import { expandHomeTimeline } from '../../actions/timelines';

8
app/javascript/flavours/glitch/features/interaction_modal/index.jsx
View File

@ -9,15 +9,15 @@ import { connect } from 'react-redux';
import { throttle, escapeRegExp } from 'lodash';
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 'flavours/glitch/actions/modal';
import api from 'flavours/glitch/api';
import { Button } from 'flavours/glitch/components/button';
import { Icon } from 'flavours/glitch/components/icon';
import { registrationsOpen, sso_redirect } from 'flavours/glitch/initial_state';
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';
const messages = defineMessages({
loginPrompt: { id: 'interaction_modal.login.prompt', defaultMessage: 'Domain of your home server, e.g. mastodon.social' },

2
app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx
View File

@ -8,9 +8,9 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import InfoIcon from '@/material-icons/400-24px/info.svg?react';
import Column from 'flavours/glitch/components/column';
import ColumnHeader from 'flavours/glitch/components/column_header';
import InfoIcon from 'mastodon/../material-icons/400-24px/info.svg?react';
const messages = defineMessages({
heading: { id: 'keyboard_shortcuts.heading', defaultMessage: 'Keyboard Shortcuts' },

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

@ -6,10 +6,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
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 'flavours/glitch/components/icon';
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 { removeFromListAdder, addToListAdder } from '../../../actions/lists';

4
app/javascript/flavours/glitch/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/flavours/glitch/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/flavours/glitch/features/list_editor/components/search.jsx
View File

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

6
app/javascript/flavours/glitch/features/list_timeline/index.jsx
View File

@ -11,6 +11,9 @@ import { connect } from 'react-redux';
import Toggle from 'react-toggle';
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 'flavours/glitch/actions/columns';
import { fetchList, deleteList, updateList } from 'flavours/glitch/actions/lists';
import { openModal } from 'flavours/glitch/actions/modal';
@ -24,9 +27,6 @@ import { RadioButton } from 'flavours/glitch/components/radio_button';
import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error';
import StatusListContainer from 'flavours/glitch/features/ui/containers/status_list_container';
import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
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';
const messages = defineMessages({
deleteMessage: { id: 'confirmations.delete_list.message', defaultMessage: 'Are you sure you want to permanently delete this list?' },

2
app/javascript/flavours/glitch/features/lists/index.jsx
View File

@ -10,13 +10,13 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
import { fetchLists } from 'flavours/glitch/actions/lists';
import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
import ScrollableList from 'flavours/glitch/components/scrollable_list';
import Column from 'flavours/glitch/features/ui/components/column';
import ColumnLink from 'flavours/glitch/features/ui/components/column_link';
import ColumnSubheading from 'flavours/glitch/features/ui/components/column_subheading';
import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
import NewListForm from './components/new_list_form';

12
app/javascript/flavours/glitch/features/local_settings/navigation/index.jsx
View File

@ -4,13 +4,13 @@ import { PureComponent } from 'react';
import { injectIntl, defineMessages } from 'react-intl';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import EditIcon from '@/material-icons/400-24px/edit.svg?react';
import ExpandLessIcon from '@/material-icons/400-24px/expand_less.svg?react';
import ImageIcon from '@/material-icons/400-24px/image.svg?react';
import ManufacturingIcon from '@/material-icons/400-24px/manufacturing.svg?react';
import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
import { preferencesLink } from 'flavours/glitch/utils/backend_links';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
import ExpandLessIcon from 'mastodon/../material-icons/400-24px/expand_less.svg?react';
import ImageIcon from 'mastodon/../material-icons/400-24px/image.svg?react';
import ManufacturingIcon from 'mastodon/../material-icons/400-24px/manufacturing.svg?react';
import SettingsIcon from 'mastodon/../material-icons/400-24px/settings-fill.svg?react';
import LocalSettingsNavigationItem from './item';

2
app/javascript/flavours/glitch/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/flavours/glitch/features/notifications/components/admin_report.jsx
View File

@ -10,10 +10,10 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { HotKeys } from 'react-hotkeys';
import FlagIcon from '@/material-icons/400-24px/flag-fill.svg?react';
import { Icon } from 'flavours/glitch/components/icon';
import { Permalink } from 'flavours/glitch/components/permalink';
import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
import FlagIcon from 'mastodon/../material-icons/400-24px/flag-fill.svg?react';
import NotificationOverlayContainer from '../containers/overlay_container';

2
app/javascript/flavours/glitch/features/notifications/components/admin_signup.jsx
View File

@ -10,11 +10,11 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { HotKeys } from 'react-hotkeys';
import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
import { Icon } from 'flavours/glitch/components/icon';
import { Permalink } from 'flavours/glitch/components/permalink';
import AccountContainer from 'flavours/glitch/containers/account_container';
import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add-fill.svg?react';
import NotificationOverlayContainer from '../containers/overlay_container';

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

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

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

@ -3,13 +3,13 @@ import { PureComponent } from 'react';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
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 'flavours/glitch/components/icon';
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';
const tooltips = defineMessages({

2
app/javascript/flavours/glitch/features/notifications/components/follow.jsx
View File

@ -10,11 +10,11 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { HotKeys } from 'react-hotkeys';
import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
import { Icon } from 'flavours/glitch/components/icon';
import { Permalink } from 'flavours/glitch/components/permalink';
import AccountContainer from 'flavours/glitch/containers/account_container';
import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add-fill.svg?react';
import NotificationOverlayContainer from '../containers/overlay_container';

6
app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx
View File

@ -10,15 +10,15 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { HotKeys } from 'react-hotkeys';
import CheckIcon from '@/material-icons/400-24px/check.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import PersonIcon from '@/material-icons/400-24px/person-fill.svg?react';
import { Avatar } from 'flavours/glitch/components/avatar';
import { DisplayName } from 'flavours/glitch/components/display_name';
import { Icon } from 'flavours/glitch/components/icon';
import { IconButton } from 'flavours/glitch/components/icon_button';
import { Permalink } from 'flavours/glitch/components/permalink';
import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import PersonIcon from 'mastodon/../material-icons/400-24px/person-fill.svg?react';
import NotificationOverlayContainer from '../containers/overlay_container';

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

@ -6,13 +6,13 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import { connect } from 'react-redux';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import TuneIcon from '@/material-icons/400-24px/tune.svg?react';
import { requestBrowserPermission } from 'flavours/glitch/actions/notifications';
import { changeSetting } from 'flavours/glitch/actions/settings';
import { Button } from 'flavours/glitch/components/button';
import { Icon } from 'flavours/glitch/components/icon';
import { IconButton } from 'flavours/glitch/components/icon_button';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import TuneIcon from 'mastodon/../material-icons/400-24px/tune.svg?react';
const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },

2
app/javascript/flavours/glitch/features/notifications/components/overlay.jsx
View File

@ -9,8 +9,8 @@ import { defineMessages, injectIntl } from 'react-intl';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import CheckIcon from '@/material-icons/400-24px/check.svg?react';
import { Icon } from 'flavours/glitch/components/icon';
import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
const messages = defineMessages({

6
app/javascript/flavours/glitch/features/notifications/index.jsx
View File

@ -13,12 +13,12 @@ import { connect } from 'react-redux';
import { debounce } from 'lodash';
import DeleteForeverIcon from '@/material-icons/400-24px/delete_forever.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 'flavours/glitch/compare_id';
import { Icon } from 'flavours/glitch/components/icon';
import { NotSignedInIndicator } from 'flavours/glitch/components/not_signed_in_indicator';
import DeleteForeverIcon from 'mastodon/../material-icons/400-24px/delete_forever.svg?react';
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 { addColumn, removeColumn, moveColumn } from '../../actions/columns';
import { submitMarkers } from '../../actions/markers';

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

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

12
app/javascript/flavours/glitch/features/onboarding/index.jsx
View File

@ -9,18 +9,18 @@ import { useDispatch } from 'react-redux';
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 'flavours/glitch/actions/compose';
import { Icon } from 'flavours/glitch/components/icon';
import Column from 'flavours/glitch/features/ui/components/column';
import { me } from 'flavours/glitch/initial_state';
import { useAppSelector } from 'flavours/glitch/store';
import { assetHost } from 'flavours/glitch/utils/config';
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 { Step } from './components/step';
import { Follows } from './follows';

4
app/javascript/flavours/glitch/features/onboarding/profile.jsx
View File

@ -10,6 +10,8 @@ import { useDispatch } from 'react-redux';
import Toggle from 'react-toggle';
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 'flavours/glitch/actions/accounts';
import { Button } from 'flavours/glitch/components/button';
import { ColumnBackButton } from 'flavours/glitch/components/column_back_button';
@ -18,8 +20,6 @@ import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
import { me } from 'flavours/glitch/initial_state';
import { useAppSelector } from 'flavours/glitch/store';
import { unescapeHTML } from 'flavours/glitch/utils/html';
import AddPhotoAlternateIcon from 'mastodon/../material-icons/400-24px/add_photo_alternate.svg?react';
import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
const messages = defineMessages({
uploadHeader: { id: 'onboarding.profile.upload_header', defaultMessage: 'Upload profile header' },

4
app/javascript/flavours/glitch/features/onboarding/share.jsx
View File

@ -9,12 +9,12 @@ import { Link } from 'react-router-dom';
import SwipeableViews from 'react-swipeable-views';
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 'flavours/glitch/components/column_back_button';
import { Icon } from 'flavours/glitch/components/icon';
import { me, domain } from 'flavours/glitch/initial_state';
import { useAppSelector } from 'flavours/glitch/store';
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';
const messages = defineMessages({
shareableMessage: { id: 'onboarding.share.message', defaultMessage: 'I\'m {username} on #Mastodon! Come follow me at {url}' },

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

@ -10,6 +10,11 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
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 'flavours/glitch/actions/boosts';
import { replyCompose } from 'flavours/glitch/actions/compose';
import { reblog, favourite, unreblog, unfavourite } from 'flavours/glitch/actions/interactions';
@ -18,11 +23,6 @@ import { IconButton } from 'flavours/glitch/components/icon_button';
import { me, boostModal } from 'flavours/glitch/initial_state';
import { makeGetStatus } from 'flavours/glitch/selectors';
import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
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';
const messages = defineMessages({
reply: { id: 'status.reply', defaultMessage: 'Reply' },

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

@ -9,10 +9,10 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import { Avatar } from 'flavours/glitch/components/avatar';
import { DisplayName } from 'flavours/glitch/components/display_name';
import { IconButton } from 'flavours/glitch/components/icon_button';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },

2
app/javascript/flavours/glitch/features/pinned_statuses/index.jsx
View File

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

2
app/javascript/flavours/glitch/features/public_timeline/index.jsx
View File

@ -8,9 +8,9 @@ import { Helmet } from 'react-helmet';
import { connect } from 'react-redux';
import PublicIcon from '@/material-icons/400-24px/public.svg?react';
import { DismissableBanner } from 'flavours/glitch/components/dismissable_banner';
import { domain } from 'flavours/glitch/initial_state';
import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
import { connectPublicStream } from '../../actions/streaming';

4
app/javascript/flavours/glitch/features/reblogs/index.jsx
View File

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

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

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

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

@ -8,19 +8,19 @@ import { withRouter } from 'react-router-dom';
import ImmutablePropTypes from 'react-immutable-proptypes';
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';
import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg';
import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'flavours/glitch/permissions';
import { accountAdminLink, statusAdminLink } from 'flavours/glitch/utils/backend_links';
import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
import 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';
import RepeatPrivateIcon from 'mastodon/../svg-icons/repeat_private.svg';
import { IconButton } from '../../../components/icon_button';
import DropdownMenuContainer from '../../../containers/dropdown_menu_container';

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

@ -9,13 +9,13 @@ import Immutable from 'immutable';
import ImmutablePropTypes from 'react-immutable-proptypes';
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 'flavours/glitch/components/blurhash';
import { Icon } from 'flavours/glitch/components/icon';
import { useBlurhash } from 'flavours/glitch/initial_state';
import { decode as decodeIDNA } from 'flavours/glitch/utils/idna';
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';
const getHostname = url => {
const parser = document.createElement('a');

4
app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
View File

@ -9,6 +9,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
import { AnimatedNumber } from 'flavours/glitch/components/animated_number';
import AttachmentList from 'flavours/glitch/components/attachment_list';
import EditedTimestamp from 'flavours/glitch/components/edited_timestamp';
@ -18,8 +20,6 @@ import PictureInPicturePlaceholder from 'flavours/glitch/components/picture_in_p
import { VisibilityIcon } from 'flavours/glitch/components/visibility_icon';
import PollContainer from 'flavours/glitch/containers/poll_container';
import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
import { Avatar } from '../../../components/avatar';
import { DisplayName } from '../../../components/display_name';

6
app/javascript/flavours/glitch/features/status/index.jsx
View File

@ -14,15 +14,15 @@ import { connect } from 'react-redux';
import { HotKeys } from 'react-hotkeys';
import ChatIcon from '@/material-icons/400-24px/chat.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 'flavours/glitch/components/icon';
import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
import ScrollContainer from 'flavours/glitch/containers/scroll_container';
import BundleColumnError from 'flavours/glitch/features/ui/components/bundle_column_error';
import { autoUnfoldCW } from 'flavours/glitch/utils/content_warning';
import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
import ChatIcon from 'mastodon/../material-icons/400-24px/chat.svg?react';
import VisibilityIcon from 'mastodon/../material-icons/400-24px/visibility.svg?react';
import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
import { initBlockModal } from '../../actions/blocks';
import { initBoostModal } from '../../actions/boosts';

2
app/javascript/flavours/glitch/features/subscribed_languages_modal/index.jsx
View File

@ -9,12 +9,12 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import { followAccount } from 'flavours/glitch/actions/accounts';
import { Button } from 'flavours/glitch/components/button';
import { IconButton } from 'flavours/glitch/components/icon_button';
import Option from 'flavours/glitch/features/report/components/option';
import { languages as preloadedLanguages } from 'flavours/glitch/initial_state';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },

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

@ -10,13 +10,13 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
import { changeBoostPrivacy } from 'flavours/glitch/actions/boosts';
import AttachmentList from 'flavours/glitch/components/attachment_list';
import { Icon } from 'flavours/glitch/components/icon';
import { VisibilityIcon } from 'flavours/glitch/components/visibility_icon';
import PrivacyDropdown from 'flavours/glitch/features/compose/components/privacy_dropdown';
import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
import { Avatar } from '../../../components/avatar';
import { Button } from '../../../components/button';

2
app/javascript/flavours/glitch/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/flavours/glitch/features/ui/components/compare_history_modal.jsx
View File

@ -8,13 +8,13 @@ import { connect } from 'react-redux';
import escapeTextContentForBrowser from 'escape-html';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import { closeModal } from 'flavours/glitch/actions/modal';
import { IconButton } from 'flavours/glitch/components/icon_button';
import InlineAccount from 'flavours/glitch/components/inline_account';
import MediaAttachments from 'flavours/glitch/components/media_attachments';
import { RelativeTimestamp } from 'flavours/glitch/components/relative_timestamp';
import emojify from 'flavours/glitch/features/emoji/emoji';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
const mapStateToProps = (state, { statusId }) => ({
language: state.getIn(['statuses', statusId, 'language']),

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