Added confirm for checking discussion threads

Signed-off-by: Jakob <minenash@protonmail.com>

.github/ISSUE_TEMPLATE/2-web-bug.yml

@@ -1,6 +1,6 @@
 name: 🌐 Website bug (modrinth.com)
 description: Report an issue on the Modrinth website.
-labels: [bug, frontend]
+labels: [bug, web]
 body:
   - type: checkboxes
     attributes:

.github/ISSUE_TEMPLATE/4-feature-request.yml

@@ -9,6 +9,8 @@ body:
       options:
         - label: I checked the [existing issues](https://github.com/modrinth/code/issues) for duplicate feature requests
           required: true
+        - label: I checked the [existing discussions](https://github.com/orgs/modrinth/discussions) for duplicate feature requests
+          required: true
         - label: I have checked that this feature request is not on our [roadmap](https://roadmap.modrinth.com)
           required: true
   - type: dropdown

.github/workflows/app-release.yml

@@ -44,28 +44,7 @@ jobs:
       - name: Setup rust cache
         uses: actions/cache@v4
         with:
-          path: |
+          path: target/**
-            target/**
-            !target/*/release/bundle/*/*.dmg
-            !target/*/release/bundle/*/*.app.tar.gz
-            !target/*/release/bundle/*/*.app.tar.gz.sig
-            !target/release/bundle/*/*.dmg
-            !target/release/bundle/*/*.app.tar.gz
-            !target/release/bundle/*/*.app.tar.gz.sig
-
-            !target/release/bundle/*/*.AppImage
-            !target/release/bundle/*/*.AppImage.tar.gz
-            !target/release/bundle/*/*.AppImage.tar.gz.sig
-            !target/release/bundle/*/*.deb
-            !target/release/bundle/*/*.rpm
-
-            !target/release/bundle/msi/*.msi
-            !target/release/bundle/msi/*.msi.zip
-            !target/release/bundle/msi/*.msi.zip.sig
-
-            !target/release/bundle/nsis/*.exe
-            !target/release/bundle/nsis/*.nsis.zip
-            !target/release/bundle/nsis/*.nsis.zip.sig
           key: ${{ runner.os }}-rust-target-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
             ${{ runner.os }}-rust-target-
@@ -99,7 +78,7 @@ jobs:
         if: startsWith(matrix.platform, 'ubuntu')
         run: |
           sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev pkg-config libayatana-appindicator3-dev librsvg2-dev
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libssl-dev sqlite3
 
       - name: Install frontend dependencies
         run: pnpm install
@@ -146,10 +125,7 @@ jobs:
             target/release/bundle/*/*.deb
             target/release/bundle/*/*.rpm
             
-            target/release/bundle/msi/*.msi
+            target/release/bundle/*/*.msi
-            target/release/bundle/msi/*.msi.zip
+            target/release/bundle/*/*.msi.zip
-            target/release/bundle/msi/*.msi.zip.sig
+            target/release/bundle/*/*.msi.zip.sig
 
-            target/release/bundle/nsis/*.exe
-            target/release/bundle/nsis/*.nsis.zip
-            target/release/bundle/nsis/*.nsis.zip.sig

.github/workflows/ci.yml

@@ -62,19 +62,9 @@ jobs:
 
       - name: Build
         run: pnpm build
-        env:
-          SQLX_OFFLINE: true
 
       - name: Lint
         run: pnpm lint
-        env:
-          SQLX_OFFLINE: true
-
-      - name: Start docker compose
-        run: docker compose up -d
 
       - name: Test
         run: pnpm test
-        env:
-          SQLX_OFFLINE: true
-          DATABASE_URL: postgresql://labrinth:labrinth@localhost/postgres

.github/workflows/daedalus-docker.yml

@@ -1,43 +0,0 @@
-name: daedalus-docker-build
-
-on:
-  push:
-    branches: [ "main" ]
-    paths:
-      - .github/workflows/daedalus-docker.yml
-      - 'apps/daedalus_client/**'
-  pull_request:
-    types: [ opened, synchronize ]
-    paths:
-      - .github/workflows/daedalus-docker.yml
-      - 'apps/daedalus_client/**'
-  merge_group:
-    types: [ checks_requested ]
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Fetch docker metadata
-        id: docker_meta
-        uses: docker/metadata-action@v3
-        with:
-          images: ghcr.io/modrinth/daedalus
-      -
-        name: Login to GitHub Images
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Build and push
-        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 }}

.github/workflows/daedalus-run.yml

@@ -1,52 +0,0 @@
-name: Run Meta
-
-on:
-  schedule:
-    - cron: '*/5 * * * *'
-  workflow_dispatch:
-
-jobs:
-  run-docker:
-    if: github.repository_owner == 'modrinth'
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-
-      - name: Pull Docker image from GHCR
-        run: docker pull ghcr.io/modrinth/daedalus:main
-
-      - name: Run Docker container
-        env:
-          BASE_URL: ${{ secrets.BASE_URL }}
-          S3_ACCESS_TOKEN: ${{ secrets.S3_ACCESS_TOKEN }}
-          S3_SECRET: ${{ secrets.S3_SECRET }}
-          S3_URL: ${{ secrets.S3_URL }}
-          S3_REGION: ${{ secrets.S3_REGION }}
-          S3_BUCKET_NAME: ${{ secrets.S3_BUCKET_NAME }}
-          CLOUDFLARE_INTEGRATION: ${{ secrets.CLOUDFLARE_INTEGRATION }}
-          CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}
-          CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }}
-        run: |
-          docker run \
-            --name daedalus \
-            -e RUST_LOG=warn,daedalus_client=trace \
-            -e BASE_URL=$BASE_URL \
-            -e S3_ACCESS_TOKEN=$S3_ACCESS_TOKEN \
-            -e S3_SECRET=$S3_SECRET \
-            -e S3_URL=$S3_URL \
-            -e S3_REGION=$S3_REGION \
-            -e S3_BUCKET_NAME=$S3_BUCKET_NAME \
-            -e CLOUDFLARE_INTEGRATION=$CLOUDFLARE_INTEGRATION \
-            -e CLOUDFLARE_TOKEN=$CLOUDFLARE_TOKEN \
-            -e CLOUDFLARE_ZONE_ID=$CLOUDFLARE_ZONE_ID \
-            ghcr.io/modrinth/daedalus:main

.github/workflows/frontend-pages.yml

@@ -1,9 +1,6 @@
-name: Clear pages cache
+name: Deploy frontend
 
-on:
+on: push
-  push:
-    branches:
-      - prod
 
 jobs:
   wait:
@@ -19,6 +16,7 @@ jobs:
           apiToken: ${{ secrets.CF_API_TOKEN }}
           accountId: '9ddae624c98677d68d93df6e524a6061'
           project: 'frontend'
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
           commitHash: ${{ steps.push-changes.outputs.commit-hash }}
       - name: Purge cache
         if: github.ref == 'refs/heads/prod'

.github/workflows/labrinth-docker.yml

@@ -1,46 +0,0 @@
-name: docker-build
-
-on:
-  push:
-    branches: [ "main" ]
-    paths:
-      - .github/workflows/labrinth-docker.yml
-      - 'apps/labrinth/**'
-  pull_request:
-    types: [ opened, synchronize ]
-    paths:
-      - .github/workflows/labrinth-docker.yml
-      - 'apps/labrinth/**'
-  merge_group:
-    types: [ checks_requested ]
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./apps/labrinth
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Fetch docker metadata
-        id: docker_meta
-        uses: docker/metadata-action@v3
-        with:
-          images: ghcr.io/modrinth/labrinth
-      -
-        name: Login to GitHub Images
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          context: ./apps/labrinth
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.docker_meta.outputs.tags }}
-          labels: ${{ steps.docker_meta.outputs.labels }}

.gitignore

