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

Merge pull request #462 from kmycode/upstream-20240115

Browse source 
Upstream 20240115
This commit is contained in:
KMY（雪あすか） 2024-01-15 19:58:03 +09:00 • committed by GitHub
commit 90bd2a0f00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
341 changed files with 1113 additions and 558 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/javascript/mastodon/features/ui/components/boost_modal.jsx
View file

@ -9,8 +9,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import { ReactComponent as RepeatIcon } from '@material-symbols/svg-600/outlined/repeat.svg';
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';

2
app/javascript/mastodon/features/ui/components/bundle_modal_error.jsx
View file

@ -3,7 +3,7 @@ import { PureComponent } from 'react';
import { defineMessages, injectIntl } from 'react-intl';
import { ReactComponent as RefreshIcon } from '@material-symbols/svg-600/outlined/refresh.svg';
import RefreshIcon from 'mastodon/../material-icons/400-24px/refresh.svg?react';
import { IconButton } from '../../../components/icon_button';

2
app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
View file

@ -6,9 +6,9 @@ import { FormattedMessage } from 'react-intl';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { connect } from 'react-redux';
import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
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';

3
app/javascript/mastodon/features/ui/components/embed_modal.jsx
View file

@ -4,8 +4,7 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import api from 'mastodon/api';
import { IconButton } from 'mastodon/components/icon_button';

3
app/javascript/mastodon/features/ui/components/filter_modal.jsx
View file

@ -5,8 +5,7 @@ import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
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';

2
app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
View file

@ -9,7 +9,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
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';

3
app/javascript/mastodon/features/ui/components/follow_requests_column_link.jsx
View file

@ -6,8 +6,7 @@ import { injectIntl, defineMessages } from 'react-intl';
import { List as ImmutableList } from 'immutable';
import { connect } from 'react-redux';
import { ReactComponent as PersonAddIcon } from '@material-symbols/svg-600/outlined/person_add.svg';
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';

5
app/javascript/mastodon/features/ui/components/header.jsx
View file

@ -7,9 +7,8 @@ import { Link, withRouter } from 'react-router-dom';
import { connect } from 'react-redux';
import { ReactComponent as RefreshIcon } from '@material-symbols/svg-600/outlined/refresh.svg';
import { ReactComponent as SearchIcon } from '@material-symbols/svg-600/outlined/search.svg';
import RefreshIcon from 'mastodon/../material-icons/400-24px/refresh.svg?react';
import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
import { openModal } from 'mastodon/actions/modal';
import { fetchServer } from 'mastodon/actions/server';
import { Avatar } from 'mastodon/components/avatar';

3
app/javascript/mastodon/features/ui/components/image_modal.jsx
View file

@ -5,8 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl';
import classNames from 'classnames';
import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import { IconButton } from 'mastodon/components/icon_button';
import ImageLoader from './image_loader';

5
app/javascript/mastodon/features/ui/components/list_panel.jsx
View file

@ -5,9 +5,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import { ReactComponent as ListAltIcon } from '@material-symbols/svg-600/outlined/list_alt.svg';
import { ReactComponent as AntennaIcon } from '@material-symbols/svg-600/outlined/wifi.svg';
import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
import AntennaIcon from 'mastodon/../material-icons/400-24px/wifi.svg?react';
import { fetchAntennas } from 'mastodon/actions/antennas';
import { fetchLists } from 'mastodon/actions/lists';

6
app/javascript/mastodon/features/ui/components/media_modal.jsx
View file

@ -7,11 +7,11 @@ import classNames from 'classnames';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { ReactComponent as ChevronLeftIcon } from '@material-symbols/svg-600/outlined/chevron_left.svg';
import { ReactComponent as ChevronRightIcon } from '@material-symbols/svg-600/outlined/chevron_right.svg';
import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
import ReactSwipeableViews from 'react-swipeable-views';
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 { getAverageFromBlurhash } from 'mastodon/blurhash';
import { GIFV } from 'mastodon/components/gifv';
import { Icon } from 'mastodon/components/icon';

27
app/javascript/mastodon/features/ui/components/navigation_panel.jsx
View file

@ -5,20 +5,19 @@ import { defineMessages, injectIntl } from 'react-intl';
import { Link } from 'react-router-dom';
import { ReactComponent as CirclesIcon } from '@material-symbols/svg-600/outlined/account_circle-fill.svg';
import { ReactComponent as AlternateEmailIcon } from '@material-symbols/svg-600/outlined/alternate_email.svg';
import { ReactComponent as BookmarksIcon } from '@material-symbols/svg-600/outlined/bookmarks-fill.svg';
import { ReactComponent as PeopleIcon } from '@material-symbols/svg-600/outlined/group.svg';
import { ReactComponent as HomeIcon } from '@material-symbols/svg-600/outlined/home-fill.svg';
import { ReactComponent as ListAltIcon } from '@material-symbols/svg-600/outlined/list_alt.svg';
import { ReactComponent as MoreHorizIcon } from '@material-symbols/svg-600/outlined/more_horiz.svg';
import { ReactComponent as PublicIcon } from '@material-symbols/svg-600/outlined/public.svg';
import { ReactComponent as SearchIcon } from '@material-symbols/svg-600/outlined/search.svg';
import { ReactComponent as SettingsIcon } from '@material-symbols/svg-600/outlined/settings-fill.svg';
import { ReactComponent as StarIcon } from '@material-symbols/svg-600/outlined/star-fill.svg';
import { ReactComponent as TagIcon } from '@material-symbols/svg-600/outlined/tag.svg';
import { ReactComponent as AntennaIcon } from '@material-symbols/svg-600/outlined/wifi.svg';
import CirclesIcon from 'mastodon/../material-icons/400-24px/account_circle-fill.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 MoreHorizIcon from 'mastodon/../material-icons/400-24px/more_horiz.svg?react';
import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
import SearchIcon from 'mastodon/../material-icons/400-24px/search.svg?react';
import SettingsIcon from 'mastodon/../material-icons/400-24px/settings-fill.svg?react';
import StarIcon from 'mastodon/../material-icons/400-24px/star-fill.svg?react';
import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
import AntennaIcon from 'mastodon/../material-icons/400-24px/wifi.svg?react';
import { WordmarkLogo } from 'mastodon/components/logo';
import { NavigationPortal } from 'mastodon/components/navigation_portal';
import { enableDtlMenu, timelinePreview, trendsEnabled, dtlTag, enableLocalTimeline, isHideItem } from 'mastodon/initial_state';

3
app/javascript/mastodon/features/ui/components/notifications_counter_icon.js
View file

@ -1,7 +1,6 @@
import { connect } from 'react-redux';
import { ReactComponent as NotificationsIcon } from '@material-symbols/svg-600/outlined/notifications-fill.svg';
import NotificationsIcon from 'mastodon/../material-icons/400-24px/notifications-fill.svg?react';
import { IconWithBadge } from 'mastodon/components/icon_with_badge';

3
app/javascript/mastodon/features/ui/components/report_modal.jsx
View file

@ -7,8 +7,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import { ReactComponent as CloseIcon } from '@material-symbols/svg-600/outlined/close.svg';
import CloseIcon from 'mastodon/../material-icons/400-24px/close.svg?react';
import { submitReport } from 'mastodon/actions/reports';
import { fetchServer } from 'mastodon/actions/server';
import { expandAccountTimeline } from 'mastodon/actions/timelines';

5
app/javascript/mastodon/features/ui/components/zoomable_image.jsx
View file

@ -3,9 +3,8 @@ import { PureComponent } from 'react';
import { defineMessages, injectIntl } from 'react-intl';
import { ReactComponent as FullscreenExitIcon } from '@material-symbols/svg-600/outlined/fullscreen_exit.svg';
import { ReactComponent as RectangleIcon } from '@material-symbols/svg-600/outlined/rectangle.svg';
import FullscreenExitIcon from 'mastodon/../material-icons/400-24px/fullscreen_exit.svg?react';
import RectangleIcon from 'mastodon/../material-icons/400-24px/rectangle.svg?react';
import { IconButton } from 'mastodon/components/icon_button';
const messages = defineMessages({