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

.bundler-audit.yml

@@ -1,3 +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

.devcontainer/docker-compose.yml

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

.rubocop.yml

@@ -121,9 +121,20 @@ Rails/LexicallyScopedActionFilter:
   Exclude:
     - 'app/controllers/auth/*'
 
-Rails/SkipsModelValidations:
+# Reason: These tasks are doing local work which do not need full env loaded
+# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsrakeenvironment
+Rails/RakeEnvironment:
   Exclude:
-    - 'db/*migrate/**/*'
+    - 'lib/tasks/auto_annotate_models.rake'
+    - 'lib/tasks/emojis.rake'
+    - 'lib/tasks/mastodon.rake'
+    - 'lib/tasks/repo.rake'
+    - 'lib/tasks/statistics.rake'
+
+# Reason: There are appropriate times to use these features
+# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsskipsmodelvalidations
+Rails/SkipsModelValidations:
+  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.

.rubocop_todo.yml

@@ -13,13 +13,6 @@ Bundler/OrderedGems:
   Exclude:
     - 'Gemfile'
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Exclude:
-    - 'app/models/account.rb'
-
 Lint/NonLocalExitFromIterator:
   Exclude:
     - 'app/helpers/jsonld_helper.rb'
@@ -71,53 +64,6 @@ Rails/OutputSafety:
   Exclude:
     - 'config/initializers/simple_form.rb'
 
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Include.
-# Include: **/Rakefile, **/*.rake
-Rails/RakeEnvironment:
-  Exclude:
-    - 'lib/tasks/auto_annotate_models.rake'
-    - 'lib/tasks/db.rake'
-    - 'lib/tasks/emojis.rake'
-    - 'lib/tasks/mastodon.rake'
-    - '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:

Gemfile.lock

@@ -21,35 +21,35 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.2)
+    actioncable (7.1.3)
-      actionpack (= 7.1.2)
+      actionpack (= 7.1.3)
-      activesupport (= 7.1.2)
+      activesupport (= 7.1.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.2)
+    actionmailbox (7.1.3)
-      actionpack (= 7.1.2)
+      actionpack (= 7.1.3)
-      activejob (= 7.1.2)
+      activejob (= 7.1.3)
-      activerecord (= 7.1.2)
+      activerecord (= 7.1.3)
-      activestorage (= 7.1.2)
+      activestorage (= 7.1.3)
-      activesupport (= 7.1.2)
+      activesupport (= 7.1.3)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.2)
+    actionmailer (7.1.3)
-      actionpack (= 7.1.2)
+      actionpack (= 7.1.3)
-      actionview (= 7.1.2)
+      actionview (= 7.1.3)
-      activejob (= 7.1.2)
+      activejob (= 7.1.3)
-      activesupport (= 7.1.2)
+      activesupport (= 7.1.3)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.2)
+    actionpack (7.1.3)
-      actionview (= 7.1.2)
+      actionview (= 7.1.3)
-      activesupport (= 7.1.2)
+      activesupport (= 7.1.3)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -57,15 +57,15 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.2)
+    actiontext (7.1.3)
-      actionpack (= 7.1.2)
+      actionpack (= 7.1.3)
-      activerecord (= 7.1.2)
+      activerecord (= 7.1.3)
-      activestorage (= 7.1.2)
+      activestorage (= 7.1.3)
-      activesupport (= 7.1.2)
+      activesupport (= 7.1.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.2)
+    actionview (7.1.3)
-      activesupport (= 7.1.2)
+      activesupport (= 7.1.3)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -75,22 +75,22 @@ GEM
       activemodel (>= 4.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (7.1.2)
+    activejob (7.1.3)
-      activesupport (= 7.1.2)
+      activesupport (= 7.1.3)
       globalid (>= 0.3.6)
-    activemodel (7.1.2)
+    activemodel (7.1.3)
-      activesupport (= 7.1.2)
+      activesupport (= 7.1.3)
-    activerecord (7.1.2)
+    activerecord (7.1.3)
-      activemodel (= 7.1.2)
+      activemodel (= 7.1.3)
-      activesupport (= 7.1.2)
+      activesupport (= 7.1.3)
       timeout (>= 0.4.0)
-    activestorage (7.1.2)
+    activestorage (7.1.3)
-      actionpack (= 7.1.2)
+      actionpack (= 7.1.3)
-      activejob (= 7.1.2)
+      activejob (= 7.1.3)
-      activerecord (= 7.1.2)
+      activerecord (= 7.1.3)
-      activesupport (= 7.1.2)
+      activesupport (= 7.1.3)
       marcel (~> 1.0)
-    activesupport (7.1.2)
+    activesupport (7.1.3)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -155,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
@@ -188,7 +188,7 @@ GEM
     climate_control (0.2.0)
     cocoon (1.2.15)
     color_diff (0.1)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     cose (1.3.0)
       cbor (~> 0.5.9)
@@ -257,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)
@@ -454,7 +454,7 @@ GEM
       uri
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.4.4)
+    net-imap (0.4.9.1)
       date
       net-protocol
     net-ldap (0.19.0)
