Merge remote-tracking branch 'origin/main' into security-txt

Signed-off-by: Erb3 <49862976+Erb3@users.noreply.github.com>

.cargo/config.toml

@@ -2,8 +2,5 @@
 [target.'cfg(windows)']
 rustflags = ["-C", "link-args=/STACK:16777220", "--cfg", "tokio_unstable"]
 
-[target.x86_64-pc-windows-msvc]
-linker = "rust-lld"
-
 [build]
 rustflags = ["--cfg", "tokio_unstable"]

.github/workflows/daedalus-docker.yml

@@ -22,26 +22,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: actions/checkout@v2
       - name: Fetch docker metadata
         id: docker_meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v3
         with:
           images: ghcr.io/modrinth/daedalus
       - name: Login to GitHub Images
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v6
+        id: docker_build
+        uses: docker/build-push-action@v2
         with:
           file: ./apps/daedalus_client/Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
-          cache-from: type=registry,ref=ghcr.io/modrinth/daedalus:main
-          cache-to: type=inline

.github/workflows/labrinth-docker.yml

@@ -20,26 +20,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: actions/checkout@v2
       - name: Fetch docker metadata
         id: docker_meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v3
         with:
           images: ghcr.io/modrinth/labrinth
       - name: Login to GitHub Images
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v6
+        id: docker_build
+        uses: docker/build-push-action@v2
         with:
           file: ./apps/labrinth/Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
-          cache-from: type=registry,ref=ghcr.io/modrinth/labrinth:main
-          cache-to: type=inline

.github/workflows/theseus-build.yml

@@ -75,7 +75,7 @@ jobs:
           rename-to: ${{ startsWith(matrix.platform, 'windows') && 'dasel.exe' || 'dasel' }}
           chmod: 0755
 
-      - name: ⚙️ Set application version and environment
+      - name: ⚙️ Set application version
         shell: bash
         run: |
           APP_VERSION="$(git describe --tags --always | sed -E 's/-([0-9]+)-(g[0-9a-fA-F]+)$/-canary+\1.\2/')"
@@ -84,8 +84,6 @@ jobs:
           dasel put -f packages/app-lib/Cargo.toml -t string -v "${APP_VERSION#v}" 'package.version'
           dasel put -f apps/app-frontend/package.json -t string -v "${APP_VERSION#v}" 'version'
 
-          cp packages/app-lib/.env.prod packages/app-lib/.env
-
       - name: 💨 Setup Turbo cache
         uses: rharkor/caching-for-turbo@v1.8
 

.github/workflows/turbo-ci.yml

@@ -52,7 +52,7 @@ jobs:
       # cargo-binstall does not have pre-built binaries for sqlx-cli, so we fall
       # back to a cached cargo install
       - name: 🧰 Setup cargo-sqlx
-        uses: taiki-e/cache-cargo-install-action@v2
+        uses: AlexTMjugador/cache-cargo-install-action@feat/features-support
         with:
           tool: sqlx-cli
           locked: false
@@ -74,14 +74,5 @@ jobs:
           cp .env.local .env
           sqlx database setup
 
-      - name: ⚙️ Set app environment
-        working-directory: packages/app-lib
-        run: cp .env.staging .env
-
       - name: 🔍 Lint and test
         run: pnpm run ci
