fix: make search use v3 everywhere (#6840)

apps/app-frontend/src/composables/browse/use-app-server-browse.ts

@@ -27,14 +27,14 @@ interface BrowseServerInstance {
 interface ContextMenuHandle {
 	showMenu: (
 		event: MouseEvent,
-		result: Labrinth.Search.v2.ResultSearchProject | Labrinth.Search.v3.ResultSearchProject,
+		result: Labrinth.Search.v3.ResultSearchProject,
 		options: { name: string }[],
 	) => void
 }
 
 interface ContextMenuOptionClick {
 	option: 'open_link' | 'copy_link'
-	item: Labrinth.Search.v2.ResultSearchProject | Labrinth.Search.v3.ResultSearchProject
+	item: Labrinth.Search.v3.ResultSearchProject
 }
 
 export interface UseAppServerBrowseOptions {
@@ -263,10 +263,7 @@ export function useAppServerBrowse(options: UseAppServerBrowseOptions) {
 		return actions
 	}
 
-	function handleRightClick(
-		event: MouseEvent,
-		result: Labrinth.Search.v2.ResultSearchProject | Labrinth.Search.v3.ResultSearchProject,
-	) {
+	function handleRightClick(event: MouseEvent, result: Labrinth.Search.v3.ResultSearchProject) {
 		contextMenuRef.value?.showMenu(event, result, [{ name: 'open_link' }, { name: 'copy_link' }])
 	}
 
@@ -315,9 +312,7 @@ export function useAppServerBrowse(options: UseAppServerBrowseOptions) {
 	}
 }
 
-function getProjectUrl(
-	item: Labrinth.Search.v2.ResultSearchProject | Labrinth.Search.v3.ResultSearchProject,
-) {
-	const projectType = 'project_types' in item ? item.project_types?.[0] : item.project_type
+function getProjectUrl(item: Labrinth.Search.v3.ResultSearchProject) {
+	const projectType = item.project_types?.[0]
 	return `https://modrinth.com/${projectType ?? 'project'}/${item.slug ?? item.project_id}`
 }

apps/app-frontend/src/pages/Browse.vue

@@ -670,7 +670,7 @@ async function getInstallProjectVersions(projectId: string) {
 }
 
 async function chooseInstanceInstallVersion(
-	project: Labrinth.Search.v2.ResultSearchProject & Labrinth.Search.v3.ResultSearchProject,
+	project: Labrinth.Search.v3.ResultSearchProject,
 	projectTypeValue: string,
 ) {
 	const targetInstance = instance.value
@@ -697,16 +697,14 @@ async function chooseInstanceInstallVersion(
 }
 
 function getCardActions(
-	result: Labrinth.Search.v2.ResultSearchProject | Labrinth.Search.v3.ResultSearchProject,
+	result: Labrinth.Search.v3.ResultSearchProject,
 	currentProjectType: string,
 ): CardAction[] {
 	if (currentProjectType === 'server') {
-		return getServerCardActions(result as Labrinth.Search.v3.ResultSearchProject)
+		return getServerCardActions(result)
 	}
 
-	// Non-server project actions
-	const projectResult = result as (Labrinth.Search.v2.ResultSearchProject &
-		Labrinth.Search.v3.ResultSearchProject) & {
+	const projectResult = result as Labrinth.Search.v3.ResultSearchProject & {
 		installed?: boolean
 		installing?: boolean
 	}
@@ -917,11 +915,9 @@ async function search(requestParams: string) {
 	}
 
 	const hits = rawResults.result.hits.map((hit) => {
-		const mapped = {
+		const mapped: Labrinth.Search.v3.ResultSearchProject & { installed?: boolean } = {
 			...hit,
-			title: hit.name,
-			description: hit.summary,
-		} as unknown as Labrinth.Search.v2.ResultSearchProject & { installed?: boolean }
+		}
 
 		if (instance.value || isServerContext.value) {
 			const installedIds = instance.value
@@ -1068,7 +1064,7 @@ provideBrowseManager({
 	projectType,
 	...searchState,
 	advancedFiltersCollapsed,
-	getProjectLink: (result: Labrinth.Search.v2.ResultSearchProject) => ({
+	getProjectLink: (result: Labrinth.Search.v3.ResultSearchProject) => ({
 		path: `/project/${result.project_id ?? result.slug}`,
 		query: getProjectBrowseQuery(),
 	}),

apps/app-frontend/src/providers/setup/server-install-content.ts

@@ -9,6 +9,7 @@ import {
 	getStoredServerAddonInstallQueue,
 	injectModrinthClient,
 	injectNotificationManager,
+	type ModpackSearchResult,
 	type PendingServerContentInstall,
 	type PendingServerContentInstallType,
 	readPendingServerContentInstalls,
@@ -24,7 +25,6 @@ import { useRoute, useRouter } from 'vue-router'
 type ServerFlowFrom = 'onboarding' | 'reset-server'
 
 type InstallableSearchResult = Labrinth.Search.v3.ResultSearchProject & {
-	title?: string
 	installing?: boolean
 	installed?: boolean
 }
@@ -69,10 +69,7 @@ export interface ServerInstallContentContext {
 	installQueuedServerInstallsAndBack: () => Promise<boolean>
 	initServerContext: () => Promise<void>
 	watchServerContextChanges: () => void
-	searchServerModpacks: (
-		query: string,
-		limit?: number,
-	) => Promise<Labrinth.Projects.v2.SearchResult>
+	searchServerModpacks: (query: string, limit?: number) => Promise<ModpackSearchResult>
 	getServerProjectVersions: (projectId: string) => Promise<{ id: string }[]>
 	enforceSetupModpackRoute: (currentProjectType: string | undefined) => void
 	getQueuedServerInstallPlans: () => Map<string, BrowseInstallPlan<InstallableSearchResult>>
@@ -172,7 +169,7 @@ function getQueuedInstallPlaceholder(
 		projectId: plan.projectId,
 		versionId: plan.versionId,
 		contentType: plan.contentType as PendingServerContentInstallType,
-		title: project.title ?? project.name ?? 'Project',
+		title: project.name ?? 'Project',
 		versionName: plan.versionName ?? null,
 		versionNumber: plan.versionNumber ?? null,
 		fileName: plan.fileName ?? null,
@@ -236,7 +233,7 @@ export function createServerInstallContent(opts: {
 	const selectedServerInstallProjects = computed<BrowseSelectedProject[]>(() =>
 		Array.from(queuedServerInstalls.value.values()).map((plan) => ({
 			id: plan.projectId,
-			name: plan.project.title ?? plan.project.name ?? 'Project',
+			name: plan.project.name ?? 'Project',
 			iconUrl: plan.project.icon_url ?? null,
 		})),
 	)
@@ -359,12 +356,24 @@ export function createServerInstallContent(opts: {
 	}
 
 	async function searchServerModpacks(query: string, limit: number = 10) {
-		return client.labrinth.projects_v2.search({
+		const results = await client.labrinth.projects_v3.search({
 			query: query || undefined,
 			new_filters:
-				'project_types = "modpack" AND (client_side = "optional" OR client_side = "required") AND server_side = "required"',
+				'project_types = "modpack" AND environment IN ["client_and_server", "server_only_client_optional"]',
 			limit,
 		})
+
+		return {
+			hits: results.hits.map((hit) => ({
+				project_id: hit.project_id,
+				title: hit.name,
+				icon_url: hit.icon_url ?? '',
+				latest_version: hit.version_id,
+			})),
+			total_hits: results.total_hits,
+			offset: (results.page - 1) * results.hits_per_page,
+			limit: results.hits_per_page,
+		}
 	}
 
 	async function getServerProjectVersions(projectId: string) {