From b3f598aa1d7154bb8522f6118049e7a02db83d15 Mon Sep 17 00:00:00 2001 From: Prospector <6166773+Prospector@users.noreply.github.com> Date: Thu, 11 Dec 2025 16:04:54 -0800 Subject: [PATCH] Fix server content search (#4891) * fix server content search * wtf --- .../ui/servers/ServerInstallation.vue | 4 +- apps/frontend/src/locales/en-US/index.json | 3 - apps/frontend/src/pages/discover/[type].vue | 25 +- .../src/pages/discover/[type]/index.vue | 96 +-- .../hosting/manage/[id]/content/index.vue | 6 +- packages/assets/generated-icons.ts | 40 +- packages/blog/compiled/index.ts | 62 +- pnpm-lock.yaml | 742 ++++++++++-------- 8 files changed, 506 insertions(+), 472 deletions(-) diff --git a/apps/frontend/src/components/ui/servers/ServerInstallation.vue b/apps/frontend/src/components/ui/servers/ServerInstallation.vue index 540f9829..b3769d9b 100644 --- a/apps/frontend/src/components/ui/servers/ServerInstallation.vue +++ b/apps/frontend/src/components/ui/servers/ServerInstallation.vue @@ -56,7 +56,7 @@ Switch modpack - + Switch modpack @@ -99,7 +99,7 @@ v-tooltip="backupInProgress ? formatMessage(backupInProgress.tooltip) : undefined" :class="{ disabled: backupInProgress }" class="!w-full sm:!w-auto" - :to="`/modpacks?sid=${props.server.serverId}`" + :to="`/discover/modpacks?sid=${props.server.serverId}`" > Find a modpack diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json index 9675c8a8..20c9b08d 100644 --- a/apps/frontend/src/locales/en-US/index.json +++ b/apps/frontend/src/locales/en-US/index.json @@ -980,9 +980,6 @@ "dashboard.withdraw.error.tax-form.title": { "message": "Please complete tax form" }, - "discover.title": { - "message": "Discover" - }, "error.collection.404.list_item.1": { "message": "You may have mistyped the collection's URL." }, diff --git a/apps/frontend/src/pages/discover/[type].vue b/apps/frontend/src/pages/discover/[type].vue index a14e552d..637c63d2 100644 --- a/apps/frontend/src/pages/discover/[type].vue +++ b/apps/frontend/src/pages/discover/[type].vue @@ -1,35 +1,12 @@ diff --git a/apps/frontend/src/pages/discover/[type]/index.vue b/apps/frontend/src/pages/discover/[type]/index.vue index 67b600c6..8fc5ebd9 100644 --- a/apps/frontend/src/pages/discover/[type]/index.vue +++ b/apps/frontend/src/pages/discover/[type]/index.vue @@ -28,7 +28,7 @@ import { } from '@modrinth/ui' import { capitalizeString, cycleValue, type Mod as InstallableMod } from '@modrinth/utils' import { useThrottleFn } from '@vueuse/core' -import { computed, type Reactive } from 'vue' +import { computed, type Reactive, watch } from 'vue' import LogoAnimated from '~/components/brand/LogoAnimated.vue' import AdPlaceholder from '~/components/ui/AdPlaceholder.vue' @@ -51,26 +51,12 @@ const auth = await useAuth() const { handleError } = injectNotificationManager() -const props = defineProps<{ - type: string -}>() +const currentType = computed(() => + queryAsStringOrEmpty(route.params.type).replaceAll(/^\/|s\/?$/g, ''), +) -const projectType = ref() - -function setProjectType() { - const projType = tags.value.projectTypes.find((x) => x.id === props.type) - - if (projType) { - projectType.value = projType - } -} - -setProjectType() -router.afterEach(() => { - setProjectType() -}) - -const projectTypes = computed(() => [projectType.value.id]) +const projectType = computed(() => tags.value.projectTypes.find((x) => x.id === currentType.value)) +const projectTypes = computed(() => (projectType.value ? [projectType.value.id] : [])) const resultsDisplayLocation = computed( () => projectType.value?.id as DisplayLocation, @@ -87,34 +73,51 @@ const eraseDataOnInstall = ref(false) const PERSISTENT_QUERY_PARAMS = ['sid', 'shi'] -await updateServerContext() - -watch(route, () => { - updateServerContext() -}) - async function updateServerContext() { const serverId = queryAsString(route.query.sid) - if (serverId && (!server.value || server.value.serverId !== serverId)) { + + if (!serverId) { + server.value = undefined + return + } + + try { if (!auth.value.user) { router.push('/auth/sign-in?redirect=' + encodeURIComponent(route.fullPath)) - } else { + return + } + + if (!server.value || server.value.serverId !== serverId) { server.value = await useModrinthServers(serverId, ['general', 'content']) } - } - if (server.value?.serverId !== serverId && routeNameAsString(route.name)?.startsWith('search')) { + if (route.query.shi && projectType.value?.id !== 'modpack' && server.value) { + serverHideInstalled.value = route.query.shi === 'true' + } + } catch (error) { + console.error('Failed to load server context:', error) server.value = undefined } - - if (route.query.shi && projectType.value.id !== 'modpack' && server.value) { - serverHideInstalled.value = route.query.shi === 'true' - } } +if (import.meta.client && route.query.sid) { + updateServerContext().catch((error) => { + console.error('Failed to initialize server context:', error) + }) +} + +watch( + () => route.query.sid, + () => { + updateServerContext().catch((error) => { + console.error('Failed to update server context:', error) + }) + }, +) + const serverFilters = computed(() => { const filters = [] - if (server.value && projectType.value.id !== 'modpack') { + if (server.value && projectType.value?.id !== 'modpack') { const gameVersion = server.value.general?.mc_version if (gameVersion) { filters.push({ @@ -236,7 +239,7 @@ async function serverInstall(project: InstallableSearchResult) { x.loaders.includes(server.value!.general.loader.toLowerCase()), ) ?? versions[0] - if (projectType.value.id === 'modpack') { + if (projectType.value?.id === 'modpack') { await server.value.general.reinstall( false, project.project_id, @@ -246,11 +249,11 @@ async function serverInstall(project: InstallableSearchResult) { ) project.installed = true navigateTo(`/hosting/manage/${server.value.serverId}/options/loader`) - } else if (projectType.value.id === 'mod') { + } else if (projectType.value?.id === 'mod') { await server.value.content.install('mod', version.project_id, version.id) await server.value.refresh(['content']) project.installed = true - } else if (projectType.value.id === 'plugin') { + } else if (projectType.value?.id === 'plugin') { await server.value.content.install('plugin', version.project_id, version.id) await server.value.refresh(['content']) project.installed = true @@ -358,11 +361,12 @@ function setClosestMaxResults() { } const ogTitle = computed( - () => `Search ${projectType.value.display}s${query.value ? ' | ' + query.value : ''}`, + () => + `Search ${projectType.value?.display ?? 'project'}s${query.value ? ' | ' + query.value : ''}`, ) const description = computed( () => - `Search and browse thousands of Minecraft ${projectType.value.display}s on Modrinth with instant, accurate search results. Our filters help you quickly find the best Minecraft ${projectType.value.display}s.`, + `Search and browse thousands of Minecraft ${projectType.value?.display ?? 'project'}s on Modrinth with instant, accurate search results. Our filters help you quickly find the best Minecraft ${projectType.value?.display ?? 'project'}s.`, ) useSeoMeta({ @@ -447,7 +451,7 @@ useSeoMeta({
@@ -469,7 +473,7 @@ useSeoMeta({