-
-      - name: 🔍 Verify intl:extract has been run
-        run: |
-          pnpm intl:extract
-          git diff --exit-code --color */*/src/locales/en-US/index.json

Cargo.lock

@@ -1706,7 +1706,7 @@ dependencies = [
  "bitflags 2.9.1",
  "core-foundation 0.10.0",
  "core-graphics-types",
- "foreign-types",
+ "foreign-types 0.5.0",
  "libc",
 ]
 
@@ -2699,6 +2699,15 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared 0.1.1",
+]
+
 [[package]]
 name = "foreign-types"
 version = "0.5.0"
@@ -2706,7 +2715,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
 dependencies = [
  "foreign-types-macros",
- "foreign-types-shared",
+ "foreign-types-shared 0.3.1",
 ]
 
 [[package]]
@@ -2720,6 +2729,12 @@ dependencies = [
  "syn 2.0.101",
 ]
 
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
 [[package]]
 name = "foreign-types-shared"
 version = "0.3.1"
@@ -3663,10 +3678,11 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.7"
+version = "0.27.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
+checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
 dependencies = [
+ "futures-util",
  "http 1.3.1",
  "hyper 1.6.0",
  "hyper-util",
@@ -3676,7 +3692,7 @@ dependencies = [
  "tokio",
  "tokio-rustls 0.26.2",
  "tower-service",
- "webpki-roots 1.0.0",
+ "webpki-roots 0.26.11",
 ]
 
 [[package]]
@@ -3692,6 +3708,22 @@ dependencies = [
  "tower-service",
 ]
 
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper 1.6.0",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
 [[package]]
 name = "hyper-util"
 version = "0.1.14"
@@ -4357,7 +4389,7 @@ dependencies = [
  "futures-util",
  "hex",
  "hmac",
- "hyper-rustls 0.27.7",
+ "hyper-tls",
  "hyper-util",
  "iana-time-zone",
  "image",
@@ -4954,6 +4986,23 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "native-tls"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework 2.11.1",
+ "security-framework-sys",
+ "tempfile",
+]
+
 [[package]]
 name = "ndk"
 version = "0.9.0"
@@ -5528,12 +5577,50 @@ dependencies = [
  "pathdiff",
 ]
 
+[[package]]
+name = "openssl"
+version = "0.10.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
+dependencies = [
+ "bitflags 2.9.1",
+ "cfg-if",
+ "foreign-types 0.3.2",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "openssl-probe"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
+[[package]]
+name = "openssl-sys"
+version = "0.9.108"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "option-ext"
 version = "0.2.0"
@@ -6763,7 +6850,7 @@ dependencies = [
  "http-body 1.0.1",
  "http-body-util",
  "hyper 1.6.0",
- "hyper-rustls 0.27.7",
+ "hyper-rustls 0.27.5",
  "hyper-util",
  "js-sys",
  "log",
@@ -7893,7 +7980,7 @@ dependencies = [
  "bytemuck",
  "cfg_aliases",
  "core-graphics",
- "foreign-types",
+ "foreign-types 0.5.0",
  "js-sys",
  "log",
  "objc2 0.5.2",
@@ -8930,7 +9017,6 @@ dependencies = [
  "data-url",
  "dirs",
  "discord-rich-presence",
- "dotenvy",
  "dunce",
  "either",
  "encoding_rs",
@@ -8985,8 +9071,6 @@ dependencies = [
  "dashmap",
  "either",
  "enumset",
- "hyper 1.6.0",
- "hyper-util",
  "native-dialog",
  "paste",
  "serde",
@@ -9208,6 +9292,16 @@ dependencies = [
  "syn 2.0.101",
 ]
 
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-rustls"
 version = "0.24.1"

Cargo.toml

@@ -67,13 +67,7 @@ heck = "0.5.0"
 hex = "0.4.3"
 hickory-resolver = "0.25.2"
 hmac = "0.12.1"
-hyper = "1.6.0"
-hyper-rustls = { version = "0.27.7", default-features = false, features = [
-  "http1",
-  "native-tokio",
-  "ring",
-  "tls12",
-] }
+hyper-tls = "0.6.0"
 hyper-util = "0.1.14"
 iana-time-zone = "0.1.63"
 image = { version = "0.25.6", default-features = false, features = ["rayon"] }

apps/app-frontend/src/App.vue

@@ -61,10 +61,9 @@ import { renderString } from '@modrinth/utils'
 import { useFetch } from '@/helpers/fetch.js'
 import { check } from '@tauri-apps/plugin-updater'
 import NavButton from '@/components/ui/NavButton.vue'
-import { cancelLogin, get as getCreds, login, logout } from '@/helpers/mr_auth.js'
+import { get as getCreds, login, logout } from '@/helpers/mr_auth.js'
 import { get_user } from '@/helpers/cache.js'
 import AppSettingsModal from '@/components/ui/modal/AppSettingsModal.vue'
-import AuthGrantFlowWaitModal from '@/components/ui/modal/AuthGrantFlowWaitModal.vue'
 import PromotionWrapper from '@/components/ui/PromotionWrapper.vue'
 import { hide_ads_window, init_ads_window } from '@/helpers/ads.js'
 import FriendsList from '@/components/ui/friends/FriendsList.vue'
@@ -264,8 +263,6 @@ const incompatibilityWarningModal = ref()
 
 const credentials = ref()
 
-const modrinthLoginFlowWaitModal = ref()
-
 async function fetchCredentials() {
   const creds = await getCreds().catch(handleError)
   if (creds && creds.user_id) {
@@ -275,24 +272,8 @@ async function fetchCredentials() {
 }
 
 async function signIn() {
-  modrinthLoginFlowWaitModal.value.show()
-
-  try {
-    await login()
-    await fetchCredentials()
-  } catch (error) {
-    if (
-      typeof error === 'object' &&
-      typeof error['message'] === 'string' &&
-      error.message.includes('Login canceled')
-    ) {
-      // Not really an error due to being a result of user interaction, show nothing
-    } else {
-      handleError(error)
-    }
-  } finally {
-    modrinthLoginFlowWaitModal.value.hide()
-  }
+  await login().catch(handleError)
+  await fetchCredentials()
 }
 
 async function logOut() {
@@ -421,9 +402,6 @@ function handleAuxClick(e) {
     <Suspense>
       <AppSettingsModal ref="settingsModal" />
     </Suspense>
-    <Suspense>
-      <AuthGrantFlowWaitModal ref="modrinthLoginFlowWaitModal" @flow-cancel="cancelLogin" />
-    </Suspense>
     <Suspense>
       <InstanceCreationModal ref="installationModal" />
     </Suspense>
@@ -507,13 +485,13 @@ function handleAuxClick(e) {
         <ModrinthAppLogo class="h-full w-auto text-contrast pointer-events-none" />
         <div class="flex items-center gap-1 ml-3">
           <button
-            class="cursor-pointer p-0 m-0 text-contrast border-none outline-none bg-button-bg rounded-full flex items-center justify-center w-6 h-6 hover:brightness-75 transition-all"
+            class="cursor-pointer p-0 m-0 border-none outline-none bg-button-bg rounded-full flex items-center justify-center w-6 h-6 hover:brightness-75 transition-all"
             @click="router.back()"
           >
             <LeftArrowIcon />
           </button>
           <button
-            class="cursor-pointer p-0 m-0 text-contrast border-none outline-none bg-button-bg rounded-full flex items-center justify-center w-6 h-6 hover:brightness-75 transition-all"
+            class="cursor-pointer p-0 m-0 border-none outline-none bg-button-bg rounded-full flex items-center justify-center w-6 h-6 hover:brightness-75 transition-all"
             @click="router.forward()"
           >
             <RightArrowIcon />

apps/app-frontend/src/components/GridDisplay.vue

@@ -136,7 +136,7 @@ const filteredResults = computed(() => {
 
   if (sortBy.value === 'Game version') {
     instances.sort((a, b) => {
-      return a.game_version.localeCompare(b.game_version, undefined, { numeric: true })
+      return a.game_version.localeCompare(b.game_version)
     })
   }
 
@@ -213,17 +213,6 @@ const filteredResults = computed(() => {
       instanceMap.set(entry[0], entry[1])
     })
   }
-  // default sorting would do 1.20.4 < 1.8.9 because 2 < 8
-  // localeCompare with numeric=true puts 1.8.9 < 1.20.4 because 8 < 20
-  if (group.value === 'Game version') {
-    const sortedEntries = [...instanceMap.entries()].sort((a, b) => {
-      return a[0].localeCompare(b[0], undefined, { numeric: true })
-    })
-    instanceMap.clear()
-    sortedEntries.forEach((entry) => {
-      instanceMap.set(entry[0], entry[1])
-    })
-  }
 
   return instanceMap
 })

apps/app-frontend/src/components/ui/InstanceCreationModal.vue

@@ -305,16 +305,12 @@ const [
   get_game_versions().then(shallowRef).catch(handleError),
   get_loaders()
     .then((value) =>
-      ref(
-        value
-          .filter((item) => item.supported_project_types.includes('modpack'))
-          .map((item) => item.name.toLowerCase()),
-      ),
+      value
+        .filter((item) => item.supported_project_types.includes('modpack'))
+        .map((item) => item.name.toLowerCase()),
     )
-    .catch((err) => {
-      handleError(err)
-      return ref([])
-    }),
+    .then(ref)
+    .catch(handleError),
 ])
 loaders.value.unshift('vanilla')
 

apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue

@@ -6,9 +6,9 @@ import { edit, get_optimal_jre_key } from '@/helpers/profile'
 import { handleError } from '@/store/notifications'
 import { defineMessages, useVIntl } from '@vintl/vintl'
 import JavaSelector from '@/components/ui/JavaSelector.vue'
+import { get_max_memory } from '@/helpers/jre'
 import { get } from '@/helpers/settings.ts'
 import type { InstanceSettingsTabProps, AppSettings, MemorySettings } from '../../../helpers/types'
-import useMemorySlider from '@/composables/useMemorySlider'
 
 const { formatMessage } = useVIntl()
 
@@ -34,7 +34,7 @@ const envVars = ref(
 
 const overrideMemorySettings = ref(!!props.instance.memory)
 const memory = ref(props.instance.memory ?? globalSettings.memory)
-const { maxMemory, snapPoints } = await useMemorySlider()
+const maxMemory = Math.floor((await get_max_memory().catch(handleError)) / 1024)
 
 const editProfileObject = computed(() => {
   const editProfile: {
@@ -156,8 +156,6 @@ const messages = defineMessages({
       :min="512"
       :max="maxMemory"
       :step="64"
-      :snap-points="snapPoints"
-      :snap-range="512"
       unit="MB"
     />
     <h2 id="project-name" class="mt-4 mb-1 text-lg font-extrabold text-contrast block">

apps/app-frontend/src/components/ui/modal/AuthGrantFlowWaitModal.vue

@@ -1,42 +0,0 @@
-<script setup lang="ts">
-import { LogInIcon, SpinnerIcon } from '@modrinth/assets'
-import { ref } from 'vue'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-
-defineProps({
-  onFlowCancel: {
-    type: Function,
-    default() {
-      return async () => {}
-    },
-  },
-})
-
-const modal = ref()
-
-function show() {
-  modal.value.show()
-}
-
-function hide() {
-  modal.value.hide()
-}
-
-defineExpose({ show, hide })
-</script>
-<template>
-  <ModalWrapper ref="modal" @hide="onFlowCancel">
-    <template #title>
-      <span class="items-center gap-2 text-lg font-extrabold text-contrast">
-        <LogInIcon /> Sign in
-      </span>
-    </template>
-
-    <div class="flex justify-center gap-2">
-      <SpinnerIcon class="w-12 h-12 animate-spin" />
-    </div>
-    <p class="text-sm text-secondary">
-      Please sign in at the browser window that just opened to continue.
-    </p>
-  </ModalWrapper>
-</template>

apps/app-frontend/src/components/ui/settings/DefaultInstanceSettings.vue

@@ -1,8 +1,9 @@
 <script setup lang="ts">
 import { get, set } from '@/helpers/settings.ts'
 import { ref, watch } from 'vue'
+import { get_max_memory } from '@/helpers/jre'
+import { handleError } from '@/store/notifications'
 import { Slider, Toggle } from '@modrinth/ui'
-import useMemorySlider from '@/composables/useMemorySlider'
 
 const fetchSettings = await get()
 fetchSettings.launchArgs = fetchSettings.extra_launch_args.join(' ')
@@ -10,7 +11,7 @@ fetchSettings.envVars = fetchSettings.custom_env_vars.map((x) => x.join('=')).jo
 
 const settings = ref(fetchSettings)
 
-const { maxMemory, snapPoints } = await useMemorySlider()
+const maxMemory = ref(Math.floor((await get_max_memory().catch(handleError)) / 1024))
 
 watch(
   settings,
@@ -106,8 +107,6 @@ watch(
       :min="512"
       :max="maxMemory"
       :step="64"
-      :snap-points="snapPoints"
-      :snap-range="512"
       unit="MB"
     />
 

apps/app-frontend/src/components/ui/skin/EditSkinModal.vue

@@ -118,7 +118,6 @@ import {
   type Cape,
   type SkinModel,
   get_normalized_skin_texture,
-  determineModelType,
 } from '@/helpers/skins.ts'
 import { handleError } from '@/store/notifications'
 import {
@@ -254,7 +253,7 @@ async function showNew(e: MouseEvent, skinTextureUrl: string) {
   mode.value = 'new'
   currentSkin.value = null
   uploadedTextureUrl.value = skinTextureUrl
-  variant.value = await determineModelType(skinTextureUrl)
+  variant.value = 'CLASSIC'
   selectedCape.value = undefined
   visibleCapeList.value = []
   initVisibleCapeList()

apps/app-frontend/src/components/ui/world/WorldItem.vue

@@ -128,14 +128,6 @@ const messages = defineMessages({
     id: 'instance.worlds.game_already_open',
     defaultMessage: 'Instance is already open',
   },
-  noContact: {
-    id: 'instance.worlds.no_contact',
-    defaultMessage: "Server couldn't be contacted",
-  },
-  incompatibleServer: {
-    id: 'instance.worlds.incompatible_server',
-    defaultMessage: 'Server is incompatible',
-  },
   copyAddress: {
     id: 'instance.worlds.copy_address',
     defaultMessage: 'Copy address',
@@ -310,33 +302,39 @@ const messages = defineMessages({
         </template>
       </div>
       <div class="flex gap-1 justify-end smart-clickable:allow-pointer-events">
-        <ButtonStyled
-          v-if="(playingWorld || (locked && playingInstance)) && !startingInstance"
-          color="red"
-        >
-          <button @click="emit('stop')">
-            <StopCircleIcon aria-hidden="true" />
-            {{ formatMessage(commonMessages.stopButton) }}
-          </button>
-        </ButtonStyled>
-        <ButtonStyled v-else>
-          <button
-            v-tooltip="
-              !serverStatus
-                ? formatMessage(messages.noContact)
-                : serverIncompatible
-                  ? formatMessage(messages.incompatibleServer)
+        <template v-if="world.type === 'singleplayer' || serverStatus">
+          <ButtonStyled
+            v-if="(playingWorld || (locked && playingInstance)) && !startingInstance"
+            color="red"
+          >
+            <button @click="emit('stop')">
+              <StopCircleIcon aria-hidden="true" />
+              {{ formatMessage(commonMessages.stopButton) }}
+            </button>
+          </ButtonStyled>
+          <ButtonStyled v-else>
+            <button
+              v-tooltip="
+                serverIncompatible
+                  ? 'Server is incompatible'
                   : !supportsQuickPlay
                     ? formatMessage(messages.noQuickPlay)
                     : playingOtherWorld || locked
                       ? formatMessage(messages.gameAlreadyOpen)
                       : null
-            "
-            :disabled="!supportsQuickPlay || playingOtherWorld || startingInstance"
-            @click="emit('play')"
-          >
-            <SpinnerIcon v-if="startingInstance && playingWorld" class="animate-spin" />
-            <PlayIcon v-else aria-hidden="true" />
+              "
+              :disabled="!supportsQuickPlay || playingOtherWorld || startingInstance"
+              @click="emit('play')"
+            >
+              <SpinnerIcon v-if="startingInstance && playingWorld" class="animate-spin" />
+              <PlayIcon v-else aria-hidden="true" />
+              {{ formatMessage(commonMessages.playButton) }}
+            </button>
+          </ButtonStyled>
+        </template>
+        <ButtonStyled v-else>
+          <button class="invisible">
+            <PlayIcon aria-hidden="true" />
             {{ formatMessage(commonMessages.playButton) }}
           </button>
         </ButtonStyled>

apps/app-frontend/src/composables/useMemorySlider.js

@@ -1,21 +0,0 @@
-import { ref, computed } from 'vue'
-import { get_max_memory } from '@/helpers/jre.js'
-import { handleError } from '@/store/notifications.js'
-
-export default async function () {
-  const maxMemory = ref(Math.floor((await get_max_memory().catch(handleError)) / 1024))
-
-  const snapPoints = computed(() => {
-    let points = []
-    let memory = 2048
-
-    while (memory <= maxMemory.value) {
-      points.push(memory)
-      memory *= 2
-    }
-
-    return points
-  })
-
-  return { maxMemory, snapPoints }
-}

apps/app-frontend/src/helpers/mr_auth.js

@@ -16,7 +16,3 @@ export async function logout() {
 export async function get() {
   return await invoke('plugin:mr-auth|get')
 }
-
-export async function cancelLogin() {
-  return await invoke('plugin:mr-auth|cancel_modrinth_login')
-}

apps/app-frontend/src/helpers/rendering/batch-skin-renderer.ts

@@ -2,46 +2,25 @@ import * as THREE from 'three'
 import type { Skin, Cape } from '../skins'
 import { get_normalized_skin_texture, determineModelType } from '../skins'
 import { reactive } from 'vue'
-import {
-  setupSkinModel,
-  disposeCaches,
-  loadTexture,
-  applyCapeTexture,
-  createTransparentTexture,
-} from '@modrinth/utils'
+import { setupSkinModel, disposeCaches } from '@modrinth/utils'
 import { skinPreviewStorage } from '../storage/skin-preview-storage'
-import { headStorage } from '../storage/head-storage'
-import { ClassicPlayerModel, SlimPlayerModel } from '@modrinth/assets'
+import { CapeModel, ClassicPlayerModel, SlimPlayerModel } from '@modrinth/assets'
 
 export interface RenderResult {
   forwards: string
   backwards: string
 }
 
-export interface RawRenderResult {
-  forwards: Blob
-  backwards: Blob
-}
-
 class BatchSkinRenderer {
-  private renderer: THREE.WebGLRenderer | null = null
-  private scene: THREE.Scene | null = null
-  private camera: THREE.PerspectiveCamera | null = null
+  private renderer: THREE.WebGLRenderer
+  private readonly scene: THREE.Scene
+  private readonly camera: THREE.PerspectiveCamera
   private currentModel: THREE.Group | null = null
-  private readonly width: number
-  private readonly height: number
 
   constructor(width: number = 360, height: number = 504) {
-    this.width = width
-    this.height = height
-  }
-
-  private initializeRenderer(): void {
-    if (this.renderer) return
-
     const canvas = document.createElement('canvas')
-    canvas.width = this.width
-    canvas.height = this.height
+    canvas.width = width
+    canvas.height = height
 
     this.renderer = new THREE.WebGLRenderer({
       canvas: canvas,
@@ -54,10 +33,10 @@ class BatchSkinRenderer {
     this.renderer.toneMapping = THREE.NoToneMapping
     this.renderer.toneMappingExposure = 10.0
     this.renderer.setClearColor(0x000000, 0)
-    this.renderer.setSize(this.width, this.height)
+    this.renderer.setSize(width, height)
 
     this.scene = new THREE.Scene()
-    this.camera = new THREE.PerspectiveCamera(20, this.width / this.height, 0.4, 1000)
+    this.camera = new THREE.PerspectiveCamera(20, width / height, 0.4, 1000)
 
     const ambientLight = new THREE.AmbientLight(0xffffff, 2)
     const directionalLight = new THREE.DirectionalLight(0xffffff, 1.2)
@@ -71,12 +50,9 @@ class BatchSkinRenderer {
     textureUrl: string,
     modelUrl: string,
     capeUrl?: string,
-  ): Promise<RawRenderResult> {
-    this.initializeRenderer()
-
-    this.clearScene()
-
-    await this.setupModel(modelUrl, textureUrl, capeUrl)
+    capeModelUrl?: string,
+  ): Promise<RenderResult> {
+    await this.setupModel(modelUrl, textureUrl, capeModelUrl, capeUrl)
 
     const headPart = this.currentModel!.getObjectByName('Head')
     let lookAtTarget: [number, number, number]
@@ -101,35 +77,35 @@ class BatchSkinRenderer {
   private async renderView(
     cameraPosition: [number, number, number],
     lookAtPosition: [number, number, number],
-  ): Promise<Blob> {
-    if (!this.camera || !this.renderer || !this.scene) {
-      throw new Error('Renderer not initialized')
-    }
-
+  ): Promise<string> {
     this.camera.position.set(...cameraPosition)
     this.camera.lookAt(...lookAtPosition)
 
     this.renderer.render(this.scene, this.camera)
 
-    const dataUrl = this.renderer.domElement.toDataURL('image/webp', 0.9)
-    const response = await fetch(dataUrl)
-    return await response.blob()
+    return new Promise<string>((resolve, reject) => {
+      this.renderer.domElement.toBlob((blob) => {
+        if (blob) {
+          const url = URL.createObjectURL(blob)
+          resolve(url)
+        } else {
+          reject(new Error('Failed to create blob from canvas'))
+        }
+      }, 'image/png')
+    })
   }
 
-  private async setupModel(modelUrl: string, textureUrl: string, capeUrl?: string): Promise<void> {
-    if (!this.scene) {
-      throw new Error('Renderer not initialized')
+  private async setupModel(
+    modelUrl: string,
+    textureUrl: string,
+    capeModelUrl?: string,
+    capeUrl?: string,
+  ): Promise<void> {
+    if (this.currentModel) {
+      this.scene.remove(this.currentModel)
     }
 
-    const { model } = await setupSkinModel(modelUrl, textureUrl)
-
-    if (capeUrl) {
-      const capeTexture = await loadTexture(capeUrl)
-      applyCapeTexture(model, capeTexture)
-    } else {
-      const transparentTexture = createTransparentTexture()
-      applyCapeTexture(model, null, transparentTexture)
-    }
+    const { model } = await setupSkinModel(modelUrl, textureUrl, capeModelUrl, capeUrl)
 
     const group = new THREE.Group()
     group.add(model)
@@ -140,39 +116,8 @@ class BatchSkinRenderer {
     this.currentModel = group
   }
 
-  private clearScene(): void {
-    if (!this.scene) return
-
-    while (this.scene.children.length > 0) {
-      const child = this.scene.children[0]
-      this.scene.remove(child)
-
-      if (child instanceof THREE.Mesh) {
-        if (child.geometry) child.geometry.dispose()
-        if (child.material) {
-          if (Array.isArray(child.material)) {
-            child.material.forEach((material) => material.dispose())
-          } else {
-            child.material.dispose()
-          }
-        }
-      }
-    }
-
-    const ambientLight = new THREE.AmbientLight(0xffffff, 2)
-    const directionalLight = new THREE.DirectionalLight(0xffffff, 1.2)
-    directionalLight.castShadow = true
-    directionalLight.position.set(2, 4, 3)
-    this.scene.add(ambientLight)
-    this.scene.add(directionalLight)
-
-    this.currentModel = null
-  }
-
   public dispose(): void {
-    if (this.renderer) {
-      this.renderer.dispose()
-    }
+    this.renderer.dispose()
     disposeCaches()
   }
 }
@@ -188,25 +133,10 @@ function getModelUrlForVariant(variant: string): string {
   }
 }
 
-export const skinBlobUrlMap = reactive(new Map<string, RenderResult>())
-export const headBlobUrlMap = reactive(new Map<string, string>())
+export const map = reactive(new Map<string, RenderResult>())
+export const headMap = reactive(new Map<string, string>())
 const DEBUG_MODE = false
 
-let sharedRenderer: BatchSkinRenderer | null = null
-function getSharedRenderer(): BatchSkinRenderer {
-  if (!sharedRenderer) {
-    sharedRenderer = new BatchSkinRenderer()
-  }
-  return sharedRenderer
-}
-
-export function disposeSharedRenderer(): void {
-  if (sharedRenderer) {
-    sharedRenderer.dispose()
-    sharedRenderer = null
-  }
-}
-
 export async function cleanupUnusedPreviews(skins: Skin[]): Promise<void> {
   const validKeys = new Set<string>()
   const validHeadKeys = new Set<string>()
@@ -220,7 +150,7 @@ export async function cleanupUnusedPreviews(skins: Skin[]): Promise<void> {
 
   try {
     await skinPreviewStorage.cleanupInvalidKeys(validKeys)
-    await headStorage.cleanupInvalidKeys(validHeadKeys)
+    await skinPreviewStorage.cleanupInvalidKeys(validHeadKeys)
   } catch (error) {
     console.warn('Failed to cleanup unused skin previews:', error)
   }
@@ -299,17 +229,13 @@ export async function generatePlayerHeadBlob(skinUrl: string, size: number = 64)
           outputCtx.drawImage(hatCanvas, 0, 0, 8, 8, 0, 0, size, size)
         }
 
-        outputCanvas.toBlob(
-          (blob) => {
-            if (blob) {
-              resolve(blob)
-            } else {
-              reject(new Error('Failed to create blob from canvas'))
-            }
-          },
-          'image/webp',
-          0.9,
-        )
+        outputCanvas.toBlob((blob) => {
+          if (blob) {
+            resolve(blob)
+          } else {
+            reject(new Error('Failed to create blob from canvas'))
+          }
+        }, 'image/png')
       } catch (error) {
         reject(error)
       }
@@ -326,24 +252,35 @@ export async function generatePlayerHeadBlob(skinUrl: string, size: number = 64)
 async function generateHeadRender(skin: Skin): Promise<string> {
   const headKey = `${skin.texture_key}-head`
 
-  if (headBlobUrlMap.has(headKey)) {
+  if (headMap.has(headKey)) {
     if (DEBUG_MODE) {
-      const url = headBlobUrlMap.get(headKey)!
+      const url = headMap.get(headKey)!
       URL.revokeObjectURL(url)
-      headBlobUrlMap.delete(headKey)
+      headMap.delete(headKey)
     } else {
-      return headBlobUrlMap.get(headKey)!
+      return headMap.get(headKey)!
     }
   }
 
+  try {
+    const cached = await skinPreviewStorage.retrieve(headKey)
+    if (cached && typeof cached === 'string') {
+      headMap.set(headKey, cached)
+      return cached
+    }
+  } catch (error) {
+    console.warn('Failed to retrieve cached head render:', error)
+  }
+
   const skinUrl = await get_normalized_skin_texture(skin)
   const headBlob = await generatePlayerHeadBlob(skinUrl, 64)
   const headUrl = URL.createObjectURL(headBlob)
 
-  headBlobUrlMap.set(headKey, headUrl)
+  headMap.set(headKey, headUrl)
 
   try {
-    await headStorage.store(headKey, headBlob)
+    // @ts-expect-error - skinPreviewStorage.store expects a RenderResult, but we are storing a string url.
+    await skinPreviewStorage.store(headKey, headUrl)
   } catch (error) {
     console.warn('Failed to store head render in persistent storage:', error)
   }
@@ -356,49 +293,30 @@ export async function getPlayerHeadUrl(skin: Skin): Promise<string> {
 }
 
 export async function generateSkinPreviews(skins: Skin[], capes: Cape[]): Promise<void> {
+  const renderer = new BatchSkinRenderer()
+
   try {
-    const skinKeys = skins.map(
-      (skin) => `${skin.texture_key}+${skin.variant}+${skin.cape_id ?? 'no-cape'}`,
-    )
-    const headKeys = skins.map((skin) => `${skin.texture_key}-head`)
-
-    const [cachedSkinPreviews, cachedHeadPreviews] = await Promise.all([
-      skinPreviewStorage.batchRetrieve(skinKeys),
-      headStorage.batchRetrieve(headKeys),
-    ])
-
-    for (let i = 0; i < skins.length; i++) {
-      const skinKey = skinKeys[i]
-      const headKey = headKeys[i]
-
-      const rawCached = cachedSkinPreviews[skinKey]
-      if (rawCached) {
-        const cached: RenderResult = {
-          forwards: URL.createObjectURL(rawCached.forwards),
-          backwards: URL.createObjectURL(rawCached.backwards),
-        }
-        skinBlobUrlMap.set(skinKey, cached)
-      }
-
-      const cachedHead = cachedHeadPreviews[headKey]
-      if (cachedHead) {
-        headBlobUrlMap.set(headKey, URL.createObjectURL(cachedHead))
-      }
-    }
-
     for (const skin of skins) {
       const key = `${skin.texture_key}+${skin.variant}+${skin.cape_id ?? 'no-cape'}`
 
-      if (skinBlobUrlMap.has(key)) {
+      if (map.has(key)) {
         if (DEBUG_MODE) {
-          const result = skinBlobUrlMap.get(key)!
+          const result = map.get(key)!
           URL.revokeObjectURL(result.forwards)
           URL.revokeObjectURL(result.backwards)
-          skinBlobUrlMap.delete(key)
+          map.delete(key)
         } else continue
       }
 
-      const renderer = getSharedRenderer()
+      try {
+        const cached = await skinPreviewStorage.retrieve(key)
+        if (cached) {
+          map.set(key, cached)
+          continue
+        }
+      } catch (error) {
+        console.warn('Failed to retrieve cached skin preview:', error)
+      }
 
       let variant = skin.variant
       if (variant === 'UNKNOWN') {
@@ -412,35 +330,25 @@ export async function generateSkinPreviews(skins: Skin[], capes: Cape[]): Promis
 
       const modelUrl = getModelUrlForVariant(variant)
       const cape: Cape | undefined = capes.find((_cape) => _cape.id === skin.cape_id)
-      const rawRenderResult = await renderer.renderSkin(
+      const renderResult = await renderer.renderSkin(
         await get_normalized_skin_texture(skin),
         modelUrl,
         cape?.texture,
+        CapeModel,
       )
 
-      const renderResult: RenderResult = {
-        forwards: URL.createObjectURL(rawRenderResult.forwards),
-        backwards: URL.createObjectURL(rawRenderResult.backwards),
-      }
-
-      skinBlobUrlMap.set(key, renderResult)
+      map.set(key, renderResult)
 
       try {
-        await skinPreviewStorage.store(key, rawRenderResult)
+        await skinPreviewStorage.store(key, renderResult)
       } catch (error) {
         console.warn('Failed to store skin preview in persistent storage:', error)
       }
 
-      const headKey = `${skin.texture_key}-head`
-      if (!headBlobUrlMap.has(headKey)) {
-        await generateHeadRender(skin)
-      }
+      await generateHeadRender(skin)
     }
   } finally {
-    disposeSharedRenderer()
+    renderer.dispose()
     await cleanupUnusedPreviews(skins)
-
-    await skinPreviewStorage.debugCalculateStorage()
-    await headStorage.debugCalculateStorage()
   }
 }

apps/app-frontend/src/helpers/skins.ts

@@ -62,12 +62,15 @@ export async function determineModelType(texture: string): Promise<'SLIM' | 'CLA
 
       context.drawImage(image, 0, 0)
 
-      const armX = 54
-      const armY = 20
-      const armWidth = 2
+      const armX = 44
+      const armY = 16
+      const armWidth = 4
       const armHeight = 12
+
       const imageData = context.getImageData(armX, armY, armWidth, armHeight).data
-      for (let alphaIndex = 3; alphaIndex < imageData.length; alphaIndex += 4) {
+
+      for (let y = 0; y < armHeight; y++) {
+        const alphaIndex = (3 + y * armWidth) * 4 + 3
         if (imageData[alphaIndex] !== 0) {
           resolve('CLASSIC')
           return

apps/app-frontend/src/helpers/storage/head-storage.ts

@@ -1,229 +0,0 @@
-interface StoredHead {
-  blob: Blob
-  timestamp: number
-}
-
-export class HeadStorage {
-  private dbName = 'head-storage'
-  private version = 1
-  private db: IDBDatabase | null = null
-
-  async init(): Promise<void> {
-    return new Promise((resolve, reject) => {
-      const request = indexedDB.open(this.dbName, this.version)
-
-      request.onerror = () => reject(request.error)
-      request.onsuccess = () => {
-        this.db = request.result
-        resolve()
-      }
-
-      request.onupgradeneeded = () => {
-        const db = request.result
-        if (!db.objectStoreNames.contains('heads')) {
-          db.createObjectStore('heads')
-        }
-      }
-    })
-  }
-
-  async store(key: string, blob: Blob): Promise<void> {
-    if (!this.db) await this.init()
-
-    const transaction = this.db!.transaction(['heads'], 'readwrite')
-    const store = transaction.objectStore('heads')
-
-    const storedHead: StoredHead = {
-      blob,
-      timestamp: Date.now(),
-    }
-
-    return new Promise((resolve, reject) => {
-      const request = store.put(storedHead, key)
-
-      request.onsuccess = () => resolve()
-      request.onerror = () => reject(request.error)
-    })
-  }
-
-  async retrieve(key: string): Promise<string | null> {
-    if (!this.db) await this.init()
-
-    const transaction = this.db!.transaction(['heads'], 'readonly')
-    const store = transaction.objectStore('heads')
-
-    return new Promise((resolve, reject) => {
-      const request = store.get(key)
-
-      request.onsuccess = () => {
-        const result = request.result as StoredHead | undefined
-
-        if (!result) {
-          resolve(null)
-          return
-        }
-
-        const url = URL.createObjectURL(result.blob)
-        resolve(url)
-      }
-      request.onerror = () => reject(request.error)
-    })
-  }
-
-  async batchRetrieve(keys: string[]): Promise<Record<string, Blob | null>> {
-    if (!this.db) await this.init()
-
-    const transaction = this.db!.transaction(['heads'], 'readonly')
-    const store = transaction.objectStore('heads')
-    const results: Record<string, Blob | null> = {}
-
-    return new Promise((resolve, _reject) => {
-      let completedRequests = 0
-
-      if (keys.length === 0) {
-        resolve(results)
-        return
-      }
-
-      for (const key of keys) {
-        const request = store.get(key)
-
-        request.onsuccess = () => {
-          const result = request.result as StoredHead | undefined
-
-          if (result) {
-            results[key] = result.blob
-          } else {
-            results[key] = null
-          }
-
-          completedRequests++
-          if (completedRequests === keys.length) {
-            resolve(results)
-          }
-        }
-
-        request.onerror = () => {
-          results[key] = null
-          completedRequests++
-          if (completedRequests === keys.length) {
-            resolve(results)
-          }
-        }
-      }
-    })
-  }
-
-  async cleanupInvalidKeys(validKeys: Set<string>): Promise<number> {
-    if (!this.db) await this.init()
-
-    const transaction = this.db!.transaction(['heads'], 'readwrite')
-    const store = transaction.objectStore('heads')
-    let deletedCount = 0
-
-    return new Promise((resolve, reject) => {
-      const request = store.openCursor()
-
-      request.onsuccess = (event) => {
-        const cursor = (event.target as IDBRequest<IDBCursorWithValue>).result
-
-        if (cursor) {
-          const key = cursor.primaryKey as string
-
-          if (!validKeys.has(key)) {
-            const deleteRequest = cursor.delete()
-            deleteRequest.onsuccess = () => {
-              deletedCount++
-            }
-            deleteRequest.onerror = () => {
-              console.warn('Failed to delete invalid head entry:', key)
-            }
-          }
-
-          cursor.continue()
-        } else {
-          resolve(deletedCount)
-        }
-      }
-
-      request.onerror = () => reject(request.error)
-    })
-  }
-
-  async debugCalculateStorage(): Promise<void> {
-    if (!this.db) await this.init()
-
-    const transaction = this.db!.transaction(['heads'], 'readonly')
-    const store = transaction.objectStore('heads')
-
-    let totalSize = 0
-    let count = 0
-    const entries: Array<{ key: string; size: number }> = []
-
-    return new Promise((resolve, reject) => {
-      const request = store.openCursor()
-
-      request.onsuccess = (event) => {
-        const cursor = (event.target as IDBRequest<IDBCursorWithValue>).result
-
-        if (cursor) {
-          const key = cursor.primaryKey as string
-          const value = cursor.value as StoredHead
-
-          const entrySize = value.blob.size
-          totalSize += entrySize
-          count++
-
-          entries.push({
-            key,
-            size: entrySize,
-          })
-
-          cursor.continue()
-        } else {
-          console.group('🗄️ Head Storage Debug Info')
-          console.log(`Total entries: ${count}`)
-          console.log(`Total size: ${(totalSize / 1024 / 1024).toFixed(2)} MB`)
-          console.log(
-            `Average size per entry: ${count > 0 ? (totalSize / count / 1024).toFixed(2) : 0} KB`,
-          )
-
-          if (entries.length > 0) {
-            const sortedEntries = entries.sort((a, b) => b.size - a.size)
-            console.log(
-              'Largest entry:',
-              sortedEntries[0].key,
-              '(' + (sortedEntries[0].size / 1024).toFixed(2) + ' KB)',
-            )
-            console.log(
-              'Smallest entry:',
-              sortedEntries[sortedEntries.length - 1].key,
-              '(' + (sortedEntries[sortedEntries.length - 1].size / 1024).toFixed(2) + ' KB)',
-            )
-          }
-
-          console.groupEnd()
-          resolve()
-        }
-      }
-
-      request.onerror = () => reject(request.error)
-    })
-  }
-
-  async clearAll(): Promise<void> {
-    if (!this.db) await this.init()
-
-    const transaction = this.db!.transaction(['heads'], 'readwrite')
-    const store = transaction.objectStore('heads')
-
-    return new Promise((resolve, reject) => {
-      const request = store.clear()
-
-      request.onsuccess = () => resolve()
-      request.onerror = () => reject(request.error)
-    })
-  }
-}
-
-export const headStorage = new HeadStorage()

apps/app-frontend/src/helpers/storage/skin-preview-storage.ts

@@ -1,4 +1,4 @@
-import type { RawRenderResult } from '../rendering/batch-skin-renderer'
+import type { RenderResult } from '../rendering/batch-skin-renderer'
 
 interface StoredPreview {
   forwards: Blob
@@ -30,15 +30,18 @@ export class SkinPreviewStorage {
     })
   }
 
-  async store(key: string, result: RawRenderResult): Promise<void> {
+  async store(key: string, result: RenderResult): Promise<void> {
     if (!this.db) await this.init()
 
+    const forwardsBlob = await fetch(result.forwards).then((r) => r.blob())
+    const backwardsBlob = await fetch(result.backwards).then((r) => r.blob())
+
     const transaction = this.db!.transaction(['previews'], 'readwrite')
     const store = transaction.objectStore('previews')
 
     const storedPreview: StoredPreview = {
-      forwards: result.forwards,
-      backwards: result.backwards,
+      forwards: forwardsBlob,
+      backwards: backwardsBlob,
       timestamp: Date.now(),
     }
 
@@ -50,7 +53,7 @@ export class SkinPreviewStorage {
     })
   }
 
-  async retrieve(key: string): Promise<RawRenderResult | null> {
+  async retrieve(key: string): Promise<RenderResult | null> {
     if (!this.db) await this.init()
 
     const transaction = this.db!.transaction(['previews'], 'readonly')
@@ -67,56 +70,14 @@ export class SkinPreviewStorage {
           return
         }
 
-        resolve({ forwards: result.forwards, backwards: result.backwards })
+        const forwards = URL.createObjectURL(result.forwards)
+        const backwards = URL.createObjectURL(result.backwards)
+        resolve({ forwards, backwards })
       }
       request.onerror = () => reject(request.error)
     })
   }
 
-  async batchRetrieve(keys: string[]): Promise<Record<string, RawRenderResult | null>> {
-    if (!this.db) await this.init()
-
-    const transaction = this.db!.transaction(['previews'], 'readonly')
-    const store = transaction.objectStore('previews')
-    const results: Record<string, RawRenderResult | null> = {}
-
-    return new Promise((resolve, _reject) => {
-      let completedRequests = 0
-
-      if (keys.length === 0) {
-        resolve(results)
-        return
-      }
-
-      for (const key of keys) {
-        const request = store.get(key)
-
-        request.onsuccess = () => {
-          const result = request.result as StoredPreview | undefined
-
-          if (result) {
-            results[key] = { forwards: result.forwards, backwards: result.backwards }
-          } else {
-            results[key] = null
-          }
-
-          completedRequests++
-          if (completedRequests === keys.length) {
-            resolve(results)
-          }
-        }
-
-        request.onerror = () => {
-          results[key] = null
-          completedRequests++
-          if (completedRequests === keys.length) {
-            resolve(results)
-          }
-        }
-      }
-    })
-  }
-
   async cleanupInvalidKeys(validKeys: Set<string>): Promise<number> {
     if (!this.db) await this.init()
 
@@ -152,67 +113,6 @@ export class SkinPreviewStorage {
       request.onerror = () => reject(request.error)
     })
   }
-
-  async debugCalculateStorage(): Promise<void> {
-    if (!this.db) await this.init()
-
-    const transaction = this.db!.transaction(['previews'], 'readonly')
-    const store = transaction.objectStore('previews')
-
-    let totalSize = 0
-    let count = 0
-    const entries: Array<{ key: string; size: number }> = []
-
-    return new Promise((resolve, reject) => {
-      const request = store.openCursor()
-
-      request.onsuccess = (event) => {
-        const cursor = (event.target as IDBRequest<IDBCursorWithValue>).result
-
-        if (cursor) {
-          const key = cursor.primaryKey as string
-          const value = cursor.value as StoredPreview
-
-          const entrySize = value.forwards.size + value.backwards.size
-          totalSize += entrySize
-          count++
-
-          entries.push({
-            key,
-            size: entrySize,
-          })
-
-          cursor.continue()
-        } else {
-          console.group('🗄️ Skin Preview Storage Debug Info')
-          console.log(`Total entries: ${count}`)
-          console.log(`Total size: ${(totalSize / 1024 / 1024).toFixed(2)} MB`)
-          console.log(
-            `Average size per entry: ${count > 0 ? (totalSize / count / 1024).toFixed(2) : 0} KB`,
-          )
-
-          if (entries.length > 0) {
-            const sortedEntries = entries.sort((a, b) => b.size - a.size)
-            console.log(
-              'Largest entry:',
-              sortedEntries[0].key,
-              '(' + (sortedEntries[0].size / 1024).toFixed(2) + ' KB)',
-            )
-            console.log(
-              'Smallest entry:',
-              sortedEntries[sortedEntries.length - 1].key,
-              '(' + (sortedEntries[sortedEntries.length - 1].size / 1024).toFixed(2) + ' KB)',
-            )
-          }
-
-          console.groupEnd()
-          resolve()
-        }
-      }
-
-      request.onerror = () => reject(request.error)
-    })
-  }
 }
 
 export const skinPreviewStorage = new SkinPreviewStorage()

apps/app-frontend/src/locales/en-US/index.json

@@ -377,12 +377,6 @@
   "instance.worlds.hardcore": {
     "message": "Hardcore mode"
   },
-  "instance.worlds.incompatible_server": {
-    "message": "Server is incompatible"
-  },
-  "instance.worlds.no_contact": {
-    "message": "Server couldn't be contacted"
-  },
   "instance.worlds.no_quick_play": {
     "message": "You can only jump straight into worlds on Minecraft 1.20+"
   },

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

@@ -220,7 +220,7 @@ async function refreshSearch() {
     }
   }
   results.value = rawResults.result
-  currentPage.value = 1
+  currentPage.value = Math.max(1, Math.min(pageCount.value, currentPage.value))
 
   const persistentParams: LocationQuery = {}
 
@@ -266,7 +266,6 @@ async function onSearchChangeToTop() {
 
 function clearSearch() {
   query.value = ''
-  currentPage.value = 1
 }
 
 watch(

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

@@ -38,7 +38,7 @@ import {
 import { get as getSettings } from '@/helpers/settings.ts'
 import { get_default_user, login as login_flow, users } from '@/helpers/auth'
 import type { RenderResult } from '@/helpers/rendering/batch-skin-renderer.ts'
-import { generateSkinPreviews, skinBlobUrlMap } from '@/helpers/rendering/batch-skin-renderer.ts'
+import { generateSkinPreviews, map } from '@/helpers/rendering/batch-skin-renderer.ts'
 import { handleSevereError } from '@/store/error'
 import { trackEvent } from '@/helpers/analytics'
 import type AccountsCard from '@/components/ui/AccountsCard.vue'
@@ -215,7 +215,7 @@ async function loadCurrentUser() {
 
 function getBakedSkinTextures(skin: Skin): RenderResult | undefined {
   const key = `${skin.texture_key}+${skin.variant}+${skin.cape_id ?? 'no-cape'}`
-  return skinBlobUrlMap.get(key)
+  return map.get(key)
 }
 
 async function login() {

apps/app-frontend/src/pages/instance/Logs.vue

@@ -483,7 +483,7 @@ onUnmounted(() => {
   display: flex;
   flex-direction: column;
   gap: 1rem;
-  height: 100vh;
+  height: calc(100vh - 11rem);
 }
 
 .button-row {

apps/app-playground/src/main.rs

@@ -15,7 +15,7 @@ pub async fn authenticate_run() -> theseus::Result<Credentials> {
     println!("A browser window will now open, follow the login flow there.");
     let login = minecraft_auth::begin_login().await?;
 
-    println!("Open URL {} in a browser", login.auth_request_uri.as_str());
+    println!("Open URL {} in a browser", login.redirect_uri.as_str());
 
     println!("Please enter URL code: ");
     let mut input = String::new();

apps/app/Cargo.toml

@@ -31,8 +31,6 @@ thiserror.workspace = true
 daedalus.workspace = true
 chrono.workspace = true
 either.workspace = true
-hyper = { workspace = true, features = ["server"] }
-hyper-util.workspace = true
 
 url.workspace = true
 urlencoding.workspace = true

apps/app/build.rs

@@ -120,12 +120,7 @@ fn main() {
             .plugin(
                 "mr-auth",
                 InlinedPlugin::new()
-                    .commands(&[
-                        "modrinth_login",
-                        "logout",
-                        "get",
-                        "cancel_modrinth_login",
-                    ])
+                    .commands(&["modrinth_login", "logout", "get"])
                     .default_permission(
                         DefaultPermissionRule::AllowAllCommands,
                     ),

apps/app/src/api/auth.rs

@@ -33,7 +33,7 @@ pub async fn login<R: Runtime>(
     let window = tauri::WebviewWindowBuilder::new(
         &app,
         "signin",
-        tauri::WebviewUrl::External(flow.auth_request_uri.parse().map_err(
+        tauri::WebviewUrl::External(flow.redirect_uri.parse().map_err(
             |_| {
                 theseus::ErrorKind::OtherError(
                     "Error parsing auth redirect URL".to_string(),
@@ -77,7 +77,6 @@ pub async fn login<R: Runtime>(
     window.close()?;
     Ok(None)
 }
-
 #[tauri::command]
 pub async fn remove_user(user: uuid::Uuid) -> Result<()> {
     Ok(minecraft_auth::remove_user(user).await?)

apps/app/src/api/mod.rs

@@ -22,8 +22,6 @@ pub mod cache;
 pub mod friends;
 pub mod worlds;
 
-mod oauth_utils;
-
 pub type Result<T> = std::result::Result<T, TheseusSerializableError>;
 
 // // Main returnable Theseus GUI error

apps/app/src/api/mr_auth.rs

@@ -1,70 +1,79 @@
 use crate::api::Result;
-use crate::api::TheseusSerializableError;
-use crate::api::oauth_utils;
-use tauri::Manager;
-use tauri::Runtime;
+use chrono::{Duration, Utc};
 use tauri::plugin::TauriPlugin;
-use tauri_plugin_opener::OpenerExt;
+use tauri::{Manager, Runtime, UserAttentionType};
 use theseus::prelude::*;
-use tokio::sync::oneshot;
 
 pub fn init<R: tauri::Runtime>() -> TauriPlugin<R> {
     tauri::plugin::Builder::new("mr-auth")
-        .invoke_handler(tauri::generate_handler![
-            modrinth_login,
-            logout,
-            get,
-            cancel_modrinth_login,
-        ])
+        .invoke_handler(tauri::generate_handler![modrinth_login, logout, get,])
         .build()
 }
 
 #[tauri::command]
 pub async fn modrinth_login<R: Runtime>(
     app: tauri::AppHandle<R>,
-) -> Result<ModrinthCredentials> {
-    let (auth_code_recv_socket_tx, auth_code_recv_socket) = oneshot::channel();
-    let auth_code = tokio::spawn(oauth_utils::auth_code_reply::listen(
-        auth_code_recv_socket_tx,
-    ));
+) -> Result<Option<ModrinthCredentials>> {
+    let redirect_uri = mr_auth::authenticate_begin_flow();
 
-    let auth_code_recv_socket = auth_code_recv_socket.await.unwrap()?;
+    let start = Utc::now();
 
-    let auth_request_uri = format!(
-        "{}?launcher=true&ipver={}&port={}",
-        mr_auth::authenticate_begin_flow(),
-        if auth_code_recv_socket.is_ipv4() {
-            "4"
-        } else {
-            "6"
-        },
-        auth_code_recv_socket.port()
-    );
-
-    app.opener()
-        .open_url(auth_request_uri, None::<&str>)
-        .map_err(|e| {
-            TheseusSerializableError::Theseus(
-                theseus::ErrorKind::OtherError(format!(
-                    "Failed to open auth request URI: {e}"
-                ))
-                .into(),
-            )
-        })?;
-
-    let Some(auth_code) = auth_code.await.unwrap()? else {
-        return Err(TheseusSerializableError::Theseus(
-            theseus::ErrorKind::OtherError("Login canceled".into()).into(),
-        ));
-    };
-
-    let credentials = mr_auth::authenticate_finish_flow(&auth_code).await?;
-
-    if let Some(main_window) = app.get_window("main") {
-        main_window.set_focus().ok();
+    if let Some(window) = app.get_webview_window("modrinth-signin") {
+        window.close()?;
     }
 
-    Ok(credentials)
+    let window = tauri::WebviewWindowBuilder::new(
+        &app,
+        "modrinth-signin",
+        tauri::WebviewUrl::External(redirect_uri.parse().map_err(|_| {
+            theseus::ErrorKind::OtherError(
+                "Error parsing auth redirect URL".to_string(),
+            )
+            .as_error()
+        })?),
+    )
+    .min_inner_size(420.0, 632.0)
+    .inner_size(420.0, 632.0)
+    .max_inner_size(420.0, 632.0)
+    .zoom_hotkeys_enabled(false)
+    .title("Sign into Modrinth")
+    .always_on_top(true)
+    .center()
+    .build()?;
+
+    window.request_user_attention(Some(UserAttentionType::Critical))?;
+
+    while (Utc::now() - start) < Duration::minutes(10) {
+        if window.title().is_err() {
+            // user closed window, cancelling flow
+            return Ok(None);
+        }
+
+        if window
+            .url()?
+            .as_str()
+            .starts_with("https://launcher-files.modrinth.com")
+        {
+            let url = window.url()?;
+
+            let code = url.query_pairs().find(|(key, _)| key == "code");
+
+            window.close()?;
+
+            return if let Some((_, code)) = code {
+                let val = mr_auth::authenticate_finish_flow(&code).await?;
+
+                Ok(Some(val))
+            } else {
+                Ok(None)
+            };
+        }
+
+        tokio::time::sleep(std::time::Duration::from_millis(50)).await;
+    }
+
+    window.close()?;
+    Ok(None)
 }
 
 #[tauri::command]
@@ -76,8 +85,3 @@ pub async fn logout() -> Result<()> {
 pub async fn get() -> Result<Option<ModrinthCredentials>> {
     Ok(theseus::mr_auth::get_credentials().await?)
 }
-
-#[tauri::command]
-pub fn cancel_modrinth_login() {
-    oauth_utils::auth_code_reply::stop_listeners();
-}

apps/app/src/api/oauth_utils/auth_code_reply.rs

@@ -1,159 +0,0 @@
-//! A minimal OAuth 2.0 authorization code grant flow redirection/reply loopback URI HTTP
-//! server implementation, compliant with [RFC 6749]'s authorization code grant flow and
-//! [RFC 8252]'s best current practices for OAuth 2.0 in native apps.
-//!
-//! This server is needed for the step 4 of the OAuth authentication dance represented in
-//! figure 1 of [RFC 8252].
-//!
-//! Further reading: https://www.oauth.com/oauth2-servers/oauth-native-apps/redirect-urls-for-native-apps/
-//!
-//! [RFC 6749]: https://datatracker.ietf.org/doc/html/rfc6749
-//! [RFC 8252]: https://datatracker.ietf.org/doc/html/rfc8252
-
-use std::{
-    net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
-    sync::{LazyLock, Mutex},
-    time::Duration,
-};
-
-use hyper::body::Incoming;
-use hyper_util::rt::{TokioIo, TokioTimer};
-use theseus::ErrorKind;
-use tokio::{
-    net::TcpListener,
-    sync::{broadcast, oneshot},
-};
-
-static SERVER_SHUTDOWN: LazyLock<broadcast::Sender<()>> =
-    LazyLock::new(|| broadcast::channel(1024).0);
-
-/// Starts a temporary HTTP server to receive OAuth 2.0 authorization code grant flow redirects
-/// on a loopback interface with an ephemeral port. The caller can know the bound socket address
-/// by listening on the counterpart channel for `listen_socket_tx`.
-///
-/// If the server is stopped before receiving an authorization code, `Ok(None)` is returned.
-pub async fn listen(
-    listen_socket_tx: oneshot::Sender<Result<SocketAddr, theseus::Error>>,
-) -> Result<Option<String>, theseus::Error> {
-    // IPv4 is tried first for the best compatibility and performance with most systems.
-    // IPv6 is also tried in case IPv4 is not available. Resolving "localhost" is avoided
-    // to prevent failures deriving from improper name resolution setup. Any available
-    // ephemeral port is used to prevent conflicts with other services. This is all as per
-    // RFC 8252's recommendations
-    const ANY_LOOPBACK_SOCKET: &[SocketAddr] = &[
-        SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), 0),
-        SocketAddr::new(IpAddr::V6(Ipv6Addr::LOCALHOST), 0),
-    ];
-
-    let listener = match TcpListener::bind(ANY_LOOPBACK_SOCKET).await {
-        Ok(listener) => {
-            listen_socket_tx
-                .send(listener.local_addr().map_err(|e| {
-                    ErrorKind::OtherError(format!(
-                        "Failed to get auth code reply socket address: {e}"
-                    ))
-                    .into()
-                }))
-                .ok();
-
-            listener
-        }
-        Err(e) => {
-            let error_msg =
-                format!("Failed to bind auth code reply socket: {e}");
-
-            listen_socket_tx
-                .send(Err(ErrorKind::OtherError(error_msg.clone()).into()))
-                .ok();
-
-            return Err(ErrorKind::OtherError(error_msg).into());
-        }
-    };
-
-    let mut auth_code = Mutex::new(None);
-    let mut shutdown_notification = SERVER_SHUTDOWN.subscribe();
-
-    while auth_code.get_mut().unwrap().is_none() {
-        let client_socket = tokio::select! {
-            biased;
-            _ = shutdown_notification.recv() => {
-                break;
-            }
-            conn_accept_result = listener.accept() => {
-                match conn_accept_result {
-                    Ok((socket, _)) => socket,
-                    Err(e) => {
-                        tracing::warn!("Failed to accept auth code reply: {e}");
-                        continue;
-                    }
-                }
-            }
-        };
-
-        if let Err(e) = hyper::server::conn::http1::Builder::new()
-            .keep_alive(false)
-            .header_read_timeout(Duration::from_secs(5))
-            .timer(TokioTimer::new())
-            .auto_date_header(false)
-            .serve_connection(
-                TokioIo::new(client_socket),
-                hyper::service::service_fn(|req| handle_reply(req, &auth_code)),
-            )
-            .await
-        {
-            tracing::warn!("Failed to handle auth code reply: {e}");
-        }
-    }
-
-    Ok(auth_code.into_inner().unwrap())
-}
-
-/// Stops any active OAuth 2.0 authorization code grant flow reply listening HTTP servers.
-pub fn stop_listeners() {
-    SERVER_SHUTDOWN.send(()).ok();
-}
-
-async fn handle_reply(
-    req: hyper::Request<Incoming>,
-    auth_code_out: &Mutex<Option<String>>,
-) -> Result<hyper::Response<String>, hyper::http::Error> {
-    if req.method() != hyper::Method::GET {
-        return hyper::Response::builder()
-            .status(hyper::StatusCode::METHOD_NOT_ALLOWED)
-            .header("Allow", "GET")
-            .body("".into());
-    }
-
-    // The authorization code is guaranteed to be sent as a "code" query parameter
-    // in the request URI query string as per RFC 6749 § 4.1.2
-    let auth_code = req.uri().query().and_then(|query_string| {
-        query_string
-            .split('&')
-            .filter_map(|query_pair| query_pair.split_once('='))
-            .find_map(|(key, value)| (key == "code").then_some(value))
-    });
-
-    let response = if let Some(auth_code) = auth_code {
-        *auth_code_out.lock().unwrap() = Some(auth_code.to_string());
-
-        hyper::Response::builder()
-            .status(hyper::StatusCode::OK)
-            .header("Content-Type", "text/html;charset=utf-8")
-            .body(
-                include_str!("auth_code_reply/page.html")
-                    .replace("{{title}}", "Success")
-                    .replace("{{message}}", "You have successfully signed in! You can close this page now."),
-            )
-    } else {
-        hyper::Response::builder()
-            .status(hyper::StatusCode::BAD_REQUEST)
-            .header("Content-Type", "text/html;charset=utf-8")
-            .body(
-                include_str!("auth_code_reply/page.html")
-                    .replace("{{title}}", "Error")
-                    .replace("{{message}}", "Authorization code not found. Please try signing in again."),
-            )
-    }?;
-
-    Ok(response)
-}

apps/app/src/api/oauth_utils/auth_code_reply/page.html

@@ -1 +0,0 @@
-<!doctype html><html class=dark-mode lang=en><meta content="width=device-width,initial-scale=1" name=viewport><title>Sign In - Modrinth App</title><style>*,:after,:before,::backdrop{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-scroll-snap-strictness:proximity;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:#3b82f680;--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000}.\!container{width:100%!important}.container{width:100%}@media (width>=640px){.\!container{max-width:640px!important}.container{max-width:640px}}@media (width>=768px){.\!container{max-width:768px!important}.container{max-width:768px}}@media (width>=1024px){.\!container{max-width:1024px!important}.container{max-width:1024px}}@media (width>=1280px){.\!container{max-width:1280px!important}.container{max-width:1280px}}@media (width>=1536px){.\!container{max-width:1536px!important}.container{max-width:1536px}}.pointer-events-none{pointer-events:none}.pointer-events-auto{pointer-events:auto}.visible{visibility:visible}.invisible{visibility:hidden}.collapse{visibility:collapse}.static{position:static}.\!fixed{position:fixed!important}.fixed{position:fixed}.absolute{position:absolute}.\!relative{position:relative!important}.relative{position:relative}.sticky{position:sticky}.inset-0{inset:0}.inset-\[calc\(-1rem-2px\)_-2rem\]{inset:calc(-1rem - 2px) -2rem}.-right-12{right:-3rem}.-top-12{top:-3rem}.-top-28{top:-7rem}.bottom-0{bottom:0}.bottom-1{bottom:.25rem}.bottom-\[10\%\]{bottom:10%}.bottom-\[18\%\]{bottom:18%}.bottom-\[250px\]{bottom:250px}.left-0{left:0}.left-1\/2{left:50%}.right-0{right:0}.right-2{right:.5rem}.right-8{right:2rem}.top-0{top:0}.top-0\.5{top:.125rem}.top-2{top:.5rem}.top-\[-4rem\]{top:-4rem}.top-\[18\%\]{top:18%}.top-\[3px\]{top:3px}.isolate{isolation:isolate}.-z-10{z-index:-10}.z-10{z-index:10}.z-50{z-index:50}.z-\[1\]{z-index:1}.col-span-2{grid-column:span 2/span 2}.col-span-3{grid-column:span 3/span 3}.col-span-full{grid-column:1/-1}.col-start-1{grid-column-start:1}.row-start-1{grid-row-start:1}.float-end{float:inline-end}.m-0{margin:0}.m-1{margin:.25rem}.m-2{margin:.5rem}.m-6{margin:1.5rem}.\!mx-2{margin-left:.5rem!important;margin-right:.5rem!important}.mx-1{margin-left:.25rem;margin-right:.25rem}.mx-2{margin-left:.5rem;margin-right:.5rem}.mx-3{margin-left:.75rem;margin-right:.75rem}.mx-auto{margin-left:auto;margin-right:auto}.my-0{margin-top:0;margin-bottom:0}.my-0\.5{margin-top:.125rem;margin-bottom:.125rem}.my-1{margin-top:.25rem;margin-bottom:.25rem}.my-2{margin-top:.5rem;margin-bottom:.5rem}.my-4{margin-top:1rem;margin-bottom:1rem}.my-auto{margin-top:auto;margin-bottom:auto}.mb-0{margin-bottom:0}.mb-0\.5{margin-bottom:.125rem}.mb-1{margin-bottom:.25rem}.mb-2{margin-bottom:.5rem}.mb-3{margin-bottom:.75rem}.mb-4{margin-bottom:1rem}.mb-5{margin-bottom:1.25rem}.ml-0{margin-left:0}.ml-0\.5{margin-left:.125rem}.ml-1{margin-left:.25rem}.ml-2{margin-left:.5rem}.ml-3{margin-left:.75rem}.ml-4{margin-left:1rem}.ml-8{margin-left:2rem}.ml-auto{margin-left:auto}.mr-1{margin-right:.25rem}.mr-3{margin-right:.75rem}.mt-0{margin-top:0}.mt-1{margin-top:.25rem}.mt-12{margin-top:3rem}.mt-2{margin-top:.5rem}.mt-3{margin-top:.75rem}.mt-4{margin-top:1rem}.mt-6{margin-top:1.5rem}.mt-9{margin-top:2.25rem}.mt-\[-1px\]{margin-top:-1px}.mt-auto{margin-top:auto}.mt-px{margin-top:1px}.line-clamp-1{-webkit-line-clamp:1;-webkit-box-orient:vertical;display:-webkit-box;overflow:hidden}.line-clamp-2{-webkit-line-clamp:2;-webkit-box-orient:vertical;display:-webkit-box;overflow:hidden}.line-clamp-3{-webkit-line-clamp:3;-webkit-box-orient:vertical;display:-webkit-box;overflow:hidden}.\!block{display:block!important}.block{display:block}.inline-block{display:inline-block}.\!inline{display:inline!important}.inline{display:inline}.\!flex{display:flex!important}.flex{display:flex}.inline-flex{display:inline-flex}.\!table{display:table!important}.table{display:table}.inline-table{display:inline-table}.table-caption{display:table-caption}.table-cell{display:table-cell}.table-column{display:table-column}.table-column-group{display:table-column-group}.table-footer-group{display:table-footer-group}.table-header-group{display:table-header-group}.table-row-group{display:table-row-group}.table-row{display:table-row}.\!grid{display:grid!important}.grid{display:grid}.contents{display:contents}.list-item{display:list-item}.\!hidden{display:none!important}.hidden{display:none}.aspect-\[10\/16\]{aspect-ratio:10/16}.aspect-\[16\/10\]{aspect-ratio:16/10}.aspect-\[2\/1\]{aspect-ratio:2}.aspect-\[5\/7\]{aspect-ratio:5/7}.aspect-square{aspect-ratio:1}.aspect-video{aspect-ratio:16/9}.size-1{width:.25rem;height:.25rem}.size-12{width:3rem;height:3rem}.size-3{width:.75rem;height:.75rem}.size-4{width:1rem;height:1rem}.size-48{width:12rem;height:12rem}.size-5{width:1.25rem;height:1.25rem}.siLine truncated

apps/app/src/api/oauth_utils/mod.rs

@@ -1,3 +0,0 @@
-//! Assorted utilities for OAuth 2.0 authorization flows.
-
-pub mod auth_code_reply;

apps/app/tauri.conf.json

@@ -63,7 +63,6 @@
         "height": 800,
         "resizable": true,
         "title": "Modrinth App",
-        "label": "main",
         "width": 1280,
         "minHeight": 700,
         "minWidth": 1100,

apps/daedalus_client/Dockerfile

@@ -1,19 +1,9 @@
-# syntax=docker/dockerfile:1
-
 FROM rust:1.88.0 AS build
 
 WORKDIR /usr/src/daedalus
 COPY . .
-RUN --mount=type=cache,target=/usr/src/daedalus/target \
-  --mount=type=cache,target=/usr/local/cargo/git/db \
-  --mount=type=cache,target=/usr/local/cargo/registry \
-  cargo build --release --package daedalus_client
+RUN cargo build --release --package daedalus_client
 
-FROM build AS artifacts
-
-RUN --mount=type=cache,target=/usr/src/daedalus/target \
-  mkdir /daedalus \
-  && cp /usr/src/daedalus/target/release/daedalus_client /daedalus/daedalus_client
 
 FROM debian:bookworm-slim
 
@@ -21,7 +11,7 @@ RUN apt-get update \
   && apt-get install -y --no-install-recommends ca-certificates openssl \
   && rm -rf /var/lib/apt/lists/*
 
-COPY --from=artifacts /daedalus /daedalus
-
+COPY --from=build /usr/src/daedalus/target/release/daedalus_client /daedalus/daedalus_client
 WORKDIR /daedalus_client
-CMD ["/daedalus/daedalus_client"]
+
+CMD /daedalus/daedalus_client

apps/docs/src/content/docs/contributing/labrinth.md

@@ -19,6 +19,8 @@ From there, you can create the database and perform all database migrations with
 sqlx database setup
 ```
 
+Finally, if on Linux, you will need the OpenSSL library. On Debian-based systems, this involves the `pkg-config` and `libssl-dev` packages.
+
 To enable labrinth to create a project, you need to add two things.
 
 1. An entry in the `loaders` table.

apps/frontend/package.json

@@ -38,10 +38,9 @@
     "@intercom/messenger-js-sdk": "^0.0.14",
     "@ltd/j-toml": "^1.38.0",
     "@modrinth/assets": "workspace:*",
-    "@modrinth/blog": "workspace:*",
-    "@modrinth/moderation": "workspace:*",
     "@modrinth/ui": "workspace:*",
     "@modrinth/utils": "workspace:*",
+    "@modrinth/blog": "workspace:*",
     "@pinia/nuxt": "^0.5.1",
     "@types/three": "^0.172.0",
     "@vintl/vintl": "^4.4.1",
@@ -59,7 +58,6 @@
     "markdown-it": "14.1.0",
     "pathe": "^1.1.2",
     "pinia": "^2.1.7",
-    "prettier": "^3.6.2",
     "qrcode.vue": "^3.4.0",
     "semver": "^7.5.4",
     "three": "^0.172.0",

apps/frontend/src/assets/styles/components.scss

@@ -197,13 +197,13 @@
   }
 
   > :where(
-    input + *,
-    .input-group + *,
-    .textarea-wrapper + *,
-    .chips + *,
-    .resizable-textarea-wrapper + *,
-    .input-div + *
-  ) {
+      input + *,
+      .input-group + *,
+      .textarea-wrapper + *,
+      .chips + *,
+      .resizable-textarea-wrapper + *,
+      .input-div + *
+    ) {
     &:not(:empty) {
       margin-block-start: var(--spacing-card-md);
     }

apps/frontend/src/assets/styles/global.scss

@@ -115,12 +115,10 @@ html {
   --shadow-inset-sm: inset 0px -1px 2px hsla(221, 39%, 11%, 0.15);
 
   --shadow-raised-lg: 0px 2px 4px hsla(221, 39%, 11%, 0.2);
-  --shadow-raised:
-    0.3px 0.5px 0.6px hsl(var(--shadow-color) / 0.15),
+  --shadow-raised: 0.3px 0.5px 0.6px hsl(var(--shadow-color) / 0.15),
     1px 2px 2.2px -1.7px hsl(var(--shadow-color) / 0.12),
     4.4px 8.8px 9.7px -3.4px hsl(var(--shadow-color) / 0.09);
-  --shadow-floating:
-    hsla(0, 0%, 0%, 0) 0px 0px 0px 0px, hsla(0, 0%, 0%, 0) 0px 0px 0px 0px,
+  --shadow-floating: hsla(0, 0%, 0%, 0) 0px 0px 0px 0px, hsla(0, 0%, 0%, 0) 0px 0px 0px 0px,
     hsla(0, 0%, 0%, 0.1) 0px 4px 6px -1px, hsla(0, 0%, 0%, 0.1) 0px 2px 4px -1px;
 
   --shadow-card: rgba(50, 50, 100, 0.1) 0px 2px 4px 0px;
@@ -152,8 +150,8 @@ html {
     rgba(255, 255, 255, 0.35) 0%,
     rgba(255, 255, 255, 0.2695) 100%
   );
-  --landing-blob-shadow:
-    2px 2px 12px rgba(0, 0, 0, 0.16), inset 2px 2px 64px rgba(255, 255, 255, 0.45);
+  --landing-blob-shadow: 2px 2px 12px rgba(0, 0, 0, 0.16),
+    inset 2px 2px 64px rgba(255, 255, 255, 0.45);
 
   --landing-card-bg: rgba(255, 255, 255, 0.8);
   --landing-card-shadow: 2px 2px 12px rgba(0, 0, 0, 0.16);
@@ -253,15 +251,13 @@ html {
 
   --shadow-raised-lg: 0px 2px 4px hsla(221, 39%, 11%, 0.2);
   --shadow-raised: 0px -2px 4px hsla(221, 39%, 11%, 0.1);
-  --shadow-floating:
-    hsla(0, 0%, 0%, 0) 0px 0px 0px 0px, hsla(0, 0%, 0%, 0) 0px 0px 0px 0px,
+  --shadow-floating: hsla(0, 0%, 0%, 0) 0px 0px 0px 0px, hsla(0, 0%, 0%, 0) 0px 0px 0px 0px,
     hsla(0, 0%, 0%, 0.1) 0px 4px 6px -1px, rgba(0, 0, 0, 0.06) 0px 2px 4px -1px;
 
   --shadow-card: rgba(0, 0, 0, 0.25) 0px 2px 4px 0px;
 
   --landing-maze-bg: url("https://cdn.modrinth.com/landing-new/landing.webp");
-  --landing-maze-gradient-bg:
-    linear-gradient(0deg, #31375f 0%, rgba(8, 14, 55, 0) 100%),
+  --landing-maze-gradient-bg: linear-gradient(0deg, #31375f 0%, rgba(8, 14, 55, 0) 100%),
     url("https://cdn.modrinth.com/landing-new/landing-lower.webp");
   --landing-maze-outer-bg: linear-gradient(180deg, #06060d 0%, #000000 100%);
 
@@ -288,8 +284,7 @@ html {
     rgba(44, 48, 79, 0.35) 0%,
     rgba(32, 35, 50, 0.2695) 100%
   );
-  --landing-blob-shadow:
-    2px 2px 12px rgba(0, 0, 0, 0.16), inset 2px 2px 64px rgba(57, 61, 94, 0.45);
+  --landing-blob-shadow: 2px 2px 12px rgba(0, 0, 0, 0.16), inset 2px 2px 64px rgba(57, 61, 94, 0.45);
 
   --landing-card-bg: rgba(59, 63, 85, 0.15);
   --landing-card-shadow: 2px 2px 12px rgba(0, 0, 0, 0.16);
@@ -365,9 +360,8 @@ body {
   // Defaults
   background-color: var(--color-bg);
   color: var(--color-text);
-  --font-standard:
-    Inter, -apple-system, BlinkMacSystemFont, Segoe UI, Oxygen, Ubuntu, Roboto, Cantarell,
-    Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
+  --font-standard: Inter, -apple-system, BlinkMacSystemFont, Segoe UI, Oxygen, Ubuntu, Roboto,
+    Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
   --mono-font: ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, Liberation Mono, monospace;
   font-family: var(--font-standard);
   font-size: 16px;

apps/frontend/src/components/ui/Notifications.vue

@@ -1,10 +1,7 @@
 <template>
   <div
     class="vue-notification-group experimental-styles-within"
-    :class="{
-      'intercom-present': isIntercomPresent,
-      rightwards: moveNotificationsRight,
-    }"
+    :class="{ 'intercom-present': isIntercomPresent }"
   >
     <transition-group name="notifs">
       <div
@@ -85,7 +82,6 @@ import {
   CopyIcon,
 } from "@modrinth/assets";
 const notifications = useNotifications();
-const { isVisible: moveNotificationsRight } = useNotificationRightwards();
 
 const isIntercomPresent = ref(false);
 
@@ -164,15 +160,6 @@ function copyToClipboard(notif) {
     bottom: 5rem;
   }
 
-  &.rightwards {
-    right: unset !important;
-    left: 1.5rem;
-
-    @media screen and (max-width: 500px) {
-      left: 0.75rem;
-    }
-  }
-
   .vue-notification-wrapper {
     width: 100%;
     overflow: hidden;

apps/frontend/src/components/ui/moderation/ChecklistKeybindsModal.vue

@@ -1,116 +0,0 @@
-<template>
-  <NewModal ref="modal" header="Moderation shortcuts" :closable="true">
-    <div>
-      <div class="keybinds-sections">
-        <div class="grid grid-cols-2 gap-x-12 gap-y-3">
-          <div
-            v-for="keybind in keybinds"
-            :key="keybind.id"
-            class="keybind-item flex items-center justify-between gap-4"
-            :class="{
-              'col-span-2': keybinds.length % 2 === 1 && keybinds[keybinds.length - 1] === keybind,
-            }"
-          >
-            <span class="text-sm text-secondary">{{ keybind.description }}</span>
-            <div class="flex items-center gap-1">
-              <kbd
-                v-for="(key, index) in parseKeybindDisplay(keybind.keybind)"
-                :key="`${keybind.id}-key-${index}`"
-                class="keybind-key"
-              >
-                {{ key }}
-              </kbd>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </NewModal>
-</template>
-
-<script setup lang="ts">
-import { ref, computed } from "vue";
-import NewModal from "@modrinth/ui/src/components/modal/NewModal.vue";
-import { keybinds, type KeybindListener, normalizeKeybind } from "@modrinth/moderation";
-
-const modal = ref<InstanceType<typeof NewModal>>();
-
-function parseKeybindDisplay(keybind: KeybindListener["keybind"]): string[] {
-  const keybinds = Array.isArray(keybind) ? keybind : [keybind];
-  const normalized = keybinds[0];
-  const def = normalizeKeybind(normalized);
-
-  const keys = [];
-
-  if (def.ctrl || def.meta) {
-    keys.push(isMac() ? "CMD" : "CTRL");
-  }
-  if (def.shift) keys.push("SHIFT");
-  if (def.alt) keys.push("ALT");
-
-  const mainKey = def.key
-    .replace("ArrowLeft", "←")
-    .replace("ArrowRight", "→")
-    .replace("ArrowUp", "↑")
-    .replace("ArrowDown", "↓")
-    .replace("Enter", "↵")
-    .replace("Space", "SPACE")
-    .replace("Escape", "ESC")
-    .toUpperCase();
-
-  keys.push(mainKey);
-
-  return keys;
-}
-
-function isMac() {
-  return navigator.platform.toUpperCase().indexOf("MAC") >= 0;
-}
-
-function show(event?: MouseEvent) {
-  modal.value?.show(event);
-}
-
-function hide() {
-  modal.value?.hide();
-}
-
-defineExpose({
-  show,
-  hide,
-});
-</script>
-
-<style scoped lang="scss">
-.keybind-key {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  min-width: 2rem;
-  padding: 0.25rem 0.5rem;
-  background-color: var(--color-bg);
-  border: 1px solid var(--color-divider);
-  border-radius: 0.375rem;
-  font-size: 0.75rem;
-  font-weight: 600;
-  text-transform: uppercase;
-  color: var(--color-contrast);
-
-  + .keybind-key {
-    margin-left: 0.25rem;
-  }
-}
-
-.keybind-item {
-  min-height: 2rem;
-}
-
-@media (max-width: 768px) {
-  .keybinds-sections {
-    .grid {
-      grid-template-columns: 1fr;
-      gap: 0.75rem;
-    }
-  }
-}
-</style>

apps/frontend/src/components/ui/moderation/ModpackPermissionsFlow.vue

@@ -1,513 +0,0 @@
-<template>
-  <div>
-    <h2 v-if="modPackData" class="m-0 mb-2 text-lg font-extrabold">
-      Modpack permissions ({{ Math.min(modPackData.length, currentIndex + 1) }} /
-      {{ modPackData.length }})
-    </h2>
-
-    <div v-if="!modPackData">Loading data...</div>
-
-    <div v-else-if="modPackData.length === 0">
-      <p>All permissions already obtained.</p>
-    </div>
-
-    <div v-else-if="!modPackData[currentIndex]">
-      <p>All permission checks complete!</p>
-    </div>
-
-    <div v-else>
-      <div v-if="modPackData[currentIndex].type === 'unknown'">
-        <p>What is the approval type of {{ modPackData[currentIndex].file_name }}?</p>
-        <div class="input-group">
-          <ButtonStyled
-            v-for="(option, index) in fileApprovalTypes"
-            :key="index"
-            :color="modPackData[currentIndex].status === option.id ? 'brand' : 'standard'"
-            @click="setStatus(currentIndex, option.id)"
-          >
-            <button>
-              {{ option.name }}
-            </button>
-          </ButtonStyled>
-        </div>
-        <div v-if="modPackData[currentIndex].status !== 'unidentified'" class="flex flex-col gap-1">
-          <label for="proof">
-            <span class="label__title">Proof</span>
-          </label>
-          <input
-            id="proof"
-            v-model="(modPackData[currentIndex] as ModerationUnknownModpackItem).proof"
-            type="text"
-            autocomplete="off"
-            placeholder="Enter proof of status..."
-            @input="persistAll()"
-          />
-          <label for="link">
-            <span class="label__title">Link</span>
-          </label>
-          <input
-            id="link"
-            v-model="(modPackData[currentIndex] as ModerationUnknownModpackItem).url"
-            type="text"
-            autocomplete="off"
-            placeholder="Enter link of project..."
-            @input="persistAll()"
-          />
-          <label for="title">
-            <span class="label__title">Title</span>
-          </label>
-          <input
-            id="title"
-            v-model="(modPackData[currentIndex] as ModerationUnknownModpackItem).title"
-            type="text"
-            autocomplete="off"
-            placeholder="Enter title of project..."
-            @input="persistAll()"
-          />
-        </div>
-      </div>
-
-      <div v-else-if="modPackData[currentIndex].type === 'flame'">
-        <p>
-          What is the approval type of {{ modPackData[currentIndex].title }} (<a
-            :href="modPackData[currentIndex].url"
-            target="_blank"
-            class="text-link"
-            >{{ modPackData[currentIndex].url }}</a
-          >)?
-        </p>
-        <div class="input-group">
-          <ButtonStyled
-            v-for="(option, index) in fileApprovalTypes"
-            :key="index"
-            :color="modPackData[currentIndex].status === option.id ? 'brand' : 'standard'"
-            @click="setStatus(currentIndex, option.id)"
-          >
-            <button>
-              {{ option.name }}
-            </button>
-          </ButtonStyled>
-        </div>
-      </div>
-
-      <div
-        v-if="
-          ['unidentified', 'no', 'with-attribution'].includes(
-            modPackData[currentIndex].status || '',
-          )
-        "
-      >
-        <p v-if="modPackData[currentIndex].status === 'unidentified'">
-          Does this project provide identification and permission for
-          <strong>{{ modPackData[currentIndex].file_name }}</strong
-          >?
-        </p>
-        <p v-else-if="modPackData[currentIndex].status === 'with-attribution'">
-          Does this project provide attribution for
-          <strong>{{ modPackData[currentIndex].file_name }}</strong
-          >?
-        </p>
-        <p v-else>
-          Does this project provide proof of permission for
-          <strong>{{ modPackData[currentIndex].file_name }}</strong
-          >?
-        </p>
-        <div class="input-group">
-          <ButtonStyled
-            v-for="(option, index) in filePermissionTypes"
-            :key="index"
-            :color="modPackData[currentIndex].approved === option.id ? 'brand' : 'standard'"
-            @click="setApproval(currentIndex, option.id)"
-          >
-            <button>
-              {{ option.name }}
-            </button>
-          </ButtonStyled>
-        </div>
-      </div>
-    </div>
-
-    <div class="mt-4 flex gap-2">
-      <ButtonStyled>
-        <button :disabled="currentIndex <= 0" @click="goToPrevious">
-          <LeftArrowIcon aria-hidden="true" />
-          Previous
-        </button>
-      </ButtonStyled>
-      <ButtonStyled v-if="modPackData && currentIndex < modPackData.length" color="blue">
-        <button :disabled="!canGoNext" @click="goToNext">
-          <RightArrowIcon aria-hidden="true" />
-          {{ currentIndex + 1 >= modPackData.length ? "Complete" : "Next" }}
-        </button>
-      </ButtonStyled>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { LeftArrowIcon, RightArrowIcon } from "@modrinth/assets";
-import type {
-  ModerationJudgements,
-  ModerationModpackItem,
-  ModerationModpackResponse,
-  ModerationUnknownModpackItem,
-  ModerationFlameModpackItem,
-  ModerationModpackPermissionApprovalType,
-  ModerationPermissionType,
-} from "@modrinth/utils";
-import { ButtonStyled } from "@modrinth/ui";
-import { ref, computed, watch, onMounted } from "vue";
-import { useLocalStorage, useSessionStorage } from "@vueuse/core";
-
-const props = defineProps<{
-  projectId: string;
-  modelValue?: ModerationJudgements;
-}>();
-
-const emit = defineEmits<{
-  complete: [];
-  "update:modelValue": [judgements: ModerationJudgements];
-}>();
-
-const persistedModPackData = useLocalStorage<ModerationModpackItem[] | null>(
-  `modpack-permissions-${props.projectId}`,
-  null,
-  {
-    serializer: {
-      read: (v: any) => (v ? JSON.parse(v) : null),
-      write: (v: any) => JSON.stringify(v),
-    },
-  },
-);
-
-const persistedIndex = useLocalStorage<number>(`modpack-permissions-index-${props.projectId}`, 0);
-
-const modPackData = useSessionStorage<ModerationModpackItem[] | null>(
-  `modpack-permissions-data-${props.projectId}`,
-  null,
-  {
-    serializer: {
-      read: (v: any) => (v ? JSON.parse(v) : null),
-      write: (v: any) => JSON.stringify(v),
-    },
-  },
-);
-const permanentNoFiles = useSessionStorage<ModerationModpackItem[]>(
-  `modpack-permissions-permanent-no-${props.projectId}`,
-  [],
-  {
-    serializer: {
-      read: (v: any) => (v ? JSON.parse(v) : []),
-      write: (v: any) => JSON.stringify(v),
-    },
-  },
-);
-const currentIndex = ref(0);
-
-const fileApprovalTypes: ModerationModpackPermissionApprovalType[] = [
-  {
-    id: "yes",
-    name: "Yes",
-  },
-  {
-    id: "with-attribution-and-source",
-    name: "With attribution and source",
-  },
-  {
-    id: "with-attribution",
-    name: "With attribution",
-  },
-  {
-    id: "no",
-    name: "No",
-  },
-  {
-    id: "permanent-no",
-    name: "Permanent no",
-  },
-  {
-    id: "unidentified",
-    name: "Unidentified",
-  },
-];
-
-const filePermissionTypes: ModerationPermissionType[] = [
-  { id: "yes", name: "Yes" },
-  { id: "no", name: "No" },
-];
-
-function persistAll() {
-  persistedModPackData.value = modPackData.value;
-  persistedIndex.value = currentIndex.value;
-}
-
-watch(
-  modPackData,
-  (newValue) => {
-    persistedModPackData.value = newValue;
-  },
-  { deep: true },
-);
-
-watch(currentIndex, (newValue) => {
-  persistedIndex.value = newValue;
-});
-
-function loadPersistedData(): void {
-  if (persistedModPackData.value) {
-    modPackData.value = persistedModPackData.value;
-  }
-  currentIndex.value = persistedIndex.value;
-}
-
-function clearPersistedData(): void {
-  persistedModPackData.value = null;
-  persistedIndex.value = 0;
-}
-
-async function fetchModPackData(): Promise<void> {
-  try {
-    const data = (await useBaseFetch(`moderation/project/${props.projectId}`, {
-      internal: true,
-    })) as ModerationModpackResponse;
-
-    const permanentNoItems: ModerationModpackItem[] = Object.entries(data.identified || {})
-      .filter(([_, file]) => file.status === "permanent-no")
-      .map(
-        ([sha1, file]): ModerationModpackItem => ({
-          sha1,
-          file_name: file.file_name,
-          type: "identified",
-          status: file.status,
-          approved: null,
-        }),
-      )
-      .sort((a, b) => a.file_name.localeCompare(b.file_name));
-
-    permanentNoFiles.value = permanentNoItems;
-
-    const sortedData: ModerationModpackItem[] = [
-      ...Object.entries(data.identified || {})
-        .filter(
-          ([_, file]) =>
-            file.status !== "yes" &&
-            file.status !== "with-attribution-and-source" &&
-            file.status !== "permanent-no",
-        )
-        .map(
-          ([sha1, file]): ModerationModpackItem => ({
-            sha1,
-            file_name: file.file_name,
-            type: "identified",
-            status: file.status,
-            approved: null,
-            ...(file.status === "unidentified" && {
-              proof: "",
-              url: "",
-              title: "",
-            }),
-          }),
-        )
-        .sort((a, b) => a.file_name.localeCompare(b.file_name)),
-      ...Object.entries(data.unknown_files || {})
-        .map(
-          ([sha1, fileName]): ModerationUnknownModpackItem => ({
-            sha1,
-            file_name: fileName,
-            type: "unknown",
-            status: null,
-            approved: null,
-            proof: "",
-            url: "",
-            title: "",
-          }),
-        )
-        .sort((a, b) => a.file_name.localeCompare(b.file_name)),
-      ...Object.entries(data.flame_files || {})
-        .map(
-          ([sha1, info]): ModerationFlameModpackItem => ({
-            sha1,
-            file_name: info.file_name,
-            type: "flame",
-            status: null,
-            approved: null,
-            id: info.id,
-            title: info.title || info.file_name,
-            url: info.url || `https://www.curseforge.com/minecraft/mc-mods/${info.id}`,
-          }),
-        )
-        .sort((a, b) => a.file_name.localeCompare(b.file_name)),
-    ];
-
-    if (modPackData.value) {
-      const existingMap = new Map(modPackData.value.map((item) => [item.sha1, item]));
-
-      sortedData.forEach((item) => {
-        const existing = existingMap.get(item.sha1);
-        if (existing) {
-          Object.assign(item, {
-            status: existing.status,
-            approved: existing.approved,
-            ...(item.type === "unknown" && {
-              proof: (existing as ModerationUnknownModpackItem).proof || "",
-              url: (existing as ModerationUnknownModpackItem).url || "",
-              title: (existing as ModerationUnknownModpackItem).title || "",
-            }),
-            ...(item.type === "flame" && {
-              url: (existing as ModerationFlameModpackItem).url || item.url,
-              title: (existing as ModerationFlameModpackItem).title || item.title,
-            }),
-          });
-        }
-      });
-    }
-
-    modPackData.value = sortedData;
-    persistAll();
-  } catch (error) {
-    console.error("Failed to fetch modpack data:", error);
-    modPackData.value = [];
-    permanentNoFiles.value = [];
-    persistAll();
-  }
-}
-
-function goToPrevious(): void {
-  if (currentIndex.value > 0) {
-    currentIndex.value--;
-    persistAll();
-  }
-}
-
-watch(
-  modPackData,
-  (newValue) => {
-    persistedModPackData.value = newValue;
-  },
-  { deep: true },
-);
-
-function goToNext(): void {
-  if (modPackData.value && currentIndex.value < modPackData.value.length) {
-    currentIndex.value++;
-
-    if (currentIndex.value >= modPackData.value.length) {
-      const judgements = getJudgements();
-      emit("update:modelValue", judgements);
-      emit("complete");
-      clearPersistedData();
-    } else {
-      persistAll();
-    }
-  }
-}
-
-function setStatus(index: number, status: ModerationModpackPermissionApprovalType["id"]): void {
-  if (modPackData.value && modPackData.value[index]) {
-    modPackData.value[index].status = status;
-    modPackData.value[index].approved = null;
-    persistAll();
-    emit("update:modelValue", getJudgements());
-  }
-}
-
-function setApproval(index: number, approved: ModerationPermissionType["id"]): void {
-  if (modPackData.value && modPackData.value[index]) {
-    modPackData.value[index].approved = approved;
-    persistAll();
-    emit("update:modelValue", getJudgements());
-  }
-}
-
-const canGoNext = computed(() => {
-  if (!modPackData.value || !modPackData.value[currentIndex.value]) return false;
-  const current = modPackData.value[currentIndex.value];
-  return current.status !== null;
-});
-
-function getJudgements(): ModerationJudgements {
-  if (!modPackData.value) return {};
-
-  const judgements: ModerationJudgements = {};
-
-  modPackData.value.forEach((item) => {
-    if (item.type === "flame") {
-      judgements[item.sha1] = {
-        type: "flame",
-        id: item.id,
-        status: item.status,
-        link: item.url,
-        title: item.title,
-        file_name: item.file_name,
-      };
-    } else if (item.type === "unknown") {
-      judgements[item.sha1] = {
-        type: "unknown",
-        status: item.status,
-        proof: item.proof,
-        link: item.url,
-        title: item.title,
-        file_name: item.file_name,
-      };
-    }
-  });
-
-  return judgements;
-}
-
-onMounted(() => {
-  loadPersistedData();
-  if (!modPackData.value) {
-    fetchModPackData();
-  }
-});
-
-watch(
-  modPackData,
-  (newValue) => {
-    if (newValue && newValue.length === 0) {
-      emit("complete");
-      clearPersistedData();
-    }
-  },
-  { immediate: true },
-);
-
-watch(
-  () => props.projectId,
-  () => {
-    clearPersistedData();
-    loadPersistedData();
-    if (!modPackData.value) {
-      fetchModPackData();
-    }
-  },
-);
-
-function getModpackFiles(): {
-  interactive: ModerationModpackItem[];
-  permanentNo: ModerationModpackItem[];
-} {
-  return {
-    interactive: modPackData.value || [],
-    permanentNo: permanentNoFiles.value,
-  };
-}
-
-defineExpose({
-  getModpackFiles,
-});
-</script>
-
-<style scoped>
-.input-group {
-  display: flex;
-  gap: 0.5rem;
-  margin-top: 0.5rem;
-  margin-bottom: 0.5rem;
-}
-
-.modpack-buttons {
-  margin-top: 1rem;
-}
-</style>

apps/frontend/src/components/ui/report/ReportInfo.vue

@@ -172,7 +172,6 @@ const flags = useFeatureFlags();
 
   .markdown-body {
     grid-area: body;
-    max-width: 100%;
   }
 
   .reporter-info {

apps/frontend/src/components/ui/report/ReportsList.vue

@@ -1,21 +1,13 @@
 <template>
-  <template v-if="moderation">
-    <Chips v-model="reasonFilter" :items="reasons" />
-    <p v-if="reports.length === MAX_REPORTS" class="text-red">
-      There are at least {{ MAX_REPORTS }} open reports. This page is at its max reports and will
-      not show any more recent ones.
-    </p>
-    <p v-else-if="reasonFilter === 'All'">There are {{ filteredReports.length }} open reports.</p>
-    <p v-else>
-      There are {{ filteredReports.length }}/{{ reports.length }} open '{{ reasonFilter }}' reports.
-    </p>
-  </template>
   <ReportInfo
-    v-for="report in filteredReports"
+    v-for="report in reports.filter(
+      (x) =>
+        (moderation || x.reporterUser.id === auth.user.id) &&
+        (viewMode === 'open' ? x.open : !x.open),
+    )"
     :key="report.id"
     :report="report"
     :thread="report.thread"
-    :show-message="false"
     :moderation="moderation"
     raised
     :auth="auth"
@@ -24,12 +16,11 @@
   <p v-if="reports.length === 0">You don't have any active reports.</p>
 </template>
 <script setup>
-import { Chips } from "@modrinth/ui";
 import ReportInfo from "~/components/ui/report/ReportInfo.vue";
 import { addReportMessage } from "~/helpers/threads.js";
 import { asEncodedJsonArray, fetchSegmented } from "~/utils/fetch-helpers.ts";
 
-const props = defineProps({
+defineProps({
   moderation: {
     type: Boolean,
     default: false,
@@ -41,14 +32,9 @@ const props = defineProps({
 });
 
 const viewMode = ref("open");
-const reasonFilter = ref("All");
 const reports = ref([]);
 
-const MAX_REPORTS = 1500;
-
-let { data: rawReports } = await useAsyncData("report", () =>
-  useBaseFetch(`report?count=${MAX_REPORTS}`),
-);
+let { data: rawReports } = await useAsyncData("report", () => useBaseFetch("report?count=1000"));
 
 rawReports = rawReports.value.map((report) => {
   report.item_id = report.item_id.replace(/"/g, "");
@@ -65,7 +51,6 @@ const userIds = [...new Set(reporterUsers.concat(reportedUsers))];
 const threadIds = [
   ...new Set(rawReports.filter((report) => report.thread_id).map((report) => report.thread_id)),
 ];
-const reasons = ["All", ...new Set(rawReports.map((report) => report.report_type))];
 
 const [{ data: users }, { data: versions }, { data: threads }] = await Promise.all([
   await useAsyncData(`users?ids=${JSON.stringify(userIds)}`, () =>
@@ -108,13 +93,4 @@ reports.value = rawReports.map((report) => {
   report.open = true;
   return report;
 });
-
-const filteredReports = computed(() =>
-  reports.value?.filter(
-    (x) =>
-      (props.moderation || x.reporterUser.id === props.auth.user.id) &&
-      (viewMode.value === "open" ? x.open : !x.open) &&
-      (reasonFilter.value === "All" || reasonFilter.value === x.report_type),
-  ),
-);
 </script>

apps/frontend/src/components/ui/servers/ContentVersionEditModal.vue

@@ -31,9 +31,9 @@
                 class="flex cursor-pointer items-center gap-1 bg-transparent p-0"
                 @click="
                   versionFilter &&
-                  (unlockFilterAccordion.isOpen
-                    ? unlockFilterAccordion.close()
-                    : unlockFilterAccordion.open())
+                    (unlockFilterAccordion.isOpen
+                      ? unlockFilterAccordion.close()
+                      : unlockFilterAccordion.open())
                 "
               >
                 <TagItem

apps/frontend/src/composables/servers/modrinth-servers.ts

@@ -194,12 +194,13 @@ export class ModrinthServer {
   }
 
   async testNodeReachability(): Promise<boolean> {
-    if (!this.general?.node?.instance) {
-      console.warn("No node instance available for ping test");
+    if (!this.general?.datacenter) {
+      console.warn("No datacenter info available for ping test");
       return false;
     }
 
-    const wsUrl = `wss://${this.general.node.instance}/pingtest`;
+    const datacenter = this.general.datacenter;
+    const wsUrl = `wss://${datacenter}.nodes.modrinth.com/pingtest`;
 
     try {
       return await new Promise((resolve) => {

apps/frontend/src/composables/servers/servers-fetch.ts

@@ -112,8 +112,7 @@ export async function useServersFetch<T>(
       const response = await $fetch<T>(fullUrl, {
         method,
         headers,
-        body:
-          body && contentType === "application/json" ? JSON.stringify(body) : (body ?? undefined),
+        body: body && contentType === "application/json" ? JSON.stringify(body) : body ?? undefined,
         timeout: 10000,
       });
 

apps/frontend/src/composables/util.ts

@@ -1,12 +0,0 @@
-export const useNotificationRightwards = () => {
-  const isVisible = useState("moderation-checklist-notifications", () => false);
-
-  const setVisible = (visible: boolean) => {
-    isVisible.value = visible;
-  };
-
-  return {
-    isVisible: readonly(isVisible),
-    setVisible,
-  };
-};

apps/frontend/src/layouts/default.vue

@@ -700,6 +700,7 @@ import {
   PackageOpenIcon,
   DiscordIcon,
   BlueskyIcon,
+  TumblrIcon,
   TwitterIcon,
   MastodonIcon,
   GithubIcon,
@@ -1184,6 +1185,13 @@ const socialLinks = [
     icon: MastodonIcon,
     rel: "me",
   },
+  {
+    label: formatMessage(
+      defineMessage({ id: "layout.footer.social.tumblr", defaultMessage: "Tumblr" }),
+    ),
+    href: "https://tumblr.com/modrinth",
+    icon: TumblrIcon,
+  },
   {
     label: formatMessage(defineMessage({ id: "layout.footer.social.x", defaultMessage: "X" })),
     href: "https://x.com/modrinth",
@@ -1338,15 +1346,6 @@ const footerLinks = [
           }),
         ),
       },
-      {
-        href: "/legal/copyright",
-        label: formatMessage(
-          defineMessage({
-            id: "layout.footer.legal.copyright-policy",
-            defaultMessage: "Copyright Policy and DMCA",
-          }),
-        ),
-      },
     ],
   },
 ];

apps/frontend/src/locales/en-US/index.json

@@ -383,15 +383,15 @@
   "layout.footer.about": {
     "message": "About"
   },
+  "layout.footer.about.news": {
+    "message": "News"
+  },
   "layout.footer.about.careers": {
     "message": "Careers"
   },
   "layout.footer.about.changelog": {
     "message": "Changelog"
   },
-  "layout.footer.about.news": {
-    "message": "News"
-  },
   "layout.footer.about.rewards-program": {
     "message": "Rewards Program"
   },
@@ -404,9 +404,6 @@
   "layout.footer.legal-disclaimer": {
     "message": "NOT AN OFFICIAL MINECRAFT SERVICE. NOT APPROVED BY OR ASSOCIATED WITH MOJANG OR MICROSOFT."
   },
-  "layout.footer.legal.copyright-policy": {
-    "message": "Copyright Policy and DMCA"
-  },
   "layout.footer.legal.privacy-policy": {
     "message": "Privacy Policy"
   },
@@ -461,6 +458,9 @@
   "layout.footer.social.mastodon": {
     "message": "Mastodon"
   },
+  "layout.footer.social.tumblr": {
+    "message": "Tumblr"
+  },
   "layout.footer.social.x": {
     "message": "X"
   },

apps/frontend/src/pages/[type]/[id].vue

@@ -29,11 +29,12 @@
             class="settings-header__icon"
           />
           <div class="settings-header__text">
-            <h1 class="wrap-as-needed">{{ project.title }}</h1>
+            <h1 class="wrap-as-needed">
+              {{ project.title }}
+            </h1>
             <ProjectStatusBadge :status="project.status" />
           </div>
         </div>
-
         <h2>Project settings</h2>
         <NavStack>
           <NavStackItem
@@ -110,7 +111,6 @@
         </NavStack>
       </aside>
     </div>
-
     <div class="normal-page__content">
       <ProjectMemberHeader
         v-if="currentMember"
@@ -145,7 +145,6 @@
       />
     </div>
   </div>
-
   <div v-else class="experimental-styles-within">
     <NewModal ref="settingsModal">
       <template #title>
@@ -175,11 +174,9 @@
         <div
           class="animation-ring-3 flex items-center justify-center rounded-full border-4 border-solid border-brand bg-brand-highlight opacity-40"
         ></div>
-
         <div
           class="animation-ring-2 flex items-center justify-center rounded-full border-4 border-solid border-brand bg-brand-highlight opacity-60"
         ></div>
-
         <div
           class="animation-ring-1 flex items-center justify-center rounded-full border-4 border-solid border-brand bg-brand-highlight"
         >
@@ -222,7 +219,8 @@
                   :href="`modrinth://mod/${project.slug}`"
                   @click="() => installWithApp()"
                 >
-                  <ModrinthIcon aria-hidden="true" /> Install with Modrinth App
+                  <ModrinthIcon aria-hidden="true" />
+                  Install with Modrinth App
                   <ExternalIcon aria-hidden="true" />
                 </a>
               </ButtonStyled>
@@ -242,7 +240,6 @@
               <div class="flex h-[2px] w-full rounded-2xl bg-button-bg"></div>
             </div>
           </div>
-
           <div class="mx-auto flex w-fit flex-col gap-2">
             <ButtonStyled v-if="project.game_versions.length === 1">
               <div class="disabled button-like">
@@ -330,7 +327,8 @@
                       }
                     "
                   >
-                    {{ gameVersion }} <CheckIcon v-if="userSelectedGameVersion === gameVersion" />
+                    {{ gameVersion }}
+                    <CheckIcon v-if="userSelectedGameVersion === gameVersion" />
                   </button>
                 </ButtonStyled>
               </ScrollablePanel>
@@ -421,6 +419,7 @@
               </ScrollablePanel>
             </Accordion>
           </div>
+
           <AutomaticAccordion div class="flex flex-col gap-2">
             <VersionSummary
               v-if="filteredRelease"
@@ -471,14 +470,10 @@
       class="new-page sidebar"
       :class="{
         'alt-layout': cosmetics.leftContentLayout,
-        'checklist-open':
+        'ultimate-sidebar':
           showModerationChecklist &&
           !collapsedModerationChecklist &&
           !flags.alwaysShowChecklistAsPopup,
-        'checklist-collapsed':
-          showModerationChecklist &&
-          collapsedModerationChecklist &&
-          !flags.alwaysShowChecklistAsPopup,
       }"
     >
       <div class="normal-page__header relative my-4">
@@ -490,11 +485,11 @@
                 :color="route.name === 'type-id-version-version' ? `standard` : `brand`"
               >
                 <button @click="(event) => downloadModal.show(event)">
-                  <DownloadIcon aria-hidden="true" /> Download
+                  <DownloadIcon aria-hidden="true" />
+                  Download
                 </button>
               </ButtonStyled>
             </div>
-
             <div class="contents sm:hidden">
               <ButtonStyled
                 size="large"
@@ -559,11 +554,9 @@
                       </button>
                     </ButtonStyled>
                   </div>
-
                   <p class="m-0 text-wrap text-sm font-medium leading-tight text-secondary">
                     Modrinth Servers is the easiest way to play with your friends without hassle!
                   </p>
-
                   <p class="m-0 text-wrap text-sm font-bold text-primary">
                     Starting at $5<span class="text-xs"> / month</span>
                   </p>
@@ -628,7 +621,6 @@
                         {{ option.name }}
                       </Checkbox>
                     </div>
-
                     <div v-else class="menu-text">
                       <p class="popout-text">No collections found.</p>
                     </div>
@@ -636,7 +628,8 @@
                       class="btn collection-button"
                       @click="(event) => $refs.modal_collection.show(event)"
                     >
-                      <PlusIcon aria-hidden="true" /> Create new collection
+                      <PlusIcon aria-hidden="true" />
+                      Create new collection
                     </button>
                   </template>
                 </PopoutMenu>
@@ -719,14 +712,25 @@
                 :dropdown-id="`${baseId}-more-options`"
               >
                 <MoreVerticalIcon aria-hidden="true" />
-                <template #analytics> <ChartIcon aria-hidden="true" /> Analytics </template>
+                <template #analytics>
+                  <ChartIcon aria-hidden="true" />
+                  Analytics
+                </template>
                 <template #moderation-checklist>
-                  <ScaleIcon aria-hidden="true" /> Review project
+                  <ScaleIcon aria-hidden="true" />
+                  Review project
+                </template>
+                <template #report>
+                  <ReportIcon aria-hidden="true" />
+                  Report
+                </template>
+                <template #copy-id>
+                  <ClipboardCopyIcon aria-hidden="true" />
+                  Copy ID
                 </template>
-                <template #report> <ReportIcon aria-hidden="true" /> Report </template>
-                <template #copy-id> <ClipboardCopyIcon aria-hidden="true" /> Copy ID </template>
                 <template #copy-permalink>
-                  <ClipboardCopyIcon aria-hidden="true" /> Copy permanent link
+                  <ClipboardCopyIcon aria-hidden="true" />
+                  Copy permanent link
                 </template>
               </OverflowMenu>
             </ButtonStyled>
@@ -752,7 +756,6 @@
           updates unless the author decides to unarchive the project.
         </MessageBanner>
       </div>
-
       <div class="normal-page__sidebar">
         <ProjectSidebarCompatibility
           :project="project"
@@ -782,7 +785,6 @@
         />
         <div class="card flex-card experimental-styles-within">
           <h2>{{ formatMessage(detailsMessages.title) }}</h2>
-
           <div class="details-list">
             <div class="details-list__item">
               <BookTextIcon aria-hidden="true" />
@@ -811,48 +813,53 @@
                 <span v-else>{{ licenseIdDisplay }}</span>
               </div>
             </div>
-
             <div
               v-if="project.approved"
               v-tooltip="$dayjs(project.approved).format('MMMM D, YYYY [at] h:mm A')"
               class="details-list__item"
             >
               <CalendarIcon aria-hidden="true" />
-              <div>{{ formatMessage(detailsMessages.published, { date: publishedDate }) }}</div>
+              <div>
+                {{ formatMessage(detailsMessages.published, { date: publishedDate }) }}
+              </div>
             </div>
-
             <div
               v-else
               v-tooltip="$dayjs(project.published).format('MMMM D, YYYY [at] h:mm A')"
               class="details-list__item"
             >
               <CalendarIcon aria-hidden="true" />
-              <div>{{ formatMessage(detailsMessages.created, { date: createdDate }) }}</div>
+              <div>
+                {{ formatMessage(detailsMessages.created, { date: createdDate }) }}
+              </div>
             </div>
-
             <div
               v-if="project.status === 'processing' && project.queued"
               v-tooltip="$dayjs(project.queued).format('MMMM D, YYYY [at] h:mm A')"
               class="details-list__item"
             >
               <ScaleIcon aria-hidden="true" />
-              <div>{{ formatMessage(detailsMessages.submitted, { date: submittedDate }) }}</div>
+              <div>
+                {{ formatMessage(detailsMessages.submitted, { date: submittedDate }) }}
+              </div>
             </div>
-
             <div
               v-if="versions.length > 0 && project.updated"
               v-tooltip="$dayjs(project.updated).format('MMMM D, YYYY [at] h:mm A')"
               class="details-list__item"
             >
               <VersionIcon aria-hidden="true" />
-              <div>{{ formatMessage(detailsMessages.updated, { date: updatedDate }) }}</div>
+              <div>
+                {{ formatMessage(detailsMessages.updated, { date: updatedDate }) }}
+              </div>
             </div>
           </div>
         </div>
       </div>
-
       <div class="normal-page__content">
-        <div class="overflow-x-auto"><NavTabs :links="navLinks" class="mb-4" /></div>
+        <div class="overflow-x-auto">
+          <NavTabs :links="navLinks" class="mb-4" />
+        </div>
         <NuxtPage
           v-model:project="project"
           v-model:versions="versions"
@@ -870,10 +877,8 @@
           @delete-version="deleteVersion"
         />
       </div>
-
       <div class="normal-page__ultimate-sidebar">
-        <!-- Uncomment this to enable the old moderation checklist. -->
-        <!-- <ModerationChecklist
+        <ModerationChecklist
           v-if="auth.user && tags.staffRoles.includes(auth.user.role) && showModerationChecklist"
           :project="project"
           :future-projects="futureProjects"
@@ -881,25 +886,11 @@
           :collapsed="collapsedModerationChecklist"
           @exit="showModerationChecklist = false"
           @toggle-collapsed="collapsedModerationChecklist = !collapsedModerationChecklist"
-        /> -->
+        />
       </div>
     </div>
   </div>
-
-  <div
-    v-if="auth.user && tags.staffRoles.includes(auth.user.role) && showModerationChecklist"
-    class="moderation-checklist"
-  >
-    <NewModerationChecklist
-      :project="project"
-      :future-project-ids="futureProjectIds"
-      :collapsed="collapsedModerationChecklist"
-      @exit="showModerationChecklist = false"
-      @toggle-collapsed="collapsedModerationChecklist = !collapsedModerationChecklist"
-    />
-  </div>
 </template>
-
 <script setup>
 import {
   BookmarkIcon,
@@ -959,16 +950,16 @@ import {
   isUnderReview,
   renderString,
 } from "@modrinth/utils";
+import { navigateTo } from "#app";
 import dayjs from "dayjs";
 import { Tooltip } from "floating-vue";
-import { useLocalStorage } from "@vueuse/core";
-import { navigateTo } from "#app";
 import Accordion from "~/components/ui/Accordion.vue";
 import AdPlaceholder from "~/components/ui/AdPlaceholder.vue";
 import AutomaticAccordion from "~/components/ui/AutomaticAccordion.vue";
 import Breadcrumbs from "~/components/ui/Breadcrumbs.vue";
 import CollectionCreateModal from "~/components/ui/CollectionCreateModal.vue";
 import MessageBanner from "~/components/ui/MessageBanner.vue";
+import ModerationChecklist from "~/components/ui/ModerationChecklist.vue";
 import NavStack from "~/components/ui/NavStack.vue";
 import NavStackItem from "~/components/ui/NavStackItem.vue";
 import NavTabs from "~/components/ui/NavTabs.vue";
@@ -976,7 +967,6 @@ import ProjectMemberHeader from "~/components/ui/ProjectMemberHeader.vue";
 import { userCollectProject } from "~/composables/user.js";
 import { reportProject } from "~/utils/report-helpers.ts";
 import { saveFeatureFlags } from "~/composables/featureFlags.ts";
-import NewModerationChecklist from "~/components/ui/moderation/NewModerationChecklist.vue";
 
 const data = useNuxtApp();
 const route = useNativeRoute();
@@ -990,7 +980,6 @@ const flags = useFeatureFlags();
 const cosmetics = useCosmetics();
 
 const { formatMessage } = useVIntl();
-const { setVisible } = useNotificationRightwards();
 
 const settingsModal = ref();
 const downloadModal = ref();
@@ -1562,28 +1551,12 @@ async function copyPermalink() {
 
 const collapsedChecklist = ref(false);
 
-const showModerationChecklist = useLocalStorage(
-  `show-moderation-checklist-${project.value.id}`,
-  false,
-);
-const collapsedModerationChecklist = useLocalStorage("collapsed-moderation-checklist", false);
-
-const futureProjectIds = useLocalStorage("moderation-future-projects", []);
-
-watch(futureProjectIds, (newValue) => {
-  console.log("Future project IDs updated:", newValue);
-});
-
-watch(
-  showModerationChecklist,
-  (newValue) => {
-    setVisible(newValue);
-  },
-  { immediate: true },
-);
-
+const showModerationChecklist = ref(false);
+const collapsedModerationChecklist = ref(false);
+const futureProjects = ref([]);
 if (import.meta.client && history && history.state && history.state.showChecklist) {
   showModerationChecklist.value = true;
+  futureProjects.value = history.state.projects;
 }
 
 function closeDownloadModal(event) {
@@ -1653,7 +1626,6 @@ const navLinks = computed(() => {
   ];
 });
 </script>
-
 <style lang="scss" scoped>
 .settings-header {
   display: flex;
@@ -1809,16 +1781,4 @@ const navLinks = computed(() => {
     left: 18px;
   }
 }
-
-.moderation-checklist {
-  position: fixed;
-  bottom: 1rem;
-  right: 1rem;
-  overflow-y: auto;
-  z-index: 50;
-
-  > div {
-    box-shadow: 0 0 15px rgba(0, 0, 0, 0.3);
-  }
-}
 </style>

apps/frontend/src/pages/[type]/[id]/gallery.vue

@@ -705,9 +705,9 @@ export default defineNuxtComponent({
   }
 
   .gallery-body {
+    flex-grow: 1;
     width: calc(100% - 2 * var(--spacing-card-md));
     padding: var(--spacing-card-sm) var(--spacing-card-md);
-    overflow-wrap: anywhere;
 
     .gallery-info {
       h2 {

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

@@ -150,26 +150,9 @@
                   </template>
                 </span>
                 <span class="text-sm text-secondary">
-                  <span
-                    v-if="charge.status === 'cancelled' && $dayjs(charge.due).isBefore($dayjs())"
-                    class="font-bold"
-                  >
-                    Ended:
-                  </span>
-                  <span v-else-if="charge.status === 'cancelled'" class="font-bold">Ends:</span>
-                  <span v-else-if="charge.type === 'refund'" class="font-bold">Issued:</span>
-                  <span v-else class="font-bold">Due:</span>
                   {{ dayjs(charge.due).format("MMMM D, YYYY [at] h:mma") }}
                   <span class="text-secondary">({{ formatRelativeTime(charge.due) }}) </span>
                 </span>
-                <span v-if="charge.last_attempt != null" class="text-sm text-secondary">
-                  <span v-if="charge.status === 'failed'" class="font-bold">Last attempt:</span>
-                  <span v-else class="font-bold">Charged:</span>
-                  {{ dayjs(charge.last_attempt).format("MMMM D, YYYY [at] h:mma") }}
-                  <span class="text-secondary"
-                    >({{ formatRelativeTime(charge.last_attempt) }})
-                  </span>
-                </span>
                 <div class="flex w-full items-center gap-1 text-xs text-secondary">
                   {{ charge.status }}
                   ⋅

apps/frontend/src/pages/app.vue

@@ -1421,8 +1421,7 @@ useSeoMeta({
           width: 25rem;
           height: 25rem;
           opacity: 0.75;
-          background:
-            radial-gradient(
+          background: radial-gradient(
               50% 50% at 50% 50%,
               rgba(5, 206, 69, 0.19) 0%,
               rgba(15, 19, 49, 0.25) 100%

apps/frontend/src/pages/auth/sign-in.vue

@@ -1,12 +1,6 @@
 <template>
-  <div v-if="subtleLauncherRedirectUri">
-    <iframe
-      :src="subtleLauncherRedirectUri"
-      class="fixed left-0 top-0 z-[9999] m-0 h-full w-full border-0 p-0"
-    ></iframe>
-  </div>
-  <div v-else>
-    <template v-if="flow && !subtleLauncherRedirectUri">
+  <div>
+    <template v-if="flow">
       <label for="two-factor-code">
         <span class="label__title">{{ formatMessage(messages.twoFactorCodeLabel) }}</span>
         <span class="label__description">
@@ -195,7 +189,6 @@ const auth = await useAuth();
 const route = useNativeRoute();
 
 const redirectTarget = route.query.redirect || "";
-const subtleLauncherRedirectUri = ref();
 
 if (route.query.code && !route.fullPath.includes("new_account=true")) {
   await finishSignIn();
@@ -269,32 +262,7 @@ async function begin2FASignIn() {
 
 async function finishSignIn(token) {
   if (route.query.launcher) {
-    if (!token) {
-      token = auth.value.token;
-    }
-
-    const usesLocalhostRedirectionScheme =
-      ["4", "6"].includes(route.query.ipver) && Number(route.query.port) < 65536;
-
-    const redirectUrl = usesLocalhostRedirectionScheme
-      ? `http://${route.query.ipver === "4" ? "127.0.0.1" : "[::1]"}:${route.query.port}/?code=${token}`
-      : `https://launcher-files.modrinth.com/?code=${token}`;
-
-    if (usesLocalhostRedirectionScheme) {
-      // When using this redirection scheme, the auth token is very visible in the URL to the user.
-      // While we could make it harder to find with a POST request, such is security by obscurity:
-      // the user and other applications would still be able to sniff the token in the request body.
-      // So, to make the UX a little better by not changing the displayed URL, while keeping the
-      // token hidden from very casual observation and keeping the protocol as close to OAuth's
-      // standard flows as possible, let's execute the redirect within an iframe that visually
-      // covers the entire page.
-      subtleLauncherRedirectUri.value = redirectUrl;
-    } else {
-      await navigateTo(redirectUrl, {
-        external: true,
-      });
-    }
-
+    await navigateTo(`https://launcher-files.modrinth.com/?code=${token}`, { external: true });
     return;
   }
 

apps/frontend/src/pages/auth/sign-up.vue

@@ -247,14 +247,16 @@ async function createAccount() {
       },
     });
 
-    await useAuth(res.session);
-    await useUser();
-
     if (route.query.launcher) {
-      await navigateTo({ path: "/auth/sign-in", query: route.query });
+      await navigateTo(`https://launcher-files.modrinth.com/?code=${res.session}`, {
+        external: true,
+      });
       return;
     }
 
+    await useAuth(res.session);
+    await useUser();
+
     if (route.query.redirect) {
       await navigateTo(route.query.redirect);
     } else {

apps/frontend/src/pages/dashboard/revenue/withdraw.vue

@@ -266,12 +266,12 @@ const getRangeOfMethod = (method) => {
 
 const maxWithdrawAmount = computed(() => {
   const interval = selectedMethod.value.interval;
-  return interval?.standard ? interval.standard.max : (interval?.fixed?.values.slice(-1)[0] ?? 0);
+  return interval?.standard ? interval.standard.max : interval?.fixed?.values.slice(-1)[0] ?? 0;
 });
 
 const minWithdrawAmount = computed(() => {
   const interval = selectedMethod.value.interval;
-  return interval?.standard ? interval.standard.min : (interval?.fixed?.values?.[0] ?? fees.value);
+  return interval?.standard ? interval.standard.min : interval?.fixed?.values?.[0] ?? fees.value;
 });
 
 const withdrawAccount = computed(() => {

apps/frontend/src/pages/moderation/review.vue

@@ -212,10 +212,6 @@ if (projects.value) {
 
 async function goToProjects() {
   const project = projectsFiltered.value[0];
-  const remainingProjectIds = projectsFiltered.value.slice(1).map((p) => p.id);
-
-  localStorage.setItem("moderation-future-projects", JSON.stringify(remainingProjectIds));
-
   await router.push({
     name: "type-id",
     params: {
@@ -224,6 +220,7 @@ async function goToProjects() {
     },
     state: {
       showChecklist: true,
+      projects: projectsFiltered.value.slice(1).map((x) => (x.slug ? x.slug : x.id)),
     },
   });
 }

apps/frontend/src/pages/plus.vue

@@ -149,8 +149,7 @@ onMounted(() => {
 </script>
 <style lang="scss" scoped>
 .main-hero {
-  background:
-    linear-gradient(360deg, rgba(199, 138, 255, 0.2) 10.92%, var(--color-bg) 100%),
+  background: linear-gradient(360deg, rgba(199, 138, 255, 0.2) 10.92%, var(--color-bg) 100%),
     var(--color-accent-contrast);
   margin-top: -5rem;
   padding: 11.25rem 1rem 8rem;

apps/frontend/src/pages/servers/index.vue

@@ -45,9 +45,8 @@
         <h2
           class="relative m-0 max-w-2xl text-base font-normal leading-[155%] text-secondary md:text-[1.2rem]"
         >
-          Modrinth Servers is the easiest way to host your own Minecraft: Java Edition server.
-          Seamlessly install and play your favorite mods and modpacks, all within the Modrinth
-          platform.
+          Modrinth Servers is the easiest way to host your own Minecraft server. Seamlessly install
+          and play your favorite mods and modpacks, all within the Modrinth platform.
         </h2>
         <div class="relative flex w-full flex-wrap items-center gap-8 align-middle sm:w-fit">
           <div
@@ -428,8 +427,11 @@
                 Do Modrinth Servers have DDoS protection?
               </summary>
               <p class="m-0 ml-6 leading-[160%]">
-                Yes. All Modrinth Servers come with DDoS protection, with up to 17Tbps capacity in
-                some locations.
+                Yes. All Modrinth Servers come with DDoS protection powered by
+                <a href="https://us.ovhcloud.com/security/anti-ddos/" target="_blank"
+                  >OVHcloud® Anti-DDoS infrastructure</a
+                >
+                which has over 17Tbps capacity. Your server is safe on Modrinth.
               </p>
             </details>
 
@@ -441,9 +443,8 @@
                 Where are Modrinth Servers located? Can I choose a region?
               </summary>
               <p class="m-0 ml-6 leading-[160%]">
-                We have servers available in North America and Europe at the moment that you can
-                choose upon purchase. More regions to come in the future! If you'd like to switch
-                your region, please contact support.
+                We have servers in both North America in Vint Hill, Virginia, and Europe in Limburg,
+                Germany. More regions to come in the future!
               </p>
             </details>
 
@@ -460,7 +461,7 @@
               </p>
             </details>
 
-            <details pyro-hash="performance" class="group" :open="$route.hash === '#performance'">
+            <details pyro-hash="players" class="group" :open="$route.hash === '#players'">
               <summary class="flex cursor-pointer items-center py-3 font-medium text-contrast">
                 <span class="mr-2 transition-transform duration-200 group-open:rotate-90">
                   <RightArrowIcon />
@@ -481,7 +482,7 @@
               </p>
             </details>
 
-            <details pyro-hash="prices" class="group" :open="$route.hash === '#prices'">
+            <details pyro-hash="players" class="group" :open="$route.hash === '#prices'">
               <summary class="flex cursor-pointer items-center py-3 font-medium text-contrast">
                 <span class="mr-2 transition-transform duration-200 group-open:rotate-90">
                   <RightArrowIcon />
@@ -492,24 +493,6 @@
                 All prices are listed in United States Dollars (USD).
               </p>
             </details>
-
-            <details pyro-hash="versions" class="group" :open="$route.hash === '#versions'">
-              <summary class="flex cursor-pointer items-center py-3 font-medium text-contrast">
-                <span class="mr-2 transition-transform duration-200 group-open:rotate-90">
-                  <RightArrowIcon />
-                </span>
-                What Minecraft versions and loaders can be used?
-              </summary>
-              <p class="m-0 ml-6 leading-[160%]">
-                Modrinth Servers can run any version of Minecraft: Java Edition going all the way
-                back to version 1.2.5, including snapshot versions.
-              </p>
-              <p class="m-0 ml-6 mt-3 leading-[160%]">
-                We also support a wide range of mod and plugin loaders, including Fabric, Quilt,
-                Forge, and NeoForge for mods, as well as Paper and Purpur for plugins. Availability
-                depends on whether the mod or plugin loader supports the selected Minecraft version.
-              </p>
-            </details>
           </div>
         </div>
       </div>

apps/frontend/src/pages/servers/manage/[id].vue

@@ -1020,7 +1020,7 @@ const nodeUnavailableDetails = computed(() => [
   {
     label: "Error message",
     value: nodeAccessible.value
-      ? (server.moduleErrors?.general?.error.message ?? "Unknown")
+      ? server.moduleErrors?.general?.error.message ?? "Unknown"
       : "Unable to reach node. Ping test failed.",
     type: "block" as const,
   },
@@ -1277,8 +1277,7 @@ useHead({
   background-repeat: no-repeat;
   filter: blur(1rem);
   content: "";
-  background-image:
-    linear-gradient(
+  background-image: linear-gradient(
       to bottom,
       rgba(from var(--color-raised-bg) r g b / 0.2),
       rgb(from var(--color-raised-bg) r g b / 0.8)

apps/frontend/src/pages/servers/manage/[id]/files.vue

@@ -101,7 +101,7 @@
                   <span :class="{ invisible: 'current_file' in op && !op.current_file }">
                     {{
                       "current_file" in op
-                        ? (op.current_file?.split("/")?.pop() ?? "unknown")
+                        ? op.current_file?.split("/")?.pop() ?? "unknown"
                         : "unknown"
                     }}
                   </span>

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

@@ -98,13 +98,6 @@
       "date": "2023-02-01T20:00:00.000Z",
       "link": "https://modrinth.com/news/article/accelerating-development"
     },
-    {
-      "title": "Modrinth's Anniversary Update",
-      "summary": "Marking two years of Modrinth and discussing our New Year's Resolutions for 2023.",
-      "thumbnail": "https://modrinth.com/news/article/two-years-of-modrinth/thumbnail.webp",
-      "date": "2023-01-07T00:00:00.000Z",
-      "link": "https://modrinth.com/news/article/two-years-of-modrinth"
-    },
     {
       "title": "Two years of Modrinth: a retrospective",
       "summary": "The history of Modrinth as we know it from December 2020 to December 2022.",
@@ -112,6 +105,13 @@
       "date": "2023-01-07T00:00:00.000Z",
       "link": "https://modrinth.com/news/article/two-years-of-modrinth-history"
     },
+    {
+      "title": "Modrinth's Anniversary Update",
+      "summary": "Marking two years of Modrinth and discussing our New Year's Resolutions for 2023.",
+      "thumbnail": "https://modrinth.com/news/article/two-years-of-modrinth/thumbnail.webp",
+      "date": "2023-01-07T00:00:00.000Z",
+      "link": "https://modrinth.com/news/article/two-years-of-modrinth"
+    },
     {
       "title": "Creators can now make money on Modrinth!",
       "summary": "Introducing the Creator Monetization Program allowing creators to earn revenue from their projects.",

apps/frontend/src/public/news/feed/rss.xml

@@ -4,7 +4,7 @@
         <description><![CDATA[Keep up-to-date on the latest news from Modrinth.]]></description>
         <link>https://modrinth.com/news/</link>
         <generator>@modrinth/blog</generator>
-        <lastBuildDate>Tue, 15 Jul 2025 12:02:34 GMT</lastBuildDate>
+        <lastBuildDate>Sat, 05 Jul 2025 21:04:25 GMT</lastBuildDate>
         <atom:link href="https://modrinth.com/news/feed/rss.xml" rel="self" type="application/rss+xml"/>
         <language><![CDATA[en]]></language>
         <item>
@@ -12,7 +12,7 @@
             <description><![CDATA[Customize your look, save your favorite skins, and swap them out in a flash, all within Modrinth App.]]></description>
             <link>https://modrinth.com/news/article/skins-now-in-modrinth-app/</link>
             <guid isPermaLink="false">https://modrinth.com/news/article/skins-now-in-modrinth-app/</guid>
-            <pubDate>Sun, 06 Jul 2025 23:45:00 GMT</pubDate>
+            <pubDate>Sat, 05 Jul 2025 19:19:00 GMT</pubDate>
             <content:encoded>&lt;![CDATA[&lt;p&gt;We&apos;re thrilled to roll out Modrinth App &lt;strong&gt;v0.10&lt;/strong&gt; with a beta release of one of our most highly requested features, the &lt;strong&gt;Skins page&lt;/strong&gt;. The Skins page allows you to manage all of your Minecraft skins directly within Modrinth App. You can see all your saved custom skins and the default Minecraft skins in one convenient place.&lt;/p&gt;&lt;p&gt;&lt;img src=&quot;./skins-page.webp&quot; alt=&quot;The new skins page, featuring a cute animated player model, your custom skins &amp;amp; default skins.&quot;&gt;&lt;/p&gt;&lt;p&gt;Adding a new skin is simple, even Herobrine could do it! When you add or edit a skin, you can &lt;strong&gt;upload&lt;/strong&gt; your custom texture file directly from your computer, &lt;strong&gt;choose&lt;/strong&gt; between the wide or slim arm style to match your preferred character model, and even &lt;strong&gt;assign&lt;/strong&gt; a specific cape to that look for the perfect finishing touch.&lt;/p&gt;&lt;p&gt;The interface makes it easy to preview your changes in real-time with the animated player model, so you can see exactly how your skin will look in-game before saving it.&lt;/p&gt;&lt;p&gt;&lt;img src=&quot;./edit-skin.webp&quot; alt=&quot;The edit skin modal that shows when you go to add or edit a skin.&quot;&gt;&lt;/p&gt;&lt;h2&gt;Fixes and More!&lt;/h2&gt;&lt;p&gt;Alongside this major new feature, &lt;strong&gt;v0.10&lt;/strong&gt; includes a host of improvements and bug fixes to make your experience smoother. We&apos;ve updated the news feed to use our new system, fixed issues with project descriptions, and tidied up how data is handled. For a full breakdown of all the changes, you can &lt;a href=&quot;https://modrinth.com/news/changelog?filter=app&quot;&gt;check out the complete changelog here.&lt;/a&gt;&lt;/p&gt;&lt;p&gt;As the skins feature is in &lt;em&gt;beta&lt;/em&gt;, we&apos;re eager to hear your feedback! &lt;strong&gt;Jump in, give it a try&lt;/strong&gt;, and let us know what you think. You can share your thoughts on our &lt;a href=&quot;https://discord.modrinth.com/&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Discord server&lt;/a&gt; or &lt;a href=&quot;https://support.modrinth.com&quot; rel=&quot;noopener nofollow ugc&quot;&gt;start a support chat&lt;/a&gt; if you&apos;re running into issues.&lt;/p&gt;&lt;p&gt;Thank you! We can&apos;t wait to see your skins in action. Happy customizing!&lt;/p&gt;]]&gt;</content:encoded>
         </item>
         <item>
@@ -25,7 +25,7 @@
         </item>
         <item>
             <title><![CDATA[A Pride Month Success: Over $8,400 Raised for The Trevor Project!]]></title>
-            <description><![CDATA[Reflecting on our Pride Month fundraiser campaign for LGBTQ+ youth.]]></description>
+            <description><![CDATA[A reflection on our Pride Month fundraiser campaign, which raised thousands for LGBTQ+ youth.]]></description>
             <link>https://modrinth.com/news/article/pride-campaign-2025/</link>
             <guid isPermaLink="false">https://modrinth.com/news/article/pride-campaign-2025/</guid>
             <pubDate>Tue, 01 Jul 2025 18:00:00 GMT</pubDate>
@@ -119,14 +119,6 @@
             <pubDate>Wed, 01 Feb 2023 20:00:00 GMT</pubDate>
             <content:encoded>&lt;![CDATA[&lt;p&gt;&lt;strong&gt;Update: On &lt;a href=&quot;/news/article/capital-return&quot; rel=&quot;noopener nofollow ugc&quot;&gt;April 4, 2024&lt;/a&gt; we announced that we had returned the remaining $800k in investor capital back to our investors to take a different path. &lt;a href=&quot;/news/article/capital-return&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Read that announcement here&lt;/a&gt;. This article remains here for archival purposes.&lt;/strong&gt;&lt;/p&gt;&lt;hr&gt;&lt;p&gt;There are over 3 billion gamers worldwide, but only a small fraction ever go further and mod the games they play. Modrinth is here to bring modding to every player on the planet—all the while allowing mod creators to make a living off of it.&lt;/p&gt;&lt;p&gt;Since our founding in 2020 and up until a few months ago, Modrinth has been a purely volunteer project. In the past couple months, the Modrinth team has been more productive than ever. We&apos;ve released the &lt;a href=&quot;../two-years-of-modrinth&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Anniversary Update&lt;/a&gt;, we&apos;re actively working on the launcher once more, and we&apos;re laying out plans for how to multiply Modrinth creator payouts.&lt;/p&gt;&lt;p&gt;The vision we have for the future of Modrinth is great, and right alongside that is the need for an amazing team to build out this vision. That&apos;s why we &lt;a href=&quot;https://x.com/modrinth/status/1615416957905342472&quot; rel=&quot;noopener nofollow ugc&quot;&gt;recently announced&lt;/a&gt; that &lt;a href=&quot;https://careers.modrinth.com&quot; rel=&quot;noopener nofollow ugc&quot;&gt;we&apos;re hiring&lt;/a&gt;—we&apos;ve already come so far on just volunteer work, but for Modrinth to be sustainable and for its growth to be sustainable, we need to pick up the pace.&lt;/p&gt;&lt;p&gt;That&apos;s why we&apos;re excited to announce that we&apos;ve raised a pre-seed round of funding led by &lt;a href=&quot;https://www.makersfund.com/&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Makers Fund&lt;/a&gt;, with investors including &lt;a href=&quot;https://x.com/ryanmjohnson&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Ryan Johnson&lt;/a&gt;, &lt;a href=&quot;https://x.com/sthenc&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Stephen Cole&lt;/a&gt;, &lt;a href=&quot;https://x.com/PimDeWitte&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Pim de Witte&lt;/a&gt;, &lt;a href=&quot;https://www.linkedin.com/in/leechris1/&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Chris Lee&lt;/a&gt;, and &lt;a href=&quot;https://x.com/andreas&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Andreas Thorstensson&lt;/a&gt; to accelerate development and expand to new horizons for Modrinth.&lt;/p&gt;&lt;h2&gt;What&apos;s next?&lt;/h2&gt;&lt;p&gt;We&apos;re thrilled to keep on building and iterating on Modrinth over the next few years. Here&apos;s a look into what we have in store over the next few months for Modrinth:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;A feature-packed launcher&lt;/li&gt;&lt;li&gt;Creator organizations (like GitHub), wikis, graphs (with playtime, views, downloads, etc)&lt;/li&gt;&lt;li&gt;More creator payouts, through the growth of Adrinth&lt;/li&gt;&lt;li&gt;Discovery/recommendation of mods (especially up-and-coming content)&lt;/li&gt;&lt;li&gt;Comments (with built-in moderation and spam protection)&lt;/li&gt;&lt;li&gt;[Redacted]&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Support for new games!&lt;/p&gt;&lt;p&gt;We are excited that we are able to build a product that will manage to grow us to sustainability and create the best modding experience for creators and users. Being able to pay ourselves and bring on new people is a big step in making that happen. There is still a lot to do, so let&apos;s get to it!&lt;/p&gt;&lt;h2&gt;Q&amp;amp;A:&lt;/h2&gt;&lt;p&gt;We know there might be some concerns so we included a short Q&amp;amp;A section below for some common ones. Feel free to ask in our &lt;a href=&quot;https://discord.modrinth.com&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Discord&lt;/a&gt; if you have any more questions!&lt;/p&gt;&lt;h3&gt;Why does Modrinth need funding?&lt;/h3&gt;&lt;p&gt;Our main expense is and will continue to be salaries. The labor cost has always been the main bottleneck for Modrinth. Having paid employees will allow us to develop Modrinth faster, bringing Modrinth to a point of sustainability and growing the platform. For example, we&apos;re planning to release our launcher this year, and eventually we&apos;re hoping to expand into more games. Those won&apos;t be possible without having paid employees.&lt;/p&gt;&lt;h3&gt;Is Modrinth still community-first?&lt;/h3&gt;&lt;p&gt;We started and always will have the goal of creating a community-oriented, open-source modding platform. Simply put, there isn&apos;t any reason for us not to be. It&apos;s clear that the previous impersonal, corporate approaches to video game modding have not worked, andLine truncated
         </item>
-        <item>
-            <title><![CDATA[Modrinth's Anniversary Update]]></title>
-            <description><![CDATA[Marking two years of Modrinth and discussing our New Year's Resolutions for 2023.]]></description>
-            <link>https://modrinth.com/news/article/two-years-of-modrinth/</link>
-            <guid isPermaLink="false">https://modrinth.com/news/article/two-years-of-modrinth/</guid>
-            <pubDate>Sat, 07 Jan 2023 00:00:00 GMT</pubDate>
-            <content:encoded>&lt;![CDATA[&lt;p&gt;Modrinth initially &lt;a href=&quot;../modrinth-beta&quot; rel=&quot;noopener nofollow ugc&quot;&gt;went into beta&lt;/a&gt; on November 30th, 2020. Just over a month ago was November 30th, 2022, marking &lt;strong&gt;two years&lt;/strong&gt; since Modrinth was generally available as a platform for everyone to use. Today, we&apos;re proud to announce the Anniversary Update, celebrating both two years of Modrinth as well as the coming of the new year, and we&apos;ll be discussing our New Year&apos;s Resolutions for 2023.&lt;/p&gt;&lt;p&gt;Before you read this post, though, we recommend taking a look at &lt;a href=&quot;../two-years-of-modrinth-history&quot; rel=&quot;noopener nofollow ugc&quot;&gt;our retrospective on Modrinth&apos;s history through 2020—2022&lt;/a&gt;. It just wouldn&apos;t be right to take a look at the present and the future without also taking a look at our past, seeing how far we&apos;ve come from our humble beginnings.&lt;/p&gt;&lt;p&gt;With that out of the way, this post primarily serves to announce a few of the smaller features we&apos;ve been working on after the release of creator monetization. We&apos;ve bundled these all together as the &lt;strong&gt;Anniversary Update&lt;/strong&gt;.&lt;/p&gt;&lt;p&gt;Looking just at what&apos;s already done is boring, though, so we&apos;ll also be looking at what&apos;s yet to come. Modrinth&apos;s future is even brighter than any of us can imagine, so we&apos;ll be focusing on what we&apos;re gonna do in order to get to that bright future. If you&apos;ve ever made &lt;strong&gt;New Year&apos;s Resolutions&lt;/strong&gt;, we&apos;re going to briefly discuss our resolutions for 2023.&lt;/p&gt;&lt;p&gt;Without further adieu, let&apos;s get right into what&apos;s new with this new year!&lt;/p&gt;&lt;h2&gt;Shader packs and data packs&lt;/h2&gt;&lt;p&gt;The long-awaited arrival of shader packs and data packs is now here on Modrinth!&lt;/p&gt;&lt;p&gt;Shader packs can be viewed in the &lt;a href=&quot;/shaders&quot; rel=&quot;noopener nofollow ugc&quot;&gt;shaders tab&lt;/a&gt;. This includes shaders that support &lt;a href=&quot;/mod/iris&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Iris&lt;/a&gt;, &lt;a href=&quot;/mod/canvas&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Canvas&lt;/a&gt;, and OptiFine, as well as vanilla core shaders. (Even though they&apos;re installed via the resource pack system, we have decided to put Canvas and core shaders in shader packs since most users will not search in resource packs for shader packs, even if that&apos;s how they&apos;re installed.)&lt;/p&gt;&lt;p&gt;Data packs can be found in the &lt;a href=&quot;/datapacks&quot; rel=&quot;noopener nofollow ugc&quot;&gt;data packs tab&lt;/a&gt;. These are implemented similarly to plugins, in that projects with a mod version can also upload a data pack version (and vice versa). Additionally, data pack authors can choose to have their data packs packaged as a mod using the handy-dandy button on the site.&lt;/p&gt;&lt;p&gt;Data packs can optionally upload a corresponding resource pack as a separate file. We discourage bundling data files and asset files in the same zip file.&lt;/p&gt;&lt;h2&gt;New landing page&lt;/h2&gt;&lt;p&gt;The &lt;a href=&quot;/&quot; rel=&quot;noopener nofollow ugc&quot;&gt;homepage&lt;/a&gt; has been completely remade, featuring a scrolling list of random projects from Modrinth. Feel free to use this to discover new projects—just make sure you refresh occasionally, because they loop after a little while until you refresh!&lt;/p&gt;&lt;p&gt;&lt;img src=&quot;./landing-page.jpg&quot; alt=&quot;A screenshot of the new homepage, with a maze background and projects scrolling across the bottom. Bold across the front is &amp;quot;The place for Minecraft mods&amp;quot;.&quot;&gt;&lt;/p&gt;&lt;h2&gt;Project overhaul for creators&lt;/h2&gt;&lt;p&gt;We&apos;re continuing to bring expansions to the creator dashboard introduced with monetization. The new &lt;strong&gt;Projects&lt;/strong&gt; tab allows you to view all of your projects in a table and quickly access their information and settings.&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;/dashboard/projects&quot; rel=&quot;noopener nofollow ugc&quot;&gt;&lt;img src=&quot;./projects-dashboard.jpg&quot; alt=&quot;The new Modrinth project dashboard&quot;&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;The same page also introduces the ability to bulk-edit the external resource links without having to edit each page individually. For example, if your Discord invite expires, you used to have to edit each of your projects individually to add it back. Now you can just select the projects you want to edit the links for and edit them all at the same time!&lt;/p&gt;&lt;p&gt;&lt;img src=&quot;./bulk-edit.jpg&quot; alt=&quot;A modal with several input fields for external resource links, listing multiple projects the input changes will be applied to.&quot;&gt;&lt;/p&gt;&lt;p&gt;Even better Line truncated
-        </item>
         <item>
             <title><![CDATA[Two years of Modrinth: a retrospective]]></title>
             <description><![CDATA[The history of Modrinth as we know it from December 2020 to December 2022.]]></description>
@@ -135,9 +127,17 @@
             <pubDate>Sat, 07 Jan 2023 00:00:00 GMT</pubDate>
             <content:encoded>&lt;![CDATA[&lt;p&gt;Let&apos;s rewind a bit and take a look at the past two years of Modrinth&apos;s history. We&apos;ve come so far from our pre-beta HexFabric days to today. A good portion of our pre-beta history can be found in the &lt;a href=&quot;../what-is-modrinth&quot; rel=&quot;noopener nofollow ugc&quot;&gt;What is Modrinth&lt;/a&gt; blog post, but Modrinth obviously is not the same platform it was two years ago.&lt;/p&gt;&lt;h2&gt;December 2020: Modrinth Beta begins&lt;/h2&gt;&lt;p&gt;&lt;img src=&quot;../modrinth-beta/new-design.jpg&quot; alt=&quot;Modrinth&apos;s brand new design, rolling out with the launch of Beta&quot;&gt;&lt;/p&gt;&lt;blockquote&gt;&lt;p&gt;Modrinth&apos;s brand new design, rolling out with the launch of Beta&lt;/p&gt;&lt;/blockquote&gt;&lt;p&gt;December was the release of the initial &lt;a href=&quot;../modrinth-beta&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Modrinth Beta&lt;/a&gt;, bringing a completely different interface and the ability for mods to be created for the first time. This interface has since been completely discarded, but this is what Modrinth looked like for well over a year. It&apos;s hard to believe!&lt;/p&gt;&lt;p&gt;December also brought the introduction of the &lt;a href=&quot;https://github.com/modrinth/minotaur&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Minotaur&lt;/a&gt; Gradle plugin for the first time for upload automation. Minotaur today also looks nothing like it did when it was introduced, but it still accomplishes the same exact thing.&lt;/p&gt;&lt;h2&gt;January 2021: Improvements to mod uploading&lt;/h2&gt;&lt;p&gt;An announcement in mid-January brought several essential additions and improvements to Modrinth which we consider commonplace today. Among these were:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;A separate version creation page&lt;/li&gt;&lt;li&gt;The ability to edit and delete existing versions&lt;/li&gt;&lt;li&gt;The ability to delete existing mods and users&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;January also brought the introduction of Google AdSense onto Modrinth. The eventual results, including our switch after to EthicalAds, solidified Modrinth&apos;s stance that ads should be unobtrusive and generally friendly to users.&lt;/p&gt;&lt;h2&gt;February-March 2021: Follows, reports, notifications, oh my!&lt;/h2&gt;&lt;p&gt;March brought the first introduction of the abilities to follow and report projects, as well as the automatic featuring of some versions depending on loader and Minecraft version. These systems have largely remained unchanged since their introduction, though the notification system will likely be getting a refresh come 2023.&lt;/p&gt;&lt;h2&gt;April-December 2021: Season of silence&lt;/h2&gt;&lt;p&gt;After follows, reports, and all that jazz, Modrinth largely went silent for a good while. This time period had some of the largest growth Modrinth had ever seen, and yet it seemed Modrinth&apos;s development had ground to a halt. Modrinth Team members were dropping like flies until there was a point where there was a single person on the team. What happened?&lt;/p&gt;&lt;p&gt;For various reasons, whether it be lack of free time or a lack of interest in Minecraft in general, people ended up leaving to pursue other things. It&apos;s not quite as apocalyptic or barren as these descriptions make it seem, but it&apos;s more fun to describe it like this.&lt;/p&gt;&lt;p&gt;Picking up the remnants from what others had left behind, one man was destined to continue developing for Modrinth. The one who began the whole operation in the first place, Geometrically, stood up and began developing. Thus came the development of project types, gallery images, API v2, and modpacks.&lt;/p&gt;&lt;h2&gt;January 2022: API v2 introduction&lt;/h2&gt;&lt;p&gt;Right around the corner came 2022. Perchance this would be the time for the silence to be broken? Indeed, the world would be able to hear about all that was brewing over the past few months.&lt;/p&gt;&lt;p&gt;Of course, this wasn&apos;t all introduced at once—it was a gradual rollout over several months. First was the introduction of v2 of Modrinth&apos;s API, allowing many breaking changes to occur, including namely the renaming of &lt;em&gt;mods&lt;/em&gt; to &lt;em&gt;projects&lt;/em&gt;. Wait, why was this necessary?&lt;/p&gt;&lt;p&gt;Up until this point, Modrinth only hosted mods. Project types, as we call them, allow projects to be given the designation of something other than &lt;em&gt;mod&lt;/em&gt;; for example, &lt;em&gt;modpack&lt;/em&gt; or &lt;em&gt;resourcepack&lt;/em&gt;, like we have today. This simple field, alongside all of the infrastructure which was needed to support it, was the first step to allow modpacks on Modrinth.&lt;/p&gt;&lt;h2&gt;February 2022: Redesign&lt;/h2&gt;&lt;p&gt;Remember the interface introduced in December 2020? Let&apos;s scrap it! Actually, it wasn&apos;t entirely scrapped, but it got a treatment similar to the &lt;a href=&quotLine truncated
         </item>
+        <item>
+            <title><![CDATA[Modrinth's Anniversary Update]]></title>
+            <description><![CDATA[Marking two years of Modrinth and discussing our New Year's Resolutions for 2023.]]></description>
+            <link>https://modrinth.com/news/article/two-years-of-modrinth/</link>
+            <guid isPermaLink="false">https://modrinth.com/news/article/two-years-of-modrinth/</guid>
+            <pubDate>Sat, 07 Jan 2023 00:00:00 GMT</pubDate>
+            <content:encoded>&lt;![CDATA[&lt;p&gt;Modrinth initially &lt;a href=&quot;../modrinth-beta&quot; rel=&quot;noopener nofollow ugc&quot;&gt;went into beta&lt;/a&gt; on November 30th, 2020. Just over a month ago was November 30th, 2022, marking &lt;strong&gt;two years&lt;/strong&gt; since Modrinth was generally available as a platform for everyone to use. Today, we&apos;re proud to announce the Anniversary Update, celebrating both two years of Modrinth as well as the coming of the new year, and we&apos;ll be discussing our New Year&apos;s Resolutions for 2023.&lt;/p&gt;&lt;p&gt;Before you read this post, though, we recommend taking a look at &lt;a href=&quot;../two-years-of-modrinth-history&quot; rel=&quot;noopener nofollow ugc&quot;&gt;our retrospective on Modrinth&apos;s history through 2020—2022&lt;/a&gt;. It just wouldn&apos;t be right to take a look at the present and the future without also taking a look at our past, seeing how far we&apos;ve come from our humble beginnings.&lt;/p&gt;&lt;p&gt;With that out of the way, this post primarily serves to announce a few of the smaller features we&apos;ve been working on after the release of creator monetization. We&apos;ve bundled these all together as the &lt;strong&gt;Anniversary Update&lt;/strong&gt;.&lt;/p&gt;&lt;p&gt;Looking just at what&apos;s already done is boring, though, so we&apos;ll also be looking at what&apos;s yet to come. Modrinth&apos;s future is even brighter than any of us can imagine, so we&apos;ll be focusing on what we&apos;re gonna do in order to get to that bright future. If you&apos;ve ever made &lt;strong&gt;New Year&apos;s Resolutions&lt;/strong&gt;, we&apos;re going to briefly discuss our resolutions for 2023.&lt;/p&gt;&lt;p&gt;Without further adieu, let&apos;s get right into what&apos;s new with this new year!&lt;/p&gt;&lt;h2&gt;Shader packs and data packs&lt;/h2&gt;&lt;p&gt;The long-awaited arrival of shader packs and data packs is now here on Modrinth!&lt;/p&gt;&lt;p&gt;Shader packs can be viewed in the &lt;a href=&quot;/shaders&quot; rel=&quot;noopener nofollow ugc&quot;&gt;shaders tab&lt;/a&gt;. This includes shaders that support &lt;a href=&quot;/mod/iris&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Iris&lt;/a&gt;, &lt;a href=&quot;/mod/canvas&quot; rel=&quot;noopener nofollow ugc&quot;&gt;Canvas&lt;/a&gt;, and OptiFine, as well as vanilla core shaders. (Even though they&apos;re installed via the resource pack system, we have decided to put Canvas and core shaders in shader packs since most users will not search in resource packs for shader packs, even if that&apos;s how they&apos;re installed.)&lt;/p&gt;&lt;p&gt;Data packs can be found in the &lt;a href=&quot;/datapacks&quot; rel=&quot;noopener nofollow ugc&quot;&gt;data packs tab&lt;/a&gt;. These are implemented similarly to plugins, in that projects with a mod version can also upload a data pack version (and vice versa). Additionally, data pack authors can choose to have their data packs packaged as a mod using the handy-dandy button on the site.&lt;/p&gt;&lt;p&gt;Data packs can optionally upload a corresponding resource pack as a separate file. We discourage bundling data files and asset files in the same zip file.&lt;/p&gt;&lt;h2&gt;New landing page&lt;/h2&gt;&lt;p&gt;The &lt;a href=&quot;/&quot; rel=&quot;noopener nofollow ugc&quot;&gt;homepage&lt;/a&gt; has been completely remade, featuring a scrolling list of random projects from Modrinth. Feel free to use this to discover new projects—just make sure you refresh occasionally, because they loop after a little while until you refresh!&lt;/p&gt;&lt;p&gt;&lt;img src=&quot;./landing-page.jpg&quot; alt=&quot;A screenshot of the new homepage, with a maze background and projects scrolling across the bottom. Bold across the front is &amp;quot;The place for Minecraft mods&amp;quot;.&quot;&gt;&lt;/p&gt;&lt;h2&gt;Project overhaul for creators&lt;/h2&gt;&lt;p&gt;We&apos;re continuing to bring expansions to the creator dashboard introduced with monetization. The new &lt;strong&gt;Projects&lt;/strong&gt; tab allows you to view all of your projects in a table and quickly access their information and settings.&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;/dashboard/projects&quot; rel=&quot;noopener nofollow ugc&quot;&gt;&lt;img src=&quot;./projects-dashboard.jpg&quot; alt=&quot;The new Modrinth project dashboard&quot;&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;The same page also introduces the ability to bulk-edit the external resource links without having to edit each page individually. For example, if your Discord invite expires, you used to have to edit each of your projects individually to add it back. Now you can just select the projects you want to edit the links for and edit them all at the same time!&lt;/p&gt;&lt;p&gt;&lt;img src=&quot;./bulk-edit.jpg&quot; alt=&quot;A modal with several input fields for external resource links, listing multiple projects the input changes will be applied to.&quot;&gt;&lt;/p&gt;&lt;p&gt;Even better Line truncated
+        </item>
         <item>
             <title><![CDATA[Creators can now make money on Modrinth!]]></title>
-            <description><![CDATA[Introducing the Creator Monetization Program allowing creators to earn revenue from their projects.]]></description>
+            <description><![CDATA[Yes, you read the title correctly: Modrinth's creator monetization program, also known as payouts, is now in an open beta phase. Read on for more information!]]></description>
             <link>https://modrinth.com/news/article/creator-monetization/</link>
             <guid isPermaLink="false">https://modrinth.com/news/article/creator-monetization/</guid>
             <pubDate>Sat, 12 Nov 2022 00:00:00 GMT</pubDate>
@@ -145,7 +145,7 @@
         </item>
         <item>
             <title><![CDATA[Modrinth's Carbon Ads experiment]]></title>
-            <description><![CDATA[Experimenting with a different ad providers to find one which one works for us.]]></description>
+            <description><![CDATA[As a step towards implementing author payouts, we're experimenting with a couple different ad providers to see which one works the best for us.]]></description>
             <link>https://modrinth.com/news/article/carbon-ads/</link>
             <guid isPermaLink="false">https://modrinth.com/news/article/carbon-ads/</guid>
             <pubDate>Thu, 08 Sep 2022 00:00:00 GMT</pubDate>
@@ -177,7 +177,7 @@
         </item>
         <item>
             <title><![CDATA[This week in Modrinth development: Filters and Fixes]]></title>
-            <description><![CDATA[Continuing to improve the user interface after a great first week since Modrinth launched out of beta.]]></description>
+            <description><![CDATA[After a great first week since Modrinth launched out of beta, we have continued to improve the user interface based on feedback.]]></description>
             <link>https://modrinth.com/news/article/knossos-v2.1.0/</link>
             <guid isPermaLink="false">https://modrinth.com/news/article/knossos-v2.1.0/</guid>
             <pubDate>Wed, 09 Mar 2022 00:00:00 GMT</pubDate>
@@ -185,7 +185,7 @@
         </item>
         <item>
             <title><![CDATA[Now showing on Modrinth: A new look!]]></title>
-            <description><![CDATA[Releasing many new features and improvements, including a redesign!]]></description>
+            <description><![CDATA[After months of relatively quiet development, Modrinth has released many new features and improvements, including a redesign. Read on to learn more!]]></description>
             <link>https://modrinth.com/news/article/redesign/</link>
             <guid isPermaLink="false">https://modrinth.com/news/article/redesign/</guid>
             <pubDate>Sun, 27 Feb 2022 00:00:00 GMT</pubDate>

apps/labrinth/.sqlx/query-99cca53fd3f35325e2da3b671532bf98b8c7ad8e7cb9158e4eb9c5bac66d20b2.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                id, user_id, price_id, amount, currency_code, status, due, last_attempt,\n                charge_type, subscription_id,\n                -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n                subscription_interval AS \"subscription_interval?\",\n                payment_platform,\n                payment_platform_id AS \"payment_platform_id?\",\n                parent_charge_id AS \"parent_charge_id?\",\n                net AS \"net?\"\n            FROM charges\n            WHERE subscription_id = $1 AND (status = 'open' OR status = 'cancelled' OR status = 'failed')",
+  "query": "\n            SELECT\n                id, user_id, price_id, amount, currency_code, status, due, last_attempt,\n                charge_type, subscription_id,\n                -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n                subscription_interval AS \"subscription_interval?\",\n                payment_platform,\n                payment_platform_id AS \"payment_platform_id?\",\n                parent_charge_id AS \"parent_charge_id?\",\n                net AS \"net?\"\n            FROM charges\n            WHERE subscription_id = $1 AND (status = 'open' OR status = 'cancelled')",
   "describe": {
     "columns": [
       {
@@ -102,5 +102,5 @@
       true
     ]
   },
-  "hash": "cf020daa52a1316e5f60d197196b880b72c0b2a576e470d9fd7182558103d055"
+  "hash": "99cca53fd3f35325e2da3b671532bf98b8c7ad8e7cb9158e4eb9c5bac66d20b2"
 }

apps/labrinth/Cargo.toml

@@ -36,7 +36,7 @@ paste.workspace = true
 meilisearch-sdk = { workspace = true, features = ["reqwest"] }
 rust-s3.workspace = true
 reqwest = { workspace = true, features = ["http2", "rustls-tls-webpki-roots", "json", "multipart"] }
-hyper-rustls.workspace = true
+hyper-tls.workspace = true
 hyper-util.workspace = true
 
 serde = { workspace = true, features = ["derive"] }

apps/labrinth/Dockerfile

@@ -1,21 +1,8 @@
-# syntax=docker/dockerfile:1
-
 FROM rust:1.88.0 AS build
 
 WORKDIR /usr/src/labrinth
 COPY . .
-RUN --mount=type=cache,target=/usr/src/labrinth/target \
-  --mount=type=cache,target=/usr/local/cargo/git/db \
-  --mount=type=cache,target=/usr/local/cargo/registry \
-  SQLX_OFFLINE=true cargo build --release --package labrinth
-
-FROM build AS artifacts
-
-RUN --mount=type=cache,target=/usr/src/labrinth/target \
-  mkdir /labrinth \
-  && cp /usr/src/labrinth/target/release/labrinth /labrinth/labrinth \
-  && cp -r /usr/src/labrinth/apps/labrinth/migrations /labrinth \
-  && cp -r /usr/src/labrinth/apps/labrinth/assets /labrinth
+RUN SQLX_OFFLINE=true cargo build --release --package labrinth
 
 FROM debian:bookworm-slim
 
@@ -24,11 +11,13 @@ LABEL org.opencontainers.image.description="Modrinth API"
 LABEL org.opencontainers.image.licenses=AGPL-3.0
 
 RUN apt-get update \
-  && apt-get install -y --no-install-recommends ca-certificates dumb-init curl \
+  && apt-get install -y --no-install-recommends ca-certificates openssl dumb-init curl \
   && rm -rf /var/lib/apt/lists/*
 
-COPY --from=artifacts /labrinth /labrinth
-
+COPY --from=build /usr/src/labrinth/target/release/labrinth /labrinth/labrinth
+COPY --from=build /usr/src/labrinth/apps/labrinth/migrations/* /labrinth/migrations/
+COPY --from=build /usr/src/labrinth/apps/labrinth/assets /labrinth/assets
 WORKDIR /labrinth
+
 ENTRYPOINT ["dumb-init", "--"]
 CMD ["/labrinth/labrinth"]

apps/labrinth/src/auth/mod.rs

@@ -43,9 +43,7 @@ pub enum AuthenticationError {
     InvalidAuthMethod,
     #[error("GitHub Token from incorrect Client ID")]
     InvalidClientId,
-    #[error(
-        "User email is already registered on Modrinth. Try 'Forgot password' to access your account."
-    )]
+    #[error("User email/account is already registered on Modrinth")]
     DuplicateUser,
     #[error("Invalid state sent, you probably need to get a new websocket")]
     SocketError,

apps/labrinth/src/clickhouse/mod.rs

@@ -1,4 +1,5 @@
-use hyper_rustls::HttpsConnectorBuilder;
+use hyper_tls::{HttpsConnector, native_tls};
+use hyper_util::client::legacy::connect::HttpConnector;
 use hyper_util::rt::TokioExecutor;
 
 mod fetch;
@@ -14,11 +15,13 @@ pub async fn init_client_with_database(
     database: &str,
 ) -> clickhouse::error::Result<clickhouse::Client> {
     let client = {
-        let https_connector = HttpsConnectorBuilder::new()
-            .with_native_roots()?
-            .https_or_http()
-            .enable_all_versions()
-            .build();
+        let mut http_connector = HttpConnector::new();
+        http_connector.enforce_http(false); // allow https URLs
+
+        let tls_connector =
+            native_tls::TlsConnector::builder().build().unwrap().into();
+        let https_connector =
+            HttpsConnector::from((http_connector, tls_connector));
         let hyper_client =
             hyper_util::client::legacy::Client::builder(TokioExecutor::new())
                 .build(https_connector);

apps/labrinth/src/database/models/charge_item.rs

@@ -197,7 +197,7 @@ impl DBCharge {
     ) -> Result<Option<DBCharge>, DatabaseError> {
         let user_subscription_id = user_subscription_id.0;
         let res = select_charges_with_predicate!(
-            "WHERE subscription_id = $1 AND (status = 'open' OR status = 'cancelled' OR status = 'failed')",
+            "WHERE subscription_id = $1 AND (status = 'open' OR status = 'cancelled')",
             user_subscription_id
         )
         .fetch_optional(exec)

apps/labrinth/src/routes/internal/flows.rs

@@ -223,8 +223,8 @@ impl TempUser {
                 stripe_customer_id: None,
                 totp_secret: None,
                 username,
-                email: self.email.clone(),
-                email_verified: self.email.is_some(),
+                email: self.email,
+                email_verified: true,
                 avatar_url,
                 raw_avatar_url,
                 bio: self.bio,
@@ -1419,15 +1419,15 @@ pub async fn create_account_with_password(
         .hash_password(new_account.password.as_bytes(), &salt)?
         .to_string();
 
-    if !crate::database::models::DBUser::get_by_case_insensitive_email(
+    if crate::database::models::DBUser::get_by_email(
         &new_account.email,
         &**pool,
     )
     .await?
-    .is_empty()
+    .is_some()
     {
         return Err(ApiError::InvalidInput(
-            "Email is already registered on Modrinth! Try 'Forgot password' to access your account.".to_string(),
+            "Email is already registered on Modrinth!".to_string(),
         ));
     }
 
@@ -2220,18 +2220,6 @@ pub async fn set_email(
     .await?
     .1;
 
-    if !crate::database::models::DBUser::get_by_case_insensitive_email(
-        &email.email,
-        &**pool,
-    )
-    .await?
-    .is_empty()
-    {
-        return Err(ApiError::InvalidInput(
-            "Email is already registered on Modrinth! Try 'Forgot password' in incognito to access and delete your other account.".to_string(),
-        ));
-    }
-
     let mut transaction = pool.begin().await?;
 
     sqlx::query!(

package.json

@@ -13,9 +13,7 @@
     "app:build": "turbo run build --filter=@modrinth/app",
     "app:fix": "turbo run fix --filter=@modrinth/app",
     "app:intl:extract": "pnpm run --filter=@modrinth/app-frontend intl:extract",
-    "blog:fix": "turbo run fix --filter=@modrinth/blog",
     "pages:build": "NITRO_PRESET=cloudflare-pages pnpm --filter frontend run build",
-    "moderation:fix": "turbo run fix --filter=@modrinth/moderation",
     "build": "turbo run build --continue",
     "lint": "turbo run lint --continue",
     "test": "turbo run test --continue",

packages/app-lib/.env.local

@@ -1,10 +1,2 @@
-MODRINTH_URL=http://localhost:3000/
-MODRINTH_API_URL=http://127.0.0.1:8000/v2/
-MODRINTH_API_URL_V3=http://127.0.0.1:8000/v3/
-MODRINTH_SOCKET_URL=ws://127.0.0.1:8000/
-MODRINTH_LAUNCHER_META_URL=https://launcher-meta.modrinth.com/
-
-# SQLite database file used by sqlx for type checking. Uncomment this to a valid path
-# in your system and run `cargo sqlx database setup` to generate an empty database that
-# can be used for developing the app DB schema
-#DATABASE_URL=sqlite:///tmp/Modrinth/code/packages/app-lib/.sqlx/generated/state.db
+# SQLite database file location
+DATABASE_URL=sqlite:///tmp/Modrinth/code/packages/app-lib/.sqlx/generated/state.db

packages/app-lib/.env.prod

@@ -1,10 +0,0 @@
-MODRINTH_URL=https://modrinth.com/
-MODRINTH_API_URL=https://api.modrinth.com/v2/
-MODRINTH_API_URL_V3=https://api.modrinth.com/v3/
-MODRINTH_SOCKET_URL=wss://api.modrinth.com/
-MODRINTH_LAUNCHER_META_URL=https://launcher-meta.modrinth.com/
-
-# SQLite database file used by sqlx for type checking. Uncomment this to a valid path
-# in your system and run `cargo sqlx database setup` to generate an empty database that
-# can be used for developing the app DB schema
-#DATABASE_URL=sqlite:///tmp/Modrinth/code/packages/app-lib/.sqlx/generated/state.db

packages/app-lib/.env.staging

@@ -1,10 +0,0 @@
-MODRINTH_URL=https://staging.modrinth.com/
-MODRINTH_API_URL=https://staging-api.modrinth.com/v2/
-MODRINTH_API_URL_V3=https://staging-api.modrinth.com/v3/
-MODRINTH_SOCKET_URL=wss://staging-api.modrinth.com/
-MODRINTH_LAUNCHER_META_URL=https://launcher-meta.modrinth.com/
-
-# SQLite database file used by sqlx for type checking. Uncomment this to a valid path
-# in your system and run `cargo sqlx database setup` to generate an empty database that
-# can be used for developing the app DB schema
-#DATABASE_URL=sqlite:///tmp/Modrinth/code/packages/app-lib/.sqlx/generated/state.db

packages/app-lib/Cargo.toml

@@ -82,7 +82,6 @@ ariadne.workspace = true
 winreg.workspace = true
 
 [build-dependencies]
-dotenvy.workspace = true
 dunce.workspace = true
 
 [features]

packages/app-lib/build.rs

@@ -4,31 +4,12 @@ use std::process::{Command, exit};
 use std::{env, fs};
 
 fn main() {
-    println!("cargo::rerun-if-changed=.env");
     println!("cargo::rerun-if-changed=java/gradle");
     println!("cargo::rerun-if-changed=java/src");
     println!("cargo::rerun-if-changed=java/build.gradle.kts");
     println!("cargo::rerun-if-changed=java/settings.gradle.kts");
     println!("cargo::rerun-if-changed=java/gradle.properties");
 
-    set_env();
-    build_java_jars();
-}
-
-fn set_env() {
-    for (var_name, var_value) in
-        dotenvy::dotenv_iter().into_iter().flatten().flatten()
-    {
-        if var_name == "DATABASE_URL" {
-            // The sqlx database URL is a build-time detail that should not be exposed to the crate
-            continue;
-        }
-
-        println!("cargo::rustc-env={var_name}={var_value}");
-    }
-}
-
-fn build_java_jars() {
     let out_dir =
         dunce::canonicalize(PathBuf::from(env::var_os("OUT_DIR").unwrap()))
             .unwrap();
@@ -56,7 +37,6 @@ fn build_java_jars() {
         .current_dir(dunce::canonicalize("java").unwrap())
         .status()
         .expect("Failed to wait on Gradle build");
-
     if !exit_status.success() {
         println!("cargo::error=Gradle build failed with {exit_status}");
         exit(exit_status.code().unwrap_or(1));

packages/app-lib/src/api/mr_auth.rs

@@ -1,7 +1,7 @@
 use crate::state::ModrinthCredentials;
 
 #[tracing::instrument]
-pub fn authenticate_begin_flow() -> &'static str {
+pub fn authenticate_begin_flow() -> String {
     crate::state::get_login_url()
 }
 

packages/app-lib/src/api/pack/import/mmc.rs

@@ -284,12 +284,6 @@ async fn import_mmc_unmanaged(
                     component.version.clone().unwrap_or_default(),
                 ));
             }
-            if component.uid.starts_with("net.neoforged") {
-                return Some((
-                    PackDependency::NeoForge,
-                    component.version.clone().unwrap_or_default(),
-                ));
-            }
             if component.uid.starts_with("org.quiltmc.quilt-loader") {
                 return Some((
                     PackDependency::QuiltLoader,

packages/app-lib/src/config.rs

@@ -0,0 +1,13 @@
+//! Configuration structs
+
+// pub const MODRINTH_URL: &str = "https://staging.modrinth.com/";
+// pub const MODRINTH_API_URL: &str = "https://staging-api.modrinth.com/v2/";
+// pub const MODRINTH_API_URL_V3: &str = "https://staging-api.modrinth.com/v3/";
+
+pub const MODRINTH_URL: &str = "https://modrinth.com/";
+pub const MODRINTH_API_URL: &str = "https://api.modrinth.com/v2/";
+pub const MODRINTH_API_URL_V3: &str = "https://api.modrinth.com/v3/";
+
+pub const MODRINTH_SOCKET_URL: &str = "wss://api.modrinth.com/";
+
+pub const META_URL: &str = "https://launcher-meta.modrinth.com/";

packages/app-lib/src/lib.rs

@@ -11,6 +11,7 @@ and launching Modrinth mod packs
 mod util;
 
 mod api;
+mod config;
 mod error;
 mod event;
 mod launcher;

packages/app-lib/src/state/cache.rs

@@ -1,3 +1,4 @@
+use crate::config::{META_URL, MODRINTH_API_URL, MODRINTH_API_URL_V3};
 use crate::state::ProjectType;
 use crate::util::fetch::{FetchSemaphore, fetch_json, sha1_async};
 use chrono::{DateTime, Utc};
@@ -7,7 +8,6 @@ use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use sqlx::SqlitePool;
 use std::collections::HashMap;
-use std::env;
 use std::fmt::Display;
 use std::hash::Hash;
 use std::path::{Path, PathBuf};
@@ -945,7 +945,7 @@ impl CachedEntry {
             CacheValueType::Project => {
                 fetch_original_values!(
                     Project,
-                    env!("MODRINTH_API_URL"),
+                    MODRINTH_API_URL,
                     "projects",
                     CacheValue::Project
                 )
@@ -953,7 +953,7 @@ impl CachedEntry {
             CacheValueType::Version => {
                 fetch_original_values!(
                     Version,
-                    env!("MODRINTH_API_URL"),
+                    MODRINTH_API_URL,
                     "versions",
                     CacheValue::Version
                 )
@@ -961,7 +961,7 @@ impl CachedEntry {
             CacheValueType::User => {
                 fetch_original_values!(
                     User,
-                    env!("MODRINTH_API_URL"),
+                    MODRINTH_API_URL,
                     "users",
                     CacheValue::User
                 )
@@ -969,7 +969,7 @@ impl CachedEntry {
             CacheValueType::Team => {
                 let mut teams = fetch_many_batched::<Vec<TeamMember>>(
                     Method::GET,
-                    env!("MODRINTH_API_URL_V3"),
+                    MODRINTH_API_URL_V3,
                     "teams?ids=",
                     &keys,
                     fetch_semaphore,
@@ -1008,7 +1008,7 @@ impl CachedEntry {
             CacheValueType::Organization => {
                 let mut orgs = fetch_many_batched::<Organization>(
                     Method::GET,
-                    env!("MODRINTH_API_URL_V3"),
+                    MODRINTH_API_URL_V3,
                     "organizations?ids=",
                     &keys,
                     fetch_semaphore,
@@ -1063,7 +1063,7 @@ impl CachedEntry {
             CacheValueType::File => {
                 let mut versions = fetch_json::<HashMap<String, Version>>(
                     Method::POST,
-                    concat!(env!("MODRINTH_API_URL"), "version_files"),
+                    &format!("{MODRINTH_API_URL}version_files"),
                     None,
                     Some(serde_json::json!({
                         "algorithm": "sha1",
@@ -1119,11 +1119,7 @@ impl CachedEntry {
                     .map(|x| {
                         (
                             x.key().to_string(),
-                            format!(
-                                "{}{}/v0/manifest.json",
-                                env!("MODRINTH_LAUNCHER_META_URL"),
-                                x.key()
-                            ),
+                            format!("{META_URL}{}/v0/manifest.json", x.key()),
                         )
                     })
                     .collect::<Vec<_>>();
@@ -1158,7 +1154,7 @@ impl CachedEntry {
             CacheValueType::MinecraftManifest => {
                 fetch_original_value!(
                     MinecraftManifest,
-                    env!("MODRINTH_LAUNCHER_META_URL"),
+                    META_URL,
                     format!(
                         "minecraft/v{}/manifest.json",
                         daedalus::minecraft::CURRENT_FORMAT_VERSION
@@ -1169,7 +1165,7 @@ impl CachedEntry {
             CacheValueType::Categories => {
                 fetch_original_value!(
                     Categories,
-                    env!("MODRINTH_API_URL"),
+                    MODRINTH_API_URL,
                     "tag/category",
                     CacheValue::Categories
                 )
@@ -1177,7 +1173,7 @@ impl CachedEntry {
             CacheValueType::ReportTypes => {
                 fetch_original_value!(
                     ReportTypes,
-                    env!("MODRINTH_API_URL"),
+                    MODRINTH_API_URL,
                     "tag/report_type",
                     CacheValue::ReportTypes
                 )
@@ -1185,7 +1181,7 @@ impl CachedEntry {
             CacheValueType::Loaders => {
                 fetch_original_value!(
                     Loaders,
-                    env!("MODRINTH_API_URL"),
+                    MODRINTH_API_URL,
                     "tag/loader",
                     CacheValue::Loaders
                 )
@@ -1193,7 +1189,7 @@ impl CachedEntry {
             CacheValueType::GameVersions => {
                 fetch_original_value!(
                     GameVersions,
-                    env!("MODRINTH_API_URL"),
+                    MODRINTH_API_URL,
                     "tag/game_version",
                     CacheValue::GameVersions
                 )
@@ -1201,7 +1197,7 @@ impl CachedEntry {
             CacheValueType::DonationPlatforms => {
                 fetch_original_value!(
                     DonationPlatforms,
-                    env!("MODRINTH_API_URL"),
+                    MODRINTH_API_URL,
                     "tag/donation_platform",
                     CacheValue::DonationPlatforms
                 )
@@ -1301,12 +1297,14 @@ impl CachedEntry {
                     }
                 });
 
+                let version_update_url =
+                    format!("{MODRINTH_API_URL}version_files/update");
                 let variations =
                     futures::future::try_join_all(filtered_keys.iter().map(
                         |((loaders_key, game_version), hashes)| {
                             fetch_json::<HashMap<String, Version>>(
                                 Method::POST,
-                                concat!(env!("MODRINTH_API_URL"), "version_files/update"),
+                                &version_update_url,
                                 None,
                                 Some(serde_json::json!({
                                     "algorithm": "sha1",
@@ -1370,11 +1368,7 @@ impl CachedEntry {
                     .map(|x| {
                         (
                             x.key().to_string(),
-                            format!(
-                                "{}search{}",
-                                env!("MODRINTH_API_URL"),
-                                x.key()
-                            ),
+                            format!("{MODRINTH_API_URL}search{}", x.key()),
                         )
                     })
                     .collect::<Vec<_>>();

packages/app-lib/src/state/friends.rs

@@ -1,3 +1,4 @@
+use crate::config::{MODRINTH_API_URL_V3, MODRINTH_SOCKET_URL};
 use crate::data::ModrinthCredentials;
 use crate::event::FriendPayload;
 use crate::event::emit::emit_friend;
@@ -76,8 +77,7 @@ impl FriendsSocket {
 
         if let Some(credentials) = credentials {
             let mut request = format!(
-                "{}_internal/launcher_socket?code={}",
-                env!("MODRINTH_SOCKET_URL"),
+                "{MODRINTH_SOCKET_URL}_internal/launcher_socket?code={}",
                 credentials.session
             )
             .into_client_request()?;
@@ -303,7 +303,7 @@ impl FriendsSocket {
     ) -> crate::Result<Vec<UserFriend>> {
         fetch_json(
             Method::GET,
-            concat!(env!("MODRINTH_API_URL_V3"), "friends"),
+            &format!("{MODRINTH_API_URL_V3}friends"),
             None,
             None,
             semaphore,
@@ -328,7 +328,7 @@ impl FriendsSocket {
     ) -> crate::Result<()> {
         fetch_advanced(
             Method::POST,
-            &format!("{}friend/{user_id}", env!("MODRINTH_API_URL_V3")),
+            &format!("{MODRINTH_API_URL_V3}friend/{user_id}"),
             None,
             None,
             None,
@@ -349,7 +349,7 @@ impl FriendsSocket {
     ) -> crate::Result<()> {
         fetch_advanced(
             Method::DELETE,
-            &format!("{}friend/{user_id}", env!("MODRINTH_API_URL_V3")),
+            &format!("{MODRINTH_API_URL_V3}friend/{user_id}"),
             None,
             None,
             None,

packages/app-lib/src/state/minecraft_auth.rs

@@ -85,18 +85,21 @@ pub struct MinecraftLoginFlow {
     pub verifier: String,
     pub challenge: String,
     pub session_id: String,
-    pub auth_request_uri: String,
+    pub redirect_uri: String,
 }
 
 #[tracing::instrument]
 pub async fn login_begin(
     exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite> + Copy,
 ) -> crate::Result<MinecraftLoginFlow> {
-    let (pair, current_date) =
-        DeviceTokenPair::refresh_and_get_device_token(Utc::now(), exec).await?;
+    let (pair, current_date, valid_date) =
+        DeviceTokenPair::refresh_and_get_device_token(Utc::now(), false, exec)
+            .await?;
 
     let verifier = generate_oauth_challenge();
-    let result = sha2::Sha256::digest(&verifier);
+    let mut hasher = sha2::Sha256::new();
+    hasher.update(&verifier);
+    let result = hasher.finalize();
     let challenge = BASE64_URL_SAFE_NO_PAD.encode(result);
 
     match sisu_authenticate(
@@ -107,15 +110,46 @@ pub async fn login_begin(
     )
     .await
     {
-        Ok((session_id, redirect_uri)) => {
-            return Ok(MinecraftLoginFlow {
-                verifier,
-                challenge,
-                session_id,
-                auth_request_uri: redirect_uri.value.msa_oauth_redirect,
-            });
+        Ok((session_id, redirect_uri)) => Ok(MinecraftLoginFlow {
+            verifier,
+            challenge,
+            session_id,
+            redirect_uri: redirect_uri.value.msa_oauth_redirect,
+        }),
+        Err(err) => {
+            if !valid_date {
+                let (pair, current_date, _) =
+                    DeviceTokenPair::refresh_and_get_device_token(
+                        Utc::now(),
+                        false,
+                        exec,
+                    )
+                    .await?;
+
+                let verifier = generate_oauth_challenge();
+                let mut hasher = sha2::Sha256::new();
+                hasher.update(&verifier);
+                let result = hasher.finalize();
+                let challenge = BASE64_URL_SAFE_NO_PAD.encode(result);
+
+                let (session_id, redirect_uri) = sisu_authenticate(
+                    &pair.token.token,
+                    &challenge,
+                    &pair.key,
+                    current_date,
+                )
+                .await?;
+
+                Ok(MinecraftLoginFlow {
+                    verifier,
+                    challenge,
+                    session_id,
+                    redirect_uri: redirect_uri.value.msa_oauth_redirect,
+                })
+            } else {
+                Err(crate::ErrorKind::from(err).into())
+            }
         }
-        Err(err) => return Err(crate::ErrorKind::from(err).into()),
     }
 }
 
@@ -125,8 +159,9 @@ pub async fn login_finish(
     flow: MinecraftLoginFlow,
     exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite> + Copy,
 ) -> crate::Result<Credentials> {
-    let (pair, _) =
-        DeviceTokenPair::refresh_and_get_device_token(Utc::now(), exec).await?;
+    let (pair, _, _) =
+        DeviceTokenPair::refresh_and_get_device_token(Utc::now(), false, exec)
+            .await?;
 
     let oauth_token = oauth_token(code, &flow.verifier).await?;
     let sisu_authorize = sisu_authorize(
@@ -232,9 +267,10 @@ impl Credentials {
         }
 
         let oauth_token = oauth_refresh(&self.refresh_token).await?;
-        let (pair, current_date) =
+        let (pair, current_date, _) =
             DeviceTokenPair::refresh_and_get_device_token(
                 oauth_token.date,
+                false,
                 exec,
             )
             .await?;
@@ -597,20 +633,21 @@ impl DeviceTokenPair {
     #[tracing::instrument(skip(exec))]
     async fn refresh_and_get_device_token(
         current_date: DateTime<Utc>,
+        force_generate: bool,
         exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite> + Copy,
-    ) -> crate::Result<(Self, DateTime<Utc>)> {
+    ) -> crate::Result<(Self, DateTime<Utc>, bool)> {
         let pair = Self::get(exec).await?;
 
         if let Some(mut pair) = pair {
-            if pair.token.not_after > current_date {
-                Ok((pair, current_date))
+            if pair.token.not_after > Utc::now() && !force_generate {
+                Ok((pair, current_date, false))
             } else {
                 let res = device_token(&pair.key, current_date).await?;
 
                 pair.token = res.value;
                 pair.upsert(exec).await?;
 
-                Ok((pair, res.date))
+                Ok((pair, res.date, true))
             }
         } else {
             let key = generate_key()?;
@@ -623,7 +660,7 @@ impl DeviceTokenPair {
 
             pair.upsert(exec).await?;
 
-            Ok((pair, res.date))
+            Ok((pair, res.date, true))
         }
     }
 
@@ -721,8 +758,8 @@ impl DeviceTokenPair {
 }
 
 const MICROSOFT_CLIENT_ID: &str = "00000000402b5328";
-const AUTH_REPLY_URL: &str = "https://login.live.com/oauth20_desktop.srf";
-const REQUESTED_SCOPE: &str = "service::user.auth.xboxlive.com::MBI_SSL";
+const REDIRECT_URL: &str = "https://login.live.com/oauth20_desktop.srf";
+const REQUESTED_SCOPES: &str = "service::user.auth.xboxlive.com::MBI_SSL";
 
 struct RequestWithDate<T> {
     pub date: DateTime<Utc>,
@@ -801,7 +838,7 @@ async fn sisu_authenticate(
           "AppId": MICROSOFT_CLIENT_ID,
           "DeviceToken": token,
           "Offers": [
-            REQUESTED_SCOPE
+            REQUESTED_SCOPES
           ],
           "Query": {
             "code_challenge": challenge,
@@ -809,7 +846,7 @@ async fn sisu_authenticate(
             "state": generate_oauth_challenge(),
             "prompt": "select_account"
           },
-          "RedirectUri": AUTH_REPLY_URL,
+          "RedirectUri": REDIRECT_URL,
           "Sandbox": "RETAIL",
           "TokenType": "code",
           "TitleId": "1794566092",
@@ -853,12 +890,12 @@ async fn oauth_token(
     verifier: &str,
 ) -> Result<RequestWithDate<OAuthToken>, MinecraftAuthenticationError> {
     let mut query = HashMap::new();
-    query.insert("client_id", MICROSOFT_CLIENT_ID);
+    query.insert("client_id", "00000000402b5328");
     query.insert("code", code);
     query.insert("code_verifier", verifier);
     query.insert("grant_type", "authorization_code");
-    query.insert("redirect_uri", AUTH_REPLY_URL);
-    query.insert("scope", REQUESTED_SCOPE);
+    query.insert("redirect_uri", "https://login.live.com/oauth20_desktop.srf");
+    query.insert("scope", "service::user.auth.xboxlive.com::MBI_SSL");
 
     let res = auth_retry(|| {
         REQWEST_CLIENT
@@ -902,11 +939,11 @@ async fn oauth_refresh(
     refresh_token: &str,
 ) -> Result<RequestWithDate<OAuthToken>, MinecraftAuthenticationError> {
     let mut query = HashMap::new();
-    query.insert("client_id", MICROSOFT_CLIENT_ID);
+    query.insert("client_id", "00000000402b5328");
     query.insert("refresh_token", refresh_token);
     query.insert("grant_type", "refresh_token");
-    query.insert("redirect_uri", AUTH_REPLY_URL);
-    query.insert("scope", REQUESTED_SCOPE);
+    query.insert("redirect_uri", "https://login.live.com/oauth20_desktop.srf");
+    query.insert("scope", "service::user.auth.xboxlive.com::MBI_SSL");
 
     let res = auth_retry(|| {
         REQWEST_CLIENT
@@ -970,7 +1007,7 @@ async fn sisu_authorize(
         "/authorize",
         json!({
             "AccessToken": format!("t={access_token}"),
-            "AppId": MICROSOFT_CLIENT_ID,
+            "AppId": "00000000402b5328",
             "DeviceToken": device_token,
             "ProofKey": {
                 "kty": "EC",

packages/app-lib/src/state/mr_auth.rs

@@ -1,3 +1,4 @@
+use crate::config::{MODRINTH_API_URL, MODRINTH_URL};
 use crate::state::{CacheBehaviour, CachedEntry};
 use crate::util::fetch::{FetchSemaphore, fetch_advanced};
 use chrono::{DateTime, Duration, TimeZone, Utc};
@@ -30,7 +31,7 @@ impl ModrinthCredentials {
 
                 let resp = fetch_advanced(
                     Method::POST,
-                    concat!(env!("MODRINTH_API_URL"), "session/refresh"),
+                    &format!("{MODRINTH_API_URL}session/refresh"),
                     None,
                     None,
                     Some(("Authorization", &*creds.session)),
@@ -189,8 +190,8 @@ impl ModrinthCredentials {
     }
 }
 
-pub const fn get_login_url() -> &'static str {
-    concat!(env!("MODRINTH_URL"), "auth/sign-in")
+pub fn get_login_url() -> String {
+    format!("{MODRINTH_URL}auth/sign-in?launcher=true")
 }
 
 pub async fn finish_login_flow(
@@ -198,12 +199,6 @@ pub async fn finish_login_flow(
     semaphore: &FetchSemaphore,
     exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
 ) -> crate::Result<ModrinthCredentials> {
-    // The authorization code actually is the access token, since Labrinth doesn't
-    // issue separate authorization codes. Therefore, this is equivalent to an
-    // implicit OAuth grant flow, and no additional exchanging or finalization is
-    // needed. TODO not do this for the reasons outlined at
-    // https://oauth.net/2/grant-types/implicit/
-
     let info = fetch_info(code, semaphore, exec).await?;
 
     Ok(ModrinthCredentials {
@@ -221,7 +216,7 @@ async fn fetch_info(
 ) -> crate::Result<crate::state::cache::User> {
     let result = fetch_advanced(
         Method::GET,
-        concat!(env!("MODRINTH_API_URL"), "user"),
+        &format!("{MODRINTH_API_URL}user"),
         None,
         None,
         Some(("Authorization", token)),

packages/app-lib/src/util/fetch.rs

@@ -1,5 +1,6 @@
 //! Functions for fetching information from the Internet
 use super::io::{self, IOError};
+use crate::config::{MODRINTH_API_URL, MODRINTH_API_URL_V3};
 use crate::event::LoadingBarId;
 use crate::event::emit::emit_loading;
 use bytes::Bytes;
@@ -83,8 +84,8 @@ pub async fn fetch_advanced(
         .as_ref()
         .is_none_or(|x| &*x.0.to_lowercase() != "authorization")
         && (url.starts_with("https://cdn.modrinth.com")
-            || url.starts_with(env!("MODRINTH_API_URL"))
-            || url.starts_with(env!("MODRINTH_API_URL_V3")))
+            || url.starts_with(MODRINTH_API_URL)
+            || url.starts_with(MODRINTH_API_URL_V3))
     {
         crate::state::ModrinthCredentials::get_active(exec).await?
     } else {

packages/assets/generated-icons.ts

@@ -12,7 +12,6 @@ import _BellRingIcon from './icons/bell-ring.svg?component'
 import _BellIcon from './icons/bell.svg?component'
 import _BlocksIcon from './icons/blocks.svg?component'
 import _BoldIcon from './icons/bold.svg?component'
-import _BookOpenIcon from './icons/book-open.svg?component'
 import _BookTextIcon from './icons/book-text.svg?component'
 import _BookIcon from './icons/book.svg?component'
 import _BookmarkIcon from './icons/bookmark.svg?component'
@@ -20,7 +19,6 @@ import _BotIcon from './icons/bot.svg?component'
 import _BoxImportIcon from './icons/box-import.svg?component'
 import _BoxIcon from './icons/box.svg?component'
 import _BracesIcon from './icons/braces.svg?component'
-import _BrushCleaningIcon from './icons/brush-cleaning.svg?component'
 import _CalendarIcon from './icons/calendar.svg?component'
 import _CardIcon from './icons/card.svg?component'
 import _ChangeSkinIcon from './icons/change-skin.svg?component'
@@ -88,7 +86,6 @@ import _InfoIcon from './icons/info.svg?component'
 import _IssuesIcon from './icons/issues.svg?component'
 import _ItalicIcon from './icons/italic.svg?component'
 import _KeyIcon from './icons/key.svg?component'
-import _KeyboardIcon from './icons/keyboard.svg?component'
 import _LanguagesIcon from './icons/languages.svg?component'
 import _LeftArrowIcon from './icons/left-arrow.svg?component'
 import _LibraryIcon from './icons/library.svg?component'
@@ -169,7 +166,6 @@ import _TextQuoteIcon from './icons/text-quote.svg?component'
 import _TimerIcon from './icons/timer.svg?component'
 import _TransferIcon from './icons/transfer.svg?component'
 import _TrashIcon from './icons/trash.svg?component'
-import _TriangleAlertIcon from './icons/triangle-alert.svg?component'
 import _UnderlineIcon from './icons/underline.svg?component'
 import _UndoIcon from './icons/undo.svg?component'
 import _UnknownDonationIcon from './icons/unknown-donation.svg?component'
@@ -203,7 +199,6 @@ export const BellRingIcon = _BellRingIcon
 export const BellIcon = _BellIcon
 export const BlocksIcon = _BlocksIcon
 export const BoldIcon = _BoldIcon
-export const BookOpenIcon = _BookOpenIcon
 export const BookTextIcon = _BookTextIcon
 export const BookIcon = _BookIcon
 export const BookmarkIcon = _BookmarkIcon
@@ -211,7 +206,6 @@ export const BotIcon = _BotIcon
 export const BoxImportIcon = _BoxImportIcon
 export const BoxIcon = _BoxIcon
 export const BracesIcon = _BracesIcon
-export const BrushCleaningIcon = _BrushCleaningIcon
 export const CalendarIcon = _CalendarIcon
 export const CardIcon = _CardIcon
 export const ChangeSkinIcon = _ChangeSkinIcon
@@ -279,7 +273,6 @@ export const InfoIcon = _InfoIcon
 export const IssuesIcon = _IssuesIcon
 export const ItalicIcon = _ItalicIcon
 export const KeyIcon = _KeyIcon
-export const KeyboardIcon = _KeyboardIcon
 export const LanguagesIcon = _LanguagesIcon
 export const LeftArrowIcon = _LeftArrowIcon
 export const LibraryIcon = _LibraryIcon
@@ -360,7 +353,6 @@ export const TextQuoteIcon = _TextQuoteIcon
 export const TimerIcon = _TimerIcon
 export const TransferIcon = _TransferIcon
 export const TrashIcon = _TrashIcon
-export const TriangleAlertIcon = _TriangleAlertIcon
 export const UnderlineIcon = _UnderlineIcon
 export const UndoIcon = _UndoIcon
 export const UnknownDonationIcon = _UnknownDonationIcon

packages/assets/icons/book-open.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-book-open-icon lucide-book-open"><path d="M12 7v14"/><path d="M3 18a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h5a4 4 0 0 1 4 4 4 4 0 0 1 4-4h5a1 1 0 0 1 1 1v13a1 1 0 0 1-1 1h-6a3 3 0 0 0-3 3 3 3 0 0 0-3-3z"/></svg>

packages/assets/icons/brush-cleaning.svg

@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
-    stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
-    class="lucide lucide-brush-cleaning-icon lucide-brush-cleaning">
-    <path d="m16 22-1-4" />
-    <path
-        d="M19 13.99a1 1 0 0 0 1-1V12a2 2 0 0 0-2-2h-3a1 1 0 0 1-1-1V4a2 2 0 0 0-4 0v5a1 1 0 0 1-1 1H6a2 2 0 0 0-2 2v.99a1 1 0 0 0 1 1" />
-    <path d="M5 14h14l1.973 6.767A1 1 0 0 1 20 22H4a1 1 0 0 1-.973-1.233z" />
-    <path d="m8 22 1-4" />
-</svg>

packages/assets/icons/keyboard.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-keyboard-icon lucide-keyboard"><path d="M10 8h.01"/><path d="M12 12h.01"/><path d="M14 8h.01"/><path d="M16 12h.01"/><path d="M18 8h.01"/><path d="M6 8h.01"/><path d="M7 16h10"/><path d="M8 12h.01"/><rect width="20" height="16" x="2" y="4" rx="2"/></svg>

packages/assets/icons/triangle-alert.svg

@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
-    stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
-    class="lucide lucide-triangle-alert-icon lucide-triangle-alert">
-    <path d="m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3" />
-    <path d="M12 9v4" />
-    <path d="M12 17h.01" />
-</svg>

packages/assets/index.ts

@@ -83,7 +83,7 @@ export const TwitterIcon = _TwitterIcon
 export const WindowsIcon = _WindowsIcon
 export const YouTubeIcon = _YouTubeIcon
 
-// Skin Models
+export { default as CapeModel } from './models/cape.gltf?url'
 export { default as ClassicPlayerModel } from './models/classic-player.gltf?url'
 export { default as SlimPlayerModel } from './models/slim-player.gltf?url'
 

packages/assets/models/cape.gltf

@@ -0,0 +1,92 @@
+{
+  "asset": { "version": "2.0", "generator": "Blockbench 4.12.4 glTF exporter" },
+  "scenes": [{ "nodes": [1], "name": "blockbench_export" }],
+  "scene": 0,
+  "nodes": [
+    {
+      "rotation": [0, 0, 0.19509032201612825, 0.9807852804032304],
+      "translation": [0.15625, 1, 0],
+      "name": "Cape",
+      "mesh": 0
+    },
+    { "children": [0] }
+  ],
+  "bufferViews": [
+    { "buffer": 0, "byteOffset": 0, "byteLength": 288, "target": 34962, "byteStride": 12 },
+    { "buffer": 0, "byteOffset": 288, "byteLength": 288, "target": 34962, "byteStride": 12 },
+    { "buffer": 0, "byteOffset": 576, "byteLength": 192, "target": 34962, "byteStride": 8 },
+    { "buffer": 0, "byteOffset": 768, "byteLength": 72, "target": 34963 }
+  ],
+  "buffers": [
+    {
+      "byteLength": 840,
+      "uri": "data:application/octet-stream;base64,AAAAPQAAAAAAAKA+AAAAPQAAAAAAAKC+AAAAPQAAgL8AAKA+AAAAPQAAgL8AAKC+AAAAvQAAAAAAAKC+AAAAvQAAAAAAAKA+AAAAvQAAgL8AAKC+AAAAvQAAgL8AAKA+AAAAvQAAAAAAAKC+AAAAPQAAAAAAAKC+AAAAvQAAAAAAAKA+AAAAPQAAAAAAAKA+AAAAvQAAgL8AAKA+AAAAPQAAgL8AAKA+AAAAvQAAgL8AAKC+AAAAPQAAgL8AAKC+AAAAvQAAAAAAAKA+AAAAPQAAAAAAAKA+AAAAvQAAgL8AAKA+AAAAPQAAgL8AAKA+AAAAPQAAAAAAAKC+AAAAvQAAAAAAAKC+AAAAPQAAgL8AAKC+AAAAvQAAgL8AAKC+AACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AACAPAAAgD0AADA+AACAPQAAgDwAAAg/AAAwPgAACD8AAEA+AACAPQAAsD4AAIA9AABAPgAACD8AALA+AAAIPwAAgDwAAAA9AACAPAAAgD0AADA+AAAAPQAAMD4AAIA9AAAwPgAAAD0AAKg+AAAAPQAAMD4AAAAAAACoPgAAAAAAAEA+AACAPQAAMD4AAIA9AABAPgAACD8AADA+AAAIPwAAAAAAAIA9AACAPAAAgD0AAAAAAAAIPwAAgDwAAAg/AAACAAEAAgADAAEABAAGAAUABgAHAAUACAAKAAkACgALAAkADAAOAA0ADgAPAA0AEAASABEAEgATABEAFAAWABUAFgAXABUA"
+    }
+  ],
+  "accessors": [
+    {
+      "bufferView": 0,
+      "componentType": 5126,
+      "count": 24,
+      "max": [0.03125, 0, 0.3125],
+      "min": [-0.03125, -1, -0.3125],
+      "type": "VEC3"
+    },
+    {
+      "bufferView": 1,
+      "componentType": 5126,
+      "count": 24,
+      "max": [1, 1, 1],
+      "min": [-1, -1, -1],
+      "type": "VEC3"
+    },
+    {
+      "bufferView": 2,
+      "componentType": 5126,
+      "count": 24,
+      "max": [0.34375, 0.53125],
+      "min": [0, 0],
+      "type": "VEC2"
+    },
+    {
+      "bufferView": 3,
+      "componentType": 5123,
+      "count": 36,
+      "max": [23],
+      "min": [0],
+      "type": "SCALAR"
+    }
+  ],
+  "materials": [
+    {
+      "pbrMetallicRoughness": {
+        "metallicFactor": 0,
+        "roughnessFactor": 1,
+        "baseColorTexture": { "index": 0 }
+      },
+      "alphaMode": "MASK",
+      "alphaCutoff": 0.05,
+      "doubleSided": true
+    }
+  ],
+  "textures": [{ "sampler": 0, "source": 0, "name": "cape.png" }],
+  "samplers": [{ "magFilter": 9728, "minFilter": 9728, "wrapS": 33071, "wrapT": 33071 }],
+  "images": [
+    {
+      "mimeType": "image/png",
+      "uri": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAAAXNSR0IArs4c6QAABCRJREFUaEPtlktoE1EUhm/sIzFpYsBgHyn2oRZt0C5ESxWFYutKNyKIWBBR6kpBd3Ur2J0FRdCiuKmIIG4qLnzgQqTUXSlVqdoXTU0lljRpYtOHI/8dznBnOm1mphMwJWeTzJ0795zznf/cex2MMXam2S/ht38siJ8V1lgd5mOBARerc3rZnmK37rwvCyk2nE6wezMRh+4EncH9B1ql+fkU64rPsaBz5bqh4T7Daxn1Kc5zVNeEePJIci0Aq71bzenY6JChwAnA0OBHQ/OtJLnWNwqAy61R1tO3k891ueRKoDKwtqbv7MGbgCnfRgHQoqG9hyX4hc/yiho+/HNqVPFtdj2jwTpQgd/RKT7/0ZUku/o4qAJw50KYXbzr4e+3BioYzc3kwGzAUCLWFw2+UBiCb3bNTDHiPQeAP3CGNmg/6VcSBpDu3hhvDQpOCwABwrQKsRIsqYAChy/EQAXwlPiZ3a3igNPkXIyTjr8o5L7PPdzGf59c+sV/faeWeIIIAHPJ8M3kc7l1K09LKghWAIgqoPZ7djPFTlxb4D6yAgBOQfntrUVWVeRk44tplXJorOVGkVIJTBCTpw9ECFYBIEkyMfmsAXh3u1qi5MlxbbGX/x1ZSCjBAAwgfPr6h49R5UVavk0FXC2wju5p07s6iqEF0PtqSlEf+bKzDRwdgaDU7AkoySJ5Oo/D6ZRq/H0yyuJ/lxkSheG/FgCNm7kL0BoEAG32sqtY1YIHd2/mGzTMVgD3y2slqjgW9xY6ma9AThAARIMiBtOpjADwTWc0bEkB+FZsSTxTW0KBsGPXx0yvrUpEeHAAQIM7wBJLcu8DwHaP/H8i6VSND6SiSjBlRW4WWUypVIBbIgzjVgB0tpdKqLReS0KVPTMTfH0ra2cEgAmAAEd+l1z52LybqwBQYAQAyZPh6gtDW4jjuC4fHx8wXSm0JDbeI95SRYHiFZlUaWVtPQiKAugl5E8ASAUYiy8vc0C474uGasPE5PHc4g0wK/f4obom6UNimol7kTZwQLANwOuqBokqDEeQf4lfvvnNxZJcBTBAGZplWQcQ3tcgwY9oWlXinRW4ugoAgNAWWe6ocn1QvgyRTUb4RZFVljlY/3hSBYCqb6cCZo8ekuATVRZPI/gQW8FWAI1VHganVgDQUajdA6y2gAgAcZFBjTBSpG0AcAqc3VVmCMDTbxGWZvIRCaMNkJ7pFMCzVQD4liCQ8kRFUlvaBkCvL+wYw2ZmNUgCgLajFhRPJlv3ADuS1VtjPQCk823S574ffN/x1dQqy8dHR5SN2Spcbaymz2mjwNYDAD4IQn3TDpVLQIAqNjwAANRrAdoI/3sAOF7Xe1khCNQGVH1bL0JGJb1R52VtD8gVYHkAuVKpbMWZV0C2yObKunkF5EqlshVnXgHZIpsr6/4DlbxcPydnT74AAAAASUVORK5CYII="
+    }
+  ],
+  "meshes": [
+    {
+      "primitives": [
+        {
+          "mode": 4,
+          "attributes": { "POSITION": 0, "NORMAL": 1, "TEXCOORD_0": 2 },
+          "indices": 3,
+          "material": 0
+        }
+      ]
+    }
+  ]
+}

packages/blog/check.ts

@@ -1,16 +1,16 @@
 import { promises as fs } from 'fs'
 import * as path from 'path'
+import fastGlob from 'fast-glob'
 import { repoPath, toVarName } from './utils'
-import { glob } from 'glob'
 
 import { PUBLIC_SRC, PUBLIC_LOCATIONS, ARTICLES_GLOB, COMPILED_DIR } from './blog.config'
 
 async function checkPublicAssets() {
-  const srcFiles = await glob('**/*', { cwd: PUBLIC_SRC, dot: true })
+  const srcFiles = await fastGlob(['**/*'], { cwd: PUBLIC_SRC, dot: true })
   let allOk = true
   for (const target of PUBLIC_LOCATIONS) {
     for (const relativeFile of srcFiles) {
-      const shouldExist = path.posix.join(target, relativeFile)
+      const shouldExist = path.join(target, relativeFile)
       try {
         await fs.access(shouldExist)
       } catch {
@@ -26,15 +26,15 @@ async function checkPublicAssets() {
 }
 
 async function checkCompiledArticles() {
-  const mdFiles = await glob(ARTICLES_GLOB)
-  const compiledFiles = await glob(`${COMPILED_DIR}/*.ts`)
+  const mdFiles = await fastGlob([ARTICLES_GLOB])
+  const compiledFiles = await fastGlob([`${COMPILED_DIR}/*.ts`])
   const compiledVarNames = compiledFiles.map((f) => path.basename(f, '.ts'))
 
   // Check all .md have compiled .ts and .content.ts and the proper public thumbnail
   for (const file of mdFiles) {
     const varName = toVarName(path.basename(file, '.md'))
-    const compiledPath = path.posix.join(COMPILED_DIR, varName + '.ts')
-    const contentPath = path.posix.join(COMPILED_DIR, varName + '.content.ts')
+    const compiledPath = path.join(COMPILED_DIR, varName + '.ts')
+    const contentPath = path.join(COMPILED_DIR, varName + '.content.ts')
     if (!compiledVarNames.includes(varName)) {
       console.error(`⚠️  Missing compiled article for: ${file} (should be: ${compiledPath})`)
       process.exit(1)
@@ -59,7 +59,7 @@ async function checkCompiledArticles() {
     if (varName === 'index' || varName.endsWith('.content')) continue
 
     const mdPathGlob = repoPath(`packages/blog/articles/**/${varName.replace(/_/g, '*')}.md`)
-    const found = await glob(mdPathGlob)
+    const found = await fastGlob([mdPathGlob])
     if (!found.length) {
       console.error(`❌  Compiled article ${compiled} has no matching markdown source!`)
       process.exit(1)