@@ -462,7 +462,7 @@ GEM
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0)
+    net-smtp (0.4.0.1)
       net-protocol
     nio4r (2.5.9)
     nokogiri (1.16.0)
@@ -552,27 +552,27 @@ GEM
       rack
     rack-proxy (0.7.6)
       rack
-    rack-session (1.0.1)
+    rack-session (1.0.2)
       rack (< 3)
     rack-test (2.1.0)
       rack (>= 1.3)
     rackup (1.0.0)
       rack (< 3)
       webrick
-    rails (7.1.2)
+    rails (7.1.3)
-      actioncable (= 7.1.2)
+      actioncable (= 7.1.3)
-      actionmailbox (= 7.1.2)
+      actionmailbox (= 7.1.3)
-      actionmailer (= 7.1.2)
+      actionmailer (= 7.1.3)
-      actionpack (= 7.1.2)
+      actionpack (= 7.1.3)
-      actiontext (= 7.1.2)
+      actiontext (= 7.1.3)
-      actionview (= 7.1.2)
+      actionview (= 7.1.3)
-      activejob (= 7.1.2)
+      activejob (= 7.1.3)
-      activemodel (= 7.1.2)
+      activemodel (= 7.1.3)
-      activerecord (= 7.1.2)
+      activerecord (= 7.1.3)
-      activestorage (= 7.1.2)
+      activestorage (= 7.1.3)
-      activesupport (= 7.1.2)
+      activesupport (= 7.1.3)
       bundler (>= 1.15.0)
-      railties (= 7.1.2)
+      railties (= 7.1.3)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -587,9 +587,9 @@ GEM
     rails-i18n (7.0.8)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.1.2)
+    railties (7.1.3)
-      actionpack (= 7.1.2)
+      actionpack (= 7.1.3)
-      activesupport (= 7.1.2)
+      activesupport (= 7.1.3)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -732,7 +732,7 @@ GEM
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
-    stackprof (0.2.25)
+    stackprof (0.2.26)
     statsd-ruby (1.5.0)
     stoplight (3.0.2)
       redlock (~> 1.0)
@@ -958,4 +958,4 @@ RUBY VERSION
    ruby 3.2.2p53
 
 BUNDLED WITH
-   2.4.20
+   2.5.4

app/controllers/admin/confirmations_controller.rb

@@ -7,7 +7,7 @@ module Admin
 
     def create
       authorize @user, :confirm?
-      @user.confirm!
+      @user.mark_email_as_confirmed!
       log_action :confirm, @user
       redirect_to admin_accounts_path
     end

app/helpers/accounts_helper.rb

@@ -27,20 +27,24 @@ module AccountsHelper
     end
   end
 
