feat: version hiding

.github/workflows/ci.yml

@@ -21,20 +21,17 @@ jobs:
         with:
           submodules: true
 
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
           node-version: lts/*
-          cache: "pnpm"
+          cache: "yarn"
 
       - name: Install dependencies
-        run: pnpm install
+        run: yarn install --immutable --network-timeout 1000000
 
       - name: Typecheck
-        run: pnpm run typecheck
+        run: yarn typecheck
 
   lint:
     name: Lint
@@ -45,17 +42,14 @@ jobs:
         with:
           submodules: true
 
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
           node-version: lts/*
-          cache: "pnpm"
+          cache: "yarn"
 
       - name: Install dependencies
-        run: pnpm install
+        run: yarn install --immutable --network-timeout 1000000
 
       - name: Lint
-        run: pnpm run lint
+        run: yarn lint

.prettierignore

@@ -1,3 +1 @@
-drop-base/
-# file is fully managed by pnpm, no reason to break it
-pnpm-lock.yaml
+drop-base/

Dockerfile

@@ -1,45 +1,40 @@
 # syntax=docker/dockerfile:1
 
-FROM node:lts-alpine AS base
-ENV PNPM_HOME="/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack enable
-WORKDIR /app
-
-# so corepack knows pnpm's version
-COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
-# prevent prompt to download
-ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0
-# setup for offline
-RUN corepack pack
-# don't call out to network anymore
-ENV COREPACK_ENABLE_NETWORK=0
-
 ### Unified deps builder
-FROM base AS deps
-RUN pnpm install --frozen-lockfile --ignore-scripts
+# FROM node:lts-alpine AS deps
+# WORKDIR /app
+# COPY package.json yarn.lock ./
+# RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn install --network-timeout 1000000 --ignore-scripts
 
 ### Build for app
-FROM base AS build-system
+FROM node:lts-alpine AS build-system
+# setup workdir - has to be the same filepath as app because fuckin' Prisma
+WORKDIR /app
 
 ENV NODE_ENV=production
 ENV NUXT_TELEMETRY_DISABLED=1
+# ENV YARN_CACHE_FOLDER=/root/.yarn
 
 # add git so drop can determine its git ref at build
-RUN apk add --no-cache git
+# pnpm for build
+RUN apk add --no-cache git pnpm
 
 # copy deps and rest of project files
-COPY --from=deps /app/node_modules ./node_modules
+# COPY --from=deps /app/node_modules ./node_modules
 COPY . .
 
 ARG BUILD_DROP_VERSION
 ARG BUILD_GIT_REF
 
 # build
-RUN pnpm run postinstall && pnpm run build
+RUN pnpm import
+RUN pnpm install --shamefully-hoist
+RUN pnpm run build
+# RUN --mount=type=cache,target=/root/.yarn yarn postinstall && yarn build
 
 ### create run environment for Drop
-FROM base AS run-system
+FROM node:lts-alpine AS run-system
+WORKDIR /app
 
 ENV NODE_ENV=production
 ENV NUXT_TELEMETRY_DISABLED=1
@@ -47,8 +42,6 @@ ENV NUXT_TELEMETRY_DISABLED=1
 # RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn add --network-timeout 1000000 --no-lockfile --ignore-scripts prisma@6.11.1
 RUN apk add --no-cache pnpm
 RUN pnpm install prisma@6.11.1
-# init prisma to download all required files
-RUN pnpm prisma init
 
 COPY --from=build-system /app/package.json ./
 COPY --from=build-system /app/.output ./app

components/AccountSidebar.vue

@@ -45,7 +45,6 @@ import {
   LockClosedIcon,
   DevicePhoneMobileIcon,
   WrenchScrewdriverIcon,
-  CodeBracketIcon,
 } from "@heroicons/vue/24/outline";
 import { UserIcon } from "@heroicons/vue/24/solid";
 import type { Component } from "vue";
@@ -74,12 +73,6 @@ const navigation: (NavigationItem & { icon: Component; count?: number })[] = [
     icon: BellIcon,
     count: notifications.value.length,
   },
-  {
-    label: t("account.token.title"),
-    route: "/account/tokens",
-    prefix: "/account/tokens",
-    icon: CodeBracketIcon,
-  },
   {
     label: t("account.settings"),
     route: "/account/settings",

components/Modal/CreateToken.vue

@@ -1,267 +0,0 @@
-<template>
-  <ModalTemplate v-model="model" size-class="max-w-3xl">
-    <template #default>
-      <div class="space-y-5">
-        <div>
-          <label
-            for="name"
-            class="block text-sm font-medium leading-6 text-zinc-100"
-            >{{ $t("account.token.name") }}</label
-          >
-          <p class="text-zinc-400 block text-xs font-medium leading-6">
-            {{ $t("account.token.nameDesc") }}
-          </p>
-          <div class="mt-2">
-            <input
-              id="name"
-              v-model="name"
-              name="name"
-              type="text"
-              autocomplete="name"
-              :placeholder="
-                props.suggestedName ?? $t('account.token.namePlaceholder')
-              "
-              class="block w-full rounded-md border-0 py-1.5 px-3 bg-zinc-800 disabled:bg-zinc-900/80 text-zinc-100 disabled:text-zinc-400 shadow-sm ring-1 ring-inset ring-zinc-700 disabled:ring-zinc-800 placeholder:text-zinc-400 focus:ring-2 focus:ring-inset focus:ring-blue-600 sm:text-sm sm:leading-6"
-            />
-          </div>
-        </div>
-
-        <div>
-          <Listbox v-model="expiryKey" as="div">
-            <ListboxLabel class="block text-sm/6 font-medium text-zinc-100">{{
-              $t("users.admin.simple.inviteExpiryLabel")
-            }}</ListboxLabel>
-            <div class="relative mt-2">
-              <ListboxButton
-                class="relative w-full cursor-default rounded-md bg-zinc-800 py-1.5 pl-3 pr-10 text-left text-zinc-100 shadow-sm ring-1 ring-inset ring-zinc-700 focus:outline-none focus:ring-2 focus:ring-blue-600 sm:text-sm/6"
-              >
-                <span class="block truncate">{{ expiryKey }}</span>
-                <span
-                  class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2"
-                >
-                  <ChevronUpDownIcon
-                    class="h-5 w-5 text-gray-400"
-                    aria-hidden="true"
-                  />
-                </span>
-              </ListboxButton>
-
-              <transition
-                leave-active-class="transition ease-in duration-100"
-                leave-from-class="opacity-100"
-                leave-to-class="opacity-0"
-              >
-                <ListboxOptions
-                  class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-md bg-zinc-900 py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm"
-                >
-                  <ListboxOption
-                    v-for="[label] in Object.entries(expiry)"
-                    :key="label"
-                    v-slot="{ active, selected }"
-                    as="template"
-                    :value="label"
-                  >
-                    <li
-                      :class="[
-                        active ? 'bg-blue-600 text-white' : 'text-zinc-300',
-                        'relative cursor-default select-none py-2 pl-3 pr-9',
-                      ]"
-                    >
-                      <span
-                        :class="[
-                          selected
-                            ? 'font-semibold text-zinc-100'
-                            : 'font-normal',
-                          'block truncate',
-                        ]"
-                        >{{ label }}</span
-                      >
-
-                      <span
-                        v-if="selected"
-                        :class="[
-                          active ? 'text-white' : 'text-blue-600',
-                          'absolute inset-y-0 right-0 flex items-center pr-4',
-                        ]"
-                      >
-                        <CheckIcon class="h-5 w-5" aria-hidden="true" />
-                      </span>
-                    </li>
-                  </ListboxOption>
-                </ListboxOptions>
-              </transition>
-            </div>
-          </Listbox>
-        </div>
-
-        <div>
-          <label
-            for="name"
-            class="block text-sm font-medium leading-6 text-zinc-100"
-            >{{ $t("account.token.acls") }}</label
-          >
-          <p class="text-zinc-400 block text-xs font-medium leading-6">
-            {{ $t("account.token.aclsDesc") }}
-          </p>
-          <fieldset class="divide-y divide-zinc-700">
-            <div
-              v-for="[sectionName, sectionAcls] in Object.entries(
-                aclsBySection,
-              )"
-              :key="sectionName"
-              class="grid lg:grid-cols-3 gap-1 py-3"
-            >
-              <div
-                v-for="[acl, description] in Object.entries(sectionAcls)"
-                :key="acl"
-                class="flex gap-3"
-              >
-                <div class="flex h-6 shrink-0 items-center">
-                  <div class="group grid size-4 grid-cols-1">
-                    <input
-                      id="acl"
-                      v-model="currentACLs[acl]"
-                      aria-describedby="acl-description"
-                      name="acl"
-                      type="checkbox"
-                      class="col-start-1 row-start-1 appearance-none rounded-sm border checked:border-blue-600 checked:bg-blue-600 indeterminate:border-blue-600 indeterminate:bg-blue-600 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-600 disabled:border-gray-300 disabled:bg-gray-100 disabled:checked:bg-gray-100 border-white/10 bg-white/5 dark:checked:border-blue-500 dark:checked:bg-blue-500 dark:indeterminate:border-blue-500 dark:indeterminate:bg-blue-500 dark:focus-visible:outline-blue-500 dark:disabled:border-white/5 dark:disabled:bg-white/10 dark:disabled:checked:bg-white/10 forced-colors:appearance-auto"
-                    />
-                    <svg
-                      class="pointer-events-none col-start-1 row-start-1 size-3.5 self-center justify-self-center stroke-white group-has-disabled:stroke-white/25"
-                      viewBox="0 0 14 14"
-                      fill="none"
-                    >
-                      <path
-                        class="opacity-0 group-has-checked:opacity-100"
-                        d="M3 8L6 11L11 3.5"
-                        stroke-width="2"
-                        stroke-linecap="round"
-                        stroke-linejoin="round"
-                      />
-                      <path
-                        class="opacity-0 group-has-indeterminate:opacity-100"
-                        d="M3 7H11"
-                        stroke-width="2"
-                        stroke-linecap="round"
-                        stroke-linejoin="round"
-                      />
-                    </svg>
-                  </div>
-                </div>
-                <div class="text-sm/6">
-                  <label
-                    for="acl"
-                    class="font-display font-medium text-white"
-                    >{{ acl }}</label
-                  >
-                  {{ " " }}
-                  <span id="acl-description" class="text-xs text-zinc-400"
-                    ><span class="sr-only">{{ acl }} </span
-                    >{{ description }}</span
-                  >
-                </div>
-              </div>
-            </div>
-          </fieldset>
-        </div>
-      </div>
-    </template>
-    <template #buttons>
-      <LoadingButton :loading="props.loading" @click="() => createToken()">
-        {{ $t("common.create") }}
-      </LoadingButton>
-      <button
-        class="inline-flex items-center rounded-md bg-zinc-800 px-3 py-2 text-sm font-semibold font-display text-white hover:bg-zinc-700"
-        @click="() => cancel()"
-      >
-        {{ $t("cancel") }}
-      </button>
-    </template>
-  </ModalTemplate>
-</template>
-
-<script setup lang="ts">
-import {
-  Listbox,
-  ListboxButton,
-  ListboxLabel,
-  ListboxOption,
-  ListboxOptions,
-} from "@headlessui/vue";
-import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/24/outline";
-import type { DurationLike } from "luxon";
-
-// Reuse for both admin and user tokens
-
-const model = defineModel<boolean>({ required: true });
-
-const { t } = useI18n();
-
-const props = defineProps<{
-  acls: { [key: string]: string };
-  loading?: boolean;
-  suggestedAcls?: string[];
-  suggestedName?: string;
-}>();
-
-// Label to parameters to moment.js .add()
-const expiry: Record<string, DurationLike | undefined> = {
-  [t("account.token.expiryMonth")]: {
-    month: 1,
-  },
-  [t("account.token.expiry3Month")]: {
-    month: 3,
-  },
-  [t("account.token.expiry6Month")]: {
-    month: 6,
-  },
-  [t("account.token.expiryYear")]: {
-    year: 1,
-  },
-  [t("account.token.expiry5Year")]: {
-    year: 5,
-  },
-  [t("account.token.noExpiry")]: undefined,
-};
-const expiryKey = ref<keyof typeof expiry>(Object.keys(expiry)[0]); // Cast to any because we just know it's okay
-const name = ref(props.suggestedName ?? "");
-const currentACLs = ref<{ [key: string]: boolean }>(
-  Object.fromEntries((props.suggestedAcls ?? []).map((v) => [v, true])),
-);
-
-const aclsBySection = computed(() => {
-  const sections: { [key: string]: { [key: string]: string } } = {};
-  for (const [acl, description] of Object.entries(props.acls)) {
-    const section = acl.split(":")[0];
-    sections[section] ??= {};
-    sections[section][acl] = description;
-  }
-  return sections;
-});
-
-const emit = defineEmits<{
-  create: [name: string, acls: string[], expiry: DurationLike | undefined];
-}>();
-
-function createToken() {
-  emit(
-    "create",
-    name.value,
-    Object.entries(currentACLs.value)
-      .filter(([_acl, enabled]) => enabled)
-      .map(([acl, _enabled]) => acl),
-    expiry[expiryKey.value],
-  );
-}
-
-function cancel() {
-  model.value = false;
-}
-
-watch(model, (c) => {
-  if (!c) {
-    name.value = "";
-    currentACLs.value = {};
-  }
-});
-</script>

composables/request.ts

@@ -46,28 +46,10 @@ export const $dropFetch: DropFetch = async (rawRequest, opts) => {
   });
   const request = requestParts.join("/");
 
-  // If not in setup
   if (!getCurrentInstance()?.proxy) {
-    try {
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore Excessive stack depth comparing types
-      return await $fetch(request, opts);
-    } catch (e) {
-      if (import.meta.client && opts?.failTitle) {
-        console.warn(e);
-        createModal(
-          ModalType.Notification,
-          {
-            title: opts.failTitle,
-            description:
-              (e as FetchError)?.statusMessage ?? (e as string).toString(),
-            //buttonText: $t("common.close"),
-          },
-          (_, c) => c(),
-        );
-      }
-      throw e;
-    }
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore Excessive stack depth comparing types
+    return await $fetch(request, opts);
   }
 
   const id = request.toString();
@@ -82,10 +64,26 @@ export const $dropFetch: DropFetch = async (rawRequest, opts) => {
   }
 
   const headers = useRequestHeaders(["cookie", "authorization"]);
-  const data = await $fetch(request, {
-    ...opts,
-    headers: { ...headers, ...opts?.headers },
-  });
-  if (import.meta.server) state.value = data;
-  return data;
+  try {
+    const data = await $fetch(request, {
+      ...opts,
+      headers: { ...headers, ...opts?.headers },
+    });
+    if (import.meta.server) state.value = data;
+    return data;
+  } catch (e) {
+    if (import.meta.client && opts?.failTitle) {
+      createModal(
+        ModalType.Notification,
+        {
+          title: opts.failTitle,
+          description:
+            (e as FetchError)?.statusMessage ?? (e as string).toString(),
+          buttonText: $t("common.close"),
+        },
+        (_, c) => c(),
+      );
+    }
+    throw e;
+  }
 };

i18n/locales/de.json

@@ -1,18 +1,17 @@
 {
   "account": {
     "devices": {
-      "capabilities": "Funktionen",
+      "capabilities": "Möglichkeiten",
       "lastConnected": "Zuletzt verbunden",
       "noDevices": "Keine Geräte sind mit deinem Konto verbunden.",
       "platform": "Plattform",
       "revoke": "Wiederrufen",
-      "subheader": "Geräte verwalten, die auf Ihr Drop Konto zugreifen dürfen.",
       "title": "Geräte"
     },
     "notifications": {
-      "all": "Alles anzeigen {arrow}",
-      "desc": "Anzeigen und Verwalten deiner Benachrichtigung.",
-      "markAllAsRead": "Markiere alle als gelesen",
+      "all": "Alle anzeigen {arrow}",
+      "desc": "Benachrichtigungen anzeigen und verwalten.",
+      "markAllAsRead": "Alles als gelesen markieren",
       "markAsRead": "Als gelesen Markieren",
       "none": "Keine Benachrichtigungen",
       "notifications": "Benachrichtigungen",
@@ -20,37 +19,17 @@
       "unread": "Ungelesene Benachrichtigungen"
     },
     "settings": "Einstellungen",
-    "title": "Kontoeinstellungen",
-    "token": {
-      "acls": "Berechtigungen (ACLs/Scopes)",
-      "aclsDesc": "Definiert, wozu dieses Schlüssel berechtigt ist. Du solltest vermeiden, alle ACLs auszuwählen, wenn dies nicht notwendig ist.",
-      "expiry": "Ablaufdatum",
-      "expiry3Month": "3 Monate",
-      "expiry5Year": "5 Jahre",
-      "expiry6Month": "6 Monate",
-      "expiryMonth": "Ein Monat",
-      "expiryYear": "Ein Jahr",
-      "name": "API-Schlüssel Name",
-      "nameDesc": "Der Name des Schlüssels, als Referenz.",
-      "namePlaceholder": "Mein neuer Schlüssel",
-      "noExpiry": "Unbegrenzt gültig",
-      "noTokens": "Keine Schlüssel mit deinem Konto verbunden.",
-      "revoke": "Wiederrufen",
-      "subheader": "Verwalte deine API-Schlüssel und deren Zugriffsrechte.",
-      "success": "Schlüssel erfolgreich erstellt.",
-      "successNote": "Bitte jetzt kopieren, da es nicht noch einmal angezeigt wird.",
-      "title": "API-Schlüssel"
-    }
+    "title": "Kontoeinstellungen"
   },
   "actions": "Aktionen",
   "add": "Hinzufügen",
-  "adminTitle": "Admin Dashboard - Drop",
-  "adminTitleTemplate": "{0} - Admin - Drop",
+  "adminTitle": "Administrator Dashbord - Drop",
+  "adminTitleTemplate": "{0} - Administrator - Drop",
   "auth": {
     "callback": {
       "authClient": "Client autorisieren?",
       "authorize": "Autorisieren",
-      "authorizedClient": "Drop hat den Client erfolgreich autorisiert. Du kannst dieses Fenster nun schließen.",
+      "authorizedClient": "Drop hat den Client erfolgreich autorisiert. Du darfst dieses Fenster nun schließen.",
       "issues": "Probleme?",
       "learn": "Mehr erfahren {arrow}",
       "paste": "Füge diesen Code in den Client ein, um fortzufahren:",
@@ -59,10 +38,9 @@
       "success": "Erfolgreich!"
     },
     "code": {
-      "description": "Verwende einen Code, um dein Drop Client zu verbinden, wenn dein Gerät kein Webbrowser öffnen kann.",
-      "title": "Verbinde deinen Drop Client"
+      "description": "Verwende ein Code, um dein Drop Client zu verbinden, wenn dein Gerät kein Webbrowser öffnen kann.",
+      "title": "Verbinde dein Drop Client"
     },
-    "confirmPassword": "Bestätige @:auth.password",
     "displayName": "Anzeigename",
     "email": "E-Mail",
     "password": "Passwort",
@@ -77,10 +55,10 @@
     "signin": {
       "externalProvider": "Bei externem Anbieter anmelden {arrow}",
       "forgot": "Passwort vergessen?",
-      "noAccount": "Noch kein Konto? Bitte den Admin, eines für dich zu erstellen.",
+      "noAccount": "Noch kein Konto? Bitten den Administrator, eines für dich zu erstellt.",
       "or": "ODER",
       "pageTitle": "Bei Drop anmelden",
-      "rememberMe": "Erinnere mich",
+      "rememberMe": "An mich erinnern",
       "signin": "Anmelden",
       "title": "Melde dich bei deinem Konto an"
     },
@@ -146,9 +124,9 @@
       }
     },
     "auth": {
-      "disabled": "Ungültiges oder deaktiviertes Konto. Bitte kontaktiere einen Server Admin.",
+      "disabled": "Ungültiges oder deaktiviertes Konto. Bitte kontaktiere einen Server Administrator.",
       "invalidInvite": "Ungültige oder abgelaufene Einladung",
-      "invalidPassState": "Ungültiger Passwortzustand. Bitte kontaktiere einen Server Admin.",
+      "invalidPassState": "Ungültiger Passwortzustand. Bitte kontaktiere einen Server Administrator.",
       "invalidUserOrPass": "Ungültiger Nutzername oder Passwort.",
       "inviteIdRequired": "id erforderlich beim Abrufen der Einladung",
       "method": {
@@ -157,10 +135,6 @@
       "usernameTaken": "Nutzername bereits vergeben."
     },
     "backHome": "{arrow} Zurück zur Startseite",
-    "externalUrl": {
-      "subtitle": "Diese Nachricht ist nur sichtbar für Admins.",
-      "title": "Zugriff über eine andere EXTERNAL_URL. Bitte die Dokumentation prüfen."
-    },
     "game": {
       "banner": {
         "description": "Das Aktualisieren des Banners ist fehlgeschlagen: {0}",
@@ -218,8 +192,6 @@
     "occurred": "Bei der Bearbeitung deiner Anfrage ist ein Fehler aufgetreten. Wenn du glaubst, dass es sich um einen Bug handelt, melde diesen bitte. Versuche dich anzumelden, um zu sehen, ob dadurch das Problem behoben wird.",
     "ohNo": "Oh nein!",
     "pageTitle": "{0} | Drop",
-    "revokeClient": "Client konnte nicht widerrufen werden",
-    "revokeClientFull": "Client konnte nicht widerrufen werden {0}",
     "signIn": "Anmelden {arrow}",
     "support": "Support Discord",
     "unknown": "Ein unbekannter Fehler ist aufgetreten",
@@ -259,13 +231,8 @@
   },
   "header": {
     "admin": {
-      "admin": "Admin",
-      "metadata": "Metadaten",
-      "settings": {
-        "store": "Store",
-        "title": "Einstellungen",
-        "tokens": "API-Schlüssel"
-      },
+      "admin": "Administrator",
+      "settings": "Einstellungen",
       "tasks": "Aufgaben",
       "users": "Benutzer"
     },
@@ -273,7 +240,6 @@
     "openSidebar": "Öffne Seitenleiste"
   },
   "helpUsTranslate": "Hilf uns Drop zu übersetzen {arrow}",
-  "highest": "Höchste",
   "home": "Startseite",
   "library": {
     "addGames": "Alle Spiele",
@@ -283,117 +249,50 @@
       "detectedVersion": "Drop hat erkannt, dass du eine neue Version dieses Spiels importieren kannst.",
       "game": {
         "addCarouselNoImages": "Keine Bilder zum hinzufügen.",
-        "addDescriptionNoImages": "Keine Bilder zum hinzufügen.",
-        "addImageCarousel": "Aus der Bilderbibliothek hinzufügen",
-        "currentBanner": "Banner",
-        "currentCover": "Cover",
-        "deleteImage": "Bild löschen",
-        "editGameDescription": "Spielbeschreibung",
-        "editGameName": "Spielname",
-        "imageCarousel": "Bilderkarussell",
-        "imageCarouselDescription": "Anpassen, welche Bilder und in welcher Reihenfolge sie auf der Shop-Seite angezeigt werden.",
-        "imageCarouselEmpty": "Es wurden noch keine Bilder zum Karussell hinzugefügt.",
-        "imageLibrary": "Bilderbibliothek",
-        "imageLibraryDescription": "Bitte beachten: Alle hochgeladenen Bilder sind für alle Nutzer über die Browser-Entwicklertools zugänglich.",
-        "removeImageCarousel": "Bild entfernen",
-        "setBanner": "Als Banner festlegen",
-        "setCover": "Als Cover festlegen"
+        "addDescriptionNoImages": "Keine Bilder zum hinzufügen."
       },
-      "gameLibrary": "Spielebibliothek",
       "import": {
-        "bulkImportDescription": "Auf dieser Seite wirst du nicht zur Importaufgabe weitergeleitet, sodass du mehrere Spiele nacheinander importieren kannst.",
-        "bulkImportTitle": "Massenimport Modus",
-        "import": "Import",
-        "link": "Import {arrow}",
-        "loading": "Spieldaten werden geladen…",
-        "search": "Suche",
-        "searchPlaceholder": "Fallout 4",
-        "selectDir": "Bitte wähle ein Verzeichnis aus…",
-        "selectGame": "Spiel zum Import auswählen",
-        "selectGamePlaceholder": "Bitte wähle ein Spiel aus…",
-        "selectGameSearch": "Spiel auswählen",
-        "selectPlatform": "Bitte wähle eine Plattform aus…",
         "version": {
-          "advancedOptions": "Erweiterte Optionen",
           "import": "Version Importieren",
-          "installDir": "(Installationsverzeichnis)/",
-          "launchCmd": "Programm/Befehl starten",
           "launchDesc": "Ausführbare Datei zum starten des Spiels",
           "launchPlaceholder": "spiel.exe",
           "loadingVersion": "Lade Versionsmetadaten…",
           "noAdv": "Keine erweiterten Optionen für diese Konfiguration.",
           "noVersions": "Keine Version zum importieren",
-          "platform": "Plattformversion",
-          "setupCmd": "Installationsprogramm oder Befehl ausführen",
-          "setupDesc": "Wird einmal ausgeführt, wenn das Spiel installiert wird",
           "setupMode": "Einrichtungsmodus",
-          "setupModeDesc": "Wenn aktiviert, hat diese Version keinen Startbefehl und führt einfach die ausführbare Datei auf dem Computer des Nutzers aus. Nützlich für Spiele, die nur einen Installer bereitstellen und keine portablen Dateien.",
           "setupPlaceholder": "setup.exe",
           "umuLauncherId": "UMU Launcher ID",
-          "umuOverride": "Überschreibe UMU Launcher Spiel ID",
-          "umuOverrideDesc": "Standardmäßig verwendet Drop beim Start über den UMU Launcher eine Nicht-ID. Um die richtigen Patches für manche Spiele zu erhalten, musst du dieses Feld eventuell manuell setzen.",
           "updateMode": "Aktualisierungsmodus",
-          "updateModeDesc": "Wenn aktiviert, werden diese Dateien über die vorherige Version installiert (überschrieben). Werden mehrere ‚Update-Modi‘ hintereinander verwendet, werden sie in der angegebenen Reihenfolge angewendet.",
           "version": "Wähle die Version für den Import aus"
         },
         "withoutMetadata": "Ohne Metadaten importieren"
       },
-      "libraryHint": "Keine Bibliotheken konfiguriert.",
-      "libraryHintDocsLink": "Was bedeutet das? {arrow}",
       "metadata": {
         "companies": {
           "action": "Verwalte {arrow}",
           "addGame": {
-            "description": "Wähle ein Spiel aus, das dem Unternehmen hinzugefügt werden soll, und lege fest, ob es als Entwickler, Publisher oder beides geführt werden soll.",
             "developer": "Entwickler?",
             "noGames": "Keine Spiele zum hinzufügen",
-            "publisher": "Publisher?",
-            "title": "Verbinde das Spiel mit diesem Unternehmen"
+            "publisher": "Publisher?"
           },
-          "description": "Unternehmen organisieren Spiele danach, wer sie entwickelt oder veröffentlicht hat.",
           "editor": {
             "action": "Spiel hinzufügen {plus}",
-            "descriptionPlaceholder": "{'<'}Beschreibung{'>'}",
             "developed": "Entwickelt",
             "libraryDescription": "Hinzufügen, bearbeiten oder entfernen, was diese Firma entwickelt und/oder veröffentlicht hat.",
             "libraryTitle": "Spielebibliothek",
             "noDescription": "(Keine Beschreibung)",
             "published": "Veröffentlicht",
             "uploadBanner": "Banner hochladen",
-            "uploadIcon": "Icon hochladen",
-            "websitePlaceholder": "{'<'}Webseite{'>'}"
+            "uploadIcon": "Icon hochladen"
           },
           "modals": {
-            "createDescription": "Erstelle ein Unternehmen, um deine Spiele besser zu organisieren.",
-            "createFieldDescription": "Unternehmensbeschreibung",
-            "createFieldDescriptionPlaceholder": "Ein kleines Indie-Studio, das…",
-            "createFieldName": "Unternehmensname",
-            "createFieldNamePlaceholder": "Mein neues Unternehmen…",
-            "createFieldWebsite": "Unternehmenswebseite",
-            "createFieldWebsitePlaceholder": "https://beispiel.de/",
-            "createTitle": "Unternehmen erstellen",
-            "nameDescription": "Bearbeite den Namen des Unternehmens. Wird verwendet, um neue Spielimporte zuzuordnen.",
-            "nameTitle": "Bearbeite Firmenname",
             "shortDeckDescription": "Bearbeite die Firmenbeschreibung. Beeinträchtigt nicht die Lange (markdown) Beschreibung.",
-            "shortDeckTitle": "Bearbeite Firmenbeschreibung",
-            "websiteDescription": "„Bearbeite die Webseite des Unternehmens. Hinweis: Dies wird ein Link sein und bietet keinen Redirect-Schutz.",
-            "websiteTitle": "Unternehmenswebseite bearbeiten"
-          },
-          "noCompanies": "Keine Unternehmen",
-          "noGames": "Keine Spiele",
-          "search": "Suche Unternehmen…",
-          "searchGames": "Unternehmensspiele durchsuchen…",
-          "title": "Unternehmen"
+            "shortDeckTitle": "Bearbeite Firmenbeschreibung"
+          }
         },
         "tags": {
           "action": "Verwalte {arrow}",
-          "create": "Erstellen",
-          "description": "Tags werden automatisch aus importierten Genres erstellt. Du kannst eigene Tags hinzufügen, um deine Spielbibliothek zu kategorisieren.",
-          "modal": {
-            "description": "Erstelle einen Tag, um deine Bibliothek zu organisieren.",
-            "title": "Tag erstellen"
-          },
-          "title": "Tags"
+          "create": "Erstellen"
         }
       },
       "metadataProvider": "Metadatenanbieter",
@@ -402,31 +301,13 @@
       "offlineTitle": "Spiel offline",
       "openEditor": "Im Editor öffnen {arrow}",
       "openStore": "Im Store öffnen",
-      "shortDesc": "Kurzbeschreibung",
       "sources": {
-        "create": "Quelle erstellen",
-        "createDesc": "Drop wird diese Quelle verwenden, um auf deine Spielbibliothek zuzugreifen und die Spiele verfügbar zu machen.",
-        "desc": "Konfiguriere deine Bibliotheksquellen, wo Drop nach neuen Spielen und Versionen zum Import suchen wird.",
-        "documentationLink": "Dokumentation {arrow}",
-        "edit": "Quelle bearbeiten",
-        "fsDesc": "Importiert Spiele von einem Pfad auf der Festplatte. Benötigt eine versionsbasierte Ordnerstruktur und unterstützt archivierte Spiele.",
-        "fsFlatDesc": "Importiert Spiele von einem Pfad auf der Festplatte, jedoch ohne separate Unterordner für Versionen. Nützlich beim Migrieren einer bestehenden Bibliothek zu Drop.",
-        "fsFlatTitle": "Kompatibilität",
         "fsPath": "Pfad",
         "fsPathDesc": "Absoluter Pfad zur Spielebibliothek.",
-        "fsPathPlaceholder": "/mnt/spiele",
-        "fsTitle": "Drop-Stil",
-        "link": "Quellen {arrow}",
-        "nameDesc": "Der Name deiner Quelle, als Referenz.",
-        "namePlaceholder": "Meine neue Quelle",
-        "sources": "Bibliotheksquellen",
-        "typeDesc": "Der Typ deiner Quelle. Ändert die erforderlichen Optionen.",
-        "working": "Funktioniert es?"
+        "fsPathPlaceholder": "/mnt/spiele"
       },
-      "subheader": "Wenn du Ordner zu deinen Bibliotheksquellen hinzufügst, erkennt Drop diese und fordert dich auf, sie zu importieren. Jedes Spiel muss importiert werden, bevor du eine Version importieren kannst.",
       "title": "Bibliotheken",
       "version": {
-        "delta": "Upgrade Modus",
         "noVersions": "Du hast keine verfügbare Version dieses Spiels.",
         "noVersionsAdded": "keine Versionen hinzugefügt"
       },
@@ -450,30 +331,19 @@
     "launcherOpen": "Im Launcher öffnen",
     "noGames": "Keine Spiele in der Bibliothek",
     "notFound": "Spiel nicht gefunden",
-    "search": "Durchsuche Bibliothek…",
-    "subheader": "Verwalte deine Spiele in Sammlungen für einen einfacheren Zugriff auf alle deine Spiele."
+    "search": "Durchsuche Bibliothek…"
   },
-  "lowest": "Niedrigste",
   "news": {
     "article": {
       "add": "Hinzufügen",
-      "content": "Inhalt (Markdown)",
       "create": "Neuen Artikel erstellen",
       "editor": "Editor",
-      "editorGuide": "Verwende die obigen Shortcuts oder schreibe direkt in Markdown. Unterstützt **fett**, *kursiv*, [Links](URL) und mehr.",
       "new": "Neuer Artikel",
       "preview": "Vorschau",
-      "shortDesc": "Kurzbeschreibung",
-      "submit": "Absenden",
-      "tagPlaceholder": "Tag hinzufügen…",
-      "titles": "Titel",
-      "uploadCover": "Cover hochladen"
+      "titles": "Titel"
     },
-    "back": "Zurück zu Neuigkeiten",
-    "checkLater": "Schaue später für Updates vorbei.",
     "delete": "Artikel löschen",
     "filter": {
-      "all": "Gesamt",
       "month": "Diesen Monat",
       "week": "Diese Woche",
       "year": "Dieses Jahr"
@@ -481,9 +351,7 @@
     "none": "Keine Artikel",
     "notFound": "Artikel nicht gefunden",
     "search": "Suche Artikel",
-    "searchPlaceholder": "Suche Artikel…",
-    "subheader": "Bleibe auf dem Laufenden über die neuesten Updates und Ankündigungen.",
-    "title": "Neueste Neuigkeiten"
+    "searchPlaceholder": "Suche Artikel…"
   },
   "options": "Einstellungen",
   "security": "Sicherheit",
@@ -491,42 +359,30 @@
   "settings": {
     "admin": {
       "description": "Konfiguriere Drop Einstellungen",
-      "store": {
-        "dropGameAltPlaceholder": "Beispiel Spielsymbol",
-        "dropGameDescriptionPlaceholder": "Dies ist ein exemplarisches Spiel. Es wird ersetzt wenn du ein Spiel importierst.",
-        "dropGameNamePlaceholder": "Beispielspiel",
-        "showGamePanelTextDecoration": "Zeige Titel und Beschreibung auf den Spielkacheln (Standard: an)",
-        "title": "Store"
-      },
       "title": "Einstellungen"
     }
   },
   "setup": {
     "auth": {
-      "description": "Die Authentifizierung in Drop erfolgt über mehrere konfigurierte ‚Provider‘. Jeder Provider ermöglicht es Nutzern, sich über seine Methode anzumelden. Um zu starten, sollte mindestens ein Authentifizierungs-Provider aktiviert sein und ein Konto über diesen erstellt werden.",
       "docs": "Dokumentation {arrow}",
       "enabled": "Aktiviert?",
       "openid": {
         "description": "OpenID Connect (OIDC) ist eine oft unterstützte OAuth2 Erweiterung. Drop erfordert die Konfiguration von OIDC über Umgebungsvariablen.",
-        "skip": "Ich habe ein OIDC Nutzer",
         "title": "OpenID Connect"
       },
       "simple": {
         "description": "Die einfache Authentifizierung verwendet Nutzername und Password zur Authentifizierung von Benutzern. Sie ist standartmäßig aktiviert, wenn kein anderer Authentifizierungsanbieter aktiviert ist.",
-        "register": "Als Admin registrieren {arrow}",
         "title": "Einfache Authentifizierung"
       },
       "title": "Authentifizierung"
     },
     "finish": "Los geht's {arrow}",
-    "noPage": "keine Seite",
     "stages": {
       "account": {
         "description": "Du benötigst mindestens ein Konto, um Drop zu benutzen.",
         "name": "Richte dein Administratorkonto ein."
       },
       "library": {
-        "description": "Füge mindestens eine Bibliotheksquelle hinzu, um Drop zu nutzen.",
         "name": "Erstelle eine Bibliothek."
       }
     },
@@ -535,127 +391,79 @@
   },
   "store": {
     "about": "Über",
-    "commingSoon": "Demnächst verfügbar",
     "developers": "Entwickler | Entwickler | Entwickler",
     "exploreMore": "Mehr entdecken {arrow}",
     "featured": "Empfohlen",
-    "images": "Spielbilder",
-    "lookAt": "Schau es dir an",
     "noDevelopers": "Keine Entwickler",
-    "noFeatured": "KEINE HERVORGEHOBENEN SPIELE",
-    "noGame": "KEIN SPIEL",
+    "noGame": "Kein Spiel",
     "noImages": "Keine Bilder",
-    "noPublishers": "Kein Publisher.",
-    "noTags": "Keine Tags",
-    "openAdminDashboard": "Im Admin Dashboard öffnen",
-    "openFeatured": "Spiele in der Admin-Bibliothek markieren {arrow}",
     "platform": "Plattform | Plattform | Plattform",
-    "publishers": "Publisher | Publisher | Publisher",
     "rating": "Bewertung",
-    "readLess": "Weniger anzeigen",
-    "readMore": "Mehr anzeigen",
     "recentlyAdded": "Kürzlich hinzugefügt",
     "recentlyReleased": "Kürzlich veröffentlicht",
     "recentlyUpdated": "Kürzlich aktualisiert",
     "released": "Veröffentlicht",
     "reviews": "({0} Bewertungen)",
-    "tags": "Tags",
-    "title": "Store",
     "view": {
       "sort": "Sortieren",
       "srFilters": "Filter",
-      "srGames": "Spiele",
-      "srViewGrid": "Raster anzeigen"
+      "srGames": "Spiele"
     },
-    "viewInStore": "Im Store ansehen",
     "website": "Webseite"
   },
   "tasks": {
     "admin": {
-      "back": "{arrow} Zurück zu den Aufgaben",
-      "completedTasksTitle": "Abgeschlossene Aufgaben",
-      "dailyScheduledTitle": "Tägliche Aufgaben",
-      "execute": "{arrow} Ausführen",
-      "noTasksRunning": "Keine laufenden Aufgaben",
-      "progress": "{0}%",
-      "runningTasksTitle": "Laufende Aufgaben",
       "scheduled": {
-        "checkUpdateDescription": "Drop auf Updates überprüfen.",
-        "checkUpdateName": "Auf Updates prüfen.",
-        "cleanupInvitationsDescription": "Bereinigt abgelaufene Einladungen aus der Datenbank, um Speicherplatz zu sparen.",
         "cleanupInvitationsName": "Einladungen bereinigen",
-        "cleanupObjectsDescription": "Erkennt und löscht nicht referenzierte und ungenutzte Objekte, um Speicherplatz zu sparen.",
-        "cleanupObjectsName": "Objekte bereinigen",
-        "cleanupSessionsDescription": "Bereinigt abgelaufene Sitzungen, um Speicherplatz zu sparen und die Sicherheit zu gewährleisten.",
         "cleanupSessionsName": "Sitzungen bereinigen."
-      },
-      "viewTask": "Ansehen {arrow}",
-      "weeklyScheduledTitle": "Wöchentliche Aufgaben"
+      }
     }
   },
   "title": "Drop",
   "titleTemplate": "{0} - Drop",
-  "todo": "Todo",
-  "type": "Typ",
   "upload": "Hochladen",
   "uploadFile": "Datei hochladen",
   "userHeader": {
     "closeSidebar": "Seitenleiste schließen",
     "links": {
-      "community": "Community",
-      "library": "Bibliothek",
-      "news": "Neuigkeiten"
+      "library": "Bibliothek"
     },
     "profile": {
-      "admin": "Admin Dashboard",
       "settings": "Kontoeinstellungen"
     }
   },
   "users": {
     "admin": {
       "adminHeader": "Administrator?",
-      "adminUserLabel": "Admin",
       "authLink": "Authentifizierung {arrow}",
       "authentication": {
         "configure": "Konfigurieren",
-        "description": "Drop unterstützt eine Vielzahl von Authentifizierungsmechanismen. Wenn du sie aktivierst oder deaktivierst, werden sie auf dem Anmeldebildschirm angezeigt, damit Benutzer sie auswählen können. Klicke auf die Drei-Punkte, um den Authentifizierungsmechanismus zu konfigurieren.",
         "disabled": "Deaktiviert",
         "enabled": "Aktiviert",
         "enabledKey": "Aktiviert?",
         "oidc": "OpenID Connect",
-        "simple": "Einfach (Nutzername/Passwort)",
         "srOpenOptions": "Einstellungen öffnen",
         "title": "Authentifizierung"
       },
       "authoptionsHeader": "Authentifizierungseinstellungen",
       "delete": "Löschen",
       "deleteUser": "Benutzer löschen {0}",
-      "description": "Verwalte Benutzer auf deiner Drop-Instanz und konfiguriere deine Authentifizierungsmethode.",
       "displayNameHeader": "Anzeigename",
       "emailHeader": "E-Mail",
       "normalUserLabel": "Normaler Benutzer",
       "simple": {
-        "adminInvitation": "Admin Einladung",
         "createInvitation": "Einladung erstellen",
-        "description": "Die einfache Authentifizierung verwendet ein Einladungssystem zur Erstellung von Benutzern. Du kannst eine Einladung erstellen und optional einen Benutzernamen oder eine E-Mail-Adresse für den Benutzer angeben. Daraufhin wird eine magische URL generiert, mit der ein Konto erstellt werden kann.",
-        "expires": "Läuft ab: {expiry}",
         "invitationTitle": "Einladungen",
         "invite3Days": "3 Tage",
         "invite6Months": "6 Monate",
         "inviteAdminSwitchDescription": "Erstelle diesen Benutzer als Administrator",
-        "inviteAdminSwitchLabel": "Admin Einladung",
         "inviteButton": "Einladung",
-        "inviteDescription": "Drop erstellt eine URL, die du an die Person senden kannst, die du einladen möchtest. Du kannst optional einen Benutzernamen oder eine E-Mail-Adresse angeben, die sie verwenden soll.",
-        "inviteEmailDescription": "Muss im Format nutzer{'@'}beispiel.de sein",
         "inviteEmailLabel": "E-Mail-Adresse (optional)",
-        "inviteEmailPlaceholder": "ich{'@'}beispiel.de",
-        "inviteExpiryLabel": "Läuft ab",
         "inviteMonth": "1 Monat",
         "inviteNever": "Niemals",
         "inviteTitle": "Ein Benutzer zu Drop einladen",
         "inviteUsernameFormat": "Muss mindestens 5 Zeichen lang sein",
         "inviteUsernameLabel": "Nutzername (optional)",
-        "inviteUsernamePlaceholder": "meinNutzername",
         "inviteWeek": "1 Woche",
         "inviteYear": "1 Jahr",
         "neverExpires": "Läuft niemals ab.",
@@ -668,6 +476,5 @@
       "srEditLabel": "Bearbeiten",
       "usernameHeader": "Nutzername"
     }
-  },
-  "welcome": "Deutsche, willkommen!"
+  }
 }

i18n/locales/en_us.json

@@ -19,28 +19,6 @@
       "title": "Notifications",
       "unread": "Unread Notifications"
     },
-    "token": {
-      "title": "API Tokens",
-      "subheader": "Manage your API tokens, and what they can access.",
-      "name": "API token name",
-      "nameDesc": "The name of the token, for reference.",
-      "namePlaceholder": "My New Token",
-      "acls": "ACLs/scopes",
-      "aclsDesc": "Defines what this token has the authority to do. You should avoid selecting all ACLs, if they are not necessary.",
-      "expiry": "Expiry",
-      "noExpiry": "No expiry",
-      "revoke": "Revoke",
-      "noTokens": "No tokens connected to your account.",
-
-      "expiryMonth": "A month",
-      "expiry3Month": "3 months",
-      "expiry6Month": "6 months",
-      "expiryYear": "A year",
-      "expiry5Year": "5 years",
-
-      "success": "Successfully created token.",
-      "successNote": "Make sure to copy it now, as it won't be shown again."
-    },
     "settings": "Settings",
     "title": "Account Settings"
   },
@@ -263,11 +241,7 @@
     "admin": {
       "admin": "Admin",
       "metadata": "Meta",
-      "settings": {
-        "title": "Settings",
-        "store": "Store",
-        "tokens": "API tokens"
-      },
+      "settings": "Settings",
       "tasks": "Tasks",
       "users": "Users"
     },
@@ -334,8 +308,10 @@
           "umuLauncherId": "UMU Launcher ID",
           "umuOverride": "Override UMU Launcher Game ID",
           "umuOverrideDesc": "By default, Drop uses a non-ID when launching with UMU Launcher. In order to get the right patches for some games, you may have to manually set this field.",
-          "updateMode": "Update mode",
+          "updateMode": "Update/delta mode",
           "updateModeDesc": "When enabled, these files will be installed on top of (overwriting) the previous version's. If multiple \"update modes\" are chained together, they are applied in order.",
+          "hide": "Hide version",
+          "hideDesc": "Hide version so clients cannot install it. Useful if you are using delta versions to save space, but don't want to allow users to install partial games.",
           "version": "Select version to import"
         },
         "withoutMetadata": "Import without metadata"

i18n/locales/fr.json

@@ -20,27 +20,7 @@
       "unread": "Notifications Non Lues"
     },
     "settings": "Paramètres",
-    "title": "Paramètres du Compte",
-    "token": {
-      "acls": "ACLs/scopes",
-      "aclsDesc": "Définir les permissions du Token. Il n'est pas recommandé de sélectionner toutes les ACLs, à moins que ce soit nécessaire.",
-      "expiry": "Expiration",
-      "expiry3Month": "3 mois",
-      "expiry5Year": "5 Années",
-      "expiry6Month": "6 mois",
-      "expiryMonth": "Un mois",
-      "expiryYear": "Une année",
-      "name": "Nom du Token API",
-      "nameDesc": "Le nom du Token, comme référence.",
-      "namePlaceholder": "Mon nouveau Token",
-      "noExpiry": "Pas d'expiration",
-      "noTokens": "Aucun Token connecté à votre compte.",
-      "revoke": "Révoquer",
-      "subheader": "Gérer vos Tokens et leurs permissions associées.",
-      "success": "Token créé avec succès.",
-      "successNote": "Assurez vous de le sauvegarder maintenant, il ne sera plus disponible après.",
-      "title": "API Tokens"
-    }
+    "title": "Paramètres du Compte"
   },
   "actions": "Actions",
   "add": "Ajouter",

i18n/locales/ru.json

@@ -5,7 +5,6 @@
       "lastConnected": "Последнее подключение",
       "noDevices": "К вашей учетной записи не подключено ни одного устройства.",
       "platform": "Платформа",
-      "revoke": "Аннулировать",
       "subheader": "Управляйте устройствами, имеющими доступ к вашей учетной записи Drop.",
       "title": "Устройства"
     },
@@ -20,27 +19,7 @@
       "unread": "Непрочитанные уведомления"
     },
     "settings": "Настройки",
-    "title": "Настройки учетной записи",
-    "token": {
-      "acls": "Доступ и права",
-      "aclsDesc": "Определяет, какие действия разрешены для этого токена. Не выбирайте все ACL, если это не требуется.",
-      "expiry": "Истечение срока",
-      "expiry3Month": "3 месяца",
-      "expiry5Year": "5 лет",
-      "expiry6Month": "6 месяцев",
-      "expiryMonth": "Месяц",
-      "expiryYear": "Год",
-      "name": "Название API-токена",
-      "nameDesc": "Название токена для справки.",
-      "namePlaceholder": "Мои новые токены",
-      "noExpiry": "Без срока действия",
-      "noTokens": "На вашем аккаунте нет подключённых токенов.",
-      "revoke": "Аннулировать",
-      "subheader": "Управляйте своими API-токенами и их доступом.",
-      "success": "Токен успешно создан.",
-      "successNote": "Скопируйте токен сейчас, позже его не будет видно.",
-      "title": "API-Токены"
-    }
+    "title": "Настройки учетной записи"
   },
   "actions": "Действия",
   "add": "Добавить",
@@ -55,50 +34,7 @@
       "learn": "Узнать больше {arrow}",
       "paste": "Вставьте этот код в клиент, чтобы продолжить:",
       "permWarning": "Принятие этого запроса позволит \"{name}\" на \"{platform}\" выполнять следующие действия:",
-      "requestedAccess": "\"{name}\" запросил доступ к вашей учетной записи Drop.",
-      "success": "Успешно!"
-    },
-    "email": "Элетронная почка",
-    "password": "Пароль",
-    "register": {
-      "confirmPasswordFormat": "Должно совпадать с выше."
-    },
-    "signin": {
-      "forgot": "Забыли пароль?",
-      "noAccount": "Нет аккаунта? Попросите администратора создать его для вас.",
-      "or": "Или",
-      "signin": "Войти",
-      "title": "Войдите в свой аккаунт"
-    },
-    "signout": "Выход",
-    "username": "Имя пользователя"
-  },
-  "cancel": "Отмена",
-  "common": {
-    "add": "Добавить",
-    "close": "Закрыть",
-    "create": "Создать",
-    "date": "Дата",
-    "deleteConfirm": "Вы точно хотите удалить \"{0}\"?",
-    "edit": "Редактировать",
-    "friends": "Друзья",
-    "groups": "Группы",
-    "name": "Имя",
-    "noResults": "Нет результатов",
-    "noSelected": "Не выбранные предметы.",
-    "remove": "Удалить",
-    "save": "Сохранить",
-    "saved": "Сохранено",
-    "servers": "Сервера",
-    "srLoading": "Загрузка…",
-    "tags": "Теги",
-    "today": "Сегодня"
-  },
-  "delete": "Удалить",
-  "drop": {
-    "drop": "Уронить"
-  },
-  "editor": {
-    "link": "Ссылка"
+      "requestedAccess": "\"{name}\" запросил доступ к вашей учетной записи Drop."
+    }
   }
 }

layouts/admin.vue

@@ -200,7 +200,7 @@ const navigation: Array<NavigationItem & { icon: Component }> = [
     icon: RectangleStackIcon,
   },
   {
-    label: $t("header.admin.settings.title"),
+    label: $t("header.admin.settings"),
     route: "/admin/settings",
     prefix: "/admin/settings",
     icon: Cog6ToothIcon,

nuxt.config.ts

@@ -74,8 +74,7 @@ export default defineNuxtConfig({
 
   vite: {
     plugins: [
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      tailwindcss() as any,
+      tailwindcss(),
       // only used in dev server, not build because nitro sucks
       // see build hook below
       viteStaticCopy({
@@ -85,8 +84,7 @@ export default defineNuxtConfig({
             dest: "twemoji",
           },
         ],
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      }) as any,
+      }),
     ],
   },
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "drop",
-  "version": "0.3.3",
+  "version": "0.3.2",
   "private": true,
   "type": "module",
   "license": "AGPL-3.0-or-later",
@@ -14,14 +14,14 @@
     "preview": "nuxt preview",
     "postinstall": "nuxt prepare && prisma generate",
     "typecheck": "nuxt typecheck",
-    "lint": "pnpm run lint:eslint && pnpm run lint:prettier",
+    "lint": "yarn lint:eslint && yarn lint:prettier",
     "lint:eslint": "eslint .",
     "lint:prettier": "prettier . --check",
     "lint:fix": "eslint . --fix && prettier --write --list-different ."
   },
   "dependencies": {
     "@discordapp/twemoji": "^16.0.1",
-    "@drop-oss/droplet": "3.0.1",
+    "@drop-oss/droplet": "2.3.1",
     "@headlessui/vue": "^1.7.23",
     "@heroicons/vue": "^2.1.5",
     "@lobomfz/prismark": "0.0.3",
@@ -53,7 +53,7 @@
     "stream-mime-type": "^2.0.0",
     "turndown": "^7.2.0",
     "unstorage": "^1.15.0",
-    "vite-plugin-static-copy": "^3.1.2",
+    "vite-plugin-static-copy": "^3.0.0",
     "vue": "latest",
     "vue-router": "latest",
     "vue3-carousel": "^0.16.0",
@@ -89,6 +89,5 @@
   },
   "prisma": {
     "schema": "./prisma"
-  },
-  "packageManager": "pnpm@10.15.0+sha512.486ebc259d3e999a4e8691ce03b5cac4a71cbeca39372a9b762cb500cfdf0873e2cb16abe3d951b1ee2cf012503f027b98b6584e4df22524e0c7450d9ec7aa7b"
+  }
 }

pages/account/tokens.vue

@@ -1,229 +0,0 @@
-<template>
-  <div>
-    <div class="w-full flex justify-between items-center">
-      <div>
-        <h2
-          class="mt-2 text-xl font-semibold tracking-tight text-zinc-100 sm:text-3xl"
-        >
-          {{ $t("account.token.title") }}
-        </h2>
-        <p
-          class="mt-2 text-pretty text-sm font-medium text-zinc-400 sm:text-md/8"
-        >
-          {{ $t("account.token.subheader") }}
-        </p>
-      </div>
-      <div>
-        <LoadingButton :loading="false" @click="() => (createOpen = true)">
-          {{ $t("common.create") }}
-        </LoadingButton>
-      </div>
-    </div>
-
-    <div
-      v-if="newToken"
-      class="mt-4 rounded-md p-4 bg-green-500/10 outline outline-green-500/20"
-    >
-      <div class="flex">
-        <div class="shrink-0">
-          <CheckCircleIcon class="size-5 text-green-400" aria-hidden="true" />
-        </div>
-        <div class="ml-3">
-          <p class="text-sm font-medium text-green-300">
-            {{ $t("account.token.success") }}
-          </p>
-          <p class="text-xs text-green-300/70">
-            {{ $t("account.token.successNote") }}
-          </p>
-          <p
-            class="mt-2 bg-zinc-950 px-3 py-2 font-mono text-zinc-400 rounded-xl"
-          >
-            {{ newToken }}
-          </p>
-        </div>
-        <div class="ml-auto pl-3">
-          <div class="-mx-1.5 -my-1.5">
-            <button
-              type="button"
-              class="inline-flex rounded-md bg-green-50 p-1.5 text-green-500 hover:bg-green-100 focus-visible:ring-2 focus-visible:ring-green-600 focus-visible:ring-offset-2 focus-visible:ring-offset-green-50 focus-visible:outline-hidden dark:bg-transparent dark:text-green-400 dark:hover:bg-green-500/10 dark:focus-visible:ring-green-500 dark:focus-visible:ring-offset-1 dark:focus-visible:ring-offset-green-900"
-              @click="() => (newToken = undefined)"
-            >
-              <span class="sr-only">{{ $t("common.close") }}</span>
-              <XMarkIcon class="size-5" aria-hidden="true" />
-            </button>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div
-      class="mt-8 overflow-hidden rounded-xl border border-zinc-800 bg-zinc-900 shadow-sm"
-    >
-      <div class="overflow-x-auto">
-        <table class="min-w-full divide-y divide-zinc-800">
-          <thead>
-            <tr class="bg-zinc-800/50">
-              <th
-                scope="col"
-                class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-zinc-100 sm:pl-6"
-              >
-                {{ $t("common.name") }}
-              </th>
-              <th
-                scope="col"
-                class="px-3 py-3.5 text-left text-sm font-semibold text-zinc-100"
-              >
-                {{ $t("account.token.acls") }}
-              </th>
-              <th
-                scope="col"
-                class="px-3 py-3.5 text-left text-sm font-semibold text-zinc-100"
-              >
-                {{ $t("account.token.expiry") }}
-              </th>
-              <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
-                <span class="sr-only">{{ $t("actions") }}</span>
-              </th>
-            </tr>
-          </thead>
-          <tbody class="divide-y divide-zinc-800">
-            <tr
-              v-for="(token, tokenIdx) in tokens"
-              :key="token.id"
-              class="transition-colors duration-150 hover:bg-zinc-800/50"
-            >
-              <td
-                class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-zinc-100 sm:pl-6"
-              >
-                {{ token.name }}
-              </td>
-              <td class="whitespace-nowrap px-3 py-4 text-sm text-zinc-400">
-                <div class="flex flex-wrap gap-2">
-                  <span
-                    v-for="acl in token.acls"
-                    :key="acl"
-                    class="inline-flex items-center gap-x-1 rounded-md bg-blue-400/10 px-2 py-1 text-xs font-medium text-blue-400 ring-1 ring-inset ring-blue-400/20"
-                  >
-                    {{ acl }}
-                  </span>
-                </div>
-              </td>
-              <td class="whitespace-nowrap px-3 py-4 text-sm text-zinc-400">
-                <RelativeTime v-if="token.expiresAt" :date="token.expiresAt" />
-                <span v-else>{{ $t("account.token.noExpiry") }}</span>
-              </td>
-              <td
-                class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6"
-              >
-                <button
-                  class="inline-flex items-center rounded-md bg-red-400/10 px-2 py-1 text-xs font-medium text-red-400 ring-1 ring-inset ring-red-400/20 transition-all duration-200 hover:bg-red-400/20 hover:scale-105 active:scale-95"
-                  @click="() => revokeToken(tokenIdx)"
-                >
-                  {{ $t("account.token.revoke") }}
-                  <span class="sr-only">
-                    {{ $t("chars.srComma", [token.name]) }}
-                  </span>
-                </button>
-              </td>
-            </tr>
-            <tr v-if="tokens.length === 0">
-              <td colspan="5" class="py-8 text-center text-sm text-zinc-400">
-                {{ $t("account.token.noTokens") }}
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-    </div>
-
-    <ModalCreateToken
-      v-model="createOpen"
-      :acls="acls"
-      :loading="createLoading"
-      :suggested-name="suggestedName"
-      :suggested-acls="suggestedAcls"
-      @create="(name, acls, expiry) => createToken(name, acls, expiry)"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ArkErrors, type } from "arktype";
-import { DateTime, type DurationLike } from "luxon";
-import { CheckCircleIcon, XMarkIcon } from "@heroicons/vue/20/solid";
-
-const tokens = ref(await $dropFetch("/api/v1/user/token"));
-const acls = await $dropFetch("/api/v1/user/token/acls");
-
-const createOpen = ref(false);
-const createLoading = ref(false);
-
-const newToken = ref<string | undefined>();
-
-const suggestedName = ref();
-const suggestedAcls = ref<string[]>([]);
-
-const payloadParser = type({
-  name: "string?",
-  acls: "string[]?",
-});
-
-const route = useRoute();
-if (route.query.payload) {
-  try {
-    const rawPayload = JSON.parse(atob(route.query.payload.toString()));
-    const payload = payloadParser(rawPayload);
-    if (payload instanceof ArkErrors) throw payload;
-    suggestedName.value = payload.name;
-    suggestedAcls.value = payload.acls ?? [];
-    createOpen.value = true;
-  } catch {
-    throw createError({
-      statusCode: 400,
-      statusMessage: "Failed to parse the token create payload.",
-      fatal: true,
-    });
-  }
-}
-
-async function createToken(
-  name: string,
-  acls: string[],
-  expiry: DurationLike | undefined,
-) {
-  createLoading.value = true;
-  try {
-    const result = await $dropFetch("/api/v1/user/token", {
-      method: "POST",
-      body: {
-        name,
-        acls,
-        expiry: expiry ? DateTime.now().plus(expiry) : undefined,
-      },
-      failTitle: "Failed to create API token.",
-    });
-    console.log(result);
-    newToken.value = result.token;
-    tokens.value.push(result);
-  } finally {
-    /* empty */
-  }
-  createOpen.value = false;
-  createLoading.value = false;
-}
-
-async function revokeToken(index: number) {
-  const token = tokens.value[index];
-  if (!token) return;
-
-  await $dropFetch("/api/v1/user/token/:id", {
-    method: "DELETE",
-    params: {
-      id: token.id,
-    },
-    failTitle: "Failed to revoke token.",
-  });
-
-  tokens.value.splice(index, 1);
-}
-</script>

