From ea64e087916562400bf79cf5956053c4397ebce7 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Mon, 28 Apr 2025 18:14:04 -0700
Subject: [PATCH] Add support for snapshots with Modrinth Servers (#3570)

* Add support for snapshots with Modrinth Servers

* Fix snapshots without dots

* Fix loader version not resetting when no longer valid

* Fix collapsing margins on Report page
---
 .../ui/servers/PlatformVersionSelectModal.vue | 80 ++++++++++++++-----
 apps/frontend/src/pages/report.vue            |  2 +-
 .../src/server/routes/loader-versions.ts      | 36 ---------
 3 files changed, 63 insertions(+), 55 deletions(-)
 delete mode 100644 apps/frontend/src/server/routes/loader-versions.ts

diff --git a/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue b/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue
index 6b3e1f24..cdc71fa1 100644
--- a/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue
+++ b/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue
@@ -53,7 +53,7 @@
         </div>
 
         <div class="flex w-full flex-col gap-2 rounded-2xl bg-table-alternateRow p-4">
-          <div class="text-sm font-bold text-contrast">Minecraft version</div>
+          <div class="text-lg font-bold text-contrast">Minecraft version</div>
           <UiServersTeleportDropdownMenu
             v-model="selectedMCVersion"
             name="mcVersion"
@@ -61,6 +61,20 @@
             class="w-full max-w-[100%]"
             placeholder="Select Minecraft version..."
           />
+          <div class="mt-2 flex items-center justify-between gap-2">
+            <label for="toggle-snapshots" class="font-semibold"> Show snapshot versions </label>
+            <div
+              v-tooltip="
+                isSnapshotSelected ? 'A snapshot version is currently selected.' : undefined
+              "
+            >
+              <Toggle
+                id="toggle-snapshots"
+                v-model="showSnapshots"
+                :disabled="isSnapshotSelected"
+              />
+            </div>
+          </div>
         </div>
 
         <div
@@ -74,7 +88,7 @@
           }"
         >
           <div class="flex flex-col gap-2">
-            <div class="text-sm font-bold text-contrast">{{ selectedLoader }} version</div>
+            <div class="text-lg font-bold text-contrast">{{ selectedLoader }} version</div>
 
             <template v-if="!selectedMCVersion">
               <div
@@ -177,8 +191,9 @@
 </template>
 
 <script setup lang="ts">
-import { BackupWarning, ButtonStyled, NewModal } from "@modrinth/ui";
-import { RightArrowIcon, XIcon, ServerIcon, DropdownIcon } from "@modrinth/assets";
+import { BackupWarning, ButtonStyled, NewModal, Toggle } from "@modrinth/ui";
+import { DropdownIcon, RightArrowIcon, ServerIcon, XIcon } from "@modrinth/assets";
+import { $fetch } from "ofetch";
 import type { Server } from "~/composables/pyroServers";
 import type { Loaders } from "~/types/servers";
 import type { BackupInProgressReason } from "~/pages/servers/manage/[id].vue";
@@ -214,6 +229,7 @@ const hardReset = ref(false);
 const isLoading = ref(false);
 const loadingServerCheck = ref(false);
 const serverCheckError = ref("");
+const showSnapshots = ref(false);
 
 const selectedLoader = ref<Loaders>("Vanilla");
 const selectedMCVersion = ref("");
@@ -226,6 +242,22 @@ const cachedVersions = ref<VersionCache>({});
 
 const versionStrings = ["forge", "fabric", "quilt", "neo"] as const;
 