+  def account_formatted_stat(value)
+    number_to_human(value, precision: 3, strip_insignificant_zeros: true)
+  end
+
   def account_description(account)
     prepend_str = [
       [
-        number_to_human(account.public_statuses_count, precision: 3, strip_insignificant_zeros: true),
+        account_formatted_stat(account.public_statuses_count),
         I18n.t('accounts.posts', count: account.public_statuses_count),
       ].join(' '),
 
       [
-        number_to_human(account.public_following_count, precision: 3, strip_insignificant_zeros: true),
+        account_formatted_stat(account.public_following_count),
         I18n.t('accounts.following', count: account.public_following_count),
       ].join(' '),
 
       [
-        number_to_human(account.public_followers_count, precision: 3, strip_insignificant_zeros: true),
+        account_formatted_stat(account.public_followers_count),
         I18n.t('accounts.followers', count: account.public_followers_count),
       ].join(' '),
     ].join(', ')

app/helpers/mascot_helper.rb

@@ -2,7 +2,7 @@
 
 module MascotHelper
   def mascot_url
-    full_asset_url(instance_presenter.mascot&.file&.url || asset_pack_path('media/images/elephant_ui_plane.svg'))
+    full_asset_url(instance_presenter.mascot&.file&.url || frontend_asset_path('images/elephant_ui_plane.svg'))
   end
 
   def instance_presenter

app/helpers/routing_helper.rb

@@ -24,8 +24,12 @@ module RoutingHelper
     Rails.configuration.action_controller.asset_host || root_url
   end
 
-  def full_pack_url(source, **options)
+  def frontend_asset_path(source, **options)
-    full_asset_url(asset_pack_path(source, **options))
+    asset_pack_path("media/#{source}", **options)
+  end
+
+  def frontend_asset_url(source, **options)
+    full_asset_url(frontend_asset_path(source, **options))
   end
 
   def use_storage?

app/javascript/mastodon/components/attachment_list.jsx

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

app/javascript/mastodon/components/badge.jsx

