Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream
This commit is contained in:
commit
2f521bc84a
|
@ -0,0 +1,6 @@
|
|||
---
|
||||
ignore:
|
||||
# devise-two-factor advisory about brute-forcing TOTP
|
||||
# We have rate-limits on authentication endpoints in place (including second
|
||||
# factor verification) since Mastodon v3.2.0
|
||||
- CVE-2024-0227
|
|
@ -70,7 +70,7 @@ services:
|
|||
hard: -1
|
||||
|
||||
libretranslate:
|
||||
image: libretranslate/libretranslate:v1.5.3
|
||||
image: libretranslate/libretranslate:v1.5.4
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- lt-data:/home/libretranslate/.local
|
||||
|
|
|
@ -109,9 +109,10 @@ Rails/LexicallyScopedActionFilter:
|
|||
Exclude:
|
||||
- 'app/controllers/auth/*'
|
||||
|
||||
# Reason: There are appropriate times to use these features
|
||||
# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsskipsmodelvalidations
|
||||
Rails/SkipsModelValidations:
|
||||
Exclude:
|
||||
- 'db/*migrate/**/*'
|
||||
Enabled: false
|
||||
|
||||
# Reason: We want to preserve the ability to migrate from arbitrary old versions,
|
||||
# and cannot guarantee that every installation has run every migration as they upgrade.
|
||||
|
|
|
@ -80,41 +80,6 @@ Rails/RakeEnvironment:
|
|||
- 'lib/tasks/repo.rake'
|
||||
- 'lib/tasks/statistics.rake'
|
||||
|
||||
# Configuration parameters: ForbiddenMethods, AllowedMethods.
|
||||
# ForbiddenMethods: decrement!, decrement_counter, increment!, increment_counter, insert, insert!, insert_all, insert_all!, toggle!, touch, touch_all, update_all, update_attribute, update_column, update_columns, update_counters, upsert, upsert_all
|
||||
Rails/SkipsModelValidations:
|
||||
Exclude:
|
||||
- 'app/controllers/admin/invites_controller.rb'
|
||||
- 'app/controllers/concerns/session_tracking_concern.rb'
|
||||
- 'app/models/concerns/account/merging.rb'
|
||||
- 'app/models/concerns/expireable.rb'
|
||||
- 'app/models/status.rb'
|
||||
- 'app/models/trends/links.rb'
|
||||
- 'app/models/trends/preview_card_batch.rb'
|
||||
- 'app/models/trends/preview_card_provider_batch.rb'
|
||||
- 'app/models/trends/status_batch.rb'
|
||||
- 'app/models/trends/statuses.rb'
|
||||
- 'app/models/trends/tag_batch.rb'
|
||||
- 'app/models/trends/tags.rb'
|
||||
- 'app/models/user.rb'
|
||||
- 'app/services/activitypub/process_status_update_service.rb'
|
||||
- 'app/services/approve_appeal_service.rb'
|
||||
- 'app/services/block_domain_service.rb'
|
||||
- 'app/services/delete_account_service.rb'
|
||||
- 'app/services/process_mentions_service.rb'
|
||||
- 'app/services/unallow_domain_service.rb'
|
||||
- 'app/services/unblock_domain_service.rb'
|
||||
- 'app/services/update_status_service.rb'
|
||||
- 'app/workers/activitypub/post_upgrade_worker.rb'
|
||||
- 'app/workers/move_worker.rb'
|
||||
- 'app/workers/scheduler/ip_cleanup_scheduler.rb'
|
||||
- 'app/workers/scheduler/scheduled_statuses_scheduler.rb'
|
||||
- 'lib/mastodon/cli/accounts.rb'
|
||||
- 'lib/mastodon/cli/maintenance.rb'
|
||||
- 'spec/lib/activitypub/activity/follow_spec.rb'
|
||||
- 'spec/services/follow_service_spec.rb'
|
||||
- 'spec/services/update_account_service_spec.rb'
|
||||
|
||||
# Configuration parameters: Include.
|
||||
# Include: app/models/**/*.rb
|
||||
Rails/UniqueValidationWithoutIndex:
|
||||
|
|
3
Gemfile
3
Gemfile
|
@ -39,8 +39,7 @@ end
|
|||
|
||||
gem 'net-ldap', '~> 0.18'
|
||||
|
||||
# TODO: Point back at released omniauth-cas gem when new version is released
|
||||
gem 'omniauth-cas', github: 'dlindahl/omniauth-cas', ref: '9d9d3a91b316c55d49ab6e621977f2067010c5bf'
|
||||
gem 'omniauth-cas', '~> 3.0.0.beta.1'
|
||||
gem 'omniauth-saml', '~> 2.0'
|
||||
gem 'omniauth_openid_connect', '~> 0.6.1'
|
||||
gem 'omniauth', '~> 2.0'
|
||||
|
|
20
Gemfile.lock
20
Gemfile.lock
|
@ -7,16 +7,6 @@ GIT
|
|||
hkdf (~> 0.2)
|
||||
jwt (~> 2.0)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/dlindahl/omniauth-cas.git
|
||||
revision: 9d9d3a91b316c55d49ab6e621977f2067010c5bf
|
||||
ref: 9d9d3a91b316c55d49ab6e621977f2067010c5bf
|
||||
specs:
|
||||
omniauth-cas (3.0.0)
|
||||
addressable (~> 2.8)
|
||||
nokogiri (~> 1.12)
|
||||
omniauth (~> 2.1)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/jhawthorn/nsa.git
|
||||
revision: e020fcc3a54d993ab45b7194d89ab720296c111b
|
||||
|
@ -165,7 +155,7 @@ GEM
|
|||
binding_of_caller (1.0.0)
|
||||
debug_inspector (>= 0.0.1)
|
||||
blurhash (0.1.7)
|
||||
bootsnap (1.17.0)
|
||||
bootsnap (1.17.1)
|
||||
msgpack (~> 1.2)
|
||||
brakeman (6.1.1)
|
||||
racc
|
||||
|
@ -267,7 +257,7 @@ GEM
|
|||
tzinfo
|
||||
excon (0.109.0)
|
||||
fabrication (2.31.0)
|
||||
faker (3.2.2)
|
||||
faker (3.2.3)
|
||||
i18n (>= 1.8.11, < 2)
|
||||
faraday (1.10.3)
|
||||
faraday-em_http (~> 1.0)
|
||||
|
@ -484,6 +474,10 @@ GEM
|
|||
hashie (>= 3.4.6)
|
||||
rack (>= 2.2.3)
|
||||
rack-protection
|
||||
omniauth-cas (3.0.0.beta.1)
|
||||
addressable (~> 2.8)
|
||||
nokogiri (~> 1.12)
|
||||
omniauth (~> 2.1)
|
||||
omniauth-rails_csrf_protection (1.0.1)
|
||||
actionpack (>= 4.2)
|
||||
omniauth (~> 2.0)
|
||||
|
@ -894,7 +888,7 @@ DEPENDENCIES
|
|||
nsa!
|
||||
oj (~> 3.14)
|
||||
omniauth (~> 2.0)
|
||||
omniauth-cas!
|
||||
omniauth-cas (~> 3.0.0.beta.1)
|
||||
omniauth-rails_csrf_protection (~> 1.0)
|
||||
omniauth-saml (~> 2.0)
|
||||
omniauth_openid_connect (~> 0.6.1)
|
||||
|
|
|
@ -19,7 +19,7 @@ class Api::V1::MarkersController < Api::BaseController
|
|||
@markers = {}
|
||||
|
||||
resource_params.each_pair do |timeline, timeline_params|
|
||||
@markers[timeline] = current_user.markers.find_or_initialize_by(timeline: timeline)
|
||||
@markers[timeline] = current_user.markers.find_or_create_by(timeline: timeline)
|
||||
@markers[timeline].update!(timeline_params)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -7,8 +7,7 @@ import classNames from 'classnames';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
|
||||
import LinkIcon from '@material-symbols/svg-600/outlined/link.svg?react';
|
||||
|
||||
import LinkIcon from 'mastodon/../material-icons/400-24px/link.svg?react';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
|
||||
const filename = url => url.split('/').pop().split('#')[0].split('?')[0];
|
||||
|
|
|
@ -2,9 +2,9 @@ import PropTypes from 'prop-types';
|
|||
|
||||
import { FormattedMessage } from 'react-intl';
|
||||
|
||||
import GroupsIcon from '@material-symbols/svg-600/outlined/group.svg?react';
|
||||
import PersonIcon from '@material-symbols/svg-600/outlined/person.svg?react';
|
||||
import SmartToyIcon from '@material-symbols/svg-600/outlined/smart_toy.svg?react';
|
||||
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';
|
||||
|
||||
|
||||
export const Badge = ({ icon, label, domain }) => (
|
||||
|
|
|
@ -2,8 +2,7 @@ import { useCallback } from 'react';
|
|||
|
||||
import { FormattedMessage } from 'react-intl';
|
||||
|
||||
import ArrowBackIcon from '@material-symbols/svg-600/outlined/arrow_back.svg?react';
|
||||
|
||||
import ArrowBackIcon from 'mastodon/../material-icons/400-24px/arrow_back.svg?react';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
import { ButtonInTabsBar } from 'mastodon/features/ui/util/columns_context';
|
||||
|
||||
|
|
|
@ -6,13 +6,12 @@ import { FormattedMessage, injectIntl, defineMessages } from 'react-intl';
|
|||
import classNames from 'classnames';
|
||||
import { withRouter } from 'react-router-dom';
|
||||
|
||||
import AddIcon from '@material-symbols/svg-600/outlined/add.svg?react';
|
||||
import ArrowBackIcon from '@material-symbols/svg-600/outlined/arrow_back.svg?react';
|
||||
import ChevronLeftIcon from '@material-symbols/svg-600/outlined/chevron_left.svg?react';
|
||||
import ChevronRightIcon from '@material-symbols/svg-600/outlined/chevron_right.svg?react';
|
||||
import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
|
||||
import TuneIcon from '@material-symbols/svg-600/outlined/tune.svg?react';
|
||||
|
||||
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 { Icon } from 'mastodon/components/icon';
|
||||
import { ButtonInTabsBar, useColumnsContext } from 'mastodon/features/ui/util/columns_context';
|
||||
import { WithRouterPropTypes } from 'mastodon/utils/react_router';
|
||||
|
|
|
@ -7,8 +7,7 @@ import classNames from 'classnames';
|
|||
|
||||
import { useDispatch } from 'react-redux';
|
||||
|
||||
import ContentCopyIcon from '@material-symbols/svg-600/outlined/content_copy.svg?react';
|
||||
|
||||
import ContentCopyIcon from 'mastodon/../material-icons/400-24px/content_copy.svg?react';
|
||||
import { showAlert } from 'mastodon/actions/alerts';
|
||||
import { IconButton } from 'mastodon/components/icon_button';
|
||||
|
||||
|
|
|
@ -8,8 +8,7 @@ import { useCallback, useState, useEffect } from 'react';
|
|||
|
||||
import { defineMessages, useIntl } from 'react-intl';
|
||||
|
||||
import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
|
||||
|
||||
import CloseIcon from 'mastodon/../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,7 +2,7 @@ import { useCallback } from 'react';
|
|||
|
||||
import { defineMessages, useIntl } from 'react-intl';
|
||||
|
||||
import LockOpenIcon from '@material-symbols/svg-600/outlined/lock_open.svg?react';
|
||||
import LockOpenIcon from 'mastodon/../material-icons/400-24px/lock_open.svg?react';
|
||||
|
||||
import { IconButton } from './icon_button';
|
||||
|
||||
|
|
|
@ -6,10 +6,10 @@ import { withRouter } from 'react-router-dom';
|
|||
|
||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
|
||||
import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
|
||||
import { supportsPassiveEvents } from 'detect-passive-events';
|
||||
import Overlay from 'react-overlays/Overlay';
|
||||
|
||||
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
|
||||
import { CircularProgress } from 'mastodon/components/circular_progress';
|
||||
import { WithRouterPropTypes } from 'mastodon/utils/react_router';
|
||||
|
||||
|
|
|
@ -5,8 +5,7 @@ import { FormattedMessage, injectIntl } from 'react-intl';
|
|||
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import ArrowDropDownIcon from '@material-symbols/svg-600/outlined/arrow_drop_down.svg?react';
|
||||
|
||||
import ArrowDropDownIcon from 'mastodon/../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';
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
import classNames from 'classnames';
|
||||
|
||||
import CheckBoxOutlineBlankIcon from '@material-symbols/svg-600/outlined/check_box_outline_blank.svg?react';
|
||||
|
||||
import CheckBoxOutlineBlankIcon from 'mastodon/../material-icons/400-24px/check_box_outline_blank.svg?react';
|
||||
import { isProduction } from 'mastodon/utils/environment';
|
||||
|
||||
interface SVGPropsWithTitle extends React.SVGProps<SVGSVGElement> {
|
||||
|
|
|
@ -2,8 +2,7 @@ import { useCallback } from 'react';
|
|||
|
||||
import { useIntl, defineMessages } from 'react-intl';
|
||||
|
||||
import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react';
|
||||
|
||||
import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
|
||||
const messages = defineMessages({
|
||||
|
|
|
@ -8,9 +8,9 @@ import classNames from 'classnames';
|
|||
import { is } from 'immutable';
|
||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
|
||||
import VisibilityOffIcon from '@material-symbols/svg-600/outlined/visibility_off.svg?react';
|
||||
import { debounce } from 'lodash';
|
||||
|
||||
import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
|
||||
import { Blurhash } from 'mastodon/components/blurhash';
|
||||
|
||||
import { autoPlayGif, displayMedia, useBlurhash } from '../initial_state';
|
||||
|
|
|
@ -5,8 +5,7 @@ import { FormattedMessage } from 'react-intl';
|
|||
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import CancelPresentationIcon from '@material-symbols/svg-600/outlined/cancel_presentation.svg?react';
|
||||
|
||||
import CancelPresentationIcon from 'mastodon/../material-icons/400-24px/cancel_presentation.svg?react';
|
||||
import { removePictureInPicture } from 'mastodon/actions/picture_in_picture';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
|
||||
|
|
|
@ -7,10 +7,10 @@ import classNames from 'classnames';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
|
||||
import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react';
|
||||
import escapeTextContentForBrowser from 'escape-html';
|
||||
import spring from 'react-motion/lib/spring';
|
||||
|
||||
import CheckIcon from 'mastodon/../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';
|
||||
|
|
|
@ -7,12 +7,12 @@ import classNames from 'classnames';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
|
||||
import AlternateEmailIcon from '@material-symbols/svg-600/outlined/alternate_email.svg?react';
|
||||
import PushPinIcon from '@material-symbols/svg-600/outlined/push_pin.svg?react';
|
||||
import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
|
||||
import ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react';
|
||||
import { HotKeys } from 'react-hotkeys';
|
||||
|
||||
import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
|
||||
import PushPinIcon from 'mastodon/../material-icons/400-24px/push_pin.svg?react';
|
||||
import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
|
||||
import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';
|
||||
import { withOptionalRouter, WithOptionalRouterPropTypes } from 'mastodon/utils/react_router';
|
||||
|
|
|
@ -9,16 +9,15 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
|
|||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import BookmarkIcon from '@material-symbols/svg-600/outlined/bookmark-fill.svg';
|
||||
import BookmarkBorderIcon from '@material-symbols/svg-600/outlined/bookmark.svg?react';
|
||||
import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react';
|
||||
import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
|
||||
import ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react';
|
||||
import ReplyAllIcon from '@material-symbols/svg-600/outlined/reply_all.svg?react';
|
||||
import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react';
|
||||
import StarBorderIcon from '@material-symbols/svg-600/outlined/star.svg?react';
|
||||
import VisibilityIcon from '@material-symbols/svg-600/outlined/visibility.svg?react';
|
||||
|
||||
import BookmarkIcon from 'mastodon/../material-icons/400-24px/bookmark-fill.svg';
|
||||
import BookmarkBorderIcon from 'mastodon/../material-icons/400-24px/bookmark.svg?react';
|
||||
import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
|
||||
import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
|
||||
import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
|
||||
import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react';
|
||||
import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
|
||||
import StarBorderIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
|
||||
import VisibilityIcon from 'mastodon/../material-icons/400-24px/visibility.svg?react';
|
||||
import RepeatDisabledIcon from 'mastodon/../svg-icons/repeat_disabled.svg?react';
|
||||
import RepeatPrivateIcon from 'mastodon/../svg-icons/repeat_private.svg?react';
|
||||
import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
|
||||
|
|
|
@ -9,8 +9,7 @@ import { Link, withRouter } from 'react-router-dom';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import ChevronRightIcon from '@material-symbols/svg-600/outlined/chevron_right.svg?react';
|
||||
|
||||
import ChevronRightIcon from 'mastodon/../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';
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react';
|
||||
import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
|
||||
|
||||
import { Icon } from './icon';
|
||||
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
import { defineMessages, useIntl } from 'react-intl';
|
||||
|
||||
import AlternateEmailIcon from '@material-symbols/svg-600/outlined/alternate_email.svg?react';
|
||||
import LockIcon from '@material-symbols/svg-600/outlined/lock.svg?react';
|
||||
import LockOpenIcon from '@material-symbols/svg-600/outlined/lock_open.svg?react';
|
||||
import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react';
|
||||
import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
|
||||
import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
|
||||
import LockOpenIcon from 'mastodon/../material-icons/400-24px/lock_open.svg?react';
|
||||
import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
|
||||
|
||||
import { Icon } from './icon';
|
||||
|
||||
|
|
|
@ -10,9 +10,8 @@ import { List as ImmutableList } from 'immutable';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import ChevronRightIcon from '@material-symbols/svg-600/outlined/chevron_right.svg?react';
|
||||
import ExpandMoreIcon from '@material-symbols/svg-600/outlined/expand_more.svg?react';
|
||||
|
||||
import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react';
|
||||
import ExpandMoreIcon from 'mastodon/../material-icons/400-24px/expand_more.svg?react';
|
||||
import { fetchServer, fetchExtendedDescription, fetchDomainBlocks } from 'mastodon/actions/server';
|
||||
import Column from 'mastodon/components/column';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
|
|
|
@ -3,9 +3,8 @@ import { FormattedMessage } from 'react-intl';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
|
||||
import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react';
|
||||
import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
|
||||
|
||||
import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
|
||||
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
|
||||
export default class FollowRequestNote extends ImmutablePureComponent {
|
||||
|
|
|
@ -9,13 +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 '@material-symbols/svg-600/outlined/check.svg?react';
|
||||
import LockIcon from '@material-symbols/svg-600/outlined/lock.svg?react';
|
||||
import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react';
|
||||
import NotificationsIcon from '@material-symbols/svg-600/outlined/notifications.svg?react';
|
||||
import NotificationsActiveIcon from '@material-symbols/svg-600/outlined/notifications_active-fill.svg?react';
|
||||
import ShareIcon from '@material-symbols/svg-600/outlined/share.svg?react';
|
||||
|
||||
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 { Avatar } from 'mastodon/components/avatar';
|
||||
import { Badge, AutomatedBadge, GroupBadge } from 'mastodon/components/badge';
|
||||
import { Button } from 'mastodon/components/button';
|
||||
|
|
|
@ -5,10 +5,9 @@ import classNames from 'classnames';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
|
||||
import AudiotrackIcon from '@material-symbols/svg-600/outlined/music_note.svg?react';
|
||||
import PlayArrowIcon from '@material-symbols/svg-600/outlined/play_arrow.svg?react';
|
||||
import VisibilityOffIcon from '@material-symbols/svg-600/outlined/visibility_off.svg?react';
|
||||
|
||||
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 { Blurhash } from 'mastodon/components/blurhash';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
import { autoPlayGif, displayMedia, useBlurhash } from 'mastodon/initial_state';
|
||||
|
|
|
@ -7,14 +7,14 @@ import classNames from 'classnames';
|
|||
|
||||
import { is } from 'immutable';
|
||||
|
||||
import DownloadIcon from '@material-symbols/svg-600/outlined/download.svg?react';
|
||||
import PauseIcon from '@material-symbols/svg-600/outlined/pause.svg?react';
|
||||
import PlayArrowIcon from '@material-symbols/svg-600/outlined/play_arrow-fill.svg?react';
|
||||
import VisibilityOffIcon from '@material-symbols/svg-600/outlined/visibility_off.svg?react';
|
||||
import VolumeOffIcon from '@material-symbols/svg-600/outlined/volume_off-fill.svg?react';
|
||||
import VolumeUpIcon from '@material-symbols/svg-600/outlined/volume_up-fill.svg?react';
|
||||
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 { Icon } from 'mastodon/components/icon';
|
||||
import { formatTime, getPointerPosition, fileNameFromURL } from 'mastodon/features/video';
|
||||
|
||||
|
|
|
@ -6,9 +6,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
|
|||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import BlockIcon from '@material-symbols/svg-600/outlined/block-fill.svg?react';
|
||||
import { debounce } from 'lodash';
|
||||
|
||||
import BlockIcon from 'mastodon/../material-icons/400-24px/block-fill.svg?react';
|
||||
|
||||
import { fetchBlocks, expandBlocks } from '../../actions/blocks';
|
||||
import { LoadingIndicator } from '../../components/loading_indicator';
|
||||
import ScrollableList from '../../components/scrollable_list';
|
||||
|
|
|
@ -8,9 +8,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
|
|||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import BookmarksIcon from '@material-symbols/svg-600/outlined/bookmarks-fill.svg?react';
|
||||
import { debounce } from 'lodash';
|
||||
|
||||
import BookmarksIcon from 'mastodon/../material-icons/400-24px/bookmarks-fill.svg?react';
|
||||
import { fetchBookmarkedStatuses, expandBookmarkedStatuses } from 'mastodon/actions/bookmarks';
|
||||
import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
|
||||
import ColumnHeader from 'mastodon/components/column_header';
|
||||
|
|
|
@ -7,8 +7,7 @@ import { Helmet } from 'react-helmet';
|
|||
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react';
|
||||
|
||||
import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
|
||||
import { DismissableBanner } from 'mastodon/components/dismissable_banner';
|
||||
import { domain } from 'mastodon/initial_state';
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
|
|||
|
||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
|
||||
import MenuIcon from '@material-symbols/svg-600/outlined/menu.svg?react';
|
||||
import MenuIcon from 'mastodon/../material-icons/400-24px/menu.svg?react';
|
||||
|
||||
import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
|
||||
|
||||
|
|
|
@ -8,9 +8,9 @@ import classNames from 'classnames';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
|
||||
import LockIcon from '@material-symbols/svg-600/outlined/lock.svg?react';
|
||||
import { length } from 'stringz';
|
||||
|
||||
import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
import { WithOptionalRouterPropTypes, withOptionalRouter } from 'mastodon/utils/react_router';
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ import { PureComponent } from 'react';
|
|||
|
||||
import { defineMessages, injectIntl } from 'react-intl';
|
||||
|
||||
import InsertChartIcon from '@material-symbols/svg-600/outlined/insert_chart.svg?react';
|
||||
import InsertChartIcon from 'mastodon/../material-icons/400-24px/insert_chart.svg?react';
|
||||
|
||||
import { IconButton } from '../../../components/icon_button';
|
||||
|
||||
|
|
|
@ -8,9 +8,8 @@ import classNames from 'classnames';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
|
||||
import AddIcon from '@material-symbols/svg-600/outlined/add.svg?react';
|
||||
import CloseIcon from '@material-symbols/svg-600/outlined/close.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 AutosuggestInput from 'mastodon/components/autosuggest_input';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
import { IconButton } from 'mastodon/components/icon_button';
|
||||
|
|
|
@ -6,14 +6,13 @@ import { injectIntl, defineMessages } from 'react-intl';
|
|||
import classNames from 'classnames';
|
||||
|
||||
|
||||
import AlternateEmailIcon from '@material-symbols/svg-600/outlined/alternate_email.svg?react';
|
||||
import LockIcon from '@material-symbols/svg-600/outlined/lock.svg?react';
|
||||
import LockOpenIcon from '@material-symbols/svg-600/outlined/lock_open.svg?react';
|
||||
import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react';
|
||||
import { supportsPassiveEvents } from 'detect-passive-events';
|
||||
import Overlay from 'react-overlays/Overlay';
|
||||
|
||||
|
||||
import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
|
||||
import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
|
||||
import LockOpenIcon from 'mastodon/../material-icons/400-24px/lock_open.svg?react';
|
||||
import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
|
||||
import { IconButton } from '../../../components/icon_button';
|
||||
|
|
|
@ -5,8 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
|
||||
import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
|
||||
|
||||
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
|
||||
import AttachmentList from 'mastodon/components/attachment_list';
|
||||
import { WithOptionalRouterPropTypes, withOptionalRouter } from 'mastodon/utils/react_router';
|
||||
|
||||
|
|
|
@ -8,10 +8,9 @@ import { withRouter } from 'react-router-dom';
|
|||
|
||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
|
||||
import CancelIcon from '@material-symbols/svg-600/outlined/cancel-fill.svg?react';
|
||||
import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
|
||||
import SearchIcon from '@material-symbols/svg-600/outlined/search.svg?react';
|
||||
|
||||
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 { Icon } from 'mastodon/components/icon';
|
||||
import { domain, searchEnabled } from 'mastodon/initial_state';
|
||||
import { HASHTAG_REGEX } from 'mastodon/utils/hashtags';
|
||||
|
|
|
@ -5,11 +5,10 @@ import { FormattedMessage } from 'react-intl';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
|
||||
import FindInPageIcon from '@material-symbols/svg-600/outlined/find_in_page.svg?react';
|
||||
import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react';
|
||||
import SearchIcon from '@material-symbols/svg-600/outlined/search.svg?react';
|
||||
import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react';
|
||||
|
||||
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 { Icon } from 'mastodon/components/icon';
|
||||
import { LoadMore } from 'mastodon/components/load_more';
|
||||
import { SearchSection } from 'mastodon/features/explore/components/search_section';
|
||||
|
|
|
@ -5,11 +5,11 @@ import { FormattedMessage } from 'react-intl';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
|
||||
import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
|
||||
import EditIcon from '@material-symbols/svg-600/outlined/edit.svg?react';
|
||||
import InfoIcon from '@material-symbols/svg-600/outlined/info.svg?react';
|
||||
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 { Icon } from 'mastodon/components/icon';
|
||||
|
||||
import Motion from '../../ui/util/optional_motion';
|
||||
|
|
|
@ -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 '@material-symbols/svg-600/outlined/add_photo_alternate.svg?react';
|
||||
import AddPhotoAlternateIcon from 'mastodon/../material-icons/400-24px/add_photo_alternate.svg?react';
|
||||
|
||||
import { IconButton } from '../../../components/icon_button';
|
||||
|
||||
|
|
|
@ -3,9 +3,9 @@ import { PureComponent } from 'react';
|
|||
|
||||
import { FormattedMessage } from 'react-intl';
|
||||
|
||||
import UploadFileIcon from '@material-symbols/svg-600/outlined/upload_file.svg?react';
|
||||
import spring from 'react-motion/lib/spring';
|
||||
|
||||
import UploadFileIcon from 'mastodon/../material-icons/400-24px/upload_file.svg?react';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
|
||||
import Motion from '../../ui/util/optional_motion';
|
||||
|
|
|
@ -9,15 +9,15 @@ import { Link } from 'react-router-dom';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react';
|
||||
import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react';
|
||||
import LogoutIcon from '@material-symbols/svg-600/outlined/logout.svg?react';
|
||||
import MenuIcon from '@material-symbols/svg-600/outlined/menu.svg?react';
|
||||
import NotificationsIcon from '@material-symbols/svg-600/outlined/notifications-fill.svg?react';
|
||||
import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react';
|
||||
import SettingsIcon from '@material-symbols/svg-600/outlined/settings-fill.svg?react';
|
||||
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 { openModal } from 'mastodon/actions/modal';
|
||||
import Column from 'mastodon/components/column';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
|
|
|
@ -8,10 +8,10 @@ import { Link, withRouter } from 'react-router-dom';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
|
||||
import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react';
|
||||
import ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react';
|
||||
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 AttachmentList from 'mastodon/components/attachment_list';
|
||||
import AvatarComposite from 'mastodon/components/avatar_composite';
|
||||
import { IconButton } from 'mastodon/components/icon_button';
|
||||
|
|
|
@ -7,8 +7,7 @@ import { Helmet } from 'react-helmet';
|
|||
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import AlternateEmailIcon from '@material-symbols/svg-600/outlined/alternate_email.svg?react';
|
||||
|
||||
import AlternateEmailIcon from 'mastodon/../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';
|
||||
|
|
|
@ -9,8 +9,7 @@ import { List as ImmutableList } from 'immutable';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react';
|
||||
|
||||
import PeopleIcon from 'mastodon/../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';
|
||||
|
|
|
@ -8,9 +8,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
|
|||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import BlockIcon from '@material-symbols/svg-600/outlined/block-fill.svg?react';
|
||||
import { debounce } from 'lodash';
|
||||
|
||||
import BlockIcon from 'mastodon/../material-icons/400-24px/block-fill.svg?react';
|
||||
|
||||
import { fetchDomainBlocks, expandDomainBlocks } from '../../actions/domain_blocks';
|
||||
import { LoadingIndicator } from '../../components/loading_indicator';
|
||||
import ScrollableList from '../../components/scrollable_list';
|
||||
|
|
|
@ -8,9 +8,8 @@ import { NavLink, Switch, Route } from 'react-router-dom';
|
|||
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import SearchIcon from '@material-symbols/svg-600/outlined/search.svg?react';
|
||||
import TagIcon from '@material-symbols/svg-600/outlined/tag.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 Column from 'mastodon/components/column';
|
||||
import ColumnHeader from 'mastodon/components/column_header';
|
||||
import Search from 'mastodon/features/compose/containers/search_container';
|
||||
|
|
|
@ -9,10 +9,9 @@ import { List as ImmutableList } from 'immutable';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import FindInPageIcon from '@material-symbols/svg-600/outlined/find_in_page.svg?react';
|
||||
import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react';
|
||||
import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react';
|
||||
|
||||
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 { submitSearch, expandSearch } from 'mastodon/actions/search';
|
||||
import { ImmutableHashtag as Hashtag } from 'mastodon/components/hashtag';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
|
|
|
@ -8,9 +8,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
|
|||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react';
|
||||
import { debounce } from 'lodash';
|
||||
|
||||
import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
|
||||
import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
|
||||
import { fetchFavouritedStatuses, expandFavouritedStatuses } from 'mastodon/actions/favourites';
|
||||
import ColumnHeader from 'mastodon/components/column_header';
|
||||
|
|
|
@ -8,9 +8,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
|
|||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import RefreshIcon from '@material-symbols/svg-600/outlined/refresh.svg?react';
|
||||
import { debounce } from 'lodash';
|
||||
|
||||
import RefreshIcon from 'mastodon/../material-icons/400-24px/refresh.svg?react';
|
||||
import { fetchFavourites, expandFavourites } from 'mastodon/actions/interactions';
|
||||
import ColumnHeader from 'mastodon/components/column_header';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
|
|
|
@ -5,9 +5,9 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
|
|||
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import AddIcon from '@material-symbols/svg-600/outlined/add.svg?react';
|
||||
import fuzzysort from 'fuzzysort';
|
||||
|
||||
import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
import { toServerSideType } from 'mastodon/utils/filters';
|
||||
import { loupeIcon, deleteIcon } from 'mastodon/utils/icons';
|
||||
|
|
|
@ -6,8 +6,7 @@ import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
|
|||
import { Helmet } from 'react-helmet';
|
||||
import { NavLink } from 'react-router-dom';
|
||||
|
||||
import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react';
|
||||
|
||||
import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
|
||||
import { addColumn } from 'mastodon/actions/columns';
|
||||
import { changeSetting } from 'mastodon/actions/settings';
|
||||
import { connectPublicStream, connectCommunityStream } from 'mastodon/actions/streaming';
|
||||
|
|
|
@ -7,8 +7,8 @@ import { Link } from 'react-router-dom';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
|
||||
import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react';
|
||||
import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
|
||||
import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
|
||||
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
|
||||
|
||||
import { Avatar } from '../../../components/avatar';
|
||||
import { DisplayName } from '../../../components/display_name';
|
||||
|
|
|
@ -8,9 +8,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
|
|||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react';
|
||||
import { debounce } from 'lodash';
|
||||
|
||||
import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
|
||||
|
||||
import { fetchFollowRequests, expandFollowRequests } from '../../actions/accounts';
|
||||
import ScrollableList from '../../components/scrollable_list';
|
||||
import { me } from '../../initial_state';
|
||||
|
|
|
@ -8,9 +8,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
|
|||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react';
|
||||
import { debounce } from 'lodash';
|
||||
|
||||
import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
|
||||
import { expandFollowedHashtags, fetchFollowedHashtags } from 'mastodon/actions/tags';
|
||||
import ColumnHeader from 'mastodon/components/column_header';
|
||||
import { Hashtag } from 'mastodon/components/hashtag';
|
||||
|
|
|
@ -9,14 +9,14 @@ import { withRouter } from 'react-router-dom';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
|
||||
import AddIcon from '@material-symbols/svg-600/outlined/add.svg?react';
|
||||
import ChevronLeftIcon from '@material-symbols/svg-600/outlined/chevron_left.svg?react';
|
||||
import ChevronRightIcon from '@material-symbols/svg-600/outlined/chevron_right.svg?react';
|
||||
import TransitionMotion from 'react-motion/lib/TransitionMotion';
|
||||
import spring from 'react-motion/lib/spring';
|
||||
import ReactSwipeableViews from 'react-swipeable-views';
|
||||
|
||||
import elephantUIPlane from 'mastodon/../images/elephant_ui_plane.svg';
|
||||
import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
|
||||
import ChevronLeftIcon from 'mastodon/../material-icons/400-24px/chevron_left.svg?react';
|
||||
import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react';
|
||||
import { AnimatedNumber } from 'mastodon/components/animated_number';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
import { IconButton } from 'mastodon/components/icon_button';
|
||||
|
|
|
@ -9,18 +9,17 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
|
|||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import AlternateEmailIcon from '@material-symbols/svg-600/outlined/alternate_email.svg?react';
|
||||
import BookmarksIcon from '@material-symbols/svg-600/outlined/bookmarks-fill.svg?react';
|
||||
import PeopleIcon from '@material-symbols/svg-600/outlined/group.svg?react';
|
||||
import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react';
|
||||
import ListAltIcon from '@material-symbols/svg-600/outlined/list_alt.svg?react';
|
||||
import MenuIcon from '@material-symbols/svg-600/outlined/menu.svg?react';
|
||||
import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react';
|
||||
import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react';
|
||||
import SettingsIcon from '@material-symbols/svg-600/outlined/settings-fill.svg?react';
|
||||
import StarIcon from '@material-symbols/svg-600/outlined/star.svg?react';
|
||||
import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react';
|
||||
|
||||
import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
|
||||
import BookmarksIcon from 'mastodon/../material-icons/400-24px/bookmarks-fill.svg?react';
|
||||
import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
|
||||
import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
|
||||
import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
|
||||
import MenuIcon from 'mastodon/../material-icons/400-24px/menu.svg?react';
|
||||
import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
|
||||
import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
|
||||
import SettingsIcon from 'mastodon/../material-icons/400-24px/settings-fill.svg?react';
|
||||
import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
|
||||
import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
|
||||
import { fetchFollowRequests } from 'mastodon/actions/accounts';
|
||||
import Column from 'mastodon/components/column';
|
||||
import ColumnHeader from 'mastodon/components/column_header';
|
||||
|
|
|
@ -8,9 +8,9 @@ import { Helmet } from 'react-helmet';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import TagIcon from '@material-symbols/svg-600/outlined/tag.svg?react';
|
||||
import { isEqual } from 'lodash';
|
||||
|
||||
import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
|
||||
import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
|
||||
import { connectHashtagStream } from 'mastodon/actions/streaming';
|
||||
import { fetchHashtag, followHashtag, unfollowHashtag } from 'mastodon/actions/tags';
|
||||
|
|
|
@ -10,9 +10,8 @@ import { createSelector } from '@reduxjs/toolkit';
|
|||
import { List as ImmutableList } from 'immutable';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import CampaignIcon from '@material-symbols/svg-600/outlined/campaign.svg?react';
|
||||
import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react';
|
||||
|
||||
import CampaignIcon from 'mastodon/../material-icons/400-24px/campaign.svg?react';
|
||||
import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
|
||||
import { fetchAnnouncements, toggleShowAnnouncements } from 'mastodon/actions/announcements';
|
||||
import { IconWithBadge } from 'mastodon/components/icon_with_badge';
|
||||
import { NotSignedInIndicator } from 'mastodon/components/not_signed_in_indicator';
|
||||
|
|
|
@ -7,12 +7,12 @@ import classNames from 'classnames';
|
|||
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react';
|
||||
import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
|
||||
import ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react';
|
||||
import StarIcon from '@material-symbols/svg-600/outlined/star.svg?react';
|
||||
import { throttle, escapeRegExp } from 'lodash';
|
||||
|
||||
import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
|
||||
import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
|
||||
import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
|
||||
import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
|
||||
import { openModal, closeModal } from 'mastodon/actions/modal';
|
||||
import api from 'mastodon/api';
|
||||
import { Button } from 'mastodon/components/button';
|
||||
|
|
|
@ -6,8 +6,7 @@ import { Helmet } from 'react-helmet';
|
|||
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
|
||||
import InfoIcon from '@material-symbols/svg-600/outlined/info.svg?react';
|
||||
|
||||
import InfoIcon from 'mastodon/../material-icons/400-24px/info.svg?react';
|
||||
import Column from 'mastodon/components/column';
|
||||
import ColumnHeader from 'mastodon/components/column_header';
|
||||
|
||||
|
|
|
@ -6,10 +6,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
|
|||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import AddIcon from '@material-symbols/svg-600/outlined/add.svg?react';
|
||||
import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
|
||||
import ListAltIcon from '@material-symbols/svg-600/outlined/list_alt.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 ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
|
||||
import { removeFromListAdder, addToListAdder } from '../../../actions/lists';
|
||||
|
|
|
@ -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 '@material-symbols/svg-600/outlined/add.svg?react';
|
||||
import CloseIcon from '@material-symbols/svg-600/outlined/close.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 { removeFromListEditor, addToListEditor } from '../../../actions/lists';
|
||||
import { Avatar } from '../../../components/avatar';
|
||||
|
|
|
@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
|
|||
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react';
|
||||
import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
|
||||
|
||||
import { changeListEditorTitle, submitListEditor } from '../../../actions/lists';
|
||||
import { IconButton } from '../../../components/icon_button';
|
||||
|
|
|
@ -7,9 +7,8 @@ import classNames from 'classnames';
|
|||
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import CancelIcon from '@material-symbols/svg-600/outlined/cancel.svg?react';
|
||||
import SearchIcon from '@material-symbols/svg-600/outlined/search.svg?react';
|
||||
|
||||
import CancelIcon from 'mastodon/../material-icons/400-24px/cancel.svg?react';
|
||||
import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
|
||||
import { fetchListSuggestions, clearListSuggestions, changeListSuggestions } from '../../../actions/lists';
|
||||
|
|
|
@ -9,11 +9,11 @@ import { withRouter } from 'react-router-dom';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import DeleteIcon from '@material-symbols/svg-600/outlined/delete.svg?react';
|
||||
import EditIcon from '@material-symbols/svg-600/outlined/edit.svg?react';
|
||||
import ListAltIcon from '@material-symbols/svg-600/outlined/list_alt.svg?react';
|
||||
import Toggle from 'react-toggle';
|
||||
|
||||
import DeleteIcon from 'mastodon/../material-icons/400-24px/delete.svg?react';
|
||||
import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
|
||||
import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
|
||||
import { addColumn, removeColumn, moveColumn } from 'mastodon/actions/columns';
|
||||
import { fetchList, deleteList, updateList } from 'mastodon/actions/lists';
|
||||
import { openModal } from 'mastodon/actions/modal';
|
||||
|
|
|
@ -9,8 +9,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
|
|||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import ListAltIcon from '@material-symbols/svg-600/outlined/list_alt.svg?react';
|
||||
|
||||
import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
|
||||
import { fetchLists } from 'mastodon/actions/lists';
|
||||
import Column from 'mastodon/components/column';
|
||||
import ColumnHeader from 'mastodon/components/column_header';
|
||||
|
|
|
@ -8,9 +8,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
|
|||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import VolumeOffIcon from '@material-symbols/svg-600/outlined/volume_off.svg?react';
|
||||
import { debounce } from 'lodash';
|
||||
|
||||
import VolumeOffIcon from 'mastodon/../material-icons/400-24px/volume_off.svg?react';
|
||||
|
||||
import { fetchMutes, expandMutes } from '../../actions/mutes';
|
||||
import { LoadingIndicator } from '../../components/loading_indicator';
|
||||
import ScrollableList from '../../components/scrollable_list';
|
||||
|
|
|
@ -3,8 +3,7 @@ import { PureComponent } from 'react';
|
|||
|
||||
import { FormattedMessage } from 'react-intl';
|
||||
|
||||
import DeleteForeverIcon from '@material-symbols/svg-600/outlined/delete_forever.svg?react';
|
||||
|
||||
import DeleteForeverIcon from 'mastodon/../material-icons/400-24px/delete_forever.svg?react';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
|
||||
export default class ClearColumnButton extends PureComponent {
|
||||
|
|
|
@ -3,13 +3,12 @@ import { PureComponent } from 'react';
|
|||
|
||||
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
|
||||
|
||||
import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react';
|
||||
import InsertChartIcon from '@material-symbols/svg-600/outlined/insert_chart.svg?react';
|
||||
import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react';
|
||||
import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
|
||||
import ReplyAllIcon from '@material-symbols/svg-600/outlined/reply_all.svg?react';
|
||||
import StarIcon from '@material-symbols/svg-600/outlined/star.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 PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
|
||||
import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
|
||||
import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react';
|
||||
import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
|
||||
const tooltips = defineMessages({
|
||||
|
|
|
@ -7,9 +7,8 @@ import { Link } from 'react-router-dom';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
|
||||
import CheckIcon from '@material-symbols/svg-600/outlined/check.svg?react';
|
||||
import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
|
||||
|
||||
import CheckIcon from 'mastodon/../material-icons/400-24px/check.svg?react';
|
||||
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
|
||||
import { Avatar } from 'mastodon/components/avatar';
|
||||
import { DisplayName } from 'mastodon/components/display_name';
|
||||
import { IconButton } from 'mastodon/components/icon_button';
|
||||
|
|
|
@ -8,16 +8,16 @@ import { Link, withRouter } from 'react-router-dom';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
|
||||
import EditIcon from '@material-symbols/svg-600/outlined/edit.svg?react';
|
||||
import FlagIcon from '@material-symbols/svg-600/outlined/flag-fill.svg?react';
|
||||
import HomeIcon from '@material-symbols/svg-600/outlined/home-fill.svg?react';
|
||||
import InsertChartIcon from '@material-symbols/svg-600/outlined/insert_chart.svg?react';
|
||||
import PersonIcon from '@material-symbols/svg-600/outlined/person-fill.svg?react';
|
||||
import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add-fill.svg?react';
|
||||
import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
|
||||
import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react';
|
||||
import { HotKeys } from 'react-hotkeys';
|
||||
|
||||
import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
|
||||
import FlagIcon from 'mastodon/../material-icons/400-24px/flag-fill.svg?react';
|
||||
import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
|
||||
import InsertChartIcon from 'mastodon/../material-icons/400-24px/insert_chart.svg?react';
|
||||
import PersonIcon from 'mastodon/../material-icons/400-24px/person-fill.svg?react';
|
||||
import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add-fill.svg?react';
|
||||
import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
|
||||
import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
import AccountContainer from 'mastodon/containers/account_container';
|
||||
import StatusContainer from 'mastodon/containers/status_container';
|
||||
|
|
|
@ -5,9 +5,8 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
|
|||
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
|
||||
import TuneIcon from '@material-symbols/svg-600/outlined/tune.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 { requestBrowserPermission } from 'mastodon/actions/notifications';
|
||||
import { changeSetting } from 'mastodon/actions/settings';
|
||||
import { Button } from 'mastodon/components/button';
|
||||
|
|
|
@ -10,10 +10,10 @@ import { List as ImmutableList } from 'immutable';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import DoneAllIcon from '@material-symbols/svg-600/outlined/done_all.svg?react';
|
||||
import NotificationsIcon from '@material-symbols/svg-600/outlined/notifications-fill.svg?react';
|
||||
import { debounce } from 'lodash';
|
||||
|
||||
import DoneAllIcon from 'mastodon/../material-icons/400-24px/done_all.svg?react';
|
||||
import NotificationsIcon from 'mastodon/../material-icons/400-24px/notifications-fill.svg?react';
|
||||
import { compareId } from 'mastodon/compare_id';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
import { NotSignedInIndicator } from 'mastodon/components/not_signed_in_indicator';
|
||||
|
|
|
@ -2,9 +2,8 @@ import PropTypes from 'prop-types';
|
|||
|
||||
import { Link } from 'react-router-dom';
|
||||
|
||||
import ArrowRightAltIcon from '@material-symbols/svg-600/outlined/arrow_right_alt.svg?react';
|
||||
import CheckIcon from '@material-symbols/svg-600/outlined/done.svg?react';
|
||||
|
||||
import ArrowRightAltIcon from 'mastodon/../material-icons/400-24px/arrow_right_alt.svg?react';
|
||||
import CheckIcon from 'mastodon/../material-icons/400-24px/done.svg?react';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
|
||||
export const Step = ({ label, description, icon, iconComponent, completed, onClick, href, to }) => {
|
||||
|
|
|
@ -8,13 +8,12 @@ import { Link, Switch, Route, useHistory } from 'react-router-dom';
|
|||
import { useDispatch } from 'react-redux';
|
||||
|
||||
|
||||
import AccountCircleIcon from '@material-symbols/svg-600/outlined/account_circle.svg?react';
|
||||
import ArrowRightAltIcon from '@material-symbols/svg-600/outlined/arrow_right_alt.svg?react';
|
||||
import ContentCopyIcon from '@material-symbols/svg-600/outlined/content_copy.svg?react';
|
||||
import EditNoteIcon from '@material-symbols/svg-600/outlined/edit_note.svg?react';
|
||||
import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react';
|
||||
|
||||
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 { focusCompose } from 'mastodon/actions/compose';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
import Column from 'mastodon/features/ui/components/column';
|
||||
|
|
|
@ -8,10 +8,10 @@ import { useHistory } from 'react-router-dom';
|
|||
|
||||
import { useDispatch } from 'react-redux';
|
||||
|
||||
import AddPhotoAlternateIcon from '@material-symbols/svg-600/outlined/add_photo_alternate.svg?react';
|
||||
import EditIcon from '@material-symbols/svg-600/outlined/edit.svg?react';
|
||||
import Toggle from 'react-toggle';
|
||||
|
||||
import AddPhotoAlternateIcon from 'mastodon/../material-icons/400-24px/add_photo_alternate.svg?react';
|
||||
import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
|
||||
import { updateAccount } from 'mastodon/actions/accounts';
|
||||
import { Button } from 'mastodon/components/button';
|
||||
import { ColumnBackButton } from 'mastodon/components/column_back_button';
|
||||
|
|
|
@ -7,10 +7,10 @@ import classNames from 'classnames';
|
|||
import { Link } from 'react-router-dom';
|
||||
|
||||
|
||||
import ArrowRightAltIcon from '@material-symbols/svg-600/outlined/arrow_right_alt.svg?react';
|
||||
import ContentCopyIcon from '@material-symbols/svg-600/outlined/content_copy.svg?react';
|
||||
import SwipeableViews from 'react-swipeable-views';
|
||||
|
||||
import ArrowRightAltIcon from 'mastodon/../material-icons/400-24px/arrow_right_alt.svg?react';
|
||||
import ContentCopyIcon from 'mastodon/../material-icons/400-24px/content_copy.svg?react';
|
||||
import { ColumnBackButton } from 'mastodon/components/column_back_button';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
import { me, domain } from 'mastodon/initial_state';
|
||||
|
|
|
@ -9,12 +9,11 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
|
|||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import OpenInNewIcon from '@material-symbols/svg-600/outlined/open_in_new.svg?react';
|
||||
import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
|
||||
import ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react';
|
||||
import ReplyAllIcon from '@material-symbols/svg-600/outlined/reply_all.svg?react';
|
||||
import StarIcon from '@material-symbols/svg-600/outlined/star.svg?react';
|
||||
|
||||
import OpenInNewIcon from 'mastodon/../material-icons/400-24px/open_in_new.svg?react';
|
||||
import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
|
||||
import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
|
||||
import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react';
|
||||
import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
|
||||
import { initBoostModal } from 'mastodon/actions/boosts';
|
||||
import { replyCompose } from 'mastodon/actions/compose';
|
||||
import { reblog, favourite, unreblog, unfavourite } from 'mastodon/actions/interactions';
|
||||
|
|
|
@ -8,8 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
|
|||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
|
||||
|
||||
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
|
||||
import { Avatar } from 'mastodon/components/avatar';
|
||||
import { DisplayName } from 'mastodon/components/display_name';
|
||||
import { IconButton } from 'mastodon/components/icon_button';
|
||||
|
|
|
@ -8,8 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
|
|||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import PushPinIcon from '@material-symbols/svg-600/outlined/push_pin.svg?react';
|
||||
|
||||
import PushPinIcon from 'mastodon/../material-icons/400-24px/push_pin.svg?react';
|
||||
import { getStatusList } from 'mastodon/selectors';
|
||||
|
||||
import { fetchPinnedStatuses } from '../../actions/pin_statuses';
|
||||
|
|
|
@ -7,8 +7,7 @@ import { Helmet } from 'react-helmet';
|
|||
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import PublicIcon from '@material-symbols/svg-600/outlined/public.svg?react';
|
||||
|
||||
import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
|
||||
import { DismissableBanner } from 'mastodon/components/dismissable_banner';
|
||||
import { domain } from 'mastodon/initial_state';
|
||||
|
||||
|
|
|
@ -8,9 +8,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
|
|||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import RefreshIcon from '@material-symbols/svg-600/outlined/refresh.svg?react';
|
||||
import { debounce } from 'lodash';
|
||||
|
||||
import RefreshIcon from 'mastodon/../material-icons/400-24px/refresh.svg?react';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
|
||||
import { fetchReblogs, expandReblogs } from '../../actions/interactions';
|
||||
|
|
|
@ -3,8 +3,7 @@ import { PureComponent } from 'react';
|
|||
|
||||
import classNames from 'classnames';
|
||||
|
||||
import CheckIcon from '@material-symbols/svg-600/outlined/done.svg?react';
|
||||
|
||||
import CheckIcon from 'mastodon/../material-icons/400-24px/done.svg?react';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
|
||||
export default class Option extends PureComponent {
|
||||
|
|
|
@ -9,15 +9,14 @@ import { withRouter } from 'react-router-dom';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import BookmarkIcon from '@material-symbols/svg-600/outlined/bookmark-fill.svg?react';
|
||||
import BookmarkBorderIcon from '@material-symbols/svg-600/outlined/bookmark.svg?react';
|
||||
import MoreHorizIcon from '@material-symbols/svg-600/outlined/more_horiz.svg?react';
|
||||
import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
|
||||
import ReplyIcon from '@material-symbols/svg-600/outlined/reply.svg?react';
|
||||
import ReplyAllIcon from '@material-symbols/svg-600/outlined/reply_all.svg?react';
|
||||
import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react';
|
||||
import StarBorderIcon from '@material-symbols/svg-600/outlined/star.svg?react';
|
||||
|
||||
import BookmarkIcon from 'mastodon/../material-icons/400-24px/bookmark-fill.svg?react';
|
||||
import BookmarkBorderIcon from 'mastodon/../material-icons/400-24px/bookmark.svg?react';
|
||||
import MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
|
||||
import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
|
||||
import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
|
||||
import ReplyAllIcon from 'mastodon/../material-icons/400-24px/reply_all.svg?react';
|
||||
import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
|
||||
import StarBorderIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
|
||||
import RepeatDisabledIcon from 'mastodon/../svg-icons/repeat_disabled.svg?react';
|
||||
import RepeatPrivateIcon from 'mastodon/../svg-icons/repeat_private.svg?react';
|
||||
import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
|
||||
|
|
|
@ -10,10 +10,9 @@ import classNames from 'classnames';
|
|||
import Immutable from 'immutable';
|
||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
|
||||
import DescriptionIcon from '@material-symbols/svg-600/outlined/description-fill.svg?react';
|
||||
import OpenInNewIcon from '@material-symbols/svg-600/outlined/open_in_new.svg?react';
|
||||
import PlayArrowIcon from '@material-symbols/svg-600/outlined/play_arrow-fill.svg?react';
|
||||
|
||||
import DescriptionIcon from 'mastodon/../material-icons/400-24px/description-fill.svg?react';
|
||||
import OpenInNewIcon from 'mastodon/../material-icons/400-24px/open_in_new.svg?react';
|
||||
import PlayArrowIcon from 'mastodon/../material-icons/400-24px/play_arrow-fill.svg?react';
|
||||
import { Blurhash } from 'mastodon/components/blurhash';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
|
||||
|
|
|
@ -8,10 +8,9 @@ import { Link, withRouter } from 'react-router-dom';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
|
||||
import AlternateEmailIcon from '@material-symbols/svg-600/outlined/alternate_email.svg?react';
|
||||
import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
|
||||
import StarIcon from '@material-symbols/svg-600/outlined/star-fill.svg?react';
|
||||
|
||||
import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
|
||||
import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
|
||||
import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
|
||||
import { AnimatedNumber } from 'mastodon/components/animated_number';
|
||||
import EditedTimestamp from 'mastodon/components/edited_timestamp';
|
||||
import { getHashtagBarForStatus } from 'mastodon/components/hashtag_bar';
|
||||
|
|
|
@ -12,10 +12,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
|
|||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import VisibilityIcon from '@material-symbols/svg-600/outlined/visibility.svg?react';
|
||||
import VisibilityOffIcon from '@material-symbols/svg-600/outlined/visibility_off.svg?react';
|
||||
import { HotKeys } from 'react-hotkeys';
|
||||
|
||||
import VisibilityIcon from 'mastodon/../material-icons/400-24px/visibility.svg?react';
|
||||
import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
import { LoadingIndicator } from 'mastodon/components/loading_indicator';
|
||||
import ScrollContainer from 'mastodon/containers/scroll_container';
|
||||
|
|
|
@ -8,8 +8,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
|
|||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
|
||||
|
||||
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
|
||||
import { followAccount } from 'mastodon/actions/accounts';
|
||||
import { Button } from 'mastodon/components/button';
|
||||
import { IconButton } from 'mastodon/components/icon_button';
|
||||
|
|
|
@ -9,8 +9,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
|
|||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import RepeatIcon from '@material-symbols/svg-600/outlined/repeat.svg?react';
|
||||
|
||||
import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
|
||||
import { changeBoostPrivacy } from 'mastodon/actions/boosts';
|
||||
import AttachmentList from 'mastodon/components/attachment_list';
|
||||
import { Icon } from 'mastodon/components/icon';
|
||||
|
|
|
@ -3,7 +3,7 @@ import { PureComponent } from 'react';
|
|||
|
||||
import { defineMessages, injectIntl } from 'react-intl';
|
||||
|
||||
import RefreshIcon from '@material-symbols/svg-600/outlined/refresh.svg?react';
|
||||
import RefreshIcon from 'mastodon/../material-icons/400-24px/refresh.svg?react';
|
||||
|
||||
import { IconButton } from '../../../components/icon_button';
|
||||
|
||||
|
|
|
@ -6,9 +6,9 @@ import { FormattedMessage } from 'react-intl';
|
|||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
|
||||
import escapeTextContentForBrowser from 'escape-html';
|
||||
|
||||
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
|
||||
import { closeModal } from 'mastodon/actions/modal';
|
||||
import { IconButton } from 'mastodon/components/icon_button';
|
||||
import InlineAccount from 'mastodon/components/inline_account';
|
||||
|
|
|
@ -4,8 +4,7 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
|
|||
|
||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
|
||||
import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
|
||||
|
||||
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
|
||||
import api from 'mastodon/api';
|
||||
import { IconButton } from 'mastodon/components/icon_button';
|
||||
|
||||
|
|
|
@ -5,8 +5,7 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
|
|||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
|
||||
|
||||
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
|
||||
import { fetchFilters, createFilter, createFilterStatus } from 'mastodon/actions/filters';
|
||||
import { fetchStatus } from 'mastodon/actions/statuses';
|
||||
import { IconButton } from 'mastodon/components/icon_button';
|
||||
|
|
|
@ -9,7 +9,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
|
|||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import CloseIcon from '@material-symbols/svg-600/outlined/close.svg?react';
|
||||
import Textarea from 'react-textarea-autosize';
|
||||
import { length } from 'stringz';
|
||||
// eslint-disable-next-line import/extensions
|
||||
|
@ -17,6 +16,7 @@ import tesseractWorkerPath from 'tesseract.js/dist/worker.min.js';
|
|||
// eslint-disable-next-line import/no-extraneous-dependencies
|
||||
import tesseractCorePath from 'tesseract.js-core/tesseract-core.wasm.js';
|
||||
|
||||
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
|
||||
import { Button } from 'mastodon/components/button';
|
||||
import { GIFV } from 'mastodon/components/gifv';
|
||||
import { IconButton } from 'mastodon/components/icon_button';
|
||||
|
|
|
@ -6,8 +6,7 @@ import { injectIntl, defineMessages } from 'react-intl';
|
|||
import { List as ImmutableList } from 'immutable';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import PersonAddIcon from '@material-symbols/svg-600/outlined/person_add.svg?react';
|
||||
|
||||
import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
|
||||
import { fetchFollowRequests } from 'mastodon/actions/accounts';
|
||||
import { IconWithBadge } from 'mastodon/components/icon_with_badge';
|
||||
import ColumnLink from 'mastodon/features/ui/components/column_link';
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue