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

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

Browse source
This commit is contained in:
KMY 2024-11-26 12:56:31 +09:00
commit 8a075ba4c6
303 changed files with 7495 additions and 4498 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,11 +10,8 @@ import {
DomainBlockModal,
ReportModal,
EmbedModal,
ListEditor,
ListAdder,
AntennaEditor,
AntennaAdder,
CircleEditor,
CircleAdder,
BookmarkCategoryAdder,
CompareHistoryModal,
@ -69,9 +66,6 @@ export const MODAL_COMPONENTS = {
'REPORT': ReportModal,
'ACTIONS': () => Promise.resolve({ default: ActionsModal }),
'EMBED': EmbedModal,
'LIST_EDITOR': ListEditor,
'ANTENNA_EDITOR': AntennaEditor,
'CIRCLE_EDITOR': CircleEditor,
'FOCAL_POINT': () => Promise.resolve({ default: FocalPointModal }),
'LIST_ADDER': ListAdder,
'ANTENNA_ADDER': AntennaAdder,

36
app/javascript/mastodon/features/ui/index.jsx
View file

@ -65,22 +65,30 @@ import {
FollowedTags,
LinkTimeline,
ListTimeline,
Lists,
ListEdit,
ListMembers,
Blocks,
DomainBlocks,
Mutes,
PinnedStatuses,
Lists,
Antennas,
Circles,
CircleStatuses,
AntennaSetting,
Directory,
Explore,
ReactionDeck,
Onboarding,
About,
PrivacyPolicy,
CommunityTimeline,
AntennaEdit,
AntennaExcludeMembers,
AntennaMembers,
CircleEdit,
CircleMembers,
BookmarkCategoryEdit,
ReactionDeck,
Onboarding,
Directory,
Explore,
} from './util/async-components';
import { ColumnsContextProvider } from './util/columns_context';
import { WrappedSwitch, WrappedRoute } from './util/react_router_helpers';
@ -220,9 +228,23 @@ class SwitchingColumnsArea extends PureComponent {
<WrappedRoute path={['/conversations', '/timelines/direct']} component={DirectTimeline} content={children} />
<WrappedRoute path='/tags/:id' component={HashtagTimeline} content={children} />
<WrappedRoute path='/links/:url' component={LinkTimeline} content={children} />
<WrappedRoute path='/lists/new' component={ListEdit} content={children} />
<WrappedRoute path='/lists/:id/edit' component={ListEdit} content={children} />
<WrappedRoute path='/lists/:id/members' component={ListMembers} content={children} />
<WrappedRoute path='/lists/:id' component={ListTimeline} content={children} />
<WrappedRoute path='/antennas/new' component={AntennaEdit} content={children} />
<WrappedRoute path='/antennas/:id/edit' component={AntennaEdit} content={children} />
<WrappedRoute path='/antennas/:id/members' component={AntennaMembers} content={children} />
<WrappedRoute path='/antennas/:id/exclude_members' component={AntennaExcludeMembers} content={children} />
<WrappedRoute path='/antennasw/:id' component={AntennaSetting} content={children} />
<WrappedRoute path='/antennast/:id' component={AntennaTimeline} content={children} />
<WrappedRoute path='/circles/new' component={CircleEdit} content={children} />
<WrappedRoute path='/circles/:id/edit' component={CircleEdit} content={children} />
<WrappedRoute path='/circles/:id/members' component={CircleMembers} content={children} />
<WrappedRoute path='/circles/:id' component={CircleStatuses} content={children} />
<WrappedRoute path='/bookmark_categories/new' component={BookmarkCategoryEdit} content={children} />
<WrappedRoute path='/bookmark_categories/:id/edit' component={BookmarkCategoryEdit} content={children} />
<WrappedRoute path='/bookmark_categories/:id' component={BookmarkCategoryStatuses} content={children} />
<WrappedRoute path='/notifications' component={NotificationsWrapper} content={children} exact />
<WrappedRoute path='/notifications/requests' component={NotificationRequests} content={children} exact />
<WrappedRoute path='/notifications/requests/:id' component={NotificationRequest} content={children} exact />
@ -230,8 +252,6 @@ class SwitchingColumnsArea extends PureComponent {
<WrappedRoute path='/emoji_reactions' component={EmojiReactedStatuses} content={children} />
<WrappedRoute path='/bookmarks' component={BookmarkedStatuses} content={children} />
<WrappedRoute path='/bookmark_categories/:id' component={BookmarkCategoryStatuses} content={children} />
<WrappedRoute path='/bookmark_categories' component={BookmarkCategories} content={children} />
<WrappedRoute path='/pinned' component={PinnedStatuses} content={children} />
<WrappedRoute path='/reaction_deck' component={ReactionDeck} content={children} />
@ -270,8 +290,8 @@ class SwitchingColumnsArea extends PureComponent {
<WrappedRoute path='/mutes' component={Mutes} content={children} />
<WrappedRoute path='/lists' component={Lists} content={children} />
<WrappedRoute path='/antennasw' component={Antennas} content={children} />
<WrappedRoute path='/circles/:id' component={CircleStatuses} content={children} />
<WrappedRoute path='/circles' component={Circles} content={children} />
<WrappedRoute path='/bookmark_categories' component={BookmarkCategories} content={children} />
<Route component={BundleColumnError} />
</WrappedSwitch>

36
app/javascript/mastodon/features/ui/util/async-components.js
View file

@ -194,10 +194,6 @@ export function EmbedModal () {
return import(/* webpackChunkName: "modals/embed_modal" */'../components/embed_modal');
}
export function ListEditor () {
return import(/* webpackChunkName: "features/list_editor" */'../../list_editor');
}
export function ListAdder () {
return import(/*webpackChunkName: "features/list_adder" */'../../list_adder');
}
@ -289,3 +285,35 @@ export function LinkTimeline () {
export function AnnualReportModal () {
return import(/*webpackChunkName: "modals/annual_report_modal" */'../components/annual_report_modal');
}
export function ListEdit () {
return import(/*webpackChunkName: "features/lists" */'../../lists/new');
}
export function ListMembers () {
return import(/* webpackChunkName: "features/lists" */'../../lists/members');
}
export function AntennaEdit () {
return import(/*webpackChunkName: "features/antennas" */'../../antennas/new');
}
export function AntennaMembers () {
return import(/* webpackChunkName: "features/antennas" */'../../antennas/members');
}
export function AntennaExcludeMembers () {
return import(/* webpackChunkName: "features/antennas" */'../../antennas/exclude_members');
}
export function CircleEdit () {
return import(/*webpackChunkName: "features/circles" */'../../circles/new');
}
export function CircleMembers () {
return import(/* webpackChunkName: "features/circles" */'../../circles/members');
}
export function BookmarkCategoryEdit () {
return import(/*webpackChunkName: "features/bookmark_categories" */'../../bookmark_categories/new');
}