Merge branch 'main' into boris/search-original-and-split

Author: Prospector

apps/frontend/src/pages/admin/billing/[id].vue

@@ -372,18 +372,20 @@ const messages = defineMessages({
 	},
 })
 
-const { data: user } = useQuery({
+const { data: user, error: userError } = useQuery({
 	queryKey: ['user', route.params.id],
 	queryFn: () => useBaseFetch(`user/${route.params.id}`),
 })
 
-if (!user.value) {
-	throw createError({
-		fatal: true,
-		statusCode: 404,
-		message: formatMessage(messages.userNotFoundError),
-	})
-}
+watch(userError, (error) => {
+	if (error) {
+		showError({
+			fatal: true,
+			statusCode: error.statusCode ?? error.status ?? 404,
+			message: formatMessage(messages.userNotFoundError),
+		})
+	}
+})
 
 const { data: subscriptions } = useQuery({
 	queryKey: computed(() => ['billing', 'subscriptions', user.value?.id]),

apps/frontend/src/pages/hosting/manage/[id]/options.vue

@@ -1,8 +1,5 @@
 <template>
 	<div class="flex flex-col gap-4">
-		<Admonition v-if="backupBusyReason" type="warning" :header="backupBusyReason">
-			Some options may not be editable while the operation is in progress.
-		</Admonition>
 		<ServerSidebar :route="route" :nav-links="navLinks" />
 	</div>
 </template>
@@ -18,7 +15,7 @@ import {
 	VersionIcon,
 	WrenchIcon,
 } from '@modrinth/assets'
-import { Admonition, injectModrinthServerContext, useVIntl } from '@modrinth/ui'
+import { injectModrinthServerContext } from '@modrinth/ui'
 import { isAdmin as isUserAdmin, type User } from '@modrinth/utils'
 
 import ServerSidebar from '~/components/ui/servers/ServerSidebar.vue'
@@ -27,17 +24,7 @@ const route = useRoute()
 const serverId = route.params.id as string
 const auth = await useAuth()
 
-const { formatMessage } = useVIntl()
-const { server, busyReasons } = injectModrinthServerContext()
-
-const backupBusyReason = computed(() => {
-	const reason = busyReasons.value.find(
-		(r) =>
-			r.reason.id === 'servers.busy.backup-creating' ||
-			r.reason.id === 'servers.busy.backup-restoring',
-	)
-	return reason ? formatMessage(reason.reason) : null
-})
+const { server } = injectModrinthServerContext()
 
 useHead({
 	title: `Options - ${server.value?.name ?? 'Server'} - Modrinth`,

apps/frontend/src/pages/settings/pats.vue

@@ -130,7 +130,7 @@
 							<template v-else>{{ formatMessage(tokenMessages.neverUsed) }}</template>
 						</span>
 						⋅
-						<span v-tooltip="formatDateTime(pat.expires)">
+						<span v-tooltip="Date.parse(pat.expires) ? formatDateTime(pat.expires) : null">
 							<template v-if="new Date(pat.expires) > new Date()">
 								{{
 									formatMessage(tokenMessages.expiresIn, {

apps/frontend/src/public/news/feed/articles.json

@@ -4,7 +4,7 @@
 			"title": "Content Management Overhaul",
 			"summary": "Overhauled content management for both Modrinth Hosting servers and Modrinth App instances.",
 			"thumbnail": "https://modrinth.com/news/article/content-management-overhaul/thumbnail.webp",
-			"date": "2026-03-13T20:30:00.000Z",
+			"date": "2026-03-17T20:15:00.000Z",
 			"link": "https://modrinth.com/news/article/content-management-overhaul"
 		},
 		{

packages/api-client/src/modules/labrinth/projects/v2.ts

@@ -71,6 +71,7 @@ export class LabrinthProjectsV2Module extends AbstractModule {
 			params: {
 				...params,
 				facets: params.facets ? JSON.stringify(params.facets) : undefined,
+				new_filters: params.new_filters ?? undefined,
 			},
 		})
 	}

packages/api-client/src/modules/labrinth/types.ts

@@ -307,6 +307,7 @@ export namespace Labrinth {
 			export type ProjectSearchParams = {
 				query?: string
 				facets?: string[][] // in the format of [["categories:forge"],["versions:1.17.1"]]
+				new_filters?: string
 				filters?: string
 				index?: 'relevance' | 'downloads' | 'follows' | 'newest' | 'updated'
 				offset?: number

packages/blog/articles/content-management-overhaul.md

@@ -1,7 +1,7 @@
 ---
 title: Content Management Overhaul
 summary: Overhauled content management for both Modrinth Hosting servers and Modrinth App instances.
-date: 2026-03-13T12:30:00-08:00
+date: 2026-03-17T12:15:00-08:00
 authors: ['AJfd8YH6', 'bOHH0P9Z', 'LnK8MbX7']
 ---
 

packages/blog/compiled/content_management_overhaul.ts

@@ -3,7 +3,7 @@ export const article = {
   html: () => import(`./content_management_overhaul.content`).then(m => m.html),
   title: "Content Management Overhaul",
   summary: "Overhauled content management for both Modrinth Hosting servers and Modrinth App instances.",
-  date: "2026-03-13T20:30:00.000Z",
+  date: "2026-03-17T20:15:00.000Z",
   slug: "content-management-overhaul",
   authors: ["AJfd8YH6","bOHH0P9Z","LnK8MbX7"],
   unlisted: false,

packages/ui/src/components/flows/creation-flow-modal/components/FinalConfigStage.vue

@@ -97,6 +97,12 @@
 				</div>
 			</div>
 		</Accordion>
+
+		<InlineBackupCreator
+			v-if="ctx.flowType === 'reset-server'"
+			backup-name="Before reinstall"
+			hide-shift-click-hint
+		/>
 	</div>
 </template>
 
@@ -106,6 +112,7 @@ import { computed, watch } from 'vue'
 
 import { useDebugLogger } from '#ui/composables/debug-logger'
 
+import InlineBackupCreator from '../../../../layouts/shared/content-tab/components/modals/InlineBackupCreator.vue'
 import { injectTags } from '../../../../providers'
 import Accordion from '../../../base/Accordion.vue'
 import Chips from '../../../base/Chips.vue'

packages/ui/src/components/flows/creation-flow-modal/components/SetupTypeStage.vue

@@ -59,7 +59,6 @@
 					@click="setSetupType('vanilla')"
 				/>
 			</div>
-			<InlineBackupCreator v-if="ctx.flowType === 'reset-server'" backup-name="Before reinstall" />
 		</template>
 	</div>
 </template>
@@ -69,7 +68,6 @@ import { BoxesIcon, BoxIcon, BoxImportIcon, PackageIcon } from '@modrinth/assets
 
 import { useDebugLogger } from '#ui/composables/debug-logger'
 
-import InlineBackupCreator from '../../../../layouts/shared/content-tab/components/modals/InlineBackupCreator.vue'
 import BigOptionButton from '../../../base/BigOptionButton.vue'
 import { injectCreationFlowContext } from '../creation-flow-context'