@@ -55,9 +55,3 @@ generated
 
 # app testing dir
 app-playground-data/*
-
-# soley because i need the PORT to be 3002 due to WSL stuff
-.env
-apps/frontend/.env
-
-.astro

.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/

.idea/daedalus.iml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/daedalus_client_new/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/apps/daedalus_client/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/packages/daedalus/src" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/discord.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DiscordProjectSettings">
-    <option name="show" value="PROJECT_FILES" />
-    <option name="description" value="" />
-  </component>
-</project>

.idea/libraries/KotlinJavaRuntime.xml

@@ -1,26 +0,0 @@
-<component name="libraryTable">
-  <library name="KotlinJavaRuntime" type="repository">
-    <properties maven-id="org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0" />
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.0/kotlin-stdlib-jdk8-1.8.0.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.0/kotlin-stdlib-1.8.0.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.0/kotlin-stdlib-common-1.8.0.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.0/kotlin-stdlib-jdk7-1.8.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.0/kotlin-stdlib-jdk8-1.8.0-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.0/kotlin-stdlib-1.8.0-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.0/kotlin-stdlib-common-1.8.0-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.0/kotlin-stdlib-jdk7-1.8.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.0/kotlin-stdlib-jdk8-1.8.0-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.8.0/kotlin-stdlib-1.8.0-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.0/kotlin-stdlib-common-1.8.0-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.0/kotlin-stdlib-jdk7-1.8.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/daedalus.iml" filepath="$PROJECT_DIR$/.idea/daedalus.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

Cargo.toml

@@ -3,10 +3,7 @@ resolver = '2'
 members = [
   './packages/app-lib',
 	'./apps/app-playground',
-  './apps/app',
+  './apps/app'
-  './apps/labrinth',
-    './apps/daedalus_client',
-    './packages/daedalus',
 ]
 
 # Optimize for speed and reduce size on release builds
@@ -19,6 +16,3 @@ strip = true # Remove debug symbols
 
 [profile.dev.package.sqlx-macros]
 opt-level = 3
-
-[patch.crates-io]
-wry = { git = "https://github.com/modrinth/wry", rev = "27fb16b" }

README.md

@@ -22,7 +22,7 @@ This repository contains two primary packages. For detailed development informat
 
 ## Contributing
 
-We welcome contributions! Before submitting any contributions, please read our [contributing guidelines](https://docs.modrinth.com/contributing/getting-started/).
+We welcome contributions! Before submitting any contributions, please read our [contributing guidelines](https://support.modrinth.com/en/articles/8802215-contributing-to-modrinth).
 
 If you plan to fork this repository for your own purposes, please review our [copying guidelines](COPYING.md).
 

apps/app-frontend/.eslintrc.cjs

@@ -0,0 +1,4 @@
+module.exports = {
+  root: true,
+  extends: ['custom/vue'],
+}

apps/app-frontend/eslint.config.mjs

@@ -1,22 +0,0 @@
-import { createConfigForNuxt } from '@nuxt/eslint-config/flat'
-import { fixupPluginRules } from '@eslint/compat'
-import turboPlugin from 'eslint-plugin-turbo'
-
-export default createConfigForNuxt().append([
-  {
-    name: 'turbo',
-    plugins: {
-      turbo: fixupPluginRules(turboPlugin),
-    },
-    rules: {
-      'turbo/no-undeclared-env-vars': 'error',
-    },
-  },
-  {
-    name: 'modrinth',
-    rules: {
-      'vue/html-self-closing': 'off',
-      'vue/multi-word-component-names': 'off',
-    },
-  },
-])

apps/app-frontend/index.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Modrinth App</title>
 
     <link rel="stylesheet" href="/src/assets/stylesheets/global.scss" />

apps/app-frontend/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@modrinth/app-frontend",
   "private": true,
-  "version": "0.8.9",
+  "version": "0.8.3-1",
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "vue-tsc --noEmit && vite build",
+    "build": "vite build",
-    "tsc:check": "vue-tsc --noEmit",
     "lint": "eslint . && prettier --check .",
     "fix": "eslint . --fix && prettier --write ."
   },
@@ -14,41 +13,36 @@
     "@modrinth/assets": "workspace:*",
     "@modrinth/ui": "workspace:*",
     "@modrinth/utils": "workspace:*",
-    "@sentry/vue": "^8.27.0",
     "@tauri-apps/api": "^2.0.0-rc.3",
     "@tauri-apps/plugin-dialog": "^2.0.0-rc.0",
     "@tauri-apps/plugin-os": "^2.0.0-rc.0",
-    "@tauri-apps/plugin-shell": "^2.0.0-rc.0",
-    "@tauri-apps/plugin-updater": "^2.0.0-rc.0",
     "@tauri-apps/plugin-window-state": "^2.0.0-rc.0",
+    "@tauri-apps/plugin-shell": "^2.0.0-rc.0",
     "@vintl/vintl": "^4.4.1",
     "dayjs": "^1.11.10",
     "floating-vue": "^5.2.2",
     "ofetch": "^1.3.4",
     "pinia": "^2.1.7",
-    "posthog-js": "^1.158.2",
     "vite-svg-loader": "^5.1.0",
     "vue": "^3.4.21",
     "vue-multiselect": "3.0.0",
     "vue-router": "4.3.0",
-    "vue-virtual-scroller": "v2.0.0-beta.8"
+    "vue-virtual-scroller": "v2.0.0-beta.8",
+    "posthog-js": "^1.158.2",
+    "@sentry/vue": "^8.27.0"
   },
   "devDependencies": {
-    "@eslint/compat": "^1.1.1",
+    "@tauri-apps/cli": "^2.0.0-rc",
-    "@nuxt/eslint-config": "^0.5.6",
     "@vitejs/plugin-vue": "^5.0.4",
     "autoprefixer": "^10.4.19",
-    "eslint": "^9.9.1",
+    "eslint": "^8.57.0",
     "eslint-config-custom": "workspace:*",
-    "eslint-plugin-turbo": "^2.1.1",
     "postcss": "^8.4.39",
     "prettier": "^3.2.5",
     "sass": "^1.74.1",
     "tailwindcss": "^3.4.4",
     "tsconfig": "workspace:*",
-    "typescript": "^5.5.4",
+    "vite": "^5.2.8"
-    "vite": "^5.2.8",
-    "vue-tsc": "^2.1.6"
   },
   "packageManager": "pnpm@9.4.0"
 }

apps/app-frontend/src/App.vue

@@ -1,15 +1,7 @@
 <script setup>
 import { computed, ref, onMounted } from 'vue'
 import { RouterView, RouterLink, useRouter, useRoute } from 'vue-router'
-import {
+import { HomeIcon, SearchIcon, LibraryIcon, PlusIcon, SettingsIcon, XIcon } from '@modrinth/assets'
-  HomeIcon,
-  SearchIcon,
-  LibraryIcon,
-  PlusIcon,
-  SettingsIcon,
-  XIcon,
-  DownloadIcon,
-} from '@modrinth/assets'
 import { Button, Notifications } from '@modrinth/ui'
 import { useLoading, useTheming } from '@/store/state'
 import AccountsCard from '@/components/ui/AccountsCard.vue'
@@ -24,7 +16,7 @@ import { handleError, useNotifications } from '@/store/notifications.js'
 import { command_listener, warning_listener } from '@/helpers/events.js'
 import { MinimizeIcon, MaximizeIcon } from '@/assets/icons'
 import { type } from '@tauri-apps/plugin-os'
-import { isDev, getOS, restartApp } from '@/helpers/utils.js'
+import { isDev, getOS } from '@/helpers/utils.js'
 import { initAnalytics, debugAnalytics, optOutAnalytics, trackEvent } from '@/helpers/analytics'
 import { getCurrentWindow } from '@tauri-apps/api/window'
 import { getVersion } from '@tauri-apps/api/app'
@@ -39,10 +31,6 @@ import { useInstall } from '@/store/install.js'
 import { invoke } from '@tauri-apps/api/core'
 import { open } from '@tauri-apps/plugin-shell'
 import { get_opening_command, initialize_state } from '@/helpers/state'
-import { saveWindowState, StateFlags } from '@tauri-apps/plugin-window-state'
-import { renderString } from '@modrinth/utils'
-import { useFetch } from '@/helpers/fetch.js'
-import { check } from '@tauri-apps/plugin-updater'
 
 const themeStore = useTheming()
 
@@ -63,8 +51,6 @@ const os = ref('')
 
 const stateInitialized = ref(false)
 
-const criticalErrorMessage = ref()
-
 onMounted(async () => {
   await useCheckDisableMouseover()
 })
@@ -121,18 +107,7 @@ async function setupApp() {
     }),
   )
 
-  useFetch(
-    `https://api.modrinth.com/appCriticalAnnouncement.json?version=${version}`,
-    'criticalAnnouncements',
-    true,
-  ).then((res) => {
-    if (res && res.header && res.body) {
-      criticalErrorMessage.value = res
-    }
-  })
-
   get_opening_command().then(handleCommand)
-  checkUpdates()
 }
 
 const stateFailed = ref(false)
@@ -151,7 +126,6 @@ initialize_state()
   })
 
 const handleClose = async () => {
-  await saveWindowState(StateFlags.ALL)
   await getCurrentWindow().close()
 }
 
@@ -197,8 +171,7 @@ document.querySelector('body').addEventListener('click', function (e) {
         ['http://', 'https://', 'mailto:', 'tel:'].some((v) => target.href.startsWith(v)) &&
         !target.classList.contains('router-link-active') &&
         !target.href.startsWith('http://localhost') &&
-        !target.href.startsWith('https://tauri.localhost') &&
+        !target.href.startsWith('https://tauri.localhost')
-        !target.href.startsWith('http://tauri.localhost')
       ) {
         open(target.href)
       }
@@ -242,20 +215,6 @@ async function handleCommand(e) {
     urlModal.value.show(e)
   }
 }
-
-const updateAvailable = ref(false)
-async function checkUpdates() {
-  const update = await check()
-  console.log(update)
-  updateAvailable.value = !!update
-
-  setTimeout(
-    () => {
-      checkUpdates()
-    },
-    5 * 1000 * 60,
-  )
-}
 </script>
 
 <template>
@@ -289,14 +248,6 @@ async function checkUpdates() {
         </div>
       </div>
       <div class="settings pages-list">
-        <button
-          v-if="updateAvailable"
-          v-tooltip="'Install update'"
-          class="btn btn-outline btn-primary icon-only collapsed-button"
-          @click="restartApp()"
-        >
-          <DownloadIcon />
-        </button>
         <Button
           v-tooltip="'Create profile'"
           class="sleek-primary collapsed-button"
@@ -312,10 +263,6 @@ async function checkUpdates() {
       </div>
     </div>
     <div class="view">
-      <div v-if="criticalErrorMessage" class="critical-error-banner" data-tauri-drag-region>
-        <h1>{{ criticalErrorMessage.header }}</h1>
-        <div class="markdown-body" v-html="renderString(criticalErrorMessage.body ?? '')"></div>
-      </div>
       <div class="appbar-row">
         <div data-tauri-drag-region class="appbar">
           <section class="navigation-controls">
@@ -428,16 +375,6 @@ async function checkUpdates() {
     width: calc(100% - var(--sidebar-width));
     background-color: var(--color-raised-bg);
 
-    .critical-error-banner {
-      margin-top: -1.25rem;
-      padding: 1rem;
-      background-color: rgba(203, 34, 69, 0.1);
-      border-left: 2px solid var(--color-red);
-      border-bottom: 2px solid var(--color-red);
-      border-right: 2px solid var(--color-red);
-      border-radius: 1rem;
-    }
-
     .appbar {
       display: flex;
       align-items: center;

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

@@ -12,13 +12,13 @@ import {
   SearchIcon,
   XIcon,
 } from '@modrinth/assets'
-import { Button, Card, DropdownSelect } from '@modrinth/ui'
+import { ConfirmModal, Button, Card, DropdownSelect } from '@modrinth/ui'
 import { formatCategoryHeader } from '@modrinth/utils'
 import ContextMenu from '@/components/ui/ContextMenu.vue'
 import dayjs from 'dayjs'
+import { useTheming } from '@/store/theme.js'
 import { duplicate, remove } from '@/helpers/profile.js'
 import { handleError } from '@/store/notifications.js'
-import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
 
 const props = defineProps({
   instances: {
@@ -35,6 +35,7 @@ const props = defineProps({
 const instanceOptions = ref(null)
 const instanceComponents = ref(null)
 
+const themeStore = useTheming()
 const currentDeleteInstance = ref(null)
 const confirmModal = ref(null)
 
@@ -229,12 +230,13 @@ const filteredResults = computed(() => {
 })
 </script>
 <template>
-  <ConfirmModalWrapper
+  <ConfirmModal
     ref="confirmModal"
     title="Are you sure you want to delete this instance?"
     description="If you proceed, all data for your instance will be removed. You will not be able to recover it."
     :has-to-type="false"
     proceed-label="Delete"
+    :noblur="!themeStore.advancedRendering"
     @proceed="deleteProfile"
   />
   <Card class="header">

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

@@ -12,7 +12,7 @@ import {
   EyeIcon,
   ChevronRightIcon,
 } from '@modrinth/assets'
-import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
+import { ConfirmModal } from '@modrinth/ui'
 import Instance from '@/components/ui/Instance.vue'
 import { computed, onMounted, onUnmounted, ref } from 'vue'
 import ContextMenu from '@/components/ui/ContextMenu.vue'
@@ -22,6 +22,7 @@ import { handleError } from '@/store/notifications.js'
 import { duplicate, kill, remove, run } from '@/helpers/profile.js'
 import { useRouter } from 'vue-router'
 import { showProfileInFolder } from '@/helpers/utils.js'
+import { useTheming } from '@/store/state.js'
 import { trackEvent } from '@/helpers/analytics'
 import { handleSevereError } from '@/store/error.js'
 import { install as installVersion } from '@/store/install.js'
@@ -52,6 +53,7 @@ const instanceComponents = ref(null)
 const rows = ref(null)
 const deleteConfirmModal = ref(null)
 
+const themeStore = useTheming()
 const currentDeleteInstance = ref(null)
 
 async function deleteProfile() {
@@ -205,12 +207,13 @@ onUnmounted(() => {
 </script>
 
 <template>
-  <ConfirmModalWrapper
+  <ConfirmModal
     ref="deleteConfirmModal"
     title="Are you sure you want to delete this instance?"
     description="If you proceed, all data for your instance will be removed. You will not be able to recover it."
     :has-to-type="false"
     proceed-label="Delete"
+    :noblur="!themeStore.advancedRendering"
     @proceed="deleteProfile"
   />
   <div class="content">

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

@@ -5,7 +5,7 @@
     v-tooltip.right="'Minecraft accounts'"
     class="button-base avatar-button"
     :class="{ expanded: mode === 'expanded' }"
-    @click="toggleMenu"
+    @click="showCard = !showCard"
   >
     <Avatar
       :size="mode === 'expanded' ? 'xs' : 'sm'"
@@ -73,7 +73,6 @@ import { handleError } from '@/store/state.js'
 import { trackEvent } from '@/helpers/analytics'
 import { process_listener } from '@/helpers/events'
 import { handleSevereError } from '@/store/error.js'
-import { show_ads_window, hide_ads_window } from '@/helpers/ads.js'
 
 defineProps({
   mode: {
@@ -134,9 +133,9 @@ const logout = async (id) => {
   trackEvent('AccountLogOut')
 }
 
-const showCard = ref(false)
+let showCard = ref(false)
-const card = ref(null)
+let card = ref(null)
-const button = ref(null)
+let button = ref(null)
 const handleClickOutside = (event) => {
   const elements = document.elementsFromPoint(event.clientX, event.clientY)
   if (
@@ -145,20 +144,7 @@ const handleClickOutside = (event) => {
     !elements.includes(card.value.$el) &&
     !button.value.contains(event.target)
   ) {
-    toggleMenu(false)
-  }
-}
-
-function toggleMenu(override = true) {
-  if (showCard.value || !override) {
-    if (showCard.value) {
-      show_ads_window()
-    }
-
     showCard.value = false
-  } else {
-    hide_ads_window()
-    showCard.value = true
   }
 }
 

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

@@ -20,7 +20,7 @@ const handleAddContentFromFile = async () => {
   if (!newProject) return
 
   for (const project of newProject) {
-    await add_project_from_path(props.instance.path, project.path ?? project).catch(handleError)
+    await add_project_from_path(props.instance.path, project).catch(handleError)
   }
 }
 

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

@@ -25,7 +25,6 @@
 
 <script setup>
 import { onBeforeUnmount, onMounted, ref } from 'vue'
-import { show_ads_window, hide_ads_window } from '@/helpers/ads.js'
 
 const emit = defineEmits(['menu-closed', 'option-clicked'])
 
@@ -38,7 +37,6 @@ const shown = ref(false)
 
 defineExpose({
   showMenu: (event, passedItem, passedOptions) => {
-    hide_ads_window()
     item.value = passedItem
     options.value = passedOptions
 
@@ -71,9 +69,6 @@ const isLinkedData = (item) => {
 }
 
 const hideContextMenu = () => {
-  if (shown.value) {
-    show_ads_window()
-  }
   shown.value = false
   emit('menu-closed')
 }

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

@@ -1,5 +1,6 @@
 <script setup>
 import { XIcon, HammerIcon, LogInIcon, UpdatedIcon } from '@modrinth/assets'
+import { Modal } from '@modrinth/ui'
 import { ChatIcon } from '@/assets/icons'
 import { ref } from 'vue'
 import { login as login_flow, set_default_user } from '@/helpers/auth.js'
@@ -8,7 +9,6 @@ import { handleSevereError } from '@/store/error.js'
 import { cancel_directory_change } from '@/helpers/settings.js'
 import { install } from '@/helpers/profile.js'
 import { trackEvent } from '@/helpers/analytics'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 
 const errorModal = ref()
 const error = ref()
@@ -121,7 +121,7 @@ async function repairInstance() {
 </script>
 
 <template>
-  <ModalWrapper ref="errorModal" :header="title" :closable="closable">
+  <Modal ref="errorModal" :header="title" :closable="closable">
     <div class="modal-body">
       <div class="markdown-body">
         <template v-if="errorType === 'minecraft_auth'">
@@ -230,7 +230,7 @@ async function repairInstance() {
           </p>
           <p>You may be able to fix it through one of the following ways:</p>
           <ul>
-            <li>Ensuring you are connected to the internet, then try restarting the app.</li>
+            <li>Ennsuring you are connected to the internet, then try restarting the app.</li>
             <li>Redownloading the app.</li>
           </ul>
         </template>
@@ -272,7 +272,7 @@ async function repairInstance() {
         <button v-if="closable" class="btn" @click="errorModal.hide()"><XIcon /> Close</button>
       </div>
     </div>
-  </ModalWrapper>
+  </Modal>
 </template>
 
 <style>

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

@@ -1,12 +1,12 @@
 <script setup>
 import { XIcon, PlusIcon } from '@modrinth/assets'
-import { Button, Checkbox } from '@modrinth/ui'
+import { Button, Checkbox, Modal } from '@modrinth/ui'
 import { PackageIcon, VersionIcon } from '@/assets/icons'
 import { ref } from 'vue'
 import { export_profile_mrpack, get_pack_export_candidates } from '@/helpers/profile.js'
 import { open } from '@tauri-apps/plugin-dialog'
 import { handleError } from '@/store/notifications.js'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
+import { useTheming } from '@/store/theme'
 
 const props = defineProps({
   instance: {
@@ -30,6 +30,8 @@ const files = ref([])
 const folders = ref([])
 const showingFiles = ref(false)
 
+const themeStore = useTheming()
+
 const initFiles = async () => {
   const newFolders = new Map()
   const sep = '/'
@@ -104,7 +106,7 @@ const exportPack = async () => {
 </script>
 
 <template>
-  <ModalWrapper ref="exportModal" header="Export modpack">
+  <Modal ref="exportModal" header="Export modpack" :noblur="!themeStore.advancedRendering">
     <div class="modal-body">
       <div class="labeled_input">
         <p>Modpack Name</p>
@@ -206,7 +208,7 @@ const exportPack = async () => {
         </Button>
       </div>
     </div>
-  </ModalWrapper>
+  </Modal>
 </template>
 
 <style scoped lang="scss">

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

@@ -1,5 +1,5 @@
 <template>
-  <ModalWrapper ref="modal" header="Create instance">
+  <Modal ref="modal" header="Create instance" :noblur="!themeStore.advancedRendering">
     <div class="modal-header">
       <Chips v-model="creationType" :items="['custom', 'from file', 'import from launcher']" />
     </div>
@@ -193,11 +193,10 @@
         />
       </div>
     </div>
-  </ModalWrapper>
+  </Modal>
 </template>
 
 <script setup>
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 import {
   PlusIcon,
   UploadIcon,
@@ -208,7 +207,7 @@ import {
   FolderSearchIcon,
   UpdatedIcon,
 } from '@modrinth/assets'
-import { Avatar, Button, Chips, Checkbox } from '@modrinth/ui'
+import { Avatar, Button, Chips, Modal, Checkbox } from '@modrinth/ui'
 import { computed, onUnmounted, ref, shallowRef } from 'vue'
 import { get_loaders } from '@/helpers/tags'
 import { create } from '@/helpers/profile'
@@ -218,6 +217,8 @@ import { get_game_versions, get_loader_versions } from '@/helpers/metadata'
 import { handleError } from '@/store/notifications.js'
 import Multiselect from 'vue-multiselect'
 import { trackEvent } from '@/helpers/analytics'
+import { useTheming } from '@/store/state.js'
+import { listen } from '@tauri-apps/api/event'
 import { install_from_file } from '@/helpers/pack.js'
 import {
   get_default_launcher_path,
@@ -225,7 +226,8 @@ import {
   import_instance,
 } from '@/helpers/import.js'
 import ProgressBar from '@/components/ui/ProgressBar.vue'
-import { getCurrentWebview } from '@tauri-apps/api/webview'
+
+const themeStore = useTheming()
 
 const profile_name = ref('')
 const game_version = ref('')
@@ -255,15 +257,13 @@ defineExpose({
     isShowing.value = true
     modal.value.show()
 
-    unlistener.value = await getCurrentWebview().onDragDropEvent(async (event) => {
+    unlistener.value = await listen('tauri://file-drop', async (event) => {
       // Only if modal is showing
       if (!isShowing.value) return
-      if (event.payload.type !== 'drop') return
       if (creationType.value !== 'from file') return
       hide()
-      const { paths } = event.payload
+      if (event.payload && event.payload.length > 0 && event.payload[0].endsWith('.mrpack')) {
-      if (paths && paths.length > 0 && paths[0].endsWith('.mrpack')) {
+        await install_from_file(event.payload[0]).catch(handleError)
-        await install_from_file(paths[0]).catch(handleError)
         trackEvent('InstanceCreate', {
           source: 'CreationModalFileDrop',
         })
@@ -371,7 +371,7 @@ const create_instance = async () => {
 }
 
 const upload_icon = async () => {
-  const res = await open({
+  icon.value = await open({
     multiple: false,
     filters: [
       {
@@ -381,8 +381,6 @@ const upload_icon = async () => {
     ],
   })
 
-  icon.value = res.path ?? res
-
   if (!icon.value) return
   display_icon.value = convertFileSrc(icon.value)
 }
@@ -419,7 +417,7 @@ const openFile = async () => {
   const newProject = await open({ multiple: false })
   if (!newProject) return
   hide()
-  await install_from_file(newProject.path ?? newProject).catch(handleError)
+  await install_from_file(newProject).catch(handleError)
 
   trackEvent('InstanceCreate', {
     source: 'CreationModalFileOpen',
@@ -464,7 +462,7 @@ const promises = profileOptions.value.map(async (option) => {
       option.name,
       instances.map((name) => ({ name, selected: false })),
     )
-  } catch {
+  } catch (error) {
     // Allow failure silently
   }
 })

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

@@ -1,5 +1,5 @@
 <template>
-  <ModalWrapper ref="detectJavaModal" header="Select java version">
+  <Modal ref="detectJavaModal" header="Select java version" :noblur="!themeStore.advancedRendering">
     <div class="auto-detect-modal">
       <div class="table">
         <div class="table-row table-head">
@@ -32,16 +32,18 @@
         </Button>
       </div>
     </div>
-  </ModalWrapper>
+  </Modal>
 </template>
 <script setup>
 import { PlusIcon, CheckIcon, XIcon } from '@modrinth/assets'
-import { Button } from '@modrinth/ui'
+import { Modal, Button } from '@modrinth/ui'
 import { ref } from 'vue'
 import { find_filtered_jres } from '@/helpers/jre.js'
 import { handleError } from '@/store/notifications.js'
+import { useTheming } from '@/store/theme.js'
 import { trackEvent } from '@/helpers/analytics'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
+
+const themeStore = useTheming()
 
 const chosenInstallOptions = ref([])
 const detectJavaModal = ref(null)

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

@@ -124,19 +124,20 @@ async function testJava() {
 }
 
 async function handleJavaFileInput() {
-  const filePath = await open()
+  let filePath = await open()
 
   if (filePath) {
-    let result = await get_jre(filePath.path ?? filePath)
+    let result = await get_jre(filePath)
     if (!result) {
       result = {
-        path: filePath.path ?? filePath,
+        path: filePath,
         version: props.version.toString(),
         architecture: 'x86',
       }
     }
 
     trackEvent('JavaManualSelect', {
+      path: filePath,
       version: props.version,
     })
 
@@ -149,7 +150,7 @@ async function autoDetect() {
   if (!props.compact) {
     detectJavaModal.value.show(props.version, props.modelValue)
   } else {
-    const versions = await find_filtered_jres(props.version).catch(handleError)
+    let versions = await find_filtered_jres(props.version).catch(handleError)
     if (versions.length > 0) {
       emit('update:modelValue', versions[0])
     }

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

@@ -1,11 +1,11 @@
 <script setup>
 import { CheckIcon } from '@modrinth/assets'
-import { Button, Badge } from '@modrinth/ui'
+import { Button, Modal, Badge } from '@modrinth/ui'
 import { computed, ref } from 'vue'
+import { useTheming } from '@/store/theme'
 import { update_managed_modrinth_version } from '@/helpers/profile'
 import { releaseColor } from '@/helpers/utils'
 import { SwapIcon } from '@/assets/icons/index.js'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 
 const props = defineProps({
   versions: {
@@ -33,6 +33,8 @@ const installedVersion = computed(() => props.instance?.linked_data?.version_id)
 const installing = computed(() => props.instance.install_stage !== 'installed')
 const inProgress = ref(false)
 
+const themeStore = useTheming()
+
 const switchVersion = async (versionId) => {
   inProgress.value = true
   await update_managed_modrinth_version(props.instance.path, versionId)
@@ -41,10 +43,11 @@ const switchVersion = async (versionId) => {
 </script>
 
 <template>
-  <ModalWrapper
+  <Modal
     ref="modpackVersionModal"
     class="modpack-version-modal"
     header="Change modpack version"
+    :noblur="!themeStore.advancedRendering"
   >
     <div class="modal-body">
       <Card v-if="instance.linked_data" class="mod-card">
@@ -108,7 +111,7 @@ const switchVersion = async (versionId) => {
         </div>
       </Card>
     </div>
-  </ModalWrapper>
+  </Modal>
 </template>
 
 <style scoped lang="scss">

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

@@ -1,20 +1,12 @@
-<script setup>
+<script setup lang="ts">
-import { ref, onMounted, onUnmounted } from 'vue'
+import { ref } from 'vue'
+import { Promotion } from '@modrinth/ui'
 import { get as getCreds } from '@/helpers/mr_auth.js'
 import { handleError } from '@/store/notifications.js'
 import { get_user } from '@/helpers/cache.js'
-import { ChevronRightIcon } from '@modrinth/assets'
-import { init_ads_window, open_ads_link, record_ads_click } from '@/helpers/ads.js'
-import { listen } from '@tauri-apps/api/event'
 
 const showAd = ref(true)
 
-defineExpose({
-  scroll() {
-    updateAdPosition()
-  },
-})
-
 const creds = await getCreds().catch(handleError)
 if (creds && creds.user_id) {
   const user = await get_user(creds.user_id).catch(handleError)
@@ -24,103 +16,8 @@ if (creds && creds.user_id) {
     showAd.value = false
   }
 }
-
-const adsWrapper = ref(null)
-let resizeObserver
-let scrollHandler
-let intersectionObserver
-let mutationObserver
-onMounted(() => {
-  if (showAd.value) {
-    updateAdPosition(true)
-
-    resizeObserver = new ResizeObserver(() => updateAdPosition())
-    resizeObserver.observe(adsWrapper.value)
-
-    intersectionObserver = new IntersectionObserver(() => updateAdPosition())
-    intersectionObserver.observe(adsWrapper.value)
-
-    mutationObserver = new MutationObserver(() => updateAdPosition())
-    mutationObserver.observe(adsWrapper.value, { attributes: true, childList: true, subtree: true })
-
-    // Add scroll event listener
-    scrollHandler = () => {
-      requestAnimationFrame(() => updateAdPosition())
-    }
-    window.addEventListener('scroll', scrollHandler, { passive: true })
-  }
-})
-
-function updateAdPosition(overrideShown = false) {
-  if (adsWrapper.value) {
-    const rect = adsWrapper.value.getBoundingClientRect()
-
-    let y = rect.top + window.scrollY
-    let height = rect.bottom - rect.top
-
-    // Prevent ad from overlaying the app bar
-    if (y <= 52) {
-      y = 52
-      height = rect.bottom - 52
-
-      if (height < 0) {
-        height = 0
-        y = -1000
-      }
-    }
-
-    init_ads_window(rect.left + window.scrollX, y, rect.right - rect.left, height, overrideShown)
-  }
-}
-
-async function openPlusLink() {
-  await record_ads_click()
-  await open_ads_link('https://modrinth.com/plus', 'https://modrinth.com')
-}
-
-const unlisten = await listen('ads-scroll', (event) => {
-  if (adsWrapper.value) {
-    adsWrapper.value.parentNode.scrollTop += event.payload.scroll
-    updateAdPosition()
-  }
-})
-
-onUnmounted(() => {
-  if (resizeObserver) {
-    resizeObserver.disconnect()
-  }
-  if (intersectionObserver) {
-    intersectionObserver.disconnect()
-  }
-  if (mutationObserver) {
-    mutationObserver.disconnect()
-  }
-  if (scrollHandler) {
-    window.removeEventListener('scroll', scrollHandler)
-  }
-
-  unlisten()
-})
 </script>
 
 <template>
-  <div
+  <Promotion v-if="showAd" :external="false" query-param="?r=launcher" />
-    v-if="showAd"
-    ref="adsWrapper"
-    class="ad-parent relative mb-3 flex w-full justify-center rounded-2xl bg-bg-raised cursor-pointer"
-  >
-    <div class="flex max-h-[250px] min-h-[250px] min-w-[300px] max-w-[300px] flex-col gap-4 p-6">
-      <p class="m-0 text-2xl font-bold text-contrast">75% of ad revenue goes to creators</p>
-      <button
-        class="mt-auto items-center gap-1 text-purple hover:underline bg-transparent border-none text-left cursor-pointer outline-none"
-        @click="openPlusLink"
-      >
-        <span>
-          Support creators and Modrinth ad-free with
-          <span class="font-bold">Modrinth+</span>
-        </span>
-        <ChevronRightIcon class="relative top-[3px] h-5 w-5" />
-      </button>
-    </div>
-  </div>
 </template>

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

@@ -88,6 +88,8 @@ import { loading_listener } from '@/helpers/events.js'
 import { getCurrentWindow } from '@tauri-apps/api/window'
 import { XIcon } from '@modrinth/assets'
 import { MaximizeIcon, MinimizeIcon } from '@/assets/icons/index.js'
+import { TauriEvent } from '@tauri-apps/api/event'
+import { saveWindowState, StateFlags } from '@tauri-apps/plugin-window-state'
 import { getOS } from '@/helpers/utils.js'
 import { useLoading } from '@/store/loading.js'
 
@@ -128,16 +130,9 @@ const os = ref('')
 getOS().then((x) => (os.value = x))
 
 loading_listener(async (e) => {
-  console.log(e)
   if (e.event.type === 'directory_move') {
     loadingProgress.value = 100 * (e.fraction ?? 1)
     message.value = 'Updating app directory...'
-  } else if (e.event.type === 'launcher_update') {
-    loadingProgress.value = 100 * (e.fraction ?? 1)
-    message.value = 'Updating Modrinth App...'
-  } else if (e.event.type === 'checking_for_updates') {
-    loadingProgress.value = 100 * (e.fraction ?? 1)
-    message.value = 'Checking for updates...'
   }
 })
 

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

@@ -1,12 +1,11 @@
 <script setup>
-import { Button } from '@modrinth/ui'
+import { Modal, Button } from '@modrinth/ui'
 import { ref } from 'vue'
 import SearchCard from '@/components/ui/SearchCard.vue'
 import { get_categories } from '@/helpers/tags.js'
 import { handleError } from '@/store/notifications.js'
 import { get_version, get_project } from '@/helpers/cache.js'
 import { install as installVersion } from '@/store/install.js'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 
 const confirmModal = ref(null)
 const project = ref(null)
@@ -42,7 +41,7 @@ async function install() {
 </script>
 
 <template>
-  <ModalWrapper ref="confirmModal" :header="`Install ${project?.title}`">
+  <Modal ref="confirmModal" :header="`Install ${project?.title}`">
     <div class="modal-body">
       <SearchCard
         :project="project"
@@ -61,7 +60,7 @@ async function install() {
         </div>
       </div>
     </div>
-  </ModalWrapper>
+  </Modal>
 </template>
 
 <style scoped lang="scss">

apps/app-frontend/src/components/ui/install_flow/IncompatibilityWarningModal.vue

@@ -1,5 +1,10 @@
 <template>
-  <ModalWrapper ref="incompatibleModal" header="Incompatibility warning" :on-hide="onInstall">
+  <Modal
+    ref="incompatibleModal"
+    header="Incompatibility warning"
+    :noblur="!themeStore.advancedRendering"
+    :on-hide="onInstall"
+  >
     <div class="modal-body">
       <p>
         This {{ versions?.length > 0 ? 'project' : 'version' }} is not compatible with the instance
@@ -46,19 +51,20 @@
         </Button>
       </div>
     </div>
-  </ModalWrapper>
+  </Modal>
 </template>
 
 <script setup>
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 import { XIcon, DownloadIcon } from '@modrinth/assets'
-import { Button, DropdownSelect } from '@modrinth/ui'
+import { Button, Modal, DropdownSelect } from '@modrinth/ui'
 import { formatCategory } from '@modrinth/utils'
 import { add_project_from_version as installMod } from '@/helpers/profile'
 import { ref } from 'vue'
-import { handleError } from '@/store/state.js'
+import { handleError, useTheming } from '@/store/state.js'
 import { trackEvent } from '@/helpers/analytics'
 
+const themeStore = useTheming()
+
 const instance = ref(null)
 const project = ref(null)
 const versions = ref(null)
@@ -66,7 +72,7 @@ const selectedVersion = ref(null)
 const incompatibleModal = ref(null)
 const installing = ref(false)
 
-const onInstall = ref(() => {})
+let onInstall = ref(() => {})
 
 defineExpose({
   show: (instanceVal, projectVal, projectVersions, callback) => {

apps/app-frontend/src/components/ui/install_flow/InstallConfirmModal.vue

@@ -1,18 +1,20 @@
 <script setup>
 import { XIcon, DownloadIcon } from '@modrinth/assets'
-import { Button } from '@modrinth/ui'
+import { Button, Modal } from '@modrinth/ui'
 import { install as pack_install } from '@/helpers/pack'
 import { ref } from 'vue'
 import { trackEvent } from '@/helpers/analytics'
+import { useTheming } from '@/store/theme.js'
 import { handleError } from '@/store/state.js'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
+
+const themeStore = useTheming()
 
 const versionId = ref()
 const project = ref()
 const confirmModal = ref(null)
 const installing = ref(false)
 
-const onInstall = ref(() => {})
+let onInstall = ref(() => {})
 
 defineExpose({
   show: (projectVal, versionIdVal, callback) => {
@@ -50,7 +52,12 @@ async function install() {
 </script>
 
 <template>
-  <ModalWrapper ref="confirmModal" header="Are you sure?" :on-hide="onInstall">
+  <Modal
+    ref="confirmModal"
+    header="Are you sure?"
+    :noblur="!themeStore.advancedRendering"
+    :on-hide="onInstall"
+  >
     <div class="modal-body">
       <p>You already have this modpack installed. Are you sure you want to install it again?</p>
       <div class="input-group push-right">
@@ -60,7 +67,7 @@ async function install() {
         >
       </div>
     </div>
-  </ModalWrapper>
+  </Modal>
 </template>
 
 <style lang="scss" scoped>

apps/app-frontend/src/components/ui/install_flow/ModInstallModal.vue

@@ -7,7 +7,7 @@ import {
   RightArrowIcon,
   CheckIcon,
 } from '@modrinth/assets'
-import { Avatar, Button, Card } from '@modrinth/ui'
+import { Avatar, Modal, Button, Card } from '@modrinth/ui'
 import { computed, ref } from 'vue'
 import {
   add_project_from_version as installMod,
@@ -19,11 +19,12 @@ import {
 import { open } from '@tauri-apps/plugin-dialog'
 import { installVersionDependencies } from '@/store/install.js'
 import { handleError } from '@/store/notifications.js'
+import { useTheming } from '@/store/theme.js'
 import { useRouter } from 'vue-router'
 import { convertFileSrc } from '@tauri-apps/api/core'
 import { trackEvent } from '@/helpers/analytics'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 
+const themeStore = useTheming()
 const router = useRouter()
 
 const versions = ref()
@@ -48,7 +49,7 @@ const shownProfiles = computed(() =>
       return profile.name.toLowerCase().includes(searchFilter.value.toLowerCase())
     })
     .filter((profile) => {
-      const loaders = versions.value.flatMap((v) => v.loaders)
+      let loaders = versions.value.flatMap((v) => v.loaders)
 
       return (
         versions.value.flatMap((v) => v.game_versions).includes(profile.game_version) &&
@@ -59,7 +60,7 @@ const shownProfiles = computed(() =>
     }),
 )
 
-const onInstall = ref(() => {})
+let onInstall = ref(() => {})
 
 defineExpose({
   show: async (projectVal, versionsVal, callback) => {
@@ -77,7 +78,7 @@ defineExpose({
     onInstall.value = callback
 
     const profilesVal = await list().catch(handleError)
-    for (const profile of profilesVal) {
+    for (let profile of profilesVal) {
       profile.installing = false
       profile.installedMod = await check_installed(profile.path, project.value.id).catch(
         handleError,
@@ -141,7 +142,7 @@ const toggleCreation = () => {
 }
 
 const upload_icon = async () => {
-  const res = await open({
+  icon.value = await open({
     multiple: false,
     filters: [
       {
@@ -150,7 +151,6 @@ const upload_icon = async () => {
       },
     ],
   })
-  icon.value = res.path ?? res
 
   if (!icon.value) return
   display_icon.value = convertFileSrc(icon.value)
@@ -213,7 +213,12 @@ const createInstance = async () => {
 </script>
 
 <template>
-  <ModalWrapper ref="installModal" header="Install project to instance" :on-hide="onInstall">
+  <Modal
+    ref="installModal"
+    header="Install project to instance"
+    :noblur="!themeStore.advancedRendering"
+    :on-hide="onInstall"
+  >
     <div class="modal-body">
       <input
         v-model="searchFilter"
@@ -230,7 +235,7 @@ const createInstance = async () => {
             @click="installModal.hide()"
           >
             <Avatar
-              :src="profile.icon_path ? convertFileSrc(profile.icon_path) : null"
+              :src="profile.icon_path ? tauri.convertFileSrc(profile.icon_path) : null"
               class="profile-image"
             />
             {{ profile.name }}
@@ -299,7 +304,7 @@ const createInstance = async () => {
         <Button @click="installModal.hide()">Cancel</Button>
       </div>
     </div>
-  </ModalWrapper>
+  </Modal>
 </template>
 
 <style scoped lang="scss">

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

@@ -1,69 +0,0 @@
-<script setup lang="ts">
-import { ref } from 'vue'
-import { ConfirmModal } from '@modrinth/ui'
-import { show_ads_window, hide_ads_window } from '@/helpers/ads.js'
-import { useTheming } from '@/store/theme.js'
-
-const themeStore = useTheming()
-
-defineProps({
-  confirmationText: {
-    type: String,
-    default: '',
-  },
-  hasToType: {
-    type: Boolean,
-    default: false,
-  },
-  title: {
-    type: String,
-    default: 'No title defined',
-    required: true,
-  },
-  description: {
-    type: String,
-    default: 'No description defined',
-    required: true,
-  },
-  proceedLabel: {
-    type: String,
-    default: 'Proceed',
-  },
-})
-
-const emit = defineEmits(['proceed'])
-const modal = ref(null)
-
-defineExpose({
-  show: () => {
-    hide_ads_window()
-    modal.value.show()
-  },
-  hide: () => {
-    onModalHide()
-    modal.value.hide()
-  },
-})
-
-function onModalHide() {
-  show_ads_window()
-}
-
-function proceed() {
-  emit('proceed')
-}
-</script>
-
-<template>
-  <ConfirmModal
-    ref="modal"
-    :confirmation-text="confirmationText"
-    :has-to-type="hasToType"
-    :title="title"
-    :description="description"
-    :proceed-label="proceedLabel"
-    :on-hide="onModalHide"
-    :noblur="!themeStore.advancedRendering"
-    @proceed="proceed"
-  />
-</template>

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

@@ -1,49 +0,0 @@
-<script setup lang="ts">
-import { ref } from 'vue'
-import { Modal } from '@modrinth/ui'
-import { show_ads_window, hide_ads_window } from '@/helpers/ads.js'
-import { useTheming } from '@/store/theme.js'
-
-const themeStore = useTheming()
-
-const props = defineProps({
-  header: {
-    type: String,
-    default: null,
-  },
-  closable: {
-    type: Boolean,
-    default: true,
-  },
-  onHide: {
-    type: Function,
-    default() {
-      return () => {}
-    },
-  },
-})
-
-const modal = ref(null)
-
-defineExpose({
-  show: () => {
-    hide_ads_window()
-    modal.value.show()
-  },
-  hide: () => {
-    onModalHide()
-    modal.value.hide()
-  },
-})
-
-function onModalHide() {
-  show_ads_window()
-  props.onHide()
-}
-</script>
-
-<template>
-  <Modal ref="modal" :header="header" :noblur="!themeStore.advancedRendering" @hide="onModalHide">
-    <slot />
-  </Modal>
-</template>

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

@@ -1,61 +0,0 @@
-<script setup lang="ts">
-import { ref } from 'vue'
-import { ShareModal } from '@modrinth/ui'
-import { show_ads_window, hide_ads_window } from '@/helpers/ads.js'
-import { useTheming } from '@/store/theme.js'
-
-const themeStore = useTheming()
-
-defineProps({
-  header: {
-    type: String,
-    default: 'Share',
-  },
-  shareTitle: {
-    type: String,
-    default: 'Modrinth',
-  },
-  shareText: {
-    type: String,
-    default: null,
-  },
-  link: {
-    type: Boolean,
-    default: false,
-  },
-  openInNewTab: {
-    type: Boolean,
-    default: true,
-  },
-})
-
-const modal = ref(null)
-
-defineExpose({
-  show: (passedContent) => {
-    hide_ads_window()
-    modal.value.show(passedContent)
-  },
-  hide: () => {
-    onModalHide()
-    modal.value.hide()
-  },
-})
-
-function onModalHide() {
-  show_ads_window()
-}
-</script>
-
-<template>
-  <ShareModal
-    ref="modal"
-    :header="header"
-    :share-title="shareTitle"
-    :share-text="shareText"
-    :link="link"
-    :open-in-new-tab="openInNewTab"
-    :on-hide="onModalHide"
-    :noblur="!themeStore.advancedRendering"
-  />
-</template>

apps/app-frontend/src/components/ui/tutorial/ModrinthLoginScreen.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { UserIcon, LockIcon, MailIcon } from '@modrinth/assets'
-import { Button, Card, Checkbox } from '@modrinth/ui'
+import { Button, Card, Checkbox, Modal } from '@modrinth/ui'
 import {
   DiscordIcon,
   GithubIcon,
@@ -13,7 +13,6 @@ import { login, login_2fa, create_account, login_pass } from '@/helpers/mr_auth.
 import { handleError, useNotifications } from '@/store/state.js'
 import { ref } from 'vue'
 import { handleSevereError } from '@/store/error.js'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 
 const props = defineProps({
   callback: {
@@ -133,7 +132,7 @@ async function createAccount() {
 </script>
 
 <template>
-  <ModalWrapper ref="modal" :on-hide="removeWidget">
+  <Modal ref="modal" :on-hide="removeWidget">
     <Card>
       <template v-if="twoFactorFlow">
         <h1>Enter two-factor code</h1>
@@ -218,17 +217,17 @@ async function createAccount() {
           v-else-if="loggingIn"
           color="primary"
           large
-          :disabled="!turnstileToken"
           @click="signIn"
+          :disabled="!turnstileToken"
         >
           Login
         </Button>
-        <Button v-else color="primary" large :disabled="!turnstileToken" @click="createAccount">
+        <Button v-else color="primary" large @click="createAccount" :disabled="!turnstileToken">
           Create account
         </Button>
       </div>
     </Card>
-  </ModalWrapper>
+  </Modal>
 </template>
 
 <style scoped lang="scss">

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

@@ -1,21 +0,0 @@
-import { invoke } from '@tauri-apps/api/core'
-
-export async function init_ads_window(x, y, width, height, overrideShown = false) {
-  return await invoke('plugin:ads|init_ads_window', { x, y, width, height, overrideShown })
-}
-
-export async function show_ads_window() {
-  return await invoke('plugin:ads|show_ads_window')
-}
-
-export async function hide_ads_window(reset) {
-  return await invoke('plugin:ads|hide_ads_window', { reset })
-}
-
-export async function record_ads_click() {
-  return await invoke('plugin:ads|record_ads_click')
-}
-
-export async function open_ads_link(path, origin) {
-  return await invoke('plugin:ads|open_link', { path, origin })
-}

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

@@ -33,10 +33,6 @@ export async function highlightModInProfile(profilePath, projectPath) {
   return await highlightInFolder(fullPath)
 }
 
-export async function restartApp() {
-  return await invoke('restart_app')
-}
-
 export const releaseColor = (releaseType) => {
   switch (releaseType) {
     case 'release':
@@ -56,7 +52,7 @@ export function debounce(fn, wait) {
     if (timer) {
       clearTimeout(timer) // clear any pre-existing timer
     }
-
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
     const context = this // get the current context
     timer = setTimeout(() => {
       fn.apply(context, args) // call the function if time expires

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

@@ -381,20 +381,20 @@ const sortedCategories = computed(() => {
 // identifier[0], then if it ties, identifier[1], etc
 async function sortByNameOrNumber(sortable, identifiers) {
   sortable.sort((a, b) => {
-    for (const identifier of identifiers) {
+    for (let identifier of identifiers) {
-      const aNum = parseFloat(a[identifier])
+      let aNum = parseFloat(a[identifier])
-      const bNum = parseFloat(b[identifier])
+      let bNum = parseFloat(b[identifier])
       if (isNaN(aNum) && isNaN(bNum)) {
         // Both are strings, sort alphabetically
-        const stringComp = a[identifier].localeCompare(b[identifier])
+        let stringComp = a[identifier].localeCompare(b[identifier])
         if (stringComp != 0) return stringComp
       } else if (!isNaN(aNum) && !isNaN(bNum)) {
         // Both are numbers, sort numerically
-        const numComp = aNum - bNum
+        let numComp = aNum - bNum
         if (numComp != 0) return numComp
       } else {
         // One is a number and one is a string, numbers go first
-        const numStringComp = isNaN(aNum) ? 1 : -1
+        let numStringComp = isNaN(aNum) ? 1 : -1
         if (numStringComp != 0) return numStringComp
       }
     }
@@ -528,8 +528,7 @@ const isModProject = computed(() => ['modpack', 'mod'].includes(projectType.valu
 
 <template>
   <div ref="searchWrapper" class="search-container">
-    <aside class="filter-panel" @scroll="$refs.promo.scroll()">
+    <aside class="filter-panel">
-      <PromotionWrapper ref="promo" />
       <Card v-if="instanceContext" class="small-instance">
         <router-link :to="`/instance/${encodeURIComponent(instanceContext.path)}`" class="instance">
           <Avatar
@@ -676,7 +675,8 @@ const isModProject = computed(() => ['modpack', 'mod'].includes(projectType.valu
       </Card>
     </aside>
     <div class="search">
-      <Card class="project-type-container mt-4">
+      <PromotionWrapper class="mt-4" />
+      <Card class="project-type-container">
         <NavRow :links="selectableProjectTypes" />
       </Card>
       <Card class="search-panel-container">
@@ -878,13 +878,13 @@ const isModProject = computed(() => ['modpack', 'mod'].includes(projectType.valu
 
   .filter-panel {
     position: fixed;
+    width: 20rem;
     padding: 1rem 0.5rem 1rem 1rem;
     display: flex;
     flex-direction: column;
     height: fit-content;
     min-height: calc(100vh - 3.25rem);
     max-height: calc(100vh - 3.25rem);
-    width: 20rem;
     overflow-y: auto;
     -ms-overflow-style: none;
     scrollbar-width: none;
@@ -903,8 +903,8 @@ const isModProject = computed(() => ['modpack', 'mod'].includes(projectType.valu
   }
 
   .search {
-    margin: 0 1rem 0.5rem calc(20rem + 1rem);
+    margin: 0 1rem 0.5rem 20.5rem;
-    width: calc(100% - calc(20rem + 1rem));
+    width: calc(100% - 20.5rem);
 
     .offline {
       margin: 1rem;

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

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onUnmounted, computed } from 'vue'
+import { ref, onUnmounted, computed } from 'vue'
 import { useRoute } from 'vue-router'
 import RowDisplay from '@/components/RowDisplay.vue'
 import { list } from '@/helpers/profile.js'
@@ -8,11 +8,6 @@ import { useBreadcrumbs } from '@/store/breadcrumbs'
 import { handleError } from '@/store/notifications.js'
 import dayjs from 'dayjs'
 import { get_search_results } from '@/helpers/cache.js'
-import { hide_ads_window } from '@/helpers/ads.js'
-
-onMounted(() => {
-  hide_ads_window(true)
-})
 
 const featuredModpacks = ref({})
 const featuredMods = ref({})
@@ -47,7 +42,7 @@ const getInstances = async () => {
     return dateB - dateA
   })
 
-  const filters = []
+  let filters = []
   for (const instance of recentInstances.value) {
     if (instance.linked_data && instance.linked_data.project_id) {
       filters.push(`NOT"project_id"="${instance.linked_data.project_id}"`)

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

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, onUnmounted, ref, shallowRef } from 'vue'
+import { onUnmounted, ref, shallowRef } from 'vue'
 import GridDisplay from '@/components/GridDisplay.vue'
 import { list } from '@/helpers/profile.js'
 import { useRoute } from 'vue-router'
@@ -10,11 +10,6 @@ import { Button } from '@modrinth/ui'
 import { PlusIcon } from '@modrinth/assets'
 import InstanceCreationModal from '@/components/ui/InstanceCreationModal.vue'
 import { NewInstanceImage } from '@/assets/icons'
-import { hide_ads_window } from '@/helpers/ads.js'
-
-onMounted(() => {
-  hide_ads_window(true)
-})
 
 const route = useRoute()
 const breadcrumbs = useBreadcrumbs()

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

@@ -1,7 +1,7 @@
 <script setup>
-import { ref, watch, onMounted } from 'vue'
+import { ref, watch } from 'vue'
 import { LogOutIcon, LogInIcon, BoxIcon, FolderSearchIcon, TrashIcon } from '@modrinth/assets'
-import { Card, Slider, DropdownSelect, Toggle, Button } from '@modrinth/ui'
+import { Card, Slider, DropdownSelect, Toggle, ConfirmModal, Button } from '@modrinth/ui'
 import { handleError, useTheming } from '@/store/state'
 import { get, set } from '@/helpers/settings'
 import { get_java_versions, get_max_memory, set_java_version } from '@/helpers/jre'
@@ -13,12 +13,6 @@ import { open } from '@tauri-apps/plugin-dialog'
 import { getOS } from '@/helpers/utils.js'
 import { getVersion } from '@tauri-apps/api/app'
 import { get_user, purge_cache_types } from '@/helpers/cache.js'
-import { hide_ads_window } from '@/helpers/ads.js'
-import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
-
-onMounted(() => {
-  hide_ads_window(true)
-})
 
 const pageOptions = ['Home', 'Library']
 
@@ -175,12 +169,13 @@ async function purgeCache() {
           Sign in
         </button>
       </div>
-      <ConfirmModalWrapper
+      <ConfirmModal
         ref="purgeCacheConfirmModal"
         title="Are you sure you want to purge the cache?"
         description="If you proceed, your entire cache will be purged. This may slow down the app temporarily."
         :has-to-type="false"
         proceed-label="Purge cache"
+        :noblur="!themeStore.advancedRendering"
         @proceed="purgeCache"
       />
       <div class="adjacent-input">
@@ -363,25 +358,6 @@ async function purgeCache() {
           <span class="label__title size-card-header">Privacy</span>
         </h3>
       </div>
-      <div class="adjacent-input">
-        <label for="opt-out-analytics">
-          <span class="label__title">Personalized ads</span>
-          <span class="label__description">
-            Modrinth's ad provider, Aditude, shows ads based on your preferences. By disabling this
-            option, you opt out and ads will no longer be shown based on your interests.
-          </span>
-        </label>
-        <Toggle
-          id="opt-out-analytics"
-          :model-value="settings.personalized_ads"
-          :checked="settings.personalized_ads"
-          @update:model-value="
-            (e) => {
-              settings.personalized_ads = e
-            }
-          "
-        />
-      </div>
       <div class="adjacent-input">
         <label for="opt-out-analytics">
           <span class="label__title">Telemetry</span>
@@ -425,14 +401,14 @@ async function purgeCache() {
           <span class="label__title size-card-header">Java settings</span>
         </h3>
       </div>
-      <template v-for="javaVersion in [21, 17, 8]" :key="`java-${javaVersion}`">
+      <template v-for="version in [21, 17, 8]">
-        <label :for="'java-' + javaVersion">
+        <label :for="'java-' + version">
-          <span class="label__title">Java {{ javaVersion }} location</span>
+          <span class="label__title">Java {{ version }} location</span>
         </label>
         <JavaSelector
-          :id="'java-selector-' + javaVersion"
+          :id="'java-selector-' + version"
-          v-model="javaVersions[javaVersion]"
+          v-model="javaVersions[version]"
-          :version="javaVersion"
+          :version="version"
           @update:model-value="updateJavaVersion"
         />
       </template>
@@ -473,7 +449,7 @@ async function purgeCache() {
           :min="8"
           :max="maxMemory"
           :step="64"
-          unit="MB"
+          unit="mb"
         />
       </div>
     </Card>

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

@@ -1,8 +1,8 @@
 <template>
   <div class="instance-container">
-    <div class="side-cards pb-4" @scroll="$refs.promo.scroll()">
+    <div class="side-cards">
       <Card class="instance-card" @contextmenu.prevent.stop="handleRightClick">
-        <Avatar size="md" :src="instance.icon_path ? convertFileSrc(instance.icon_path) : null" />
+        <Avatar size="lg" :src="instance.icon_path ? convertFileSrc(instance.icon_path) : null" />
         <div class="instance-info">
           <h2 class="name">{{ instance.name }}</h2>
           <span class="metadata"> {{ instance.loader }} {{ instance.game_version }} </span>
@@ -61,9 +61,9 @@
           </RouterLink>
         </div>
       </Card>
-      <PromotionWrapper ref="promo" class="mt-4" />
     </div>
     <div class="content">
+      <PromotionWrapper />
       <RouterView v-slot="{ Component }">
         <template v-if="Component">
           <Suspense @pending="loadingBar.startLoading()" @resolve="loadingBar.stopLoading()">
@@ -311,6 +311,7 @@ onUnmounted(() => {
   display: flex;
   flex-direction: column;
   gap: 1rem;
+  width: 17rem;
 }
 
 Button {
@@ -324,13 +325,12 @@ Button {
 }
 
 .side-cards {
-  position: fixed;
+  position: absolute;
-  width: 300px;
   display: flex;
   flex-direction: column;
-
+  padding: 1rem;
-  min-height: calc(100vh - 3.25rem);
+  min-height: calc(100% - 3.25rem);
-  max-height: calc(100vh - 3.25rem);
+  max-height: calc(100% - 3.25rem);
   overflow-y: auto;
   -ms-overflow-style: none;
   scrollbar-width: none;
@@ -374,7 +374,10 @@ Button {
   overflow: auto;
   gap: 1rem;
   min-height: 100%;
-  padding: 1rem;
+}
+
+.content {
+  margin-left: 19rem;
 }
 
 .instance-info {
@@ -448,10 +451,10 @@ Button {
 }
 
 .content {
-  margin: 0 1rem 0.5rem 20rem;
+  width: 100%;
-  width: calc(100% - 20rem);
   display: flex;
   flex-direction: column;
+  padding: 1rem 1rem 0 0;
   overflow: auto;
 }
 

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

@@ -76,7 +76,7 @@
         </div>
       </RecycleScroller>
     </div>
-    <ShareModalWrapper
+    <ShareModal
       ref="shareModal"
       header="Share Log"
       share-title="Instance Log"
@@ -89,7 +89,7 @@
 
 <script setup>
 import { CheckIcon, ClipboardCopyIcon, ShareIcon, TrashIcon } from '@modrinth/assets'
-import { Button, Card, Checkbox, DropdownSelect } from '@modrinth/ui'
+import { Button, Card, ShareModal, Checkbox, DropdownSelect } from '@modrinth/ui'
 import {
   delete_logs_by_filename,
   get_logs,
@@ -107,7 +107,6 @@ import { handleError } from '@/store/notifications.js'
 import { ofetch } from 'ofetch'
 import { RecycleScroller } from 'vue-virtual-scroller'
 import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
-import ShareModalWrapper from '@/components/ui/modal/ShareModalWrapper.vue'
 
 dayjs.extend(isToday)
 dayjs.extend(isYesterday)
@@ -296,7 +295,7 @@ if (logs.value.length > 1 && !props.playing) {
 
 const deleteLog = async () => {
   if (logs.value[selectedLogIndex.value] && selectedLogIndex.value !== 0) {
-    const deleteIndex = selectedLogIndex.value
+    let deleteIndex = selectedLogIndex.value
     selectedLogIndex.value = deleteIndex - 1
     await delete_logs_by_filename(
       props.instance.path,

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

@@ -284,7 +284,7 @@
     :link-function="(page) => `?page=${page}`"
     @switch-page="switchPage"
   />
-  <ModalWrapper ref="deleteWarning" header="Are you sure?">
+  <Modal ref="deleteWarning" header="Are you sure?">
     <div class="modal-body">
       <div class="markdown-body">
         <p>
@@ -302,8 +302,8 @@
         </Button>
       </div>
     </div>
-  </ModalWrapper>
+  </Modal>
-  <ModalWrapper ref="deleteDisabledWarning" header="Are you sure?">
+  <Modal ref="deleteDisabledWarning" header="Are you sure?">
     <div class="modal-body">
       <div class="markdown-body">
         <p>
@@ -325,8 +325,8 @@
         </Button>
       </div>
     </div>
-  </ModalWrapper>
+  </Modal>
-  <ShareModalWrapper
+  <ShareModal
     ref="shareModal"
     share-title="Sharing modpack content"
     share-text="Check out the projects I'm using in my modpack!"
@@ -360,6 +360,8 @@ import {
 import {
   Pagination,
   DropdownSelect,
+  ShareModal,
+  Modal,
   Checkbox,
   AnimatedLogo,
   Avatar,
@@ -378,6 +380,7 @@ import {
 } from '@/helpers/profile.js'
 import { handleError } from '@/store/notifications.js'
 import { trackEvent } from '@/helpers/analytics'
+import { listen } from '@tauri-apps/api/event'
 import { highlightModInProfile } from '@/helpers/utils.js'
 import { MenuIcon, ToggleIcon, TextInputIcon, AddProjectImage, PackageIcon } from '@/assets/icons'
 import ExportModal from '@/components/ui/ExportModal.vue'
@@ -390,9 +393,6 @@ import {
   get_version_many,
 } from '@/helpers/cache.js'
 import { profile_listener } from '@/helpers/events.js'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import ShareModalWrapper from '@/components/ui/modal/ShareModalWrapper.vue'
-import { getCurrentWebview } from '@tauri-apps/api/webview'
 
 const props = defineProps({
   instance: {
@@ -717,7 +717,7 @@ const updateProject = async (mod) => {
   })
 }
 
-const locks = {}
+let locks = {}
 
 const toggleDisableMod = async (mod) => {
   // Use mod's id as the key for the lock. If mod doesn't have a unique id, replace `mod.id` with some unique property.
@@ -725,7 +725,7 @@ const toggleDisableMod = async (mod) => {
     locks[mod.id] = ref(null)
   }
 
-  const lock = locks[mod.id]
+  let lock = locks[mod.id]
 
   while (lock.value) {
     await lock.value
@@ -784,7 +784,6 @@ const deleteDisabled = async () => {
 }
 
 const shareNames = async () => {
-  console.log(functionValues.value)
   await shareModal.value.show(functionValues.value.map((x) => x.name).join('\n'))
 }
 
@@ -879,10 +878,8 @@ async function refreshProjects() {
   refreshingProjects.value = false
 }
 
-const unlisten = await getCurrentWebview().onDragDropEvent(async (event) => {
+const unlisten = await listen('tauri://file-drop', async (event) => {
-  if (event.payload.type !== 'drop') return
+  for (const file of event.payload) {
-
-  for (const file of event.payload.paths) {
     if (file.endsWith('.mrpack')) continue
     await add_project_from_path(props.instance.path, file).catch(handleError)
   }

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

@@ -1,13 +1,18 @@
 <template>
-  <ConfirmModalWrapper
+  <ConfirmModal
     ref="modal_confirm"
     title="Are you sure you want to delete this instance?"
     description="If you proceed, all data for your instance will be removed. You will not be able to recover it."
     :has-to-type="false"
     proceed-label="Delete"
+    :noblur="!themeStore.advancedRendering"
     @proceed="removeProfile"
   />
-  <ModalWrapper ref="modalConfirmUnlock" header="Are you sure you want to unlock this instance?">
+  <Modal
+    ref="modalConfirmUnlock"
+    header="Are you sure you want to unlock this instance?"
+    :noblur="!themeStore.advancedRendering"
+  >
     <div class="modal-delete">
       <div
         class="markdown-body"
@@ -26,9 +31,13 @@
         </button>
       </div>
     </div>
-  </ModalWrapper>
+  </Modal>
 
-  <ModalWrapper ref="modalConfirmUnpair" header="Are you sure you want to unpair this instance?">
+  <Modal
+    ref="modalConfirmUnpair"
+    header="Are you sure you want to unpair this instance?"
+    :noblur="!themeStore.advancedRendering"
+  >
     <div class="modal-delete">
       <div
         class="markdown-body"
@@ -47,9 +56,13 @@
         </button>
       </div>
     </div>
-  </ModalWrapper>
+  </Modal>
 
-  <ModalWrapper ref="changeVersionsModal" header="Change instance versions">
+  <Modal
+    ref="changeVersionsModal"
+    header="Change instance versions"
+    :noblur="!themeStore.advancedRendering"
+  >
     <div class="change-versions-modal universal-body">
       <div class="input-row">
         <p class="input-label">Loader</p>
@@ -93,7 +106,7 @@
         </button>
       </div>
     </div>
-  </ModalWrapper>
+  </Modal>
   <section class="card">
     <div class="label">
       <h3>
@@ -498,7 +511,18 @@ import {
   DownloadIcon,
   ClipboardCopyIcon,
 } from '@modrinth/assets'
-import { Button, Toggle, Card, Slider, Checkbox, Avatar, Chips, DropdownSelect } from '@modrinth/ui'
+import {
+  Button,
+  Toggle,
+  ConfirmModal,
+  Card,
+  Slider,
+  Checkbox,
+  Avatar,
+  Modal,
+  Chips,
+  DropdownSelect,
+} from '@modrinth/ui'
 import { SwapIcon } from '@/assets/icons'
 
 import { Multiselect } from 'vue-multiselect'
@@ -522,11 +546,10 @@ import { open } from '@tauri-apps/plugin-dialog'
 import { get_loader_versions } from '@/helpers/metadata.js'
 import { get_game_versions, get_loaders } from '@/helpers/tags.js'
 import { handleError } from '@/store/notifications.js'
+import { useTheming } from '@/store/theme.js'
 import { useBreadcrumbs } from '@/store/breadcrumbs'
 import ModpackVersionModal from '@/components/ui/ModpackVersionModal.vue'
 import { trackEvent } from '@/helpers/analytics'
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue'
 
 const breadcrumbs = useBreadcrumbs()
 
@@ -547,6 +570,8 @@ const props = defineProps({
   },
 })
 
+const themeStore = useTheming()
+
 const title = ref(props.instance.name)
 const icon = ref(props.instance.icon_path)
 const groups = ref(props.instance.groups)
@@ -581,7 +606,7 @@ async function setIcon() {
 
   if (!value) return
 
-  icon.value = value.path ?? value
+  icon.value = value
   await edit_icon(props.instance.path, icon.value).catch(handleError)
 
   trackEvent('InstanceSetIcon')
@@ -596,12 +621,12 @@ const overrideJavaInstall = ref(!!props.instance.java_path)
 const optimalJava = readonly(await get_optimal_jre_key(props.instance.path).catch(handleError))
 const javaInstall = ref({ path: optimalJava.path ?? props.instance.java_path })
 
-const overrideJavaArgs = ref(props.instance.extra_launch_args?.length !== undefined)
+const overrideJavaArgs = ref(!!props.instance.extra_launch_args)
 const javaArgs = ref(
   (props.instance.extra_launch_args ?? globalSettings.extra_launch_args).join(' '),
 )
 
-const overrideEnvVars = ref(props.instance.custom_env_vars?.length !== undefined)
+const overrideEnvVars = ref(!!props.instance.custom_env_vars)
 const envVars = ref(
   (props.instance.custom_env_vars ?? globalSettings.custom_env_vars)
     .map((x) => x.join('='))
@@ -685,15 +710,19 @@ const editProfileObject = computed(() => {
   }
 
   if (overrideJavaArgs.value) {
-    editProfile.extra_launch_args = javaArgs.value.trim().split(/\s+/).filter(Boolean)
+    if (javaArgs.value !== '') {
+      editProfile.extra_launch_args = javaArgs.value.trim().split(/\s+/).filter(Boolean)
+    }
   }
 
   if (overrideEnvVars.value) {
-    editProfile.custom_env_vars = envVars.value
+    if (envVars.value !== '') {
-      .trim()
+      editProfile.custom_env_vars = envVars.value
-      .split(/\s+/)
+        .trim()
-      .filter(Boolean)
+        .split(/\s+/)
-      .map((x) => x.split('=').filter(Boolean))
+        .filter(Boolean)
+        .map((x) => x.split('=').filter(Boolean))
+    }
   }
 
   if (overrideMemorySettings.value) {
@@ -876,7 +905,7 @@ const editing = ref(false)
 async function saveGvLoaderEdits() {
   editing.value = true
 
-  const editProfile = editProfileObject.value
+  let editProfile = editProfileObject.value
   editProfile.loader = loader.value
   editProfile.game_version = gameVersion.value
 

apps/app-frontend/src/pages/project/Gallery.vue

@@ -20,14 +20,14 @@
       </span>
     </Card>
   </div>
-  <div v-if="expandedGalleryItem" class="expanded-image-modal" @click="hideImage">
+  <div v-if="expandedGalleryItem" class="expanded-image-modal" @click="expandedGalleryItem = null">
     <div class="content">
       <img
         class="image"
         :class="{ 'zoomed-in': zoomedIn }"
         :src="
-          expandedGalleryItem.raw_url
+          expandedGalleryItem.url
-            ? expandedGalleryItem.raw_url
+            ? expandedGalleryItem.url
             : 'https://cdn.modrinth.com/placeholder-banner.svg'
         "
         :alt="expandedGalleryItem.title ? expandedGalleryItem.title : 'gallery-image'"
@@ -45,15 +45,15 @@
         </div>
         <div class="controls">
           <div class="buttons">
-            <Button class="close" icon-only @click="hideImage">
+            <Button class="close" icon-only @click="expandedGalleryItem = null">
               <XIcon aria-hidden="true" />
             </Button>
             <a
               class="open btn icon-only"
               target="_blank"
               :href="
-                expandedGalleryItem.raw_url
+                expandedGalleryItem.url
-                  ? expandedGalleryItem.raw_url
+                  ? expandedGalleryItem.url
                   : 'https://cdn.modrinth.com/placeholder-banner.svg'
               "
             >
@@ -94,7 +94,6 @@ import {
 import { Button, Card } from '@modrinth/ui'
 import { ref } from 'vue'
 import { trackEvent } from '@/helpers/analytics'
-import { show_ads_window, hide_ads_window } from '@/helpers/ads.js'
 
 const props = defineProps({
   project: {
@@ -103,14 +102,9 @@ const props = defineProps({
   },
 })
 
-const expandedGalleryItem = ref(null)
+let expandedGalleryItem = ref(null)
-const expandedGalleryIndex = ref(0)
+let expandedGalleryIndex = ref(0)
-const zoomedIn = ref(false)
+let zoomedIn = ref(false)
-
-const hideImage = () => {
-  expandedGalleryItem.value = null
-  show_ads_window()
-}
 
 const nextImage = () => {
   expandedGalleryIndex.value++
@@ -137,7 +131,6 @@ const previousImage = () => {
 }
 
 const expandImage = (item, index) => {
-  hide_ads_window()
   expandedGalleryItem.value = item
   expandedGalleryIndex.value = index
   zoomedIn.value = false
@@ -147,20 +140,6 @@ const expandImage = (item, index) => {
     url: item.url,
   })
 }
-
-function keyListener(e) {
-  if (expandedGalleryItem.value) {
-    e.preventDefault()
-    if (e.key === 'Escape') {
-      hideImage()
-    } else if (e.key === 'ArrowLeft') {
-      previousImage()
-    } else if (e.key === 'ArrowRight') {
-      nextImage()
-    }
-  }
-}
-document.addEventListener('keypress', keyListener)
 </script>
 
 <style scoped lang="scss">

apps/app-frontend/src/pages/project/Index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="root-container">
-    <div v-if="data" class="project-sidebar" @scroll="$refs.promo.scroll()">
+    <div v-if="data" class="project-sidebar">
       <Card v-if="instance" class="small-instance">
         <router-link class="instance" :to="`/instance/${encodeURIComponent(instance.path)}`">
           <Avatar
@@ -20,7 +20,7 @@
         </router-link>
       </Card>
       <Card class="sidebar-card" @contextmenu.prevent.stop="handleRightClick">
-        <Avatar size="md" :src="data.icon_url" />
+        <Avatar size="lg" :src="data.icon_url" />
         <div class="instance-info">
           <h2 class="name">{{ data.title }}</h2>
           {{ data.description }}
@@ -61,9 +61,7 @@
             Site
           </a>
         </div>
-      </Card>
+        <hr class="card-divider" />
-      <PromotionWrapper ref="promo" />
-      <Card class="sidebar-card">
         <div class="stats">
           <div class="stat">
             <DownloadIcon aria-hidden="true" />
@@ -165,6 +163,7 @@
       </Card>
     </div>
     <div v-if="data" class="content-container">
+      <PromotionWrapper />
       <Card class="tabs">
         <NavRow
           v-if="data.gallery.length > 0"
@@ -232,7 +231,15 @@ import {
   GlobeIcon,
   ClipboardCopyIcon,
 } from '@modrinth/assets'
-import { Categories, EnvironmentIndicator, Card, Avatar, Button, NavRow } from '@modrinth/ui'
+import {
+  Categories,
+  EnvironmentIndicator,
+  Card,
+  Avatar,
+  Button,
+  Promotion,
+  NavRow,
+} from '@modrinth/ui'
 import { formatNumber } from '@modrinth/utils'
 import {
   BuyMeACoffeeIcon,
@@ -253,7 +260,7 @@ import { handleError } from '@/store/notifications.js'
 import { convertFileSrc } from '@tauri-apps/api/core'
 import ContextMenu from '@/components/ui/ContextMenu.vue'
 import { install as installVersion } from '@/store/install.js'
-import { get_project, get_team, get_version_many } from '@/helpers/cache.js'
+import { get_project, get_project_many, get_team, get_version_many } from '@/helpers/cache.js'
 import PromotionWrapper from '@/components/ui/PromotionWrapper.vue'
 
 dayjs.extend(relativeTime)
@@ -302,13 +309,11 @@ async function fetchProjectData() {
 
 await fetchProjectData()
 
-const promo = ref(null)
 watch(
   () => route.params.id,
   async () => {
     if (route.params.id && route.path.startsWith('/project')) {
       await fetchProjectData()
-      promo.value.scroll()
     }
   },
 )
@@ -372,7 +377,7 @@ const handleOptionsClick = (args) => {
 
 .project-sidebar {
   position: fixed;
-  width: calc(300px + 1.5rem);
+  width: 20rem;
   min-height: calc(100vh - 3.25rem);
   height: fit-content;
   max-height: calc(100vh - 3.25rem);
@@ -398,7 +403,7 @@ const handleOptionsClick = (args) => {
   flex-direction: column;
   width: 100%;
   padding: 1rem;
-  margin-left: calc(300px + 1rem);
+  margin-left: 19.5rem;
 }
 
 .button-group {

apps/app-frontend/tsconfig.app.json

@@ -1,24 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2020",
-    "useDefineForClassFields": true,
-    "module": "ESNext",
-    "lib": ["ES2020", "DOM", "DOM.Iterable"],
-    "skipLibCheck": true,
-
-    "moduleResolution": "bundler",
-    "allowJs": true,
-    "allowImportingTsExtensions": true,
-    "isolatedModules": true,
-    "moduleDetection": "force",
-    "noEmit": true,
-    "jsx": "preserve",
-
-    "strict": true,
-
-    "paths": {
-      "@/*": ["./src/*"]
-    }
-  },
-  "include": ["src"]
-}

apps/app-frontend/tsconfig.json

@@ -1,4 +1,12 @@
 {
-  "files": [],
+  "compilerOptions": {
-  "references": [{ "path": "./tsconfig.app.json" }, { "path": "./tsconfig.node.json" }]
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["src/*"]
+    },
+    "target": "ESNext"
+  },
+  "exclude": ["node_modules", "dist"]
 }

apps/app-frontend/tsconfig.node.json

@@ -1,17 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2022",
-    "lib": ["ES2023"],
-    "module": "ESNext",
-    "skipLibCheck": true,
-
-    "moduleResolution": "bundler",
-    "allowImportingTsExtensions": true,
-    "isolatedModules": true,
-    "moduleDetection": "force",
-    "noEmit": true,
-
-    "strict": true
-  },
-  "include": ["vite.config.ts"]
-}

apps/app-frontend/vite.config.ts

@@ -42,8 +42,8 @@ export default defineConfig({
     port: 1420,
     strictPort: true,
   },
-  // to make use of `TAURI_ENV_DEBUG` and other env variables
+  // to make use of `TAURI_DEBUG` and other env variables
-  // https://v2.tauri.app/reference/environment-variables/#tauri-cli-hook-commands
+  // https://tauri.studio/v1/api/config#buildconfig.beforedevcommand
   envPrefix: ['VITE_', 'TAURI_'],
   build: {
     // Tauri supports es2021

apps/app-playground/Cargo.toml

@@ -10,6 +10,7 @@ theseus = { path = "../../packages/app-lib", features = ["cli"] }
 
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
+tauri = "2.0.0-rc.4"
 tokio = { version = "1", features = ["full"] }
 thiserror = "1.0"
 url = "2.2"

apps/app-playground/package.json

@@ -2,7 +2,7 @@
   "name": "@modrinth/app-playground",
   "scripts": {
     "build": "cargo build --release",
-    "lint": "cargo fmt --check && cargo clippy --all-targets --all-features -- -D warnings",
+    "lint": "cargo fmt --check && cargo clippy -- -D warnings",
     "fix": "cargo fmt && cargo clippy --fix",
     "dev": "cargo run",
     "test": "cargo test"

apps/app/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "theseus_gui"
-version = "0.8.9"
+version = "0.8.3-1"
 description = "The Modrinth App is a desktop application for managing your Minecraft mods"
 license = "GPL-3.0-only"
 repository = "https://github.com/modrinth/code/apps/app/"
@@ -16,19 +16,18 @@ theseus = { path = "../../packages/app-lib", features = ["tauri"] }
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 
-tauri = { version = "2.0.0-rc", features = ["devtools", "macos-private-api", "protocol-asset", "unstable"] }
+tauri = { version = "2.0.0-rc.6", features = ["devtools", "macos-private-api", "protocol-asset", "unstable"] }
 tauri-plugin-window-state = "2.0.0-rc"
 tauri-plugin-deep-link = "2.0.0-rc"
 tauri-plugin-os = "2.0.0-rc"
 tauri-plugin-shell = "2.0.0-rc"
 tauri-plugin-dialog = "2.0.0-rc"
-tauri-plugin-updater = { version = "2.0.0-rc" }
+tauri-plugin-updater = { version = "2.0.0-rc.1", optional = true }
-tauri-plugin-single-instance = { version = "2.0.0-rc" }
 
 tokio = { version = "1", features = ["full"] }
 thiserror = "1.0"
 futures = "0.3"
-daedalus = { path = "../../packages/daedalus" }
+daedalus = "0.2.3"
 chrono = "0.4.26"
 
 dirs = "5.0.1"
@@ -58,9 +57,6 @@ cocoa = "0.25.0"
 objc = "0.2.7"
 rand = "0.8.5"
 
-[target.'cfg(target_os = "linux")'.dependencies]
-tauri-plugin-updater = { version = "2.0.0-rc", optional = true, features = ["native-tls-vendored", "zip"], default-features = false }
-
 [features]
 # by default Tauri runs in production mode
 # when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL
@@ -68,4 +64,4 @@ default = ["custom-protocol"]
 # this feature is used for production builds where `devPath` points to the filesystem
 # DO NOT remove this
 custom-protocol = ["tauri/custom-protocol"]
-updater = []
+updater = ["dep:tauri-plugin-updater"]

apps/app/README.md

@@ -15,7 +15,7 @@ Before you begin, ensure you have the following installed on your machine:
 - [Node.js](https://nodejs.org/en/)
 - [pnpm](https://pnpm.io/)
 - [Rust](https://www.rust-lang.org/tools/install)
-- [Tauri](https://v2.tauri.app/start/prerequisites/)
+- [Tauri](https://tauri.app/v1/guides/getting-started/prerequisites/#installing)
 
 ### Setup
 

apps/app/build.rs

@@ -62,7 +62,7 @@ fn main() {
                 InlinedPlugin::new()
                     .commands(&[
                         "get_java_versions",
-                        "set_java_version",
+                        "set_java_versions",
                         "jre_find_filtered_jres",
                         "jre_get_jre",
                         "jre_test_jre",
@@ -217,22 +217,6 @@ fn main() {
                     .default_permission(
                         DefaultPermissionRule::AllowAllCommands,
                     ),
-            )
-            .plugin(
-                "ads",
-                InlinedPlugin::new()
-                    .commands(&[
-                        "init_ads_window",
-                        "hide_ads_window",
-                        "scroll_ads_window",
-                        "show_ads_window",
-                        "record_ads_click",
-                        "open_link",
-                        "get_ads_personalization",
-                    ])
-                    .default_permission(
-                        DefaultPermissionRule::AllowAllCommands,
-                    ),
             ),
     )
     .expect("Failed to run tauri-build");

apps/app/capabilities/ads.json

@@ -1,14 +0,0 @@
-{
-  "identifier": "ads",
-  "description": "",
-  "local": false,
-  "remote": {
-    "urls": ["https://modrinth.com/*", "http://localhost:3000/*"]
-  },
-  "webviews": [
-    "ads-window"
-  ],
-  "permissions": [
-    "ads:default"
-  ]
-}

apps/app/capabilities/plugins.json

@@ -2,7 +2,9 @@
   "identifier": "plugins",
   "description": "",
   "local": true,
-  "windows": ["main"],
+  "windows": [
+    "main"
+  ],
   "permissions": [
     "dialog:allow-open",
     "dialog:allow-confirm",
@@ -33,7 +35,6 @@
     "cache:default",
     "settings:default",
     "tags:default",
-    "utils:default",
+    "utils:default"
-    "ads:default"
   ]
 }

apps/app/capabilities/updater.json

@@ -1,11 +0,0 @@
-{
-  "identifier": "updater",
-  "description": "",
-  "local": true,
-  "windows": [
-    "main"
-  ],
-  "permissions": [
-    "updater:default"
-  ]
-}

apps/app/gen/schemas/capabilities.json

@@ -1 +1 @@
-{"ads":{"identifier":"ads","description":"","remote":{"urls":["https://modrinth.com/*","http://localhost:3000/*"]},"local":false,"webviews":["ads-window"],"permissions":["ads:default"]},"core":{"identifier":"core","description":"","local":true,"windows":["main"],"permissions":["core:default","core:path:default","core:event:default","core:window:default","core:app:default","core:resources:default","core:menu:default","core:tray:default","core:window:allow-create","core:window:allow-maximize","core:window:allow-toggle-maximize","core:window:allow-unmaximize","core:window:allow-minimize","core:window:allow-unminimize","core:window:allow-show","core:window:allow-hide","core:window:allow-close","core:window:allow-set-decorations","core:window:allow-start-dragging","core:webview:allow-set-webview-zoom"]},"plugins":{"identifier":"plugins","description":"","local":true,"windows":["main"],"permissions":["dialog:allow-open","dialog:allow-confirm","shell:allow-open","os:allow-platform","os:allow-version","os:allow-os-type","os:allow-family","os:allow-arch","os:allow-exe-extension","os:allow-locale","os:allow-hostname","deep-link:default","window-state:default","window-state:allow-restore-state","window-state:allow-save-window-state","auth:default","import:default","jre:default","logs:default","metadata:default","mr-auth:default","profile-create:default","pack:default","process:default","profile:default","cache:default","settings:default","tags:default","utils:default","ads:default"]},"updater":{"identifier":"updater","description":"","local":true,"windows":["main"],"permissions":["updater:default"]}}
+{"core":{"identifier":"core","description":"","local":true,"windows":["main"],"permissions":["core:default","core:path:default","core:event:default","core:window:default","core:app:default","core:resources:default","core:menu:default","core:tray:default","core:window:allow-create","core:window:allow-maximize","core:window:allow-toggle-maximize","core:window:allow-unmaximize","core:window:allow-minimize","core:window:allow-unminimize","core:window:allow-show","core:window:allow-hide","core:window:allow-close","core:window:allow-set-decorations","core:window:allow-start-dragging","core:webview:allow-set-webview-zoom"]},"plugins":{"identifier":"plugins","description":"","local":true,"windows":["main"],"permissions":["dialog:allow-open","dialog:allow-confirm","shell:allow-open","os:allow-platform","os:allow-version","os:allow-os-type","os:allow-family","os:allow-arch","os:allow-exe-extension","os:allow-locale","os:allow-hostname","deep-link:default","window-state:default","window-state:allow-restore-state","window-state:allow-save-window-state","auth:default","import:default","jre:default","logs:default","metadata:default","mr-auth:default","profile-create:default","pack:default","process:default","profile:default","cache:default","settings:default","tags:default","utils:default"]}}

apps/app/gen/schemas/linux-schema.json

@@ -299,69 +299,6 @@
     },
     "Identifier": {
       "oneOf": [
-        {
-          "description": "ads:default -> Default plugin permissions.",
-          "type": "string",
-          "enum": [
-            "ads:default"
-          ]
-        },
-        {
-          "description": "ads:allow-hide-ads-window -> Enables the hide_ads_window command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "ads:allow-hide-ads-window"
-          ]
-        },
-        {
-          "description": "ads:allow-init-ads-window -> Enables the init_ads_window command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "ads:allow-init-ads-window"
-          ]
-        },
-        {
-          "description": "ads:allow-scroll-ads-window -> Enables the scroll_ads_window command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "ads:allow-scroll-ads-window"
-          ]
-        },
-        {
-          "description": "ads:allow-show-ads-window -> Enables the show_ads_window command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "ads:allow-show-ads-window"
-          ]
-        },
-        {
-          "description": "ads:deny-hide-ads-window -> Denies the hide_ads_window command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "ads:deny-hide-ads-window"
-          ]
-        },
-        {
-          "description": "ads:deny-init-ads-window -> Denies the init_ads_window command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "ads:deny-init-ads-window"
-          ]
-        },
-        {
-          "description": "ads:deny-scroll-ads-window -> Denies the scroll_ads_window command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "ads:deny-scroll-ads-window"
-          ]
-        },
-        {
-          "description": "ads:deny-show-ads-window -> Denies the show_ads_window command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "ads:deny-show-ads-window"
-          ]
-        },
         {
           "description": "auth:default -> Default plugin permissions.",
           "type": "string",
@@ -2848,10 +2785,10 @@
           ]
         },
         {
-          "description": "jre:allow-set-java-version -> Enables the set_java_version command without any pre-configured scope.",
+          "description": "jre:allow-set-java-versions -> Enables the set_java_versions command without any pre-configured scope.",
           "type": "string",
           "enum": [
-            "jre:allow-set-java-version"
+            "jre:allow-set-java-versions"
           ]
         },
         {
@@ -2897,10 +2834,10 @@
           ]
         },
         {
-          "description": "jre:deny-set-java-version -> Denies the set_java_version command without any pre-configured scope.",
+          "description": "jre:deny-set-java-versions -> Denies the set_java_versions command without any pre-configured scope.",
           "type": "string",
           "enum": [
-            "jre:deny-set-java-version"
+            "jre:deny-set-java-versions"
           ]
         },
         {

apps/app/msi/main.wxs

@@ -0,0 +1,346 @@
+<?if $(sys.BUILDARCH)="x86"?>
+    <?define Win64 = "no" ?>
+    <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
+<?elseif $(sys.BUILDARCH)="x64"?>
+    <?define Win64 = "yes" ?>
+    <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
+<?else?>
+    <?error Unsupported value of sys.BUILDARCH=$(sys.BUILDARCH)?>
+<?endif?>
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Product
+            Id="*"
+            Name="{{product_name}}"
+            UpgradeCode="{{upgrade_code}}"
+            Language="!(loc.TauriLanguage)"
+            Manufacturer="{{manufacturer}}"
+            Version="{{version}}">
+
+        <Package Id="*"
+                 Keywords="Installer"
+                 InstallerVersion="450"
+                 Languages="0"
+                 Compressed="yes"
+                 InstallScope="perMachine"
+                 SummaryCodepage="!(loc.TauriCodepage)"/>
+
+        <!-- https://docs.microsoft.com/en-us/windows/win32/msi/reinstallmode -->
+        <!-- reinstall all files; rewrite all registry entries; reinstall all shortcuts -->
+        <Property Id="REINSTALLMODE" Value="amus" />
+
+        {{#if allow_downgrades}}
+            <MajorUpgrade Schedule="afterInstallInitialize" AllowDowngrades="yes" />
+        {{else}}
+            <MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="!(loc.DowngradeErrorMessage)" AllowSameVersionUpgrades="yes" />
+        {{/if}}
+
+        <InstallExecuteSequence>
+            <RemoveShortcuts>Installed AND NOT UPGRADINGPRODUCTCODE</RemoveShortcuts>
+        </InstallExecuteSequence>
+
+        <Media Id="1" Cabinet="app.cab" EmbedCab="yes" />
+
+        {{#if banner_path}}
+        <WixVariable Id="WixUIBannerBmp" Value="{{banner_path}}" />
+        {{/if}}
+        {{#if dialog_image_path}}
+        <WixVariable Id="WixUIDialogBmp" Value="{{dialog_image_path}}" />
+        {{/if}}
+        {{#if license}}
+        <WixVariable Id="WixUILicenseRtf" Value="{{license}}" />
+        {{/if}}
+
+        <Icon Id="ProductIcon" SourceFile="{{icon_path}}"/>
+        <Property Id="ARPPRODUCTICON" Value="ProductIcon" />
+        <Property Id="ARPNOREPAIR" Value="yes" Secure="yes" />      <!-- Remove repair -->
+        <SetProperty Id="ARPNOMODIFY" Value="1" After="InstallValidate" Sequence="execute"/>
+
+        <!-- initialize with previous InstallDir -->
+        <Property Id="INSTALLDIR">
+            <RegistrySearch Id="PrevInstallDirReg" Root="HKCU" Key="Software\\{{manufacturer}}\\{{product_name}}" Name="InstallDir" Type="raw"/>
+        </Property>
+
+        <!-- launch app checkbox -->
+        <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="!(loc.LaunchApp)" />
+        <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1"/>
+        <Property Id="WixShellExecTarget" Value="[!Path]" />
+        <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
+
+        <UI>
+            <!-- launch app checkbox -->
+            <Publish Dialog="ExitDialog" Control="Finish" Event="DoAction" Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
+
+            <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
+
+            {{#unless license}}
+            <!-- Skip license dialog -->
+            <Publish Dialog="WelcomeDlg"
+                     Control="Next"
+                     Event="NewDialog"
+                     Value="InstallDirDlg"
+                     Order="2">1</Publish>
+            <Publish Dialog="InstallDirDlg"
+                     Control="Back"
+                     Event="NewDialog"
+                     Value="WelcomeDlg"
+                     Order="2">1</Publish>
+            {{/unless}}
+        </UI>
+
+        <UIRef Id="WixUI_InstallDir" />
+
+        <Directory Id="TARGETDIR" Name="SourceDir">
+            <Directory Id="DesktopFolder" Name="Desktop">
+                <Component Id="ApplicationShortcutDesktop" Guid="*">
+                    <Shortcut Id="ApplicationDesktopShortcut" Name="{{product_name}}" Description="Runs {{product_name}}" Target="[!Path]" WorkingDirectory="INSTALLDIR" />
+                    <RemoveFolder Id="DesktopFolder" On="uninstall" />
+                    <RegistryValue Root="HKCU" Key="Software\\{{manufacturer}}\\{{product_name}}" Name="Desktop Shortcut" Type="integer" Value="1" KeyPath="yes" />
+                </Component>
+            </Directory>
+            <Directory Id="$(var.PlatformProgramFilesFolder)" Name="PFiles">
+                <Directory Id="INSTALLDIR" Name="{{product_name}}"/>
+            </Directory>
+            <Directory Id="ProgramMenuFolder">
+                <Directory Id="ApplicationProgramsFolder" Name="{{product_name}}"/>
+            </Directory>
+        </Directory>
+
+        <DirectoryRef Id="INSTALLDIR">
+            <Component Id="RegistryEntries" Guid="*">
+                <RegistryKey Root="HKCU" Key="Software\\{{manufacturer}}\\{{product_name}}">
+                    <RegistryValue Name="InstallDir" Type="string" Value="[INSTALLDIR]" KeyPath="yes" />
+                </RegistryKey>
+            </Component>
+
+            <Component Id="Path" Guid="{{path_component_guid}}" Win64="$(var.Win64)">
+                <File Id="Path" Source="{{app_exe_source}}" KeyPath="yes" Checksum="yes"/>
+                <!-- THESEUS -->
+                <ProgId Id="theseus.mrpack.Document" Description="Modrinth File">
+                    <Extension Id="mrpack" ContentType="application/mrpack">
+                    <!-- no flags on argument, so we can hijack deep link library-->
+                     <Verb Id="open" Command="Open" TargetFile="Path" Argument="&quot;%1&quot;" />
+                    </Extension>
+                </ProgId>
+                <!-- /THESEUS -->
+            </Component>
+            {{#each binaries as |bin| ~}}
+            <Component Id="{{ bin.id }}" Guid="{{bin.guid}}" Win64="$(var.Win64)">
+                <File Id="Bin_{{ bin.id }}" Source="{{bin.path}}" KeyPath="yes"/>
+            </Component>
+            {{/each~}}
+            {{#if enable_elevated_update_task}}
+            <Component Id="UpdateTask" Guid="C492327D-9720-4CD5-8DB8-F09082AF44BE" Win64="$(var.Win64)">
+                <File Id="UpdateTask" Source="update.xml" KeyPath="yes" Checksum="yes"/>
+            </Component>
+            <Component Id="UpdateTaskInstaller" Guid="011F25ED-9BE3-50A7-9E9B-3519ED2B9932" Win64="$(var.Win64)">
+                <File Id="UpdateTaskInstaller" Source="install-task.ps1" KeyPath="yes" Checksum="yes"/>
+            </Component>
+            <Component Id="UpdateTaskUninstaller" Guid="D4F6CC3F-32DC-5FD0-95E8-782FFD7BBCE1" Win64="$(var.Win64)">
+                <File Id="UpdateTaskUninstaller" Source="uninstall-task.ps1" KeyPath="yes" Checksum="yes"/>
+            </Component>
+            {{/if}}
+            {{resources}}
+            <Component Id="CMP_UninstallShortcut" Guid="*">
+
+                <Shortcut Id="UninstallShortcut"
+						  Name="Uninstall {{product_name}}"
+						  Description="Uninstalls {{product_name}}"
+						  Target="[System64Folder]msiexec.exe"
+						  Arguments="/x [ProductCode]" />
+
+				<RemoveFolder Id="INSTALLDIR"
+							  On="uninstall" />
+
+				<RegistryValue Root="HKCU"
+							   Key="Software\\{{manufacturer}}\\{{product_name}}"
+							   Name="Uninstaller Shortcut"
+							   Type="integer"
+							   Value="1"
+							   KeyPath="yes" />
+            </Component>
+
+            <!-- THESEUS -->
+            <Component Id="FileTypeAssociationsReg" Guid="*">
+				<RegistryValue Root="HKLM" Key="SOFTWARE\modrinth\theseus\Capabilities" Name="ApplicationDescription" Value="theseus" Type="string" />
+				<RegistryValue Root="HKLM" Key="SOFTWARE\modrinth\theseus\Capabilities" Name="ApplicationIcon" Value="[INSTALLDIR]theseus,0" Type="string" />
+				<RegistryValue Root="HKLM" Key="SOFTWARE\modrinth\theseus\Capabilities" Name="ApplicationName" Value="theseus" Type="string" />
+				<RegistryValue Root="HKLM" Key="SOFTWARE\modrinth\theseus\Capabilities\DefaultIcon" Value="[INSTALLDIR]theseus,1" Type="string" />
+				<RegistryValue Root="HKLM" Key="SOFTWARE\modrinth\theseus\Capabilities\FileAssociations" Name=".mrpack" Value="theseus.mrpack.Document" Type="string" />
+				<RegistryValue Root="HKLM" Key="SOFTWARE\modrinth\theseus\Capabilities\MIMEAssociations" Name="application/mrpack" Value="theseus.mrpack.Document" Type="string" />
+				<RegistryValue Root="HKLM" Key="SOFTWARE\modrinth\theseus\Capabilities\shell\Open\command" Value="&quot;[INSTALLDIR]theseus&quot; -e &quot;%1&quot;" Type="string" />
+
+				<RegistryValue Root="HKLM" Key="SOFTWARE\RegisteredApplications" Name="theseus" Value="SOFTWARE\modrinth\theseus\Capabilities" Type="string" KeyPath="yes" />
+
+				<RegistryValue Root="HKLM" Key="SOFTWARE\Classes\theseus.mrpack.Document" Name="MRPACK File" Value="Modrinth Modpack Installer" Type="string" />
+				<RegistryValue Root="HKLM" Key="SOFTWARE\Classes\.mrpack" Name="Content Type" Value="application/mrpack" Type="string" />
+				<RegistryValue Root="HKLM" Key="SOFTWARE\Classes\.mrpack\OpenWithList\theseus" Value="" Type="string" />
+				<RegistryValue Root="HKLM" Key="SOFTWARE\Classes\.mrpack\OpenWithProgids" Name="theseus.mrpack.Document" Value="" Type="string" />
+				<RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Applications\mrpack\SupportedTypes" Name=".mrpack" Value="" Type="string" />
+				<RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Applications\mrpack\shell\open" Name="FriendlyAppName" Value="theseus" Type="string" />
+			</Component>
+            <!-- /THESEUS -->
+
+        </DirectoryRef>
+
+        <DirectoryRef Id="ApplicationProgramsFolder">
+            <Component Id="ApplicationShortcut" Guid="*">
+                <Shortcut Id="ApplicationStartMenuShortcut"
+                    Name="{{product_name}}"
+                    Description="Runs {{product_name}}"
+                    Target="[!Path]"
+                    Icon="ProductIcon"
+                    WorkingDirectory="INSTALLDIR">
+                    <ShortcutProperty Key="System.AppUserModel.ID" Value="{{bundle_id}}"/>
+                </Shortcut>
+                <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
+                <RegistryValue Root="HKCU" Key="Software\\{{manufacturer}}\\{{product_name}}" Name="Start Menu Shortcut" Type="integer" Value="1" KeyPath="yes"/>
+           </Component>
+        </DirectoryRef>
+
+        {{#each merge_modules as |msm| ~}}
+        <DirectoryRef Id="TARGETDIR">
+            <Merge Id="{{ msm.name }}" SourceFile="{{ msm.path }}" DiskId="1" Language="!(loc.TauriLanguage)" />
+        </DirectoryRef>
+
+        <Feature Id="{{ msm.name }}" Title="{{ msm.name }}" AllowAdvertise="no" Display="hidden" Level="1">
+            <MergeRef Id="{{ msm.name }}"/>
+        </Feature>
+        {{/each~}}
+
+        <Feature
+                Id="MainProgram"
+                Title="Application"
+                Description="!(loc.InstallAppFeature)"
+                Level="1"
+                ConfigurableDirectory="INSTALLDIR"
+                AllowAdvertise="no"
+                Display="expand"
+                Absent="disallow">
+
+            <ComponentRef Id="RegistryEntries"/>
+
+            <!-- THESEUS -->
+            <ComponentRef Id="FileTypeAssociationsReg" />
+            <!-- /THESEUS -->
+
+            {{#each resource_file_ids as |resource_file_id| ~}}
+                <ComponentRef Id="{{ resource_file_id }}"/>
+            {{/each~}}
+
+            {{#if enable_elevated_update_task}}
+                <ComponentRef Id="UpdateTask" />
+                <ComponentRef Id="UpdateTaskInstaller" />
+                <ComponentRef Id="UpdateTaskUninstaller" />
+            {{/if}}
+
+            <Feature Id="ShortcutsFeature"
+                Title="Shortcuts"
+                Level="1">
+                <ComponentRef Id="Path"/>
+                <ComponentRef Id="CMP_UninstallShortcut" />
+                <ComponentRef Id="ApplicationShortcut" />
+                <ComponentRef Id="ApplicationShortcutDesktop" />
+            </Feature>
+
+            <Feature
+                Id="Environment"
+                Title="PATH Environment Variable"
+                Description="!(loc.PathEnvVarFeature)"
+                Level="1"
+                Absent="allow">
+            <ComponentRef Id="Path"/>
+            {{#each binaries as |bin| ~}}
+            <ComponentRef Id="{{ bin.id }}"/>
+            {{/each~}}
+            </Feature>
+        </Feature>
+
+        <Feature Id="External" AllowAdvertise="no" Absent="disallow">
+            {{#each component_group_refs as |id| ~}}
+            <ComponentGroupRef Id="{{ id }}"/>
+            {{/each~}}
+            {{#each component_refs as |id| ~}}
+            <ComponentRef Id="{{ id }}"/>
+            {{/each~}}
+            {{#each feature_group_refs as |id| ~}}
+            <FeatureGroupRef Id="{{ id }}"/>
+            {{/each~}}
+            {{#each feature_refs as |id| ~}}
+            <FeatureRef Id="{{ id }}"/>
+            {{/each~}}
+            {{#each merge_refs as |id| ~}}
+            <MergeRef Id="{{ id }}"/>
+            {{/each~}}
+        </Feature>
+
+        {{#if install_webview}}
+        <!-- WebView2 -->
+        <Property Id="WVRTINSTALLED">
+            <RegistrySearch Id="WVRTInstalledSystem" Root="HKLM" Key="SOFTWARE\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" Name="pv" Type="raw" Win64="no" />
+            <RegistrySearch Id="WVRTInstalledUser" Root="HKCU" Key="SOFTWARE\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" Name="pv" Type="raw"/>
+        </Property>
+
+        {{#if download_bootstrapper}}
+        <CustomAction Id='DownloadAndInvokeBootstrapper' Directory="INSTALLDIR" Execute="deferred" ExeCommand='powershell.exe -NoProfile -windowstyle hidden try [\{] [\[]Net.ServicePointManager[\]]::SecurityProtocol = [\[]Net.SecurityProtocolType[\]]::Tls12 [\}] catch [\{][\}]; Invoke-WebRequest -Uri "https://go.microsoft.com/fwlink/p/?LinkId=2124703" -OutFile "$env:TEMP\MicrosoftEdgeWebview2Setup.exe" ; Start-Process -FilePath "$env:TEMP\MicrosoftEdgeWebview2Setup.exe" -ArgumentList ({{webview_installer_args}} &apos;/install&apos;) -Wait' Return='check'/>
+        <InstallExecuteSequence>
+            <Custom Action='DownloadAndInvokeBootstrapper' Before='InstallFinalize'>
+                <![CDATA[NOT(REMOVE OR WVRTINSTALLED)]]>
+            </Custom>
+        </InstallExecuteSequence>
+        {{/if}}
+
+        <!-- Embedded webview bootstrapper mode -->
+        {{#if webview2_bootstrapper_path}}
+        <Binary Id="MicrosoftEdgeWebview2Setup.exe" SourceFile="{{webview2_bootstrapper_path}}"/>
+        <CustomAction Id='InvokeBootstrapper' BinaryKey='MicrosoftEdgeWebview2Setup.exe' Execute="deferred" ExeCommand='{{webview_installer_args}} /install' Return='check' />
+        <InstallExecuteSequence>
+            <Custom Action='InvokeBootstrapper' Before='InstallFinalize'>
+                <![CDATA[NOT(REMOVE OR WVRTINSTALLED)]]>
+            </Custom>
+        </InstallExecuteSequence>
+        {{/if}}
+
+        <!-- Embedded offline installer -->
+        {{#if webview2_installer_path}}
+        <Binary Id="MicrosoftEdgeWebView2RuntimeInstaller.exe" SourceFile="{{webview2_installer_path}}"/>
+        <CustomAction Id='InvokeStandalone' BinaryKey='MicrosoftEdgeWebView2RuntimeInstaller.exe' Execute="deferred" ExeCommand='{{webview_installer_args}} /install' Return='check' />
+        <InstallExecuteSequence>
+            <Custom Action='InvokeStandalone' Before='InstallFinalize'>
+                <![CDATA[NOT(REMOVE OR WVRTINSTALLED)]]>
+            </Custom>
+        </InstallExecuteSequence>
+        {{/if}}
+
+        {{/if}}
+
+        {{#if enable_elevated_update_task}}
+        <!-- Install an elevated update task within Windows Task Scheduler -->
+        <CustomAction
+            Id="CreateUpdateTask"
+            Return="check"
+            Directory="INSTALLDIR"
+            Execute="commit"
+            Impersonate="yes"
+            ExeCommand="powershell.exe -WindowStyle hidden .\install-task.ps1" />
+        <InstallExecuteSequence>
+            <Custom Action='CreateUpdateTask' Before='InstallFinalize'>
+                NOT(REMOVE)
+            </Custom>
+        </InstallExecuteSequence>
+        <!-- Remove elevated update task during uninstall -->
+        <CustomAction
+            Id="DeleteUpdateTask"
+            Return="check"
+            Directory="INSTALLDIR"
+            ExeCommand="powershell.exe -WindowStyle hidden .\uninstall-task.ps1" />
+        <InstallExecuteSequence>
+            <Custom Action="DeleteUpdateTask" Before='InstallFinalize'>
+                (REMOVE = "ALL") AND NOT UPGRADINGPRODUCTCODE
+            </Custom>
+        </InstallExecuteSequence>
+        {{/if}}
+
+        <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLDIR]" After="CostFinalize"/>
+    </Product>
+</Wix>

apps/app/nsis/hooks.nsi

@@ -1,41 +0,0 @@
-!macro NSIS_HOOK_POSTINSTALL
-    SetShellVarContext current
-
-    IfFileExists "$LOCALAPPDATA${PRODUCTNAME}\theseus_gui.exe" file_found file_not_found
-    file_found:
-        Delete "$LOCALAPPDATA${PRODUCTNAME}\theseus_gui.exe"
-
-        Delete "$LOCALAPPDATA${PRODUCTNAME}\uninstall.exe"
-        RMDir "$LOCALAPPDATA${PRODUCTNAME}"
-
-        !insertmacro DeleteAppUserModelId
-
-        ; Remove start menu shortcut
-        !insertmacro MUI_STARTMENU_GETFOLDER Application $AppStartMenuFolder
-        !insertmacro IsShortcutTarget "$SMPROGRAMS$AppStartMenuFolder${PRODUCTNAME}.lnk" "$LOCALAPPDATA${PRODUCTNAME}\theseus_gui.exe"
-        Pop $0
-        ${If} $0 = 1
-          !insertmacro UnpinShortcut "$SMPROGRAMS$AppStartMenuFolder${PRODUCTNAME}.lnk"
-          Delete "$SMPROGRAMS$AppStartMenuFolder${PRODUCTNAME}.lnk"
-          RMDir "$SMPROGRAMS$AppStartMenuFolder"
-        ${EndIf}
-        !insertmacro IsShortcutTarget "$SMPROGRAMS${PRODUCTNAME}.lnk" "$LOCALAPPDATA${PRODUCTNAME}\theseus_gui.exe"
-        Pop $0
-        ${If} $0 = 1
-          !insertmacro UnpinShortcut "$SMPROGRAMS${PRODUCTNAME}.lnk"
-          Delete "$SMPROGRAMS${PRODUCTNAME}.lnk"
-        ${EndIf}
-
-        !insertmacro IsShortcutTarget "$DESKTOP${PRODUCTNAME}.lnk" "$LOCALAPPDATA${PRODUCTNAME}\theseus_gui.exe"
-        Pop $0
-        ${If} $0 = 1
-          !insertmacro UnpinShortcut "$DESKTOP${PRODUCTNAME}.lnk"
-          Delete "$DESKTOP${PRODUCTNAME}.lnk"
-        ${EndIf}
-
-        DeleteRegKey HKCU "${UNINSTKEY}"
-
-        goto end_of_test ;<== important for not continuing on the else branch
-    file_not_found:
-    end_of_test:
-!macroend

apps/app/package.json

@@ -5,15 +5,14 @@
     "tauri": "tauri",
     "dev": "tauri dev",
     "test": "cargo test",
-    "lint": "cargo fmt --check && cargo clippy --all-targets -- -D warnings",
+    "lint": "cargo fmt --check && cargo clippy -- -D warnings",
     "fix": "cargo fmt && cargo clippy --fix"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.0.0-rc.16"
+    "@tauri-apps/cli": "2.0.0-rc.5"
   },
   "dependencies": {
     "@modrinth/app-frontend": "workspace:*",
-    "@modrinth/app-lib": "workspace:*",
+    "@modrinth/app-lib": "workspace:*"
-    "@modrinth/daedalus": "workspace:*"
   }
 }

apps/app/src/api/ads-init.js

@@ -1,23 +0,0 @@
-document.addEventListener(
-  'click',
-  function (e) {
-    window.top.postMessage({ modrinthAdClick: true }, 'https://modrinth.com')
-
-    let target = e.target
-    while (target != null) {
-      if (target.matches('a')) {
-        e.preventDefault()
-        if (target.href) {
-          window.top.postMessage({ modrinthOpenUrl: target.href }, 'https://modrinth.com')
-        }
-        break
-      }
-      target = target.parentElement
-    }
-  },
-  true,
-)
-
-window.open = (url, target, features) => {
-  window.top.postMessage({ modrinthOpenUrl: url }, 'https://modrinth.com')
-}

apps/app/src/api/ads.rs

@@ -1,216 +0,0 @@
-use serde::Serialize;
-use std::collections::HashSet;
-use std::time::{Duration, Instant};
-use tauri::plugin::TauriPlugin;
-use tauri::{Emitter, LogicalPosition, LogicalSize, Manager, Runtime};
-use tauri_plugin_shell::ShellExt;
-use theseus::settings;
-use tokio::sync::RwLock;
-
-pub struct AdsState {
-    pub shown: bool,
-    pub size: Option<LogicalSize<f32>>,
-    pub position: Option<LogicalPosition<f32>>,
-    pub last_click: Option<Instant>,
-    pub malicious_origins: HashSet<String>,
-}
-
-const AD_LINK: &str = "https://modrinth.com/wrapper/app-ads-cookie";
-
-pub fn init<R: Runtime>() -> TauriPlugin<R> {
-    tauri::plugin::Builder::<R>::new("ads")
-        .setup(|app, _api| {
-            app.manage(RwLock::new(AdsState {
-                shown: true,
-                size: None,
-                position: None,
-                last_click: None,
-                malicious_origins: HashSet::new(),
-            }));
-
-            // We refresh the ads window every 5 minutes for performance
-            let app = app.clone();
-            tauri::async_runtime::spawn(async move {
-                loop {
-                    if let Some(webview) = app.webviews().get_mut("ads-window")
-                    {
-                        let _ = webview.navigate(AD_LINK.parse().unwrap());
-                    }
-
-                    tokio::time::sleep(std::time::Duration::from_secs(60 * 5))
-                        .await;
-                }
-            });
-
-            Ok(())
-        })
-        .invoke_handler(tauri::generate_handler![
-            init_ads_window,
-            hide_ads_window,
-            scroll_ads_window,
-            show_ads_window,
-            record_ads_click,
-            open_link,
-            get_ads_personalization,
-        ])
-        .build()
-}
-
-#[tauri::command]
-#[cfg(not(target_os = "linux"))]
-pub async fn init_ads_window<R: Runtime>(
-    app: tauri::AppHandle<R>,
-    x: f32,
-    y: f32,
-    width: f32,
-    height: f32,
-    override_shown: bool,
-) -> crate::api::Result<()> {
-    use tauri::WebviewUrl;
-    const LINK_SCRIPT: &str = include_str!("ads-init.js");
-
-    let state = app.state::<RwLock<AdsState>>();
-    let mut state = state.write().await;
-    state.size = Some(LogicalSize::new(width, height));
-    state.position = Some(LogicalPosition::new(x, y));
-
-    if override_shown {
-        state.shown = true;
-    }
-
-    if let Some(webview) = app.webviews().get("ads-window") {
-        if state.shown {
-            let _ = webview.set_position(LogicalPosition::new(x, y));
-            let _ = webview.set_size(LogicalSize::new(width, height));
-        }
-    } else if let Some(window) = app.get_window("main") {
-        let _ = window.add_child(
-            tauri::webview::WebviewBuilder::new(
-                "ads-window",
-                WebviewUrl::External(
-                   AD_LINK.parse().unwrap(),
-                ),
-            )
-            .initialization_script(LINK_SCRIPT)
-            .user_agent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36")
-            .zoom_hotkeys_enabled(false)
-            .transparent(true),
-            if state.shown {
-                LogicalPosition::new(x, y)
-            } else {
-                LogicalPosition::new(-1000.0, -1000.0)
-            },
-            LogicalSize::new(width, height),
-        );
-    }
-
-    Ok(())
-}
-
-// TODO: make ads work on linux
-#[tauri::command]
-#[cfg(target_os = "linux")]
-pub async fn init_ads_window() {}
-
-#[tauri::command]
-pub async fn show_ads_window<R: Runtime>(
-    app: tauri::AppHandle<R>,
-) -> crate::api::Result<()> {
-    if let Some(webview) = app.webviews().get("ads-window") {
-        let state = app.state::<RwLock<AdsState>>();
-        let mut state = state.write().await;
-
-        state.shown = true;
-        if let Some(size) = state.size {
-            let _ = webview.set_size(size);
-        }
-
-        if let Some(position) = state.position {
-            let _ = webview.set_position(position);
-        }
-    }
-
-    Ok(())
-}
-
-#[tauri::command]
-pub async fn hide_ads_window<R: Runtime>(
-    app: tauri::AppHandle<R>,
-    reset: Option<bool>,
-) -> crate::api::Result<()> {
-    if let Some(webview) = app.webviews().get("ads-window") {
-        let state = app.state::<RwLock<AdsState>>();
-        let mut state = state.write().await;
-        state.shown = false;
-
-        if reset.unwrap_or(false) {
-            state.size = None;
-            state.position = None;
-        }
-
-        let _ = webview.set_position(LogicalPosition::new(-1000, -1000));
-    }
-
-    Ok(())
-}
-
-#[derive(Serialize, Clone)]
-struct ScrollEvent {
-    scroll: f32,
-}
-
-#[tauri::command]
-pub async fn scroll_ads_window<R: Runtime>(
-    app: tauri::AppHandle<R>,
-    scroll: f32,
-) -> crate::api::Result<()> {
-    let _ = app.emit("ads-scroll", ScrollEvent { scroll });
-
-    Ok(())
-}
-
-#[tauri::command]
-pub async fn record_ads_click<R: Runtime>(
-    app: tauri::AppHandle<R>,
-) -> crate::api::Result<()> {
-    let state = app.state::<RwLock<AdsState>>();
-
-    let mut state = state.write().await;
-    state.last_click = Some(Instant::now());
-
-    Ok(())
-}
-
-#[tauri::command]
-pub async fn open_link<R: Runtime>(
-    app: tauri::AppHandle<R>,
-    path: String,
-    origin: String,
-) -> crate::api::Result<()> {
-    let state = app.state::<RwLock<AdsState>>();
-    let mut state = state.write().await;
-
-    if url::Url::parse(&path).is_ok()
-        && !state.malicious_origins.contains(&origin)
-    {
-        if let Some(last_click) = state.last_click {
-            if last_click.elapsed() < Duration::from_millis(100) {
-                let _ = app.shell().open(&path, None);
-                state.last_click = None;
-
-                return Ok(());
-            }
-        }
-    }
-
-    tracing::info!("Malicious click: {path} origin {origin}");
-    state.malicious_origins.insert(origin);
-
-    Ok(())
-}
-
-#[tauri::command]
-pub async fn get_ads_personalization() -> crate::api::Result<bool> {
-    let res = settings::get().await?;
-    Ok(res.personalized_ads)
-}

apps/app/src/api/mod.rs

@@ -16,7 +16,6 @@ pub mod settings;
 pub mod tags;
 pub mod utils;
 
-pub mod ads;
 pub mod cache;
 
 pub type Result<T> = std::result::Result<T, TheseusSerializableError>;
@@ -40,10 +39,6 @@ pub enum TheseusSerializableError {
 
     #[error("Tauri error: {0}")]
     Tauri(#[from] tauri::Error),
-
-    #[cfg(feature = "updater")]
-    #[error("Tauri updater error: {0}")]
-    TauriUpdater(#[from] tauri_plugin_updater::Error),
 }
 
 // Generic implementation of From<T> for ErrorTypeA
@@ -91,15 +86,7 @@ macro_rules! impl_serialize {
 }
 
 // Use the macro to implement Serialize for TheseusSerializableError
-#[cfg(not(feature = "updater"))]
 impl_serialize! {
     IO,
     Tauri,
 }
-
-#[cfg(feature = "updater")]
-impl_serialize! {
-    IO,
-    Tauri,
-    TauriUpdater,
-}

apps/app/src/main.rs

@@ -26,73 +26,11 @@ extern crate objc;
 #[tauri::command]
 async fn initialize_state(app: tauri::AppHandle) -> api::Result<()> {
     theseus::EventState::init(app.clone()).await?;
-
+    State::init().await?;
-    #[cfg(feature = "updater")]
-    {
-        use tauri_plugin_updater::UpdaterExt;
-
-        let updater = app.updater_builder().build()?;
-
-        let update_fut = updater.check();
-
-        State::init().await?;
-
-        let check_bar = theseus::init_loading(
-            theseus::LoadingBarType::CheckingForUpdates,
-            1.0,
-            "Checking for updates...",
-        )
-        .await?;
-
-        let update = update_fut.await;
-
-        drop(check_bar);
-
-        if let Some(update) = update.ok().flatten() {
-            tracing::info!("Update found: {:?}", update.download_url);
-            let loader_bar_id = theseus::init_loading(
-                theseus::LoadingBarType::LauncherUpdate {
-                    version: update.version.clone(),
-                    current_version: update.current_version.clone(),
-                },
-                1.0,
-                "Updating Modrinth App...",
-            )
-            .await?;
-
-            // 100 MiB
-            const DEFAULT_CONTENT_LENGTH: u64 = 1024 * 1024 * 100;
-
-            update
-                .download_and_install(
-                    |chunk_length, content_length| {
-                        let _ = theseus::emit_loading(
-                            &loader_bar_id,
-                            (chunk_length as f64)
-                                / (content_length
-                                    .unwrap_or(DEFAULT_CONTENT_LENGTH)
-                                    as f64),
-                            None,
-                        );
-                    },
-                    || {},
-                )
-                .await?;
-
-            app.restart();
-        }
-    }
-
-    #[cfg(not(feature = "updater"))]
-    {
-        State::init().await?;
-    }
 
     let state = State::get().await?;
     app.asset_protocol_scope()
         .allow_directory(state.directories.caches_dir(), true)?;
-    app.asset_protocol_scope()
-        .allow_directory(state.directories.caches_dir().join("icons"), true)?;
 
     Ok(())
 }
@@ -101,7 +39,7 @@ async fn initialize_state(app: tauri::AppHandle) -> api::Result<()> {
 #[tracing::instrument(skip_all)]
 #[tauri::command]
 fn show_window(app: tauri::AppHandle) {
-    let win = app.get_window("main").unwrap();
+    let win = app.get_webview_window("main").unwrap();
     if let Err(e) = win.show() {
         MessageDialog::new()
             .set_type(MessageType::Error)
@@ -135,11 +73,6 @@ async fn toggle_decorations(b: bool, window: tauri::Window) -> api::Result<()> {
     Ok(())
 }
 
-#[tauri::command]
-fn restart_app(app: tauri::AppHandle) {
-    app.restart();
-}
-
 // if Tauri app is called with arguments, then those arguments will be treated as commands
 // ie: deep links or filepaths for .mrpacks
 fn main() {
@@ -169,19 +102,6 @@ fn main() {
     }
 
     builder = builder
-        .plugin(tauri_plugin_single_instance::init(|app, args, _cwd| {
-            if let Some(payload) = args.get(1) {
-                tracing::info!("Handling deep link from arg {payload}");
-                let payload = payload.clone();
-                tauri::async_runtime::spawn(api::utils::handle_command(
-                    payload,
-                ));
-            }
-
-            if let Some(win) = app.get_window("main") {
-                let _ = win.set_focus();
-            }
-        }))
         .plugin(tauri_plugin_os::init())
         .plugin(tauri_plugin_dialog::init())
         .plugin(tauri_plugin_deep_link::init())
@@ -259,14 +179,12 @@ fn main() {
         .plugin(api::tags::init())
         .plugin(api::utils::init())
         .plugin(api::cache::init())
-        .plugin(api::ads::init())
         .invoke_handler(tauri::generate_handler![
             initialize_state,
             is_dev,
             toggle_decorations,
             api::mr_auth::modrinth_auth_login,
             show_window,
-            restart_app,
         ]);
 
     #[cfg(target_os = "macos")]
@@ -317,7 +235,7 @@ fn main() {
                     MessageDialog::new()
                         .set_type(MessageType::Error)
                         .set_title("Initialization error")
-                        .set_text("Your Microsoft Edge WebView2 installation is corrupt.\n\nMicrosoft Edge WebView2 is required to run Modrinth App.\n\nLearn how to repair it at https://support.modrinth.com/en/articles/8797765-corrupted-microsoft-edge-webview2-installation")
+                        .set_text("Your Microsoft Edge WebView2 installation is corrupt.\n\nMicrosoft Edge WebView2 is required to run Modrinth App.\n\nLearn how to repair it at https://docs.modrinth.com/faq/app/webview2")
                         .show_alert()
                         .unwrap();
 

apps/app/tauri-release.conf.json

@@ -5,11 +5,6 @@
   "build": {
     "features": ["updater"]
   },
-  "app": {
-    "security": {
-      "capabilities": ["ads", "core", "plugins", "updater"]
-    }
-  },
   "plugins": {
     "updater": {
       "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDIwMzM5QkE0M0FCOERBMzkKUldRNTJyZzZwSnN6SUdPRGdZREtUUGxMblZqeG9OVHYxRUlRTzJBc2U3MUNJaDMvZDQ1UytZZmYK",

apps/app/tauri.conf.json

@@ -21,9 +21,8 @@
       "certificateThumbprint": null,
       "digestAlgorithm": "sha256",
       "timestampUrl": "http://timestamp.digicert.com",
-      "nsis": {
+      "wix": {
-        "installMode": "perMachine",
+        "template": "./msi/main.wxs"
-        "installerHooks": "./nsis/hooks.nsi"
       }
     },
     "longDescription": "",
@@ -49,8 +48,7 @@
     ]
   },
   "productName": "Modrinth App",
-  "version": "0.8.9",
+  "version": "0.8.3-1",
-  "mainBinaryName": "Modrinth App",
   "identifier": "ModrinthApp",
   "plugins": {
     "deep-link": {
@@ -72,10 +70,10 @@
         "resizable": true,
         "title": "Modrinth App",
         "width": 1280,
-        "minHeight": 750,
+        "minHeight": 700,
         "minWidth": 1100,
         "visible": false,
-        "zoomHotkeysEnabled": false,
+        "zoomHotkeysEnabled": true,
         "decorations": false
       }
     ],
@@ -88,18 +86,7 @@
         ],
         "enable": true
       },
-      "capabilities": ["ads", "core", "plugins"],
+      "csp": "default-src 'self'; connect-src ipc: http://ipc.localhost https://modrinth.com https://*.modrinth.com https://*.posthog.com https://*.sentry.io https://*.cloudflare.com https://api.mclo.gs; font-src https://cdn-raw.modrinth.com/fonts/inter/; img-src tauri: https: data: blob: 'unsafe-inline' asset: https://asset.localhost; script-src https://*.cloudflare.com 'self'; frame-src https://*.cloudflare.com https://www.youtube.com https://www.youtube-nocookie.com https://discord.com 'self'; style-src unsafe-inline 'self'"
-      "csp": {
-        "default-src": "'self' customprotocol: asset:",
-        "connect-src": "ipc: http://ipc.localhost https://modrinth.com https://*.modrinth.com https://*.posthog.com https://*.sentry.io https://*.cloudflare.com https://api.mclo.gs https://cmp.inmobi.com",
-        "font-src": [
-          "https://cdn-raw.modrinth.com/fonts/inter/"
-        ],
-        "img-src": "https: 'unsafe-inline' 'self' asset: http://asset.localhost blob: data:",
-        "style-src": "'unsafe-inline' 'self'",
-        "script-src": "https://cmp.inmobi.com https://*.cloudflare.com https://*.posthog.com 'self'",
-        "frame-src": "https://*.cloudflare.com https://www.youtube.com https://www.youtube-nocookie.com https://discord.com 'self'"
-      }
     }
   }
 }

apps/app/tauri.linux.conf.json

@@ -1,3 +0,0 @@
-{
-  "mainBinaryName": "ModrinthApp"
-}

apps/app/tauri.macos.conf.json

@@ -12,7 +12,7 @@
         "minHeight": 700,
         "minWidth": 1100,
         "visible": false,
-        "zoomHotkeysEnabled": false,
+        "zoomHotkeysEnabled": true,
         "decorations": true
       }
     ]

apps/daedalus_client/.env

@@ -1,15 +0,0 @@
-RUST_LOG=warn,daedalus_client=trace
-
-BASE_URL=http://localhost:9000/meta
-
-CONCURRENCY_LIMIT=10
-
-S3_ACCESS_TOKEN=none
-S3_SECRET=none
-S3_URL=http://localhost:9000
-S3_REGION=path-style
-S3_BUCKET_NAME=meta
-
-CLOUDFLARE_INTEGRATION=false
-CLOUDFLARE_TOKEN=none
-CLOUDFLARE_ZONE_ID=none

apps/daedalus_client/Cargo.toml

@@ -1,42 +0,0 @@
-[package]
-name = "daedalus_client"
-version = "0.2.2"
-authors = ["Jai A <jai@modrinth.com>"]
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-daedalus = { path = "../../packages/daedalus" }
-tokio = { version = "1", features = ["full"] }
-futures = "0.3.25"
-dotenvy = "0.15.6"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-serde-xml-rs = "0.6.0"
-lazy_static = "1.4.0"
-thiserror = "1.0"
-reqwest = { version = "0.12.5", default-features = false, features = [
-    "stream",
-    "json",
-    "rustls-tls-native-roots",
-] }
-async_zip = { version = "0.0.17", features = ["full"] }
-semver = "1.0"
-chrono = { version = "0.4", features = ["serde"] }
-bytes = "1.6.0"
-rust-s3 = { version = "0.33.0", default-features = false, features = [
-    "fail-on-err",
-    "tags",
-    "tokio-rustls-tls",
-    "reqwest",
-] }
-dashmap = "5.5.3"
-sha1_smol = { version = "1.0.0", features = ["std"] }
-indexmap = { version = "2.2.6", features = ["serde"] }
-itertools = "0.13.0"
-tracing-error = "0.2.0"
-
-tracing = "0.1"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-tracing-futures = { version = "0.2.5", features = ["futures", "tokio"] }

apps/daedalus_client/Dockerfile

@@ -1,21 +0,0 @@
-FROM rust:1.82.0 as build
-ENV PKG_CONFIG_ALLOW_CROSS=1
-
-WORKDIR /usr/src/daedalus
-COPY . .
-RUN cargo build --release --package daedalus_client
-
-
-FROM debian:bookworm-slim
-
-RUN apt-get update \
- && apt-get install -y --no-install-recommends ca-certificates openssl \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/*
-
-RUN update-ca-certificates
-
-COPY --from=build /usr/src/daedalus/target/release/daedalus_client /daedalus/daedalus_client
-WORKDIR /daedalus_client
-
-CMD /daedalus/daedalus_client

apps/daedalus_client/LICENSE

@@ -1,7 +0,0 @@
-Copyright © 2024 Rinth, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

apps/daedalus_client/README.md

@@ -1,9 +0,0 @@
-# Daedalus 
-
-Daedalus is a powerful tool which queries and generates metadata for the Minecraft (and other games in the future!) game
-and mod loaders for:
-- Performance (Serving static files can be easily cached and is extremely quick)
-- Ease for Launcher Devs (Metadata is served in an easy to query and use format)
-- Reliability (Provides a versioning system which ensures no breakage with updates)
-
-Daedalus supports the original Minecraft data and reposting for the Forge, Fabric, Quilt, and NeoForge loaders.

apps/daedalus_client/docker-compose.yml

@@ -1,17 +0,0 @@
-version: '3'
-
-services:
-  minio:
-    image: quay.io/minio/minio
-    volumes:
-      - minio-data:/data
-    ports:
-      - "9000:9000"
-      - "9001:9001"
-    environment:
-      MINIO_ROOT_USER: minioadmin
-      MINIO_ROOT_PASSWORD: miniosecret
-    command: server /data --console-address ":9001"
-
-volumes:
-  minio-data:

apps/daedalus_client/package.json

@@ -1,13 +0,0 @@
-{
-  "name": "@modrinth/daedalus_client",
-  "scripts": {
-    "build": "cargo build --release",
-    "lint": "cargo fmt --check && cargo clippy --all-targets --all-features -- -D warnings",
-    "fix": "cargo fmt && cargo clippy --fix",
-    "dev": "cargo run",
-    "test": "cargo test"
-  },
-  "dependencies": {
-    "@modrinth/daedalus": "workspace:*"
-  }
-}

apps/daedalus_client/src/error.rs

@@ -1,63 +0,0 @@
-use tracing_error::InstrumentError;
-
-#[derive(thiserror::Error, Debug)]
-pub enum ErrorKind {
-    #[error("Daedalus Error: {0}")]
-    Daedalus(#[from] daedalus::Error),
-    #[error("Invalid input: {0}")]
-    InvalidInput(String),
-    #[error("Error while managing asynchronous tasks")]
-    TaskError(#[from] tokio::task::JoinError),
-    #[error("Error while deserializing JSON: {0}")]
-    SerdeJSON(#[from] serde_json::Error),
-    #[error("Error while deserializing XML: {0}")]
-    SerdeXML(#[from] serde_xml_rs::Error),
-    #[error("Failed to validate file checksum at url {url} with hash {hash} after {tries} tries")]
-    ChecksumFailure {
-        hash: String,
-        url: String,
-        tries: u32,
-    },
-    #[error("Unable to fetch {item}")]
-    Fetch { inner: reqwest::Error, item: String },
-    #[error("Error while uploading file to S3: {file}")]
-    S3 {
-        inner: s3::error::S3Error,
-        file: String,
-    },
-    #[error("Error acquiring semaphore: {0}")]
-    Acquire(#[from] tokio::sync::AcquireError),
-    #[error("Tracing error: {0}")]
-    Tracing(#[from] tracing::subscriber::SetGlobalDefaultError),
-    #[error("Zip error: {0}")]
-    Zip(#[from] async_zip::error::ZipError),
-}
-
-#[derive(Debug)]
-pub struct Error {
-    pub source: tracing_error::TracedError<ErrorKind>,
-}
-
-impl std::fmt::Display for Error {
-    fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(fmt, "{}", self.source)
-    }
-}
-
-impl<E: Into<ErrorKind>> From<E> for Error {
-    fn from(source: E) -> Self {
-        let error = Into::<ErrorKind>::into(source);
-
-        Self {
-            source: error.in_current_span(),
-        }
-    }
-}
-
-impl ErrorKind {
-    pub fn as_error(self) -> Error {
-        self.into()
-    }
-}
-
-pub type Result<T> = core::result::Result<T, Error>;

apps/daedalus_client/src/fabric.rs

@@ -1,301 +0,0 @@
-use crate::util::{download_file, fetch_json, format_url};
-use crate::{insert_mirrored_artifact, Error, MirrorArtifact, UploadFile};
-use daedalus::modded::{Manifest, PartialVersionInfo, DUMMY_REPLACE_STRING};
-use dashmap::DashMap;
-use serde::Deserialize;
-use std::sync::Arc;
-use tokio::sync::Semaphore;
-
-#[tracing::instrument(skip(semaphore, upload_files, mirror_artifacts))]
-pub async fn fetch_fabric(
-    semaphore: Arc<Semaphore>,
-    upload_files: &DashMap<String, UploadFile>,
-    mirror_artifacts: &DashMap<String, MirrorArtifact>,
-) -> Result<(), Error> {
-    fetch(
-        daedalus::modded::CURRENT_FABRIC_FORMAT_VERSION,
-        "fabric",
-        "https://meta.fabricmc.net/v2",
-        "https://maven.fabricmc.net/",
-        &[],
-        semaphore,
-        upload_files,
-        mirror_artifacts,
-    )
-    .await
-}
-
-#[tracing::instrument(skip(semaphore, upload_files, mirror_artifacts))]
-pub async fn fetch_quilt(
-    semaphore: Arc<Semaphore>,
-    upload_files: &DashMap<String, UploadFile>,
-    mirror_artifacts: &DashMap<String, MirrorArtifact>,
-) -> Result<(), Error> {
-    fetch(
-        daedalus::modded::CURRENT_QUILT_FORMAT_VERSION,
-        "quilt",
-        "https://meta.quiltmc.org/v3",
-        "https://maven.quiltmc.org/repository/release/",
-        &[
-            // This version is broken as it contains invalid library coordinates
-            "0.17.5-beta.4",
-        ],
-        semaphore,
-        upload_files,
-        mirror_artifacts,
-    )
-    .await
-}
-
-#[allow(clippy::too_many_arguments)]
-#[tracing::instrument(skip(semaphore, upload_files, mirror_artifacts))]
-async fn fetch(
-    format_version: usize,
-    mod_loader: &str,
-    meta_url: &str,
-    maven_url: &str,
-    skip_versions: &[&str],
-    semaphore: Arc<Semaphore>,
-    upload_files: &DashMap<String, UploadFile>,
-    mirror_artifacts: &DashMap<String, MirrorArtifact>,
-) -> Result<(), Error> {
-    let modrinth_manifest = fetch_json::<Manifest>(
-        &format_url(&format!("{mod_loader}/v{format_version}/manifest.json",)),
-        &semaphore,
-    )
-    .await
-    .ok();
-    let fabric_manifest = fetch_json::<FabricVersions>(
-        &format!("{meta_url}/versions"),
-        &semaphore,
-    )
-    .await?;
-
-    // We check Modrinth's fabric version manifest and compare if the fabric version exists in Modrinth's database
-    // We also check intermediary versions that are newly added to query
-    let (fetch_fabric_versions, fetch_intermediary_versions) =
-        if let Some(modrinth_manifest) = modrinth_manifest {
-            let (mut fetch_versions, mut fetch_intermediary_versions) =
-                (Vec::new(), Vec::new());
-
-            for version in &fabric_manifest.loader {
-                if !modrinth_manifest
-                    .game_versions
-                    .iter()
-                    .any(|x| x.loaders.iter().any(|x| x.id == version.version))
-                    && !skip_versions.contains(&&*version.version)
-                {
-                    fetch_versions.push(version);
-                }
-            }
-
-            for version in &fabric_manifest.intermediary {
-                if !modrinth_manifest
-                    .game_versions
-                    .iter()
-                    .any(|x| x.id == version.version)
-                    && fabric_manifest
-                        .game
-                        .iter()
-                        .any(|x| x.version == version.version)
-                {
-                    fetch_intermediary_versions.push(version);
-                }
-            }
-
-            (fetch_versions, fetch_intermediary_versions)
-        } else {
-            (
-                fabric_manifest
-                    .loader
-                    .iter()
-                    .filter(|x| !skip_versions.contains(&&*x.version))
-                    .collect(),
-                fabric_manifest.intermediary.iter().collect(),
-            )
-        };
-
-    const DUMMY_GAME_VERSION: &str = "1.21";
-
-    if !fetch_intermediary_versions.is_empty() {
-        for x in &fetch_intermediary_versions {
-            insert_mirrored_artifact(
-                &x.maven,
-                None,
-                vec![maven_url.to_string()],
-                false,
-                mirror_artifacts,
-            )?;
-        }
-    }
-
-    if !fetch_fabric_versions.is_empty() {
-        let fabric_version_manifest_urls = fetch_fabric_versions
-            .iter()
-            .map(|x| {
-                format!(
-                    "{}/versions/loader/{}/{}/profile/json",
-                    meta_url, DUMMY_GAME_VERSION, x.version
-                )
-            })
-            .collect::<Vec<_>>();
-        let fabric_version_manifests = futures::future::try_join_all(
-            fabric_version_manifest_urls
-                .iter()
-                .map(|x| download_file(x, None, &semaphore)),
-        )
-        .await?
-        .into_iter()
-        .map(|x| serde_json::from_slice(&x))
-        .collect::<Result<Vec<PartialVersionInfo>, serde_json::Error>>()?;
-
-        let patched_version_manifests = fabric_version_manifests
-            .into_iter()
-            .map(|mut version_info| {
-                for lib in &mut version_info.libraries {
-                    let new_name = lib
-                        .name
-                        .replace(DUMMY_GAME_VERSION, DUMMY_REPLACE_STRING);
-
-                    // Hard-code: This library is not present on fabric's maven, so we fetch it from MC libraries
-                    if &*lib.name == "net.minecraft:launchwrapper:1.12" {
-                        lib.url = Some(
-                            "https://libraries.minecraft.net/".to_string(),
-                        );
-                    }
-
-                    // If a library is not intermediary, we add it to mirror artifacts to be mirrored
-                    if lib.name == new_name {
-                        insert_mirrored_artifact(
-                            &new_name,
-                            None,
-                            vec![lib
-                                .url
-                                .clone()
-                                .unwrap_or_else(|| maven_url.to_string())],
-                            false,
-                            mirror_artifacts,
-                        )?;
-                    } else {
-                        lib.name = new_name;
-                    }
-
-                    lib.url = Some(format_url("maven/"));
-                }
-
-                version_info.id = version_info
-                    .id
-                    .replace(DUMMY_GAME_VERSION, DUMMY_REPLACE_STRING);
-                version_info.inherits_from = version_info
-                    .inherits_from
-                    .replace(DUMMY_GAME_VERSION, DUMMY_REPLACE_STRING);
-
-                Ok(version_info)
-            })
-            .collect::<Result<Vec<_>, Error>>()?;
-        let serialized_version_manifests = patched_version_manifests
-            .iter()
-            .map(|x| serde_json::to_vec(x).map(bytes::Bytes::from))
-            .collect::<Result<Vec<_>, serde_json::Error>>()?;
-
-        serialized_version_manifests
-            .into_iter()
-            .enumerate()
-            .for_each(|(index, bytes)| {
-                let loader = fetch_fabric_versions[index];
-
-                let version_path = format!(
-                    "{mod_loader}/v{format_version}/versions/{}.json",
-                    loader.version
-                );
-
-                upload_files.insert(
-                    version_path,
-                    UploadFile {
-                        file: bytes,
-                        content_type: Some("application/json".to_string()),
-                    },
-                );
-            });
-    }
-
-    if !fetch_fabric_versions.is_empty()
-        || !fetch_intermediary_versions.is_empty()
-    {
-        let fabric_manifest_path =
-            format!("{mod_loader}/v{format_version}/manifest.json",);
-
-        let loader_versions = daedalus::modded::Version {
-            id: DUMMY_REPLACE_STRING.to_string(),
-            stable: true,
-            loaders: fabric_manifest
-                .loader
-                .into_iter()
-                .map(|x| {
-                    let version_path = format!(
-                        "{mod_loader}/v{format_version}/versions/{}.json",
-                        x.version,
-                    );
-
-                    daedalus::modded::LoaderVersion {
-                        id: x.version,
-                        url: format_url(&version_path),
-                        stable: x.stable,
-                    }
-                })
-                .collect(),
-        };
-
-        let manifest = daedalus::modded::Manifest {
-            game_versions: std::iter::once(loader_versions)
-                .chain(fabric_manifest.game.into_iter().map(|x| {
-                    daedalus::modded::Version {
-                        id: x.version,
-                        stable: x.stable,
-                        loaders: vec![],
-                    }
-                }))
-                .collect(),
-        };
-
-        upload_files.insert(
-            fabric_manifest_path,
-            UploadFile {
-                file: bytes::Bytes::from(serde_json::to_vec(&manifest)?),
-                content_type: Some("application/json".to_string()),
-            },
-        );
-    }
-
-    Ok(())
-}
-
-#[derive(Deserialize, Debug, Clone)]
-struct FabricVersions {
-    pub loader: Vec<FabricLoaderVersion>,
-    pub game: Vec<FabricGameVersion>,
-    #[serde(alias = "hashed")]
-    pub intermediary: Vec<FabricIntermediaryVersion>,
-}
-
-#[derive(Deserialize, Debug, Clone)]
-struct FabricLoaderVersion {
-    // pub separator: String,
-    // pub build: u32,
-    // pub maven: String,
-    pub version: String,
-    #[serde(default)]
-    pub stable: bool,
-}
-
-#[derive(Deserialize, Debug, Clone)]
-struct FabricIntermediaryVersion {
-    pub maven: String,
-    pub version: String,
-}
-
-#[derive(Deserialize, Debug, Clone)]
-struct FabricGameVersion {
-    pub version: String,
-    pub stable: bool,
-}

apps/daedalus_client/src/forge.rs

@@ -1,792 +0,0 @@
-use crate::util::{download_file, fetch_json, fetch_xml, format_url};
-use crate::{insert_mirrored_artifact, Error, MirrorArtifact, UploadFile};
-use chrono::{DateTime, Utc};
-use daedalus::get_path_from_artifact;
-use daedalus::modded::PartialVersionInfo;
-use dashmap::DashMap;
-use futures::io::Cursor;
-use indexmap::IndexMap;
-use itertools::Itertools;
-use serde::de::DeserializeOwned;
-use serde::Deserialize;
-use std::collections::HashMap;
-use std::sync::Arc;
-use tokio::sync::Semaphore;
-
-#[tracing::instrument(skip(semaphore, upload_files, mirror_artifacts))]
-pub async fn fetch_forge(
-    semaphore: Arc<Semaphore>,
-    upload_files: &DashMap<String, UploadFile>,
-    mirror_artifacts: &DashMap<String, MirrorArtifact>,
-) -> Result<(), Error> {
-    let forge_manifest = fetch_json::<IndexMap<String, Vec<String>>>(
-        "https://files.minecraftforge.net/net/minecraftforge/forge/maven-metadata.json",
-        &semaphore,
-    )
-        .await?;
-
-    let mut format_version = 0;
-
-    let forge_versions = forge_manifest.into_iter().flat_map(|(game_version, versions)| versions.into_iter().map(|loader_version| {
-        // Forge versions can be in these specific formats:
-        // 1.10.2-12.18.1.2016-failtests
-        // 1.9-12.16.0.1886
-        // 1.9-12.16.0.1880-1.9
-        // 1.14.4-28.1.30
-        // This parses them to get the actual Forge version. Ex: 1.15.2-31.1.87 -> 31.1.87
-        let version_split = loader_version.split('-').nth(1).unwrap_or(&loader_version).to_string();
-
-        // Forge has 3 installer formats:
-        // - Format 0 (Unsupported ATM): Forge Legacy (pre-1.5.2). Uses Binary Patch method to install
-        //   To install: Download patch, download minecraft client JAR. Combine patch and client JAR and delete META-INF/.
-        //      (pre-1.3-2) Client URL: https://maven.minecraftforge.net/net/minecraftforge/forge/{version}/forge-{version}-client.zip
-        //      (pre-1.3-2) Server URL: https://maven.minecraftforge.net/net/minecraftforge/forge/{version}/forge-{version}-server.zip
-        //      (1.3-2-onwards) Universal URL: https://maven.minecraftforge.net/net/minecraftforge/forge/{version}/forge-{version}-universal.zip
-        // - Format 1: Forge Installer Legacy (1.5.2-1.12.2ish)
-        //     To install: Extract install_profile.json from archive. "versionInfo" is the profile's version info. Convert it to the modern format
-        //     Extract forge library from archive. Path is at "install"."path".
-        // - Format 2: Forge Installer Modern
-        //     To install: Extract install_profile.json from archive. Extract version.json from archive. Combine the two and extract all libraries
-        //     which are embedded into the installer JAR.
-        //     Then upload. The launcher will need to run processors!
-        if format_version != 1 && &*version_split == "7.8.0.684" {
-            format_version = 1;
-        } else if format_version != 2 && &*version_split == "14.23.5.2851" {
-            format_version = 2;
-        }
-
-        ForgeVersion {
-            format_version,
-            installer_url: format!("https://maven.minecraftforge.net/net/minecraftforge/forge/{0}/forge-{0}-installer.jar", loader_version),
-            raw: loader_version,
-            loader_version: version_split,
-            game_version: game_version.clone(),
-        }
-    })
-        .collect::<Vec<_>>())
-        // TODO: support format version 0 (see above)
-        .filter(|x| x.format_version != 0)
-        .filter(|x| {
-            // These following Forge versions are broken and cannot be installed
-            const BLACKLIST : &[&str] = &[
-                // Not supported due to `data` field being `[]` even though the type is a map
-                "1.12.2-14.23.5.2851",
-                // Malformed Archives
-                "1.6.1-8.9.0.749",
-                "1.6.1-8.9.0.751",
-                "1.6.4-9.11.1.960",
-                "1.6.4-9.11.1.961",
-                "1.6.4-9.11.1.963",
-                "1.6.4-9.11.1.964",
-            ];
-
-            !BLACKLIST.contains(&&*x.raw)
-        })
-        .collect::<Vec<_>>();
-
-    fetch(
-        daedalus::modded::CURRENT_FORGE_FORMAT_VERSION,
-        "forge",
-        "https://maven.minecraftforge.net/",
-        forge_versions,
-        semaphore,
-        upload_files,
-        mirror_artifacts,
-    )
-    .await
-}
-
-#[tracing::instrument(skip(semaphore, upload_files, mirror_artifacts))]
-pub async fn fetch_neo(
-    semaphore: Arc<Semaphore>,
-    upload_files: &DashMap<String, UploadFile>,
-    mirror_artifacts: &DashMap<String, MirrorArtifact>,
-) -> Result<(), Error> {
-    #[derive(Debug, Deserialize)]
-    struct Metadata {
-        versioning: Versioning,
-    }
-
-    #[derive(Debug, Deserialize)]
-    struct Versioning {
-        versions: Versions,
-    }
-
-    #[derive(Debug, Deserialize)]
-    struct Versions {
-        version: Vec<String>,
-    }
-
-    let forge_versions = fetch_xml::<Metadata>(
-        "https://maven.neoforged.net/net/neoforged/forge/maven-metadata.xml",
-        &semaphore,
-    )
-    .await?;
-    let neo_versions = fetch_xml::<Metadata>(
-        "https://maven.neoforged.net/net/neoforged/neoforge/maven-metadata.xml",
-        &semaphore,
-    )
-    .await?;
-
-    let parsed_versions = forge_versions.versioning.versions.version.into_iter().map(|loader_version| {
-        // NeoForge Forge versions can be in these specific formats:
-        // 1.20.1-47.1.74
-        // 47.1.82
-        // This parses them to get the actual Forge version. Ex: 1.20.1-47.1.74 -> 47.1.74
-        let version_split = loader_version.split('-').nth(1).unwrap_or(&loader_version).to_string();
-
-        Ok(ForgeVersion {
-            format_version: 2,
-            installer_url: format!("https://maven.neoforged.net/net/neoforged/forge/{0}/forge-{0}-installer.jar", loader_version),
-            raw: loader_version,
-            loader_version: version_split,
-            game_version: "1.20.1".to_string(), // All NeoForge Forge versions are for 1.20.1
-        })
-    }).chain(neo_versions.versioning.versions.version.into_iter().map(|loader_version| {
-        let mut parts = loader_version.split('.');
-
-        // NeoForge Forge versions are in this format: 20.2.29-beta, 20.6.119
-        // Where the first number is the major MC version, the second is the minor MC version, and the third is the NeoForge version
-        let major = parts.next().ok_or_else(
-            || crate::ErrorKind::InvalidInput(format!("Unable to find major game version for NeoForge {loader_version}"))
-        )?;
-
-        let minor = parts.next().ok_or_else(
-            || crate::ErrorKind::InvalidInput(format!("Unable to find minor game version for NeoForge {loader_version}"))
-        )?;
-
-        let game_version = if minor == "0" {
-            format!("1.{major}")
-        } else {
-            format!("1.{major}.{minor}")
-        };
-
-        Ok(ForgeVersion {
-            format_version: 2,
-            installer_url: format!("https://maven.neoforged.net/net/neoforged/neoforge/{0}/neoforge-{0}-installer.jar", loader_version),
-            loader_version: loader_version.clone(),
-            raw: loader_version,
-            game_version,
-        })
-    }))
-        .collect::<Result<Vec<_>, Error>>()?
-        .into_iter()
-        .filter(|x| {
-        // These following Forge versions are broken and cannot be installed
-        const BLACKLIST : &[&str] = &[
-            // Unreachable / 404
-            "1.20.1-47.1.7",
-            "47.1.82",
-        ];
-
-        !BLACKLIST.contains(&&*x.raw)
-    }).collect();
-
-    fetch(
-        daedalus::modded::CURRENT_NEOFORGE_FORMAT_VERSION,
-        "neo",
-        "https://maven.neoforged.net/",
-        parsed_versions,
-        semaphore,
-        upload_files,
-        mirror_artifacts,
-    )
-    .await
-}
-
-#[tracing::instrument(skip(
-    forge_versions,
-    semaphore,
-    upload_files,
-    mirror_artifacts
-))]
-async fn fetch(
-    format_version: usize,
-    mod_loader: &str,
-    maven_url: &str,
-    forge_versions: Vec<ForgeVersion>,
-    semaphore: Arc<Semaphore>,
-    upload_files: &DashMap<String, UploadFile>,
-    mirror_artifacts: &DashMap<String, MirrorArtifact>,
-) -> Result<(), Error> {
-    let modrinth_manifest = fetch_json::<daedalus::modded::Manifest>(
-        &format_url(&format!("{mod_loader}/v{format_version}/manifest.json",)),
-        &semaphore,
-    )
-    .await
-    .ok();
-
-    let fetch_versions = if let Some(modrinth_manifest) = modrinth_manifest {
-        let mut fetch_versions = Vec::new();
-
-        for version in &forge_versions {
-            if !modrinth_manifest.game_versions.iter().any(|x| {
-                x.id == version.game_version
-                    && x.loaders.iter().any(|x| x.id == version.loader_version)
-            }) {
-                fetch_versions.push(version);
-            }
-        }
-
-        fetch_versions
-    } else {
-        forge_versions.iter().collect()
-    };
-
-    if !fetch_versions.is_empty() {
-        let forge_installers = futures::future::try_join_all(
-            fetch_versions
-                .iter()
-                .map(|x| download_file(&x.installer_url, None, &semaphore)),
-        )
-        .await?;
-
-        #[tracing::instrument(skip(raw, upload_files, mirror_artifacts))]
-        async fn read_forge_installer(
-            raw: bytes::Bytes,
-            loader: &ForgeVersion,
-            maven_url: &str,
-            mod_loader: &str,
-            upload_files: &DashMap<String, UploadFile>,
-            mirror_artifacts: &DashMap<String, MirrorArtifact>,
-        ) -> Result<PartialVersionInfo, Error> {
-            tracing::trace!(
-                "Reading forge installer for {}",
-                loader.loader_version
-            );
-            type ZipFileReader = async_zip::base::read::seek::ZipFileReader<
-                Cursor<bytes::Bytes>,
-            >;
-
-            let cursor = Cursor::new(raw);
-            let mut zip = ZipFileReader::new(cursor).await?;
-
-            #[tracing::instrument(skip(zip))]
-            async fn read_file(
-                zip: &mut ZipFileReader,
-                file_name: &str,
-            ) -> Result<Option<Vec<u8>>, Error> {
-                let zip_index_option =
-                    zip.file().entries().iter().position(|f| {
-                        f.filename().as_str().unwrap_or_default() == file_name
-                    });
-
-                if let Some(zip_index) = zip_index_option {
-                    let mut buffer = Vec::new();
-                    let mut reader = zip.reader_with_entry(zip_index).await?;
-                    reader.read_to_end_checked(&mut buffer).await?;
-
-                    Ok(Some(buffer))
-                } else {
-                    Ok(None)
-                }
-            }
-
-            #[tracing::instrument(skip(zip))]
-            async fn read_json<T: DeserializeOwned>(
-                zip: &mut ZipFileReader,
-                file_name: &str,
-            ) -> Result<Option<T>, Error> {
-                if let Some(file) = read_file(zip, file_name).await? {
-                    Ok(Some(serde_json::from_slice(&file)?))
-                } else {
-                    Ok(None)
-                }
-            }
-
-            if loader.format_version == 1 {
-                #[derive(Deserialize, Debug)]
-                #[serde(rename_all = "camelCase")]
-                struct ForgeInstallerProfileInstallDataV1 {
-                    // pub mirror_list: String,
-                    // pub target: String,
-                    /// Path to the Forge universal library
-                    pub file_path: String,
-                    // pub logo: String,
-                    // pub welcome: String,
-                    // pub version: String,
-                    /// Maven coordinates of the Forge universal library
-                    pub path: String,
-                    // pub profile_name: String,
-                    pub minecraft: String,
-                }
-
-                #[derive(Deserialize, Debug)]
-                #[serde(rename_all = "camelCase")]
-                struct ForgeInstallerProfileManifestV1 {
-                    pub id: String,
-                    pub libraries: Vec<daedalus::minecraft::Library>,
-                    pub main_class: Option<String>,
-                    pub minecraft_arguments: Option<String>,
-                    pub release_time: DateTime<Utc>,
-                    pub time: DateTime<Utc>,
-                    pub type_: daedalus::minecraft::VersionType,
-                    // pub assets: Option<String>,
-                    // pub inherits_from: Option<String>,
-                    // pub jar: Option<String>,
-                }
-
-                #[derive(Deserialize, Debug)]
-                #[serde(rename_all = "camelCase")]
-                struct ForgeInstallerProfileV1 {
-                    pub install: ForgeInstallerProfileInstallDataV1,
-                    pub version_info: ForgeInstallerProfileManifestV1,
-                }
-
-                let install_profile = read_json::<ForgeInstallerProfileV1>(
-                    &mut zip,
-                    "install_profile.json",
-                )
-                .await?
-                .ok_or_else(|| {
-                    crate::ErrorKind::InvalidInput(format!(
-                        "No install_profile.json present for loader {}",
-                        loader.installer_url
-                    ))
-                })?;
-
-                let forge_library =
-                    read_file(&mut zip, &install_profile.install.file_path)
-                        .await?
-                        .ok_or_else(|| {
-                            crate::ErrorKind::InvalidInput(format!(
-                                "No forge library present for loader {}",
-                                loader.installer_url
-                            ))
-                        })?;
-
-                upload_files.insert(
-                    format!(
-                        "maven/{}",
-                        get_path_from_artifact(&install_profile.install.path)?
-                    ),
-                    UploadFile {
-                        file: bytes::Bytes::from(forge_library),
-                        content_type: None,
-                    },
-                );
-
-                Ok(PartialVersionInfo {
-                    id: install_profile.version_info.id,
-                    inherits_from: install_profile.install.minecraft,
-                    release_time: install_profile.version_info.release_time,
-                    time: install_profile.version_info.time,
-                    main_class: install_profile.version_info.main_class,
-                    minecraft_arguments: install_profile
-                        .version_info
-                        .minecraft_arguments
-                        .clone(),
-                    arguments: install_profile
-                        .version_info
-                        .minecraft_arguments
-                        .map(|x| {
-                            [(
-                                daedalus::minecraft::ArgumentType::Game,
-                                x.split(' ')
-                                    .map(|x| {
-                                        daedalus::minecraft::Argument::Normal(
-                                            x.to_string(),
-                                        )
-                                    })
-                                    .collect(),
-                            )]
-                            .iter()
-                            .cloned()
-                            .collect()
-                        }),
-                    libraries: install_profile
-                        .version_info
-                        .libraries
-                        .into_iter()
-                        .map(|mut lib| {
-                            // For all libraries besides the forge lib extracted, we mirror them from maven servers
-                            // unless the URL is empty/null or available on Minecraft's servers
-                            if let Some(ref url) = lib.url {
-                                if lib.name == install_profile.install.path {
-                                    lib.url = Some(format_url("maven/"));
-                                } else if !url.is_empty()
-                                    && !url.contains(
-                                        "https://libraries.minecraft.net/",
-                                    )
-                                {
-                                    insert_mirrored_artifact(
-                                        &lib.name,
-                                        None,
-                                        vec![
-                                            url.clone(),
-                                            "https://maven.creeperhost.net/"
-                                                .to_string(),
-                                            maven_url.to_string(),
-                                        ],
-                                        false,
-                                        mirror_artifacts,
-                                    )?;
-
-                                    lib.url = Some(format_url("maven/"));
-                                }
-                            }
-
-                            Ok(lib)
-                        })
-                        .collect::<Result<Vec<_>, Error>>()?,
-                    type_: install_profile.version_info.type_,
-                    data: None,
-                    processors: None,
-                })
-            } else if loader.format_version == 2 {
-                #[derive(Deserialize, Debug)]
-                #[serde(rename_all = "camelCase")]
-                struct ForgeInstallerProfileV2 {
-                    // pub spec: i32,
-                    // pub profile: String,
-                    // pub version: String,
-                    // pub json: String,
-                    // pub path: Option<String>,
-                    // pub minecraft: String,
-                    pub data: HashMap<String, daedalus::modded::SidedDataEntry>,
-                    pub libraries: Vec<daedalus::minecraft::Library>,
-                    pub processors: Vec<daedalus::modded::Processor>,
-                }
-
-                let install_profile = read_json::<ForgeInstallerProfileV2>(
-                    &mut zip,
-                    "install_profile.json",
-                )
-                .await?
-                .ok_or_else(|| {
-                    crate::ErrorKind::InvalidInput(format!(
-                        "No install_profile.json present for loader {}",
-                        loader.installer_url
-                    ))
-                })?;
-
-                let mut version_info =
-                    read_json::<PartialVersionInfo>(&mut zip, "version.json")
-                        .await?
-                        .ok_or_else(|| {
-                            crate::ErrorKind::InvalidInput(format!(
-                                "No version.json present for loader {}",
-                                loader.installer_url
-                            ))
-                        })?;
-
-                version_info.processors = Some(install_profile.processors);
-                version_info.libraries.extend(
-                    install_profile.libraries.into_iter().map(|mut x| {
-                        x.include_in_classpath = false;
-
-                        x
-                    }),
-                );
-
-                async fn mirror_forge_library(
-                    mut zip: ZipFileReader,
-                    mut lib: daedalus::minecraft::Library,
-                    maven_url: &str,
-                    upload_files: &DashMap<String, UploadFile>,
-                    mirror_artifacts: &DashMap<String, MirrorArtifact>,
-                ) -> Result<daedalus::minecraft::Library, Error>
-                {
-                    let artifact_path = get_path_from_artifact(&lib.name)?;
-
-                    if let Some(ref mut artifact) =
-                        lib.downloads.as_mut().and_then(|x| x.artifact.as_mut())
-                    {
-                        if !artifact.url.is_empty() {
-                            insert_mirrored_artifact(
-                                &lib.name,
-                                Some(artifact.sha1.clone()),
-                                vec![artifact.url.clone()],
-                                true,
-                                mirror_artifacts,
-                            )?;
-
-                            artifact.url =
-                                format_url(&format!("maven/{}", artifact_path));
-
-                            return Ok(lib);
-                        }
-                    } else if let Some(url) = &lib.url {
-                        if !url.is_empty() {
-                            insert_mirrored_artifact(
-                                &lib.name,
-                                None,
-                                vec![
-                                    url.clone(),
-                                    "https://libraries.minecraft.net/"
-                                        .to_string(),
-                                    "https://maven.creeperhost.net/"
-                                        .to_string(),
-                                    maven_url.to_string(),
-                                ],
-                                false,
-                                mirror_artifacts,
-                            )?;
-
-                            lib.url = Some(format_url("maven/"));
-
-                            return Ok(lib);
-                        }
-                    }
-
-                    // Other libraries are generally available in the "maven" directory of the installer. If they are
-                    // not present here, they will be generated by Forge processors.
-                    let extract_path = format!("maven/{artifact_path}");
-                    if let Some(file) =
-                        read_file(&mut zip, &extract_path).await?
-                    {
-                        upload_files.insert(
-                            extract_path,
-                            UploadFile {
-                                file: bytes::Bytes::from(file),
-                                content_type: None,
-                            },
-                        );
-
-                        lib.url = Some(format_url("maven/"));
-                    } else {
-                        lib.downloadable = false;
-                    }
-
-                    Ok(lib)
-                }
-
-                version_info.libraries = futures::future::try_join_all(
-                    version_info.libraries.into_iter().map(|lib| {
-                        mirror_forge_library(
-                            zip.clone(),
-                            lib,
-                            maven_url,
-                            upload_files,
-                            mirror_artifacts,
-                        )
-                    }),
-                )
-                .await?;
-
-                // In Minecraft Forge modern installers, processors are run during the install process. Some processors
-                // are extracted from the installer JAR. This function finds these files, extracts them, and uploads them
-                // and registers them as libraries instead.
-                // Ex:
-                // "BINPATCH": {
-                //      "client": "/data/client.lzma",
-                //      "server": "/data/server.lzma"
-                //     },
-                // Becomes:
-                // "BINPATCH": {
-                //      "client": "[net.minecraftforge:forge:1.20.3-49.0.1:shim:client@lzma]",
-                //      "server": "[net.minecraftforge:forge:1.20.3-49.0.1:shim:server@lzma]"
-                // },
-                // And the resulting library is added to the profile's libraries
-                let mut new_data = HashMap::new();
-                for (key, entry) in install_profile.data {
-                    async fn extract_data(
-                        zip: &mut ZipFileReader,
-                        key: &str,
-                        value: &str,
-                        upload_files: &DashMap<String, UploadFile>,
-                        libs: &mut Vec<daedalus::minecraft::Library>,
-                        mod_loader: &str,
-                        version: &ForgeVersion,
-                    ) -> Result<String, Error> {
-                        let extract_file =
-                            read_file(zip, &value[1..value.len()])
-                                .await?
-                                .ok_or_else(|| {
-                                    crate::ErrorKind::InvalidInput(format!(
-                                "Unable reading data key {key} at path {value}",
-                            ))
-                                })?;
-
-                        let file_name = value.split('/').last()
-                            .ok_or_else(|| {
-                                crate::ErrorKind::InvalidInput(format!(
-                                    "Unable reading filename for data key {key} at path {value}",
-
-                                ))
-                            })?;
-
-                        let mut file = file_name.split('.');
-                        let file_name = file.next()
-                            .ok_or_else(|| {
-                                crate::ErrorKind::InvalidInput(format!(
-                                    "Unable reading filename only for data key {key} at path {value}",
-                                ))
-                            })?;
-                        let ext = file.next()
-                            .ok_or_else(|| {
-                                crate::ErrorKind::InvalidInput(format!(
-                                    "Unable reading extension only for data key {key} at path {value}",
-                                ))
-                            })?;
-
-                        let path = format!(
-                            "com.modrinth.daedalus:{}-installer-extracts:{}:{}@{}",
-                            mod_loader,
-                            version.raw,
-                            file_name,
-                            ext
-                        );
-
-                        upload_files.insert(
-                            format!("maven/{}", get_path_from_artifact(&path)?),
-                            UploadFile {
-                                file: bytes::Bytes::from(extract_file),
-                                content_type: None,
-                            },
-                        );
-
-                        libs.push(daedalus::minecraft::Library {
-                            downloads: None,
-                            extract: None,
-                            name: path.clone(),
-                            url: Some(format_url("maven/")),
-                            natives: None,
-                            rules: None,
-                            checksums: None,
-                            include_in_classpath: false,
-                            downloadable: true,
-                        });
-
-                        Ok(format!("[{path}]"))
-                    }
-
-                    let client = if entry.client.starts_with('/') {
-                        extract_data(
-                            &mut zip,
-                            &key,
-                            &entry.client,
-                            upload_files,
-                            &mut version_info.libraries,
-                            mod_loader,
-                            loader,
-                        )
-                        .await?
-                    } else {
-                        entry.client.clone()
-                    };
-
-                    let server = if entry.server.starts_with('/') {
-                        extract_data(
-                            &mut zip,
-                            &key,
-                            &entry.server,
-                            upload_files,
-                            &mut version_info.libraries,
-                            mod_loader,
-                            loader,
-                        )
-                        .await?
-                    } else {
-                        entry.server.clone()
-                    };
-
-                    new_data.insert(
-                        key.clone(),
-                        daedalus::modded::SidedDataEntry { client, server },
-                    );
-                }
-
-                version_info.data = Some(new_data);
-
-                Ok(version_info)
-            } else {
-                Err(crate::ErrorKind::InvalidInput(format!(
-                    "Unknown format version {} for loader {}",
-                    loader.format_version, loader.installer_url
-                ))
-                .into())
-            }
-        }
-
-        let forge_version_infos = futures::future::try_join_all(
-            forge_installers
-                .into_iter()
-                .enumerate()
-                .map(|(index, raw)| {
-                    let loader = fetch_versions[index];
-
-                    read_forge_installer(
-                        raw,
-                        loader,
-                        maven_url,
-                        mod_loader,
-                        upload_files,
-                        mirror_artifacts,
-                    )
-                }),
-        )
-        .await?;
-
-        let serialized_version_manifests = forge_version_infos
-            .iter()
-            .map(|x| serde_json::to_vec(x).map(bytes::Bytes::from))
-            .collect::<Result<Vec<_>, serde_json::Error>>()?;
-
-        serialized_version_manifests
-            .into_iter()
-            .enumerate()
-            .for_each(|(index, bytes)| {
-                let loader = fetch_versions[index];
-
-                let version_path = format!(
-                    "{mod_loader}/v{format_version}/versions/{}.json",
-                    loader.loader_version
-                );
-
-                upload_files.insert(
-                    version_path,
-                    UploadFile {
-                        file: bytes,
-                        content_type: Some("application/json".to_string()),
-                    },
-                );
-            });
-
-        let forge_manifest_path =
-            format!("{mod_loader}/v{format_version}/manifest.json",);
-
-        let manifest = daedalus::modded::Manifest {
-            game_versions: forge_versions
-                .into_iter()
-                .sorted_by(|a, b| b.game_version.cmp(&a.game_version))
-                .rev()
-                .chunk_by(|x| x.game_version.clone())
-                .into_iter()
-                .map(|(game_version, loaders)| daedalus::modded::Version {
-                    id: game_version,
-                    stable: true,
-                    loaders: loaders
-                        .map(|x| daedalus::modded::LoaderVersion {
-                            url: format_url(&format!(
-                        "{mod_loader}/v{format_version}/versions/{}.json",
-                        x.loader_version
-                    )),
-                            id: x.loader_version,
-                            stable: false,
-                        })
-                        .collect(),
-                })
-                .collect(),
-        };
-
-        upload_files.insert(
-            forge_manifest_path,
-            UploadFile {
-                file: bytes::Bytes::from(serde_json::to_vec(&manifest)?),
-                content_type: Some("application/json".to_string()),
-            },
-        );
-    }
-
-    Ok(())
-}
-
-#[derive(Debug)]
-struct ForgeVersion {
-    pub format_version: usize,
-    pub raw: String,
-    pub loader_version: String,
-    pub game_version: String,
-    pub installer_url: String,
-}

apps/daedalus_client/src/main.rs

@@ -1,218 +0,0 @@
-use crate::util::{
-    format_url, upload_file_to_bucket, upload_url_to_bucket_mirrors,
-    REQWEST_CLIENT,
-};
-use daedalus::get_path_from_artifact;
-use dashmap::{DashMap, DashSet};
-use std::sync::Arc;
-use tokio::sync::Semaphore;
-use tracing_error::ErrorLayer;
-use tracing_subscriber::{fmt, prelude::*, EnvFilter};
-
-mod error;
-mod fabric;
-mod forge;
-mod minecraft;
-pub mod util;
-
-pub use error::{Error, ErrorKind, Result};
-
-#[tokio::main]
-async fn main() -> Result<()> {
-    dotenvy::dotenv().ok();
-
-    let subscriber = tracing_subscriber::registry()
-        .with(fmt::layer())
-        .with(EnvFilter::from_default_env())
-        .with(ErrorLayer::default());
-
-    tracing::subscriber::set_global_default(subscriber)?;
-
-    tracing::info!("Initialized tracing. Starting Daedalus!");
-
-    if check_env_vars() {
-        tracing::error!("Some environment variables are missing!");
-
-        return Ok(());
-    }
-
-    let semaphore = Arc::new(Semaphore::new(
-        dotenvy::var("CONCURRENCY_LIMIT")
-            .ok()
-            .and_then(|x| x.parse().ok())
-            .unwrap_or(10),
-    ));
-
-    // path, upload file
-    let upload_files: DashMap<String, UploadFile> = DashMap::new();
-    // path, mirror artifact
-    let mirror_artifacts: DashMap<String, MirrorArtifact> = DashMap::new();
-
-    minecraft::fetch(semaphore.clone(), &upload_files, &mirror_artifacts)
-        .await?;
-    fabric::fetch_fabric(semaphore.clone(), &upload_files, &mirror_artifacts)
-        .await?;
-    fabric::fetch_quilt(semaphore.clone(), &upload_files, &mirror_artifacts)
-        .await?;
-    forge::fetch_neo(semaphore.clone(), &upload_files, &mirror_artifacts)
-        .await?;
-    forge::fetch_forge(semaphore.clone(), &upload_files, &mirror_artifacts)
-        .await?;
-
-    futures::future::try_join_all(upload_files.iter().map(|x| {
-        upload_file_to_bucket(
-            x.key().clone(),
-            x.value().file.clone(),
-            x.value().content_type.clone(),
-            &semaphore,
-        )
-    }))
-    .await?;
-
-    futures::future::try_join_all(mirror_artifacts.iter().map(|x| {
-        upload_url_to_bucket_mirrors(
-            format!("maven/{}", x.key()),
-            x.value()
-                .mirrors
-                .iter()
-                .map(|mirror| {
-                    if mirror.entire_url {
-                        mirror.path.clone()
-                    } else {
-                        format!("{}{}", mirror.path, x.key())
-                    }
-                })
-                .collect(),
-            x.sha1.clone(),
-            &semaphore,
-        )
-    }))
-    .await?;
-
-    if dotenvy::var("CLOUDFLARE_INTEGRATION")
-        .ok()
-        .and_then(|x| x.parse::<bool>().ok())
-        .unwrap_or(false)
-    {
-        if let Ok(token) = dotenvy::var("CLOUDFLARE_TOKEN") {
-            if let Ok(zone_id) = dotenvy::var("CLOUDFLARE_ZONE_ID") {
-                let cache_clears = upload_files
-                    .into_iter()
-                    .map(|x| format_url(&x.0))
-                    .chain(
-                        mirror_artifacts
-                            .into_iter()
-                            .map(|x| format_url(&format!("maven/{}", x.0))),
-                    )
-                    .collect::<Vec<_>>();
-
-                // Cloudflare ratelimits cache clears to 500 files per request
-                for chunk in cache_clears.chunks(500) {
-                    REQWEST_CLIENT.post(format!("https://api.cloudflare.com/client/v4/zones/{zone_id}/purge_cache"))
-                        .bearer_auth(&token)
-                        .json(&serde_json::json!({
-                        "files": chunk
-                    }))
-                        .send()
-                        .await
-                        .map_err(|err| {
-                            ErrorKind::Fetch {
-                                inner: err,
-                                item: "cloudflare clear cache".to_string(),
-                            }
-                        })?
-                        .error_for_status()
-                        .map_err(|err| {
-                            ErrorKind::Fetch {
-                                inner: err,
-                                item: "cloudflare clear cache".to_string(),
-                            }
-                        })?;
-                }
-            }
-        }
-    }
-
-    Ok(())
-}
-
-pub struct UploadFile {
-    file: bytes::Bytes,
-    content_type: Option<String>,
-}
-
-pub struct MirrorArtifact {
-    pub sha1: Option<String>,
-    pub mirrors: DashSet<Mirror>,
-}
-
-#[derive(Eq, PartialEq, Hash)]
-pub struct Mirror {
-    path: String,
-    entire_url: bool,
-}
-
-#[tracing::instrument(skip(mirror_artifacts))]
-pub fn insert_mirrored_artifact(
-    artifact: &str,
-    sha1: Option<String>,
-    mirrors: Vec<String>,
-    entire_url: bool,
-    mirror_artifacts: &DashMap<String, MirrorArtifact>,
-) -> Result<()> {
-    let val = mirror_artifacts
-        .entry(get_path_from_artifact(artifact)?)
-        .or_insert(MirrorArtifact {
-            sha1,
-            mirrors: DashSet::new(),
-        });
-
-    for mirror in mirrors {
-        val.mirrors.insert(Mirror {
-            path: mirror,
-            entire_url,
-        });
-    }
-
-    Ok(())
-}
-
-fn check_env_vars() -> bool {
-    let mut failed = false;
-
-    fn check_var<T: std::str::FromStr>(var: &str) -> bool {
-        if dotenvy::var(var)
-            .ok()
-            .and_then(|s| s.parse::<T>().ok())
-            .is_none()
-        {
-            tracing::warn!(
-                "Variable `{}` missing in dotenvy or not of type `{}`",
-                var,
-                std::any::type_name::<T>()
-            );
-            true
-        } else {
-            false
-        }
-    }
-
-    failed |= check_var::<String>("BASE_URL");
-
-    failed |= check_var::<String>("S3_ACCESS_TOKEN");
-    failed |= check_var::<String>("S3_SECRET");
-    failed |= check_var::<String>("S3_URL");
-    failed |= check_var::<String>("S3_REGION");
-    failed |= check_var::<String>("S3_BUCKET_NAME");
-
-    if dotenvy::var("CLOUDFLARE_INTEGRATION")
-        .ok()
-        .and_then(|x| x.parse::<bool>().ok())
-        .unwrap_or(false)
-    {
-        failed |= check_var::<String>("CLOUDFLARE_TOKEN");
-        failed |= check_var::<String>("CLOUDFLARE_ZONE_ID");
-    }
-
-    failed
-}

apps/daedalus_client/src/minecraft.rs

@@ -1,230 +0,0 @@
-use crate::util::fetch_json;
-use crate::{
-    util::download_file, util::format_url, util::sha1_async, Error,
-    MirrorArtifact, UploadFile,
-};
-use daedalus::minecraft::{
-    merge_partial_library, Library, PartialLibrary, VersionInfo,
-    VersionManifest, VERSION_MANIFEST_URL,
-};
-use dashmap::DashMap;
-use serde::Deserialize;
-use std::sync::Arc;
-use tokio::sync::Semaphore;
-
-#[tracing::instrument(skip(semaphore, upload_files, _mirror_artifacts))]
-pub async fn fetch(
-    semaphore: Arc<Semaphore>,
-    upload_files: &DashMap<String, UploadFile>,
-    _mirror_artifacts: &DashMap<String, MirrorArtifact>,
-) -> Result<(), Error> {
-    let modrinth_manifest = fetch_json::<VersionManifest>(
-        &format_url(&format!(
-            "minecraft/v{}/manifest.json",
-            daedalus::minecraft::CURRENT_FORMAT_VERSION
-        )),
-        &semaphore,
-    )
-    .await
-    .ok();
-    let mojang_manifest =
-        fetch_json::<VersionManifest>(VERSION_MANIFEST_URL, &semaphore).await?;
-
-    // TODO: experimental snapshots: https://github.com/PrismLauncher/meta/blob/main/meta/common/mojang-minecraft-experiments.json
-    // TODO: old snapshots: https://github.com/PrismLauncher/meta/blob/main/meta/common/mojang-minecraft-old-snapshots.json
-
-    // We check Modrinth's version manifest and compare if the version 1) exists in Modrinth's database and 2) is unchanged
-    // If they are not, we will fetch them
-    let (fetch_versions, existing_versions) =
-        if let Some(mut modrinth_manifest) = modrinth_manifest {
-            let (mut fetch_versions, mut existing_versions) =
-                (Vec::new(), Vec::new());
-
-            for version in mojang_manifest.versions {
-                if let Some(index) = modrinth_manifest
-                    .versions
-                    .iter()
-                    .position(|x| x.id == version.id)
-                {
-                    let modrinth_version =
-                        modrinth_manifest.versions.remove(index);
-
-                    if modrinth_version
-                        .original_sha1
-                        .as_ref()
-                        .map(|x| x == &version.sha1)
-                        .unwrap_or(false)
-                    {
-                        existing_versions.push(modrinth_version);
-                    } else {
-                        fetch_versions.push(version);
-                    }
-                } else {
-                    fetch_versions.push(version);
-                }
-            }
-
-            (fetch_versions, existing_versions)
-        } else {
-            (mojang_manifest.versions, Vec::new())
-        };
-
-    if !fetch_versions.is_empty() {
-        let version_manifests = futures::future::try_join_all(
-            fetch_versions
-                .iter()
-                .map(|x| download_file(&x.url, Some(&x.sha1), &semaphore)),
-        )
-        .await?
-        .into_iter()
-        .map(|x| serde_json::from_slice(&x))
-        .collect::<Result<Vec<VersionInfo>, serde_json::Error>>()?;
-
-        // Patch libraries of Minecraft versions for M-series Mac Support, Better Linux Compatibility, etc
-        let library_patches = fetch_library_patches()?;
-        let patched_version_manifests = version_manifests
-            .into_iter()
-            .map(|mut x| {
-                if !library_patches.is_empty() {
-                    let mut new_libraries = Vec::new();
-                    for library in x.libraries {
-                        let mut libs = patch_library(&library_patches, library);
-                        new_libraries.append(&mut libs)
-                    }
-                    x.libraries = new_libraries
-                }
-
-                x
-            })
-            .collect::<Vec<_>>();
-
-        // serialize + compute hashes
-        let serialized_version_manifests = patched_version_manifests
-            .iter()
-            .map(|x| serde_json::to_vec(x).map(bytes::Bytes::from))
-            .collect::<Result<Vec<_>, serde_json::Error>>()?;
-        let hashes_version_manifests = futures::future::try_join_all(
-            serialized_version_manifests
-                .iter()
-                .map(|x| sha1_async(x.clone())),
-        )
-        .await?;
-
-        // We upload the new version manifests and add them to the versions list
-        let mut new_versions = patched_version_manifests
-            .into_iter()
-            .zip(serialized_version_manifests.into_iter())
-            .zip(hashes_version_manifests.into_iter())
-            .map(|((version, bytes), hash)| {
-                let version_path = format!(
-                    "minecraft/v{}/versions/{}.json",
-                    daedalus::minecraft::CURRENT_FORMAT_VERSION,
-                    version.id
-                );
-
-                let url = format_url(&version_path);
-                upload_files.insert(
-                    version_path,
-                    UploadFile {
-                        file: bytes,
-                        content_type: Some("application/json".to_string()),
-                    },
-                );
-
-                daedalus::minecraft::Version {
-                    original_sha1: fetch_versions
-                        .iter()
-                        .find(|x| x.id == version.id)
-                        .map(|x| x.sha1.clone()),
-                    id: version.id,
-                    type_: version.type_,
-                    url,
-                    time: version.time,
-                    release_time: version.release_time,
-                    sha1: hash,
-                    compliance_level: 1,
-                }
-            })
-            .chain(existing_versions.into_iter())
-            .collect::<Vec<_>>();
-
-        new_versions.sort_by(|a, b| b.release_time.cmp(&a.release_time));
-
-        // create and upload the new manifest
-        let version_manifest_path = format!(
-            "minecraft/v{}/manifest.json",
-            daedalus::minecraft::CURRENT_FORMAT_VERSION
-        );
-
-        let new_manifest = VersionManifest {
-            latest: mojang_manifest.latest,
-            versions: new_versions,
-        };
-
-        upload_files.insert(
-            version_manifest_path,
-            UploadFile {
-                file: bytes::Bytes::from(serde_json::to_vec(&new_manifest)?),
-                content_type: Some("application/json".to_string()),
-            },
-        );
-    }
-
-    Ok(())
-}
-
-#[derive(Deserialize, Debug)]
-#[serde(rename_all = "camelCase")]
-pub struct LibraryPatch {
-    #[serde(rename = "_comment")]
-    pub _comment: String,
-    #[serde(rename = "match")]
-    pub match_: Vec<String>,
-    pub additional_libraries: Option<Vec<Library>>,
-    #[serde(rename = "override")]
-    pub override_: Option<PartialLibrary>,
-    pub patch_additional_libraries: Option<bool>,
-}
-
-fn fetch_library_patches() -> Result<Vec<LibraryPatch>, Error> {
-    let patches = include_bytes!("../library-patches.json");
-    Ok(serde_json::from_slice(patches)?)
-}
-
-pub fn patch_library(
-    patches: &Vec<LibraryPatch>,
-    mut library: Library,
-) -> Vec<Library> {
-    let mut val = Vec::new();
-
-    let actual_patches = patches
-        .iter()
-        .filter(|x| x.match_.contains(&library.name))
-        .collect::<Vec<_>>();
-
-    if !actual_patches.is_empty() {
-        for patch in actual_patches {
-            if let Some(override_) = &patch.override_ {
-                library = merge_partial_library(override_.clone(), library);
-            }
-
-            if let Some(additional_libraries) = &patch.additional_libraries {
-                for additional_library in additional_libraries {
-                    if patch.patch_additional_libraries.unwrap_or(false) {
-                        let mut libs =
-                            patch_library(patches, additional_library.clone());
-                        val.append(&mut libs)
-                    } else {
-                        val.push(additional_library.clone());
-                    }
-                }
-            }
-        }
-
-        val.push(library);
-    } else {
-        val.push(library);
-    }
-
-    val
-}

apps/daedalus_client/src/util.rs

@@ -1,234 +0,0 @@
-use crate::{Error, ErrorKind};
-use bytes::Bytes;
-use s3::creds::Credentials;
-use s3::{Bucket, Region};
-use serde::de::DeserializeOwned;
-use std::sync::Arc;
-use tokio::sync::Semaphore;
-
-lazy_static::lazy_static! {
-    static ref BUCKET : Bucket = {
-        let region = dotenvy::var("S3_REGION").unwrap();
-        let b = Bucket::new(
-            &dotenvy::var("S3_BUCKET_NAME").unwrap(),
-            if &*region == "r2" {
-                Region::R2 {
-                    account_id: dotenvy::var("S3_URL").unwrap(),
-                }
-            } else {
-                Region::Custom {
-                    region: region.clone(),
-                    endpoint: dotenvy::var("S3_URL").unwrap(),
-                }
-            },
-            Credentials::new(
-                Some(&*dotenvy::var("S3_ACCESS_TOKEN").unwrap()),
-                Some(&*dotenvy::var("S3_SECRET").unwrap()),
-                None,
-                None,
-                None,
-            ).unwrap(),
-        ).unwrap();
-
-        if region == "path-style" {
-            b.with_path_style()
-        } else {
-            b
-        }
-    };
-}
-
-lazy_static::lazy_static! {
-    pub static ref REQWEST_CLIENT: reqwest::Client = {
-        let mut headers = reqwest::header::HeaderMap::new();
-        if let Ok(header) = reqwest::header::HeaderValue::from_str(&format!(
-            "modrinth/daedalus/{} (support@modrinth.com)",
-            env!("CARGO_PKG_VERSION")
-        )) {
-            headers.insert(reqwest::header::USER_AGENT, header);
-        }
-
-        reqwest::Client::builder()
-            .tcp_keepalive(Some(std::time::Duration::from_secs(10)))
-            .timeout(std::time::Duration::from_secs(15))
-            .default_headers(headers)
-            .build()
-            .unwrap()
-    };
-}
-
-#[tracing::instrument(skip(bytes, semaphore))]
-pub async fn upload_file_to_bucket(
-    path: String,
-    bytes: Bytes,
-    content_type: Option<String>,
-    semaphore: &Arc<Semaphore>,
-) -> Result<(), Error> {
-    let _permit = semaphore.acquire().await?;
-    let key = path.clone();
-
-    const RETRIES: i32 = 3;
-    for attempt in 1..=(RETRIES + 1) {
-        tracing::trace!("Attempting file upload, attempt {attempt}");
-        let result = if let Some(ref content_type) = content_type {
-            BUCKET
-                .put_object_with_content_type(key.clone(), &bytes, content_type)
-                .await
-        } else {
-            BUCKET.put_object(key.clone(), &bytes).await
-        }
-        .map_err(|err| ErrorKind::S3 {
-            inner: err,
-            file: path.clone(),
-        });
-
-        match result {
-            Ok(_) => return Ok(()),
-            Err(_) if attempt <= RETRIES => continue,
-            Err(_) => {
-                result?;
-            }
-        }
-    }
-    unreachable!()
-}
-
-pub async fn upload_url_to_bucket_mirrors(
-    upload_path: String,
-    mirrors: Vec<String>,
-    sha1: Option<String>,
-    semaphore: &Arc<Semaphore>,
-) -> Result<(), Error> {
-    if mirrors.is_empty() {
-        return Err(ErrorKind::InvalidInput(
-            "No mirrors provided!".to_string(),
-        )
-        .into());
-    }
-
-    for (index, mirror) in mirrors.iter().enumerate() {
-        let result = upload_url_to_bucket(
-            upload_path.clone(),
-            mirror.clone(),
-            sha1.clone(),
-            semaphore,
-        )
-        .await;
-
-        if result.is_ok() || (result.is_err() && index == (mirrors.len() - 1)) {
-            return result;
-        }
-    }
-
-    unreachable!()
-}
-
-#[tracing::instrument(skip(semaphore))]
-pub async fn upload_url_to_bucket(
-    path: String,
-    url: String,
-    sha1: Option<String>,
-    semaphore: &Arc<Semaphore>,
-) -> Result<(), Error> {
-    let data = download_file(&url, sha1.as_deref(), semaphore).await?;
-
-    upload_file_to_bucket(path, data, None, semaphore).await?;
-
-    Ok(())
-}
-
-#[tracing::instrument(skip(bytes))]
-pub async fn sha1_async(bytes: Bytes) -> Result<String, Error> {
-    let hash = tokio::task::spawn_blocking(move || {
-        sha1_smol::Sha1::from(bytes).hexdigest()
-    })
-    .await?;
-
-    Ok(hash)
-}
-
-#[tracing::instrument(skip(semaphore))]
-pub async fn download_file(
-    url: &str,
-    sha1: Option<&str>,
-    semaphore: &Arc<Semaphore>,
-) -> Result<bytes::Bytes, crate::Error> {
-    let _permit = semaphore.acquire().await?;
-    tracing::trace!("Starting file download");
-
-    const RETRIES: u32 = 10;
-    for attempt in 1..=(RETRIES + 1) {
-        let result = REQWEST_CLIENT
-            .get(url.replace("http://", "https://"))
-            .send()
-            .await
-            .and_then(|x| x.error_for_status());
-
-        match result {
-            Ok(x) => {
-                let bytes = x.bytes().await;
-
-                if let Ok(bytes) = bytes {
-                    if let Some(sha1) = sha1 {
-                        if &*sha1_async(bytes.clone()).await? != sha1 {
-                            if attempt <= 3 {
-                                continue;
-                            } else {
-                                return Err(
-                                    crate::ErrorKind::ChecksumFailure {
-                                        hash: sha1.to_string(),
-                                        url: url.to_string(),
-                                        tries: attempt,
-                                    }
-                                    .into(),
-                                );
-                            }
-                        }
-                    }
-
-                    return Ok(bytes);
-                } else if attempt <= RETRIES {
-                    continue;
-                } else if let Err(err) = bytes {
-                    return Err(crate::ErrorKind::Fetch {
-                        inner: err,
-                        item: url.to_string(),
-                    }
-                    .into());
-                }
-            }
-            Err(_) if attempt <= RETRIES => continue,
-            Err(err) => {
-                return Err(crate::ErrorKind::Fetch {
-                    inner: err,
-                    item: url.to_string(),
-                }
-                .into())
-            }
-        }
-    }
-
-    unreachable!()
-}
-
-pub async fn fetch_json<T: DeserializeOwned>(
-    url: &str,
-    semaphore: &Arc<Semaphore>,
-) -> Result<T, Error> {
-    Ok(serde_json::from_slice(
-        &download_file(url, None, semaphore).await?,
-    )?)
-}
-
-pub async fn fetch_xml<T: DeserializeOwned>(
-    url: &str,
-    semaphore: &Arc<Semaphore>,
-) -> Result<T, Error> {
-    Ok(serde_xml_rs::from_reader(
-        &*download_file(url, None, semaphore).await?,
-    )?)
-}
-
-pub fn format_url(path: &str) -> String {
-    format!("{}/{}", &*dotenvy::var("BASE_URL").unwrap(), path)
-}

apps/docs/.gitignore

@@ -1,21 +0,0 @@
-# build output
-dist/
-# generated types
-.astro/
-
-# dependencies
-node_modules/
-
-# logs
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-
-
-# environment variables
-.env
-.env.production
-
-# macOS-specific files
-.DS_Store