+const isSnapshotSelected = computed(() => {
+  if (selectedMCVersion.value) {
+    const selected = tags.value.gameVersions.find((x) => x.version === selectedMCVersion.value);
+    if (selected?.version_type !== "release") {
+      return true;
+    }
+  }
+  return false;
+});
+
+const getLoaderVersions = async (loader: string) => {
+  return await $fetch(
+    `https://launcher-meta.modrinth.com/${loader?.toLowerCase()}/v0/manifest.json`,
+  );
+};
+
 const fetchLoaderVersions = async () => {
   const versions = await Promise.all(
     versionStrings.map(async (loader) => {
@@ -234,7 +266,7 @@ const fetchLoaderVersions = async () => {
           throw new Error("Failed to fetch loader versions");
         }
         try {
-          const res = await $fetch(`/loader-versions?loader=${loader}`);
+          const res = await getLoaderVersions(loader);
           return { [loader]: (res as any).gameVersions };
           // eslint-disable-next-line @typescript-eslint/no-unused-vars
         } catch (_) {
@@ -277,11 +309,11 @@ const fetchPurpurVersions = async (mcVersion: string) => {
   }
 };
 
-const selectedLoaderVersions = computed(() => {
+const selectedLoaderVersions = computed<string[]>(() => {
   const loader = selectedLoader.value.toLowerCase();
 
   if (loader === "paper") {
-    return paperVersions.value[selectedMCVersion.value] || [];
+    return paperVersions.value[selectedMCVersion.value].map((x) => `${x}`) || [];
   }
 
   if (loader === "purpur") {
@@ -325,13 +357,22 @@ watch(selectedLoader, async () => {
 watch(
   selectedLoaderVersions,
   (newVersions) => {
-    if (newVersions.length > 0 && !selectedLoaderVersion.value) {
+    if (
+      newVersions.length > 0 &&
+      (!selectedLoaderVersion.value || !newVersions.includes(selectedLoaderVersion.value))
+    ) {
       selectedLoaderVersion.value = String(newVersions[0]);
     }
   },
   { immediate: true },
 );
 
+const getLoaderVersion = async (loader: string, version: string) => {
+  return await $fetch(
+    `https://launcher-meta.modrinth.com/${loader?.toLowerCase()}/v0/versions/${version}.json`,
+  );
+};
+
 const checkVersionAvailability = async (version: string) => {
   if (!version || version.trim().length < 3) return;
 
@@ -339,9 +380,7 @@ const checkVersionAvailability = async (version: string) => {
   loadingServerCheck.value = true;
 
   try {
-    const mcRes =
-      cachedVersions.value[version] ||
-      (await $fetch(`/loader-versions?loader=minecraft&version=${version}`));
+    const mcRes = cachedVersions.value[version] || (await getLoaderVersion("minecraft", version));
 
     cachedVersions.value[version] = mcRes;
 
@@ -377,13 +416,15 @@ onMounted(() => {
 });
 
 const tags = useTags();
-const mcVersions = tags.value.gameVersions
-  .filter((x) => x.version_type === "release")
-  .map((x) => x.version)
-  .filter((x) => {
-    const segment = parseInt(x.split(".")[1], 10);
-    return !isNaN(segment) && segment > 2;
-  });
+const mcVersions = computed(() =>
+  tags.value.gameVersions
+    .filter((x) =>
+      showSnapshots.value
+        ? x.version_type === "snapshot" || x.version_type === "release"
+        : x.version_type === "release",
+    )
+    .map((x) => x.version),
+);
 
 const isDangerous = computed(() => hardReset.value);
 const canInstall = computed(() => {
@@ -448,6 +489,9 @@ const handleReinstall = async () => {
 
 const onShow = () => {
   selectedMCVersion.value = props.server.general?.mc_version || "";
+  if (isSnapshotSelected.value) {
+    showSnapshots.value = true;
+  }
 };
 
 const onHide = () => {
diff --git a/apps/frontend/src/pages/report.vue b/apps/frontend/src/pages/report.vue
index 7ce690a2..9da7b5ec 100644
--- a/apps/frontend/src/pages/report.vue
+++ b/apps/frontend/src/pages/report.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="page">
     <div class="experimental-styles-within flex flex-col gap-2">
-      <RadialHeader class="top-box mb-2 text-center" color="orange">
+      <RadialHeader class="top-box mb-2 flex flex-col items-center justify-center" color="orange">
         <ScaleIcon class="h-12 w-12 text-brand-orange" />
         <h1 class="m-3 gap-2 text-3xl font-extrabold">
           {{
diff --git a/apps/frontend/src/server/routes/loader-versions.ts b/apps/frontend/src/server/routes/loader-versions.ts
deleted file mode 100644
index 989bac2b..00000000
--- a/apps/frontend/src/server/routes/loader-versions.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-const getLoaderVersions = async (loader: string) => {
-  const loaderVersions = await fetch(
-    `https://launcher-meta.modrinth.com/${loader?.toLowerCase()}/v0/manifest.json`,
-  );
-  return loaderVersions.json();
-};
-
-const getLoaderVersion = async (loader: string, version: string) => {
-  const loaderVersion = await fetch(
-    `https://launcher-meta.modrinth.com/${loader?.toLowerCase()}/v0/versions/${version}.json`,
-  );
-  return loaderVersion.json();
-};
-
-export default defineEventHandler(async (e) => {
-  const params = new URLSearchParams(e._path?.split("?")[1] ?? "");
-  if (!params.has("loader"))
-    return new Response(
-      JSON.stringify({
-        error: "Missing loader",
-      }),
-      { status: 400, headers: { "Content-Type": "application/json" } },
-    );
-  const loader = params.get("loader");
-  const version = params.get("version");
-  if (version) {
-    const loaderVersion = await getLoaderVersion(loader!, version);
-    return new Response(JSON.stringify(loaderVersion), {
-      headers: { "Content-Type": "application/json" },
-    });
-  }
-  const loaderVersions = await getLoaderVersions(loader!);
-  return new Response(JSON.stringify(loaderVersions), {
-    headers: { "Content-Type": "application/json" },
-  });
-});