@@ -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 GroupsIcon from '@/material-icons/400-24px/group.svg?react';
-import PersonIcon from 'mastodon/../material-icons/400-24px/person.svg?react';
+import PersonIcon from '@/material-icons/400-24px/person.svg?react';
-import SmartToyIcon from 'mastodon/../material-icons/400-24px/smart_toy.svg?react';
+import SmartToyIcon from '@/material-icons/400-24px/smart_toy.svg?react';
 
 
 export const Badge = ({ icon, label, domain }) => (

app/javascript/mastodon/components/column_back_button.tsx

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

app/javascript/mastodon/components/column_header.jsx

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

app/javascript/mastodon/components/copy_icon_button.jsx

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

app/javascript/mastodon/components/dismissable_banner.tsx

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

app/javascript/mastodon/components/domain.tsx

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

app/javascript/mastodon/components/dropdown_menu.jsx

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

app/javascript/mastodon/components/edited_timestamp/index.jsx

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

app/javascript/mastodon/components/icon.tsx

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

app/javascript/mastodon/components/load_gap.tsx

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

app/javascript/mastodon/components/logo.tsx

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

app/javascript/mastodon/components/media_gallery.jsx

@@ -10,7 +10,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 
 import { debounce } from 'lodash';
 
-import VisibilityOffIcon from 'mastodon/../material-icons/400-24px/visibility_off.svg?react';
+import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
 import { Blurhash } from 'mastodon/components/blurhash';
 
 import { autoPlayGif, displayMedia, displayMediaExpand, useBlurhash } from '../initial_state';
@@ -119,7 +119,7 @@ class Item extends PureComponent {
     }
 
     if (attachment.get('description')?.length > 0) {
-      badges.push(<span key='alt' className='media-gallery__gifv__label'>ALT</span>);
+      badges.push(<span key='alt' className='media-gallery__alt__label'>ALT</span>);
     }
 
     const description = attachment.getIn(['translation', 'description']) || attachment.get('description');

app/javascript/mastodon/components/picture_in_picture_placeholder.jsx

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

app/javascript/mastodon/components/poll.jsx

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

app/javascript/mastodon/components/regeneration_indicator.jsx

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

app/javascript/mastodon/components/searchability_icon.tsx

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

app/javascript/mastodon/components/status.jsx

@@ -9,14 +9,14 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { HotKeys } from 'react-hotkeys';
 
-import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
-import QuoteIcon from 'mastodon/../material-icons/400-24px/format_quote.svg?react';
+import QuoteIcon from '@/material-icons/400-24px/format_quote.svg?react';
-import ReferenceIcon from 'mastodon/../material-icons/400-24px/link.svg?react';
+import ReferenceIcon from '@/material-icons/400-24px/link.svg?react';
-import PushPinIcon from 'mastodon/../material-icons/400-24px/push_pin.svg?react';
+import PushPinIcon from '@/material-icons/400-24px/push_pin.svg?react';
-import RepeatIcon from 'mastodon/../material-icons/400-24px/repeat.svg?react';
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
-import ReplyIcon from 'mastodon/../material-icons/400-24px/reply.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
-import LimitedIcon from 'mastodon/../material-icons/400-24px/shield.svg?react';
+import LimitedIcon from '@/material-icons/400-24px/shield.svg?react';
-import TimerIcon from 'mastodon/../material-icons/400-24px/timer.svg?react';
+import TimerIcon from '@/material-icons/400-24px/timer.svg?react';
 import AttachmentList from 'mastodon/components/attachment_list';
 import { Icon }  from 'mastodon/components/icon';
 import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';

app/javascript/mastodon/components/status_action_bar.jsx

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

app/javascript/mastodon/components/status_content.jsx

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

app/javascript/mastodon/components/verified_badge.tsx

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

app/javascript/mastodon/components/visibility_icon.tsx

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

app/javascript/mastodon/features/about/index.jsx

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

app/javascript/mastodon/features/account/components/follow_request_note.jsx

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

app/javascript/mastodon/features/account/components/header.jsx

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

app/javascript/mastodon/features/account_gallery/components/media_item.jsx

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

app/javascript/mastodon/features/antenna_adder/components/antenna.jsx

@@ -6,9 +6,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
-import AntennaIcon from 'mastodon/../material-icons/400-24px/wifi.svg?react';
+import AntennaIcon from '@/material-icons/400-24px/wifi.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 import { removeFromAntennaAdder, addToAntennaAdder, removeExcludeFromAntennaAdder, addExcludeToAntennaAdder } from '../../../actions/antennas';

app/javascript/mastodon/features/antenna_editor/components/account.jsx

@@ -7,8 +7,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 
 import { removeFromAntennaEditor, addToAntennaEditor, removeExcludeFromAntennaEditor, addExcludeToAntennaEditor } from '../../../actions/antennas';
 import { Avatar } from '../../../components/avatar';

app/javascript/mastodon/features/antenna_editor/components/edit_antenna_form.jsx

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

app/javascript/mastodon/features/antenna_editor/components/search.jsx

@@ -7,8 +7,8 @@ import classNames from 'classnames';
 
 import { connect } from 'react-redux';
 
-import CancelIcon from 'mastodon/../material-icons/400-24px/cancel-fill.svg?react';
+import CancelIcon from '@/material-icons/400-24px/cancel-fill.svg?react';
-import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
+import SearchIcon from '@/material-icons/400-24px/search.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 import { fetchAntennaSuggestions, clearAntennaSuggestions, changeAntennaSuggestions } from '../../../actions/antennas';

app/javascript/mastodon/features/antenna_setting/components/text_list.jsx

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

app/javascript/mastodon/features/antenna_setting/index.jsx

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

app/javascript/mastodon/features/antenna_timeline/index.jsx

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

app/javascript/mastodon/features/antennas/index.jsx

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

app/javascript/mastodon/features/audio/index.jsx

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

app/javascript/mastodon/features/blocks/index.jsx

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

app/javascript/mastodon/features/bookmark_categories/index.jsx

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

app/javascript/mastodon/features/bookmark_category_adder/components/bookmark_category.jsx

@@ -7,9 +7,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
-import BookmarkIcon from 'mastodon/../material-icons/400-24px/bookmark-fill.svg?react';
+import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg?react';
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 import { removeFromBookmarkCategoryAdder, addToBookmarkCategoryAdder } from '../../../actions/bookmark_categories';

app/javascript/mastodon/features/bookmark_category_statuses/components/edit_bookmark_category_form.jsx

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

app/javascript/mastodon/features/bookmark_category_statuses/index.jsx

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

app/javascript/mastodon/features/bookmarked_statuses/index.jsx

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

app/javascript/mastodon/features/circle_adder/components/circle.jsx

@@ -6,9 +6,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import CircleIcon from 'mastodon/../material-icons/400-24px/account_circle.svg?react';
+import CircleIcon from '@/material-icons/400-24px/account_circle.svg?react';
-import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
-import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 import { removeFromCircleAdder, addToCircleAdder } from '../../../actions/circles';

app/javascript/mastodon/features/circle_editor/components/account.jsx

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

app/javascript/mastodon/features/circle_editor/components/edit_circle_form.jsx

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

app/javascript/mastodon/features/circle_editor/components/search.jsx

@@ -7,8 +7,8 @@ import classNames from 'classnames';
 
 import { connect } from 'react-redux';
 
-import CancelIcon from 'mastodon/../material-icons/400-24px/cancel-fill.svg?react';
+import CancelIcon from '@/material-icons/400-24px/cancel-fill.svg?react';
-import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
+import SearchIcon from '@/material-icons/400-24px/search.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 
 import { fetchCircleSuggestions, clearCircleSuggestions, changeCircleSuggestions } from '../../../actions/circles';

app/javascript/mastodon/features/circle_statuses/index.jsx

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

app/javascript/mastodon/features/circles/index.jsx

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

app/javascript/mastodon/features/community_timeline/index.jsx

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

app/javascript/mastodon/features/compose/components/action_bar.jsx

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

app/javascript/mastodon/features/compose/components/compose_form.jsx

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

app/javascript/mastodon/features/compose/components/expiration_dropdown.jsx

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

app/javascript/mastodon/features/compose/components/poll_button.jsx

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

app/javascript/mastodon/features/compose/components/poll_form.jsx

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

app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx

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

app/javascript/mastodon/features/compose/components/reply_indicator.jsx

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

app/javascript/mastodon/features/compose/components/search.jsx

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

app/javascript/mastodon/features/compose/components/search_results.jsx

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

app/javascript/mastodon/features/compose/components/searchability_dropdown.jsx

@@ -8,12 +8,12 @@ import classNames from 'classnames';
 import { supportsPassiveEvents } from 'detect-passive-events';
 import Overlay from 'react-overlays/Overlay';
 
-import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
-import PublicUnlistedIcon from 'mastodon/../material-icons/400-24px/cloud.svg?react';
+import PublicUnlistedIcon from '@/material-icons/400-24px/cloud.svg?react';
-import LockIcon from 'mastodon/../material-icons/400-24px/lock.svg?react';
+import LockIcon from '@/material-icons/400-24px/lock.svg?react';
-import LockOpenIcon from 'mastodon/../material-icons/400-24px/no_encryption.svg?react';
+import LockOpenIcon from '@/material-icons/400-24px/no_encryption.svg?react';
-import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
+import PublicIcon from '@/material-icons/400-24px/public.svg?react';
-import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
+import SearchIcon from '@/material-icons/400-24px/search.svg?react';
 import { Icon }  from 'mastodon/components/icon';
 import { enableLocalPrivacy } from 'mastodon/initial_state';
 

app/javascript/mastodon/features/compose/components/upload.jsx

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

app/javascript/mastodon/features/compose/components/upload_button.jsx

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