pages/admin/library/[id]/import.vue

@@ -398,6 +398,36 @@
           />
         </Switch>
       </SwitchGroup>
+            <!-- setup mode -->
+      <SwitchGroup as="div" class="flex items-center justify-between">
+        <span class="flex flex-grow flex-col">
+          <SwitchLabel
+            as="span"
+            class="text-sm font-medium leading-6 text-zinc-100"
+            passive
+            >{{ $t("library.admin.import.version.hide") }}</SwitchLabel
+          >
+          <SwitchDescription as="span" class="text-sm text-zinc-400">{{
+            $t("library.admin.import.version.hideDesc")
+          }}</SwitchDescription>
+        </span>
+        <Switch
+          v-model="versionSettings.hide"
+          :class="[
+            versionSettings.hide ? 'bg-blue-600' : 'bg-zinc-800',
+            'relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-blue-600 focus:ring-offset-2',
+          ]"
+        >
+          <span
+            aria-hidden="true"
+            :class="[
+              versionSettings.hide ? 'translate-x-5' : 'translate-x-0',
+              'pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out',
+            ]"
+          />
+        </Switch>
+      </SwitchGroup>
+
       <Disclosure v-slot="{ open }" as="div" class="py-2">
         <dt>
           <DisclosureButton
@@ -548,6 +578,7 @@ import {
 import { XCircleIcon } from "@heroicons/vue/16/solid";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
 import { ChevronDownIcon, ChevronUpIcon } from "@heroicons/vue/24/solid";
+import type { ImportVersion } from "~/server/api/v1/admin/import/version/index.post";
 
 definePageMeta({
   layout: "admin",
@@ -561,18 +592,7 @@ const versions = await $dropFetch(
   `/api/v1/admin/import/version?id=${encodeURIComponent(gameId)}`,
 );
 const currentlySelectedVersion = ref(-1);
-const versionSettings = ref<{
-  platform: PlatformClient | undefined;
-
-  onlySetup: boolean;
-  launch: string;
-  launchArgs: string;
-  setup: string;
-  setupArgs: string;
-
-  delta: boolean;
-  umuId: string;
-}>({
+const versionSettings = ref<Partial<typeof ImportVersion.infer>>({
   platform: undefined,
   launch: "",
   launchArgs: "",
@@ -581,6 +601,7 @@ const versionSettings = ref<{
   delta: false,
   onlySetup: false,
   umuId: "",
+  hide: false,
 });
 
 const versionGuesses =

pages/admin/settings.vue

@@ -1,68 +0,0 @@
-<template>
-  <div class="flex flex-col">
-    <!-- tabs-->
-    <div>
-      <div class="border-b border-gray-200 dark:border-white/10">
-        <nav class="-mb-px flex gap-x-2" aria-label="Tabs">
-          <NuxtLink
-            v-for="(tab, tabIdx) in navigation"
-            :key="tab.route"
-            :href="tab.route"
-            :class="[
-              currentNavigationIndex == tabIdx
-                ? 'border-blue-500 text-blue-600 dark:border-blue-400 dark:text-blue-400'
-                : 'border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700 dark:text-gray-400 dark:hover:border-white/20 dark:hover:text-gray-300',
-              'group inline-flex items-center border-b-2 px-1 py-4 text-sm font-medium',
-            ]"
-            :aria-current="tab ? 'page' : undefined"
-          >
-            <component
-              :is="tab.icon"
-              :class="[
-                currentNavigationIndex == tabIdx
-                  ? 'text-blue-500 dark:text-blue-400'
-                  : 'text-gray-400 group-hover:text-gray-500 dark:text-gray-500 dark:group-hover:text-gray-400',
-                'mr-2 -ml-0.5 size-5',
-              ]"
-              aria-hidden="true"
-            />
-            <span>{{ tab.label }}</span>
-          </NuxtLink>
-        </nav>
-      </div>
-    </div>
-    <!-- content -->
-    <div class="mt-4 grow flex">
-      <NuxtPage />
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import {
-  BuildingStorefrontIcon,
-  CodeBracketIcon,
-} from "@heroicons/vue/24/outline";
-
-const navigation: Array<NavigationItem & { icon: Component }> = [
-  {
-    label: $t("header.admin.settings.store"),
-    route: "/admin/settings",
-    prefix: "/admin/settings",
-    icon: BuildingStorefrontIcon,
-  },
-  {
-    label: $t("header.admin.settings.tokens"),
-    route: "/admin/settings/tokens",
-    prefix: "/admin/settings/tokens",
-    icon: CodeBracketIcon,
-  },
-];
-
-// const notifications = useNotifications();
-// const unreadNotifications = computed(() =>
-//   notifications.value.filter((e) => !e.read)
-// );
-
-const currentNavigationIndex = useCurrentNavigationIndex(navigation);
-</script>

pages/admin/settings/index.vue

@@ -1,55 +1,68 @@
 <template>
-  <form class="space-y-4" @submit.prevent="() => saveSettings()">
-    <div class="pb-4 border-b border-zinc-700">
-      <h2 class="text-xl font-semibold text-zinc-100">
-        {{ $t("settings.admin.store.title") }}
-      </h2>
-
-      <h3 class="text-base font-medium text-zinc-400 mb-3 m-x-0">
-        {{ $t("settings.admin.store.showGamePanelTextDecoration") }}
-      </h3>
-      <ul class="flex gap-3">
-        <li class="inline-block">
-          <OptionWrapper
-            :active="showGamePanelTextDecoration"
-            @click="setShowTitleDescription(true)"
-          >
-            <div class="flex">
-              <GamePanel
-                :animate="false"
-                :game="game"
-                :default-placeholder="true"
-              />
-            </div>
-          </OptionWrapper>
-        </li>
-        <li class="inline-block">
-          <OptionWrapper
-            :active="!showGamePanelTextDecoration"
-            @click="setShowTitleDescription(false)"
-          >
-            <div class="flex">
-              <GamePanel
-                :game="game"
-                :show-title-description="false"
-                :animate="false"
-                :default-placeholder="true"
-              />
-            </div>
-          </OptionWrapper>
-        </li>
-      </ul>
+  <div class="space-y-4">
+    <div class="sm:flex sm:items-center">
+      <div class="sm:flex-auto">
+        <h1 class="text-2xl font-semibold text-zinc-100">
+          {{ $t("settings.admin.title") }}
+        </h1>
+        <p class="mt-2 text-base text-zinc-400">
+          {{ $t("settings.admin.description") }}
+        </p>
+      </div>
     </div>
 
-    <LoadingButton
-      type="submit"
-      class="inline-flex w-full shadow-sm sm:w-auto"
-      :loading="saving"
-      :disabled="!allowSave"
-    >
-      {{ allowSave ? $t("common.save") : $t("common.saved") }}
-    </LoadingButton>
-  </form>
+    <form class="space-y-4" @submit.prevent="() => saveSettings()">
+      <div class="py-6 border-y border-zinc-700">
+        <h2 class="text-xl font-semibold text-zinc-100">
+          {{ $t("settings.admin.store.title") }}
+        </h2>
+
+        <h3 class="text-base font-medium text-zinc-400 mb-3 m-x-0">
+          {{ $t("settings.admin.store.showGamePanelTextDecoration") }}
+        </h3>
+        <ul class="flex gap-3">
+          <li class="inline-block">
+            <OptionWrapper
+              :active="showGamePanelTextDecoration"
+              @click="setShowTitleDescription(true)"
+            >
+              <div class="flex">
+                <GamePanel
+                  :animate="false"
+                  :game="game"
+                  :default-placeholder="true"
+                />
+              </div>
+            </OptionWrapper>
+          </li>
+          <li class="inline-block">
+            <OptionWrapper
+              :active="!showGamePanelTextDecoration"
+              @click="setShowTitleDescription(false)"
+            >
+              <div class="flex">
+                <GamePanel
+                  :game="game"
+                  :show-title-description="false"
+                  :animate="false"
+                  :default-placeholder="true"
+                />
+              </div>
+            </OptionWrapper>
+          </li>
+        </ul>
+      </div>
+
+      <LoadingButton
+        type="submit"
+        class="inline-flex w-full shadow-sm sm:w-auto"
+        :loading="saving"
+        :disabled="!allowSave"
+      >
+        {{ allowSave ? $t("common.save") : $t("common.saved") }}
+      </LoadingButton>
+    </form>
+  </div>
 </template>
 
 <script setup lang="ts">

pages/admin/settings/tokens.vue

@@ -1,233 +0,0 @@
-<template>
-  <div class="w-full">
-    <div class="w-full flex justify-between items-center">
-      <div>
-        <h2
-          class="mt-2 text-xl font-semibold tracking-tight text-zinc-100 sm:text-3xl"
-        >
-          {{ $t("account.token.title") }}
-        </h2>
-        <p
-          class="mt-2 text-pretty text-sm font-medium text-zinc-400 sm:text-md/8"
-        >
-          {{ $t("account.token.subheader") }}
-        </p>
-      </div>
-      <div>
-        <LoadingButton :loading="false" @click="() => (createOpen = true)">
-          {{ $t("common.create") }}
-        </LoadingButton>
-      </div>
-    </div>
-
-    <div
-      v-if="newToken"
-      class="mt-4 rounded-md p-4 bg-green-500/10 outline outline-green-500/20"
-    >
-      <div class="flex">
-        <div class="shrink-0">
-          <CheckCircleIcon class="size-5 text-green-400" aria-hidden="true" />
-        </div>
-        <div class="ml-3">
-          <p class="text-sm font-medium text-green-300">
-            {{ $t("account.token.success") }}
-          </p>
-          <p class="text-xs text-green-300/70">
-            {{ $t("account.token.successNote") }}
-          </p>
-          <p
-            class="mt-2 bg-zinc-950 px-3 py-2 font-mono text-zinc-400 rounded-xl"
-          >
-            {{ newToken }}
-          </p>
-        </div>
-        <div class="ml-auto pl-3">
-          <div class="-mx-1.5 -my-1.5">
-            <button
-              type="button"
-              class="inline-flex rounded-md bg-green-50 p-1.5 text-green-500 hover:bg-green-100 focus-visible:ring-2 focus-visible:ring-green-600 focus-visible:ring-offset-2 focus-visible:ring-offset-green-50 focus-visible:outline-hidden dark:bg-transparent dark:text-green-400 dark:hover:bg-green-500/10 dark:focus-visible:ring-green-500 dark:focus-visible:ring-offset-1 dark:focus-visible:ring-offset-green-900"
-              @click="() => (newToken = undefined)"
-            >
-              <span class="sr-only">{{ $t("common.close") }}</span>
-              <XMarkIcon class="size-5" aria-hidden="true" />
-            </button>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div
-      class="mt-8 overflow-hidden rounded-xl border border-zinc-800 bg-zinc-900 shadow-sm"
-    >
-      <div class="overflow-x-auto">
-        <table class="min-w-full divide-y divide-zinc-800">
-          <thead>
-            <tr class="bg-zinc-800/50">
-              <th
-                scope="col"
-                class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-zinc-100 sm:pl-6"
-              >
-                {{ $t("common.name") }}
-              </th>
-              <th
-                scope="col"
-                class="px-3 py-3.5 text-left text-sm font-semibold text-zinc-100"
-              >
-                {{ $t("account.token.acls") }}
-              </th>
-              <th
-                scope="col"
-                class="px-3 py-3.5 text-left text-sm font-semibold text-zinc-100"
-              >
-                {{ $t("account.token.expiry") }}
-              </th>
-              <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
-                <span class="sr-only">{{ $t("actions") }}</span>
-              </th>
-            </tr>
-          </thead>
-          <tbody class="divide-y divide-zinc-800">
-            <tr
-              v-for="(token, tokenIdx) in tokens"
-              :key="token.id"
-              class="transition-colors duration-150 hover:bg-zinc-800/50"
-            >
-              <td
-                class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-zinc-100 sm:pl-6"
-              >
-                {{ token.name }}
-              </td>
-              <td class="whitespace-nowrap px-3 py-4 text-sm text-zinc-400">
-                <div class="flex flex-wrap gap-2">
-                  <span
-                    v-for="acl in token.acls"
-                    :key="acl"
-                    class="inline-flex items-center gap-x-1 rounded-md bg-blue-400/10 px-2 py-1 text-xs font-medium text-blue-400 ring-1 ring-inset ring-blue-400/20"
-                  >
-                    {{ acl }}
-                  </span>
-                </div>
-              </td>
-              <td class="whitespace-nowrap px-3 py-4 text-sm text-zinc-400">
-                <RelativeTime v-if="token.expiresAt" :date="token.expiresAt" />
-                <span v-else>{{ $t("account.token.noExpiry") }}</span>
-              </td>
-              <td
-                class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6"
-              >
-                <button
-                  class="inline-flex items-center rounded-md bg-red-400/10 px-2 py-1 text-xs font-medium text-red-400 ring-1 ring-inset ring-red-400/20 transition-all duration-200 hover:bg-red-400/20 hover:scale-105 active:scale-95"
-                  @click="() => revokeToken(tokenIdx)"
-                >
-                  {{ $t("account.token.revoke") }}
-                  <span class="sr-only">
-                    {{ $t("chars.srComma", [token.name]) }}
-                  </span>
-                </button>
-              </td>
-            </tr>
-            <tr v-if="tokens.length === 0">
-              <td colspan="5" class="py-8 text-center text-sm text-zinc-400">
-                {{ $t("account.token.noTokens") }}
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-    </div>
-
-    <ModalCreateToken
-      v-model="createOpen"
-      :acls="acls"
-      :loading="createLoading"
-      :suggested-name="suggestedName"
-      :suggested-acls="suggestedAcls"
-      @create="(name, acls, expiry) => createToken(name, acls, expiry)"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ArkErrors, type } from "arktype";
-import { DateTime, type DurationLike } from "luxon";
-import { CheckCircleIcon, XMarkIcon } from "@heroicons/vue/20/solid";
-
-definePageMeta({
-  layout: "admin",
-});
-
-const tokens = ref(await $dropFetch("/api/v1/admin/token"));
-const acls = await $dropFetch("/api/v1/admin/token/acls");
-
-const createOpen = ref(false);
-const createLoading = ref(false);
-
-const newToken = ref<string | undefined>();
-
-const suggestedName = ref();
-const suggestedAcls = ref<string[]>([]);
-
-const payloadParser = type({
-  name: "string?",
-  acls: "string[]?",
-});
-
-const route = useRoute();
-if (route.query.payload) {
-  try {
-    const rawPayload = JSON.parse(atob(route.query.payload.toString()));
-    const payload = payloadParser(rawPayload);
-    if (payload instanceof ArkErrors) throw payload;
-    suggestedName.value = payload.name;
-    suggestedAcls.value = payload.acls ?? [];
-    createOpen.value = true;
-  } catch {
-    throw createError({
-      statusCode: 400,
-      statusMessage: "Failed to parse the token create payload.",
-      fatal: true,
-    });
-  }
-}
-
-async function createToken(
-  name: string,
-  acls: string[],
-  expiry: DurationLike | undefined,
-) {
-  createLoading.value = true;
-  try {
-    const result = await $dropFetch("/api/v1/admin/token", {
-      method: "POST",
-      body: {
-        name,
-        acls,
-        expiry: expiry ? DateTime.now().plus(expiry) : undefined,
-      },
-      failTitle: "Failed to create API token.",
-    });
-    console.log(result);
-    newToken.value = result.token;
-    tokens.value.push(result);
-  } catch {
-    /* empty */
-  }
-  createOpen.value = false;
-  createLoading.value = false;
-}
-
-async function revokeToken(index: number) {
-  const token = tokens.value[index];
-  if (!token) return;
-
-  await $dropFetch("/api/v1/admin/token/:id", {
-    method: "DELETE",
-    params: {
-      id: token.id,
-    },
-    failTitle: "Failed to revoke token.",
-  });
-
-  tokens.value.splice(index, 1);
-}
-</script>

pnpm-workspace.yaml

@@ -1 +0,0 @@
-shamefullyHoist: true

prisma/migrations/20250819062913_add_hidden_field_to_versions/migration.sql

@@ -2,7 +2,7 @@
 DROP INDEX "GameTag_name_idx";
 
 -- AlterTable
-ALTER TABLE "APIToken" ADD COLUMN     "expiresAt" TIMESTAMP(3);
+ALTER TABLE "GameVersion" ADD COLUMN     "hidden" BOOLEAN NOT NULL DEFAULT false;
 
 -- CreateIndex
 CREATE INDEX "GameTag_name_idx" ON "GameTag" USING GIST ("name" gist_trgm_ops(siglen=32));

prisma/models/auth.prisma

@@ -45,8 +45,6 @@ model APIToken {
 
     acls String[]
 
-    expiresAt DateTime?
-
     @@index([token])
 }
 

prisma/models/content.prisma

@@ -56,12 +56,11 @@ model GameTag {
   id   String @id @default(uuid())
   name String @unique
 
-  games    Game[]
+  games Game[]
 
   @@index([name(ops: raw("gist_trgm_ops(siglen=32)"))], type: Gist)
 }
 
-
 model GameRating {
   id String @id @default(uuid())
 
@@ -95,6 +94,7 @@ model GameVersion {
   setupCommand  String   @default("") // Command to setup game (dependencies and such)
   setupArgs     String[]
   onlySetup     Boolean  @default(false)
+  hidden        Boolean  @default(false)
 
   umuIdOverride String?
 

server/api/v1/admin/game/[id]/index.get.ts

@@ -17,8 +17,11 @@ export default defineEventHandler(async (h3) => {
         orderBy: {
           versionIndex: "asc",
         },
-        omit: {
-          dropletManifest: true,
+        select: {
+          versionIndex: true,
+          versionName: true,
+          platform: true,
+          delta: true,
         },
       },
       tags: true,

server/api/v1/admin/game/version/index.patch.ts

@@ -18,55 +18,30 @@ export default defineEventHandler<{ body: typeof UpdateVersionOrder }>(
     const body = await readDropValidatedBody(h3, UpdateVersionOrder);
     const gameId = body.id;
     // We expect an array of the version names for this game
-    const unsortedVersions = await prisma.gameVersion.findMany({
-      where: {
-        versionName: { in: body.versions },
-      },
-      select: {
-        versionName: true,
-        versionIndex: true,
-        delta: true,
-        platform: true,
-      },
-    });
+    const versions = body.versions;
 
-    const versions = body.versions
-      .map((e) => unsortedVersions.find((v) => v.versionName === e))
-      .filter((e) => e !== undefined);
-
-    if (versions.length !== unsortedVersions.length)
-      throw createError({
-        statusCode: 500,
-        statusMessage: "Sorting versions yielded less results, somehow.",
-      });
-
-    // Validate the new order
-    const has: { [key: string]: boolean } = {};
-    for (const version of versions) {
-      if (version.delta && !has[version.platform])
-        throw createError({
-          statusCode: 400,
-          statusMessage: `"${version.versionName}" requires a base version to apply the delta to.`,
-        });
-      has[version.platform] = true;
-    }
-
-    await prisma.$transaction(
-      versions.map((version, versionIndex) =>
+    const newVersions = await prisma.$transaction(
+      versions.map((versionName, versionIndex) =>
         prisma.gameVersion.update({
           where: {
             gameId_versionName: {
               gameId: gameId,
-              versionName: version.versionName,
+              versionName: versionName,
             },
           },
           data: {
             versionIndex: versionIndex,
           },
+          select: {
+            versionIndex: true,
+            versionName: true,
+            platform: true,
+            delta: true,
+          },
         }),
       ),
     );
 
-    return versions;
+    return newVersions;
   },
 );

server/api/v1/admin/import/version/index.post.ts

@@ -1,20 +1,25 @@
 import { type } from "arktype";
+import { PlatformClient } from "~/composables/types";
 import { readDropValidatedBody, throwingArktype } from "~/server/arktype";
 import aclManager from "~/server/internal/acls";
 import prisma from "~/server/internal/db/database";
 import libraryManager from "~/server/internal/library";
-import { parsePlatform } from "~/server/internal/utils/parseplatform";
 
-const ImportVersion = type({
+export const ImportVersion = type({
   id: "string",
   version: "string",
 
-  platform: "string",
+  platform: type.valueOf(PlatformClient),
+
   launch: "string = ''",
   launchArgs: "string = ''",
+
   setup: "string = ''",
   setupArgs: "string = ''",
+
   onlySetup: "boolean = false",
+  hide: "boolean = false",
+
   delta: "boolean = false",
   umuId: "string = ''",
 }).configure(throwingArktype);
@@ -34,15 +39,12 @@ export default defineEventHandler(async (h3) => {
     onlySetup,
     delta,
     umuId,
+    hide,
   } = await readDropValidatedBody(h3, ImportVersion);
 
-  const platformParsed = parsePlatform(platform);
-  if (!platformParsed)
-    throw createError({ statusCode: 400, statusMessage: "Invalid platform." });
-
   if (delta) {
     const validOverlayVersions = await prisma.gameVersion.count({
-      where: { gameId: id, platform: platformParsed, delta: false },
+      where: { gameId: id, platform, delta: false },
     });
     if (validOverlayVersions == 0)
       throw createError({
@@ -75,6 +77,7 @@ export default defineEventHandler(async (h3) => {
     launchArgs,
     setup,
     setupArgs,
+    hide,
 
     umuId,
     delta,

server/api/v1/admin/token/[id]/index.delete.ts

@@ -1,23 +0,0 @@
-import { APITokenMode } from "~/prisma/client/enums";
-import aclManager from "~/server/internal/acls";
-import prisma from "~/server/internal/db/database";
-
-export default defineEventHandler(async (h3) => {
-  const allowed = await aclManager.allowSystemACL(h3, []); // No ACLs only allows session authentication
-  if (!allowed) throw createError({ statusCode: 403 });
-
-  const id = h3.context.params?.id;
-  if (!id)
-    throw createError({
-      statusCode: 400,
-      statusMessage: "No id in router params",
-    });
-
-  const deleted = await prisma.aPIToken.delete({
-    where: { id: id, mode: APITokenMode.System },
-  })!;
-  if (!deleted)
-    throw createError({ statusCode: 404, statusMessage: "Token not found" });
-
-  return;
-});

server/api/v1/admin/token/acls.get.ts

@@ -1,9 +0,0 @@
-import aclManager from "~/server/internal/acls";
-import { systemACLDescriptions } from "~/server/internal/acls/descriptions";
-
-export default defineEventHandler(async (h3) => {
-  const allowed = await aclManager.allowSystemACL(h3, []); // No ACLs only allows session authentication
-  if (!allowed) throw createError({ statusCode: 403 });
-
-  return systemACLDescriptions;
-});

server/api/v1/admin/token/index.get.ts

@@ -1,15 +0,0 @@
-import { APITokenMode } from "~/prisma/client/enums";
-import aclManager from "~/server/internal/acls";
-import prisma from "~/server/internal/db/database";
-
-export default defineEventHandler(async (h3) => {
-  const allowed = await aclManager.allowSystemACL(h3, []); // No ACLs only allows session authentication
-  if (!allowed) throw createError({ statusCode: 403 });
-
-  const tokens = await prisma.aPIToken.findMany({
-    where: { mode: APITokenMode.System },
-    omit: { token: true },
-  });
-
-  return tokens;
-});

server/api/v1/admin/token/index.post.ts

@@ -1,38 +0,0 @@
-import { type } from "arktype";
-import { APITokenMode } from "~/prisma/client/enums";
-import { readDropValidatedBody, throwingArktype } from "~/server/arktype";
-import aclManager, { systemACLs } from "~/server/internal/acls";
-import prisma from "~/server/internal/db/database";
-
-const CreateToken = type({
-  name: "string",
-  acls: "string[] > 0",
-  expiry: "string.date.iso.parse?",
-}).configure(throwingArktype);
-
-export default defineEventHandler(async (h3) => {
-  const allowed = await aclManager.allowSystemACL(h3, []); // No ACLs only allows session authentication
-  if (!allowed) throw createError({ statusCode: 403 });
-
-  const body = await readDropValidatedBody(h3, CreateToken);
-
-  const invalidACLs = body.acls.filter(
-    (e) => systemACLs.findIndex((v) => e == v) == -1,
-  );
-  if (invalidACLs.length > 0)
-    throw createError({
-      statusCode: 400,
-      statusMessage: `Invalid ACLs: ${invalidACLs.join(", ")}`,
-    });
-
-  const token = await prisma.aPIToken.create({
-    data: {
-      mode: APITokenMode.System,
-      name: body.name,
-      acls: body.acls,
-      expiresAt: body.expiry ?? null,
-    },
-  });
-
-  return token;
-});

server/api/v1/client/game/version.get.ts

@@ -17,6 +17,7 @@ export default defineClientEventHandler(async (h3) => {
         gameId: id,
         versionName: version,
       },
+      hidden: false,
     },
   });
 

server/api/v1/client/game/versions.get.ts

@@ -13,6 +13,7 @@ export default defineClientEventHandler(async (h3) => {
   const versions = await prisma.gameVersion.findMany({
     where: {
       gameId: id,
+      hidden: false,
     },
     orderBy: {
       versionIndex: "desc", // Latest one first

server/api/v1/token.get.ts

@@ -1,6 +0,0 @@
-import aclManager from "~/server/internal/acls";
-
-export default defineEventHandler(async (h3) => {
-  const acls = await aclManager.fetchAllACLs(h3);
-  return acls;
-});

server/api/v1/user/token/index.post.ts

@@ -1,22 +1,30 @@
-import { type } from "arktype";
 import { APITokenMode } from "~/prisma/client/enums";
-import { readDropValidatedBody, throwingArktype } from "~/server/arktype";
 import aclManager, { userACLs } from "~/server/internal/acls";
 import prisma from "~/server/internal/db/database";
 
-const CreateToken = type({
-  name: "string",
-  acls: "string[] > 0",
-  expiry: "string.date.iso.parse?",
-}).configure(throwingArktype);
-
 export default defineEventHandler(async (h3) => {
   const userId = await aclManager.getUserIdACL(h3, []); // No ACLs only allows session authentication
   if (!userId) throw createError({ statusCode: 403 });
 
-  const body = await readDropValidatedBody(h3, CreateToken);
+  const body = await readBody(h3);
+  const name: string = body.name;
+  const acls: string[] = body.acls;
 
-  const invalidACLs = body.acls.filter(
+  if (!name || typeof name !== "string")
+    throw createError({
+      statusCode: 400,
+      statusMessage: "Token name required",
+    });
+  if (!acls || !Array.isArray(acls))
+    throw createError({ statusCode: 400, statusMessage: "ACLs required" });
+
+  if (acls.length == 0)
+    throw createError({
+      statusCode: 400,
+      statusMessage: "Token requires more than zero ACLs",
+    });
+
+  const invalidACLs = acls.filter(
     (e) => userACLs.findIndex((v) => e == v) == -1,
   );
   if (invalidACLs.length > 0)
@@ -28,10 +36,9 @@ export default defineEventHandler(async (h3) => {
   const token = await prisma.aPIToken.create({
     data: {
       mode: APITokenMode.User,
-      name: body.name,
+      name: name,
       userId: userId,
-      acls: body.acls,
-      expiresAt: body.expiry ?? null,
+      acls: acls,
     },
   });
 

server/api/v2/client/chunk.post.ts

@@ -9,10 +9,7 @@ const GetChunk = type({
   files: type({
     filename: "string",
     chunkIndex: "number",
-  })
-    .array()
-    .atLeastLength(1)
-    .atMostLength(256),
+  }).array(),
 }).configure(throwingArktype);
 
 export default defineEventHandler(async (h3) => {
@@ -49,27 +46,21 @@ export default defineEventHandler(async (h3) => {
     streamFiles.map((e) => e.end - e.start).join(","),
   ); // Non-standard header, but we're cool like that 😎
 
-  const streams = await Promise.all(
-    streamFiles.map(async (file) => {
-      const gameReadStream = await libraryManager.readFile(
-        context.libraryId,
-        context.libraryPath,
-        context.versionName,
-        file.filename,
-        { start: file.start, end: file.end },
-      );
-      if (!gameReadStream)
-        throw createError({
-          statusCode: 500,
-          statusMessage: "Failed to create read stream",
-        });
-      return { ...file, stream: gameReadStream };
-    }),
-  );
-
-  for (const file of streams) {
+  for (const file of streamFiles) {
+    const gameReadStream = await libraryManager.readFile(
+      context.libraryId,
+      context.libraryPath,
+      context.versionName,
+      file.filename,
+      { start: file.start, end: file.end },
+    );
+    if (!gameReadStream)
+      throw createError({
+        statusCode: 500,
+        statusMessage: "Failed to create read stream",
+      });
     let length = 0;
-    await file.stream.pipeTo(
+    await gameReadStream.pipeTo(
       new WritableStream({
         write(chunk) {
           h3.node.res.write(chunk);

server/internal/acls/descriptions.ts

@@ -36,7 +36,7 @@ export const userACLDescriptions: ObjectFromList<typeof userACLs> = {
   "library:remove": "Remove a game from your library.",
 
   "clients:read": "Read the clients connected to this account",
-  "clients:revoke": "Remove clients connected to this account",
+  "clients:revoke": "",
 
   "news:read": "Read the server's news articles.",
 

server/internal/downloads/coordinator.ts

@@ -57,7 +57,7 @@ class DownloadContextManager {
   async cleanup() {
     for (const key of this.contexts.keys()) {
       const context = this.contexts.get(key)!;
-      if (context.timeout.getTime() < Date.now() - TIMEOUT) {
+      if (context.timeout.getDate() + TIMEOUT < Date.now()) {
         this.contexts.delete(key);
       }
     }

server/internal/library/index.ts

@@ -15,6 +15,7 @@ import { GameNotFoundError, type LibraryProvider } from "./provider";
 import { logger } from "../logging";
 import type { GameModel } from "~/prisma/client/models";
 import { createHash } from "node:crypto";
+import type { ImportVersion } from "~/server/api/v1/admin/import/version/index.post";
 
 export function createGameImportTaskId(libraryId: string, libraryPath: string) {
   return createHash("md5")
@@ -171,8 +172,6 @@ class LibraryManager {
         ".sh",
         // No extension is common for Linux binaries
         "",
-        // AppImages
-        ".appimage",
       ],
       Windows: [".exe", ".bat"],
       macOS: [
@@ -233,18 +232,7 @@ class LibraryManager {
   async importVersion(
     gameId: string,
     versionName: string,
-    metadata: {
-      platform: string;
-      onlySetup: boolean;
-
-      setup: string;
-      setupArgs: string;
-      launch: string;
-      launchArgs: string;
-      delta: boolean;
-
-      umuId: string;
-    },
+    metadata: Omit<typeof ImportVersion.infer, "id" | "version">,
   ) {
     const taskId = createVersionImportTaskId(gameId, versionName);
 
@@ -288,41 +276,24 @@ class LibraryManager {
         });
 
         // Then, create the database object
-        if (metadata.onlySetup) {
-          await prisma.gameVersion.create({
-            data: {
-              gameId: gameId,
-              versionName: versionName,
-              dropletManifest: manifest,
-              versionIndex: currentIndex,
-              delta: metadata.delta,
-              umuIdOverride: metadata.umuId,
-              platform: platform,
+        await prisma.gameVersion.create({
+          data: {
+            gameId: gameId,
+            versionName: versionName,
+            dropletManifest: manifest,
+            versionIndex: currentIndex,
+            delta: metadata.delta,
+            umuIdOverride: metadata.umuId,
+            platform: platform,
 
-              onlySetup: true,
-              setupCommand: metadata.setup,
-              setupArgs: metadata.setupArgs.split(" "),
-            },
-          });
-        } else {
-          await prisma.gameVersion.create({
-            data: {
-              gameId: gameId,
-              versionName: versionName,
-              dropletManifest: manifest,
-              versionIndex: currentIndex,
-              delta: metadata.delta,
-              umuIdOverride: metadata.umuId,
-              platform: platform,
-
-              onlySetup: false,
-              setupCommand: metadata.setup,
-              setupArgs: metadata.setupArgs.split(" "),
-              launchCommand: metadata.launch,
-              launchArgs: metadata.launchArgs.split(" "),
-            },
-          });
-        }
+            hidden: metadata.hide,
+            onlySetup: metadata.onlySetup,
+            setupCommand: metadata.setup,
+            setupArgs: metadata.setupArgs.split(" "),
+            launchCommand: metadata.launch,
+            launchArgs: metadata.launchArgs.split(" "),
+          },
+        });
 
         logger.info("Successfully created version!");
 

server/internal/metadata/index.ts

@@ -306,7 +306,7 @@ export class MetadataHandler {
         result = await provider.fetchCompany({ query, createObject });
         if (result === undefined) {
           throw new Error(
-            `${provider.source()} failed to find a company for "${query}"`,
+            `${provider.source()} failed to find a company for "${query}`,
           );
         }
       } catch (e) {

server/middleware/latency.ts

@@ -1,3 +1,3 @@
 export default defineEventHandler(async () => {
-  // await new Promise((r) => setTimeout(r, 1400));
+  // await new Promise((r) => setTimeout(r, 700));
 });