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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

4
app/javascript/mastodon/components/media_gallery.jsx
View file

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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