Add tags field to Archon /create request

apps/frontend/nuxt.config.ts

@@ -143,8 +143,13 @@ export default defineNuxtConfig({
         state.lastGenerated &&
         new Date(state.lastGenerated).getTime() + TTL > new Date().getTime() &&
         // ...but only if the API URL is the same
-        state.apiUrl === API_URL
+        state.apiUrl === API_URL &&
+        // ...and if no errors were caught during the last generation
+        (state.errors ?? []).length === 0
       ) {
+        console.log(
+          "Tags already recently generated. Delete apps/frontend/generated/state.json to force regeneration.",
+        );
         return;
       }
 

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

@@ -1,481 +1,510 @@
 <template>
-  <div v-if="showInvitation" class="universal-card information invited my-4">
-    <h2>{{ getFormattedMessage(messages.invitationTitle) }}</h2>
-    <p v-if="currentMember?.project_role">
-      {{ formatMessage(messages.invitationWithRole, { role: currentMember.project_role }) }}
+  <div v-if="showInvitation" class="universal-card information invited">
+    <h2>Invitation to join project</h2>
+    <p>
+      You've been invited be a member of this project with the role of '{{ currentMember.role }}'.
     </p>
-    <p v-else>{{ getFormattedMessage(messages.invitationNoRole) }}</p>
     <div class="input-group">
-      <ButtonStyled color="brand">
-        <button class="brand-button" @click="acceptInvite()">
-          <CheckIcon />
-          {{ getFormattedMessage(messages.accept) }}
-        </button>
-      </ButtonStyled>
-      <ButtonStyled color="red">
-        <button @click="declineInvite">
-          <XIcon />
-          {{ getFormattedMessage(messages.decline) }}
-        </button>
-      </ButtonStyled>
+      <button class="iconified-button brand-button" @click="acceptInvite()">
+        <CheckIcon />
+        Accept
+      </button>
+      <button class="iconified-button danger-button" @click="declineInvite()">
+        <XIcon />
+        Decline
+      </button>
     </div>
   </div>
   <div
     v-if="
       currentMember &&
-      visibleNags.length > 0 &&
+      nags.filter((x) => x.condition).length > 0 &&
       (project.status === 'draft' || tags.rejectedStatuses.includes(project.status))
     "
-    class="universal-card my-4"
+    class="author-actions universal-card mb-4"
   >
-    <div class="flex max-w-full flex-wrap items-center gap-x-6 gap-y-4">
-      <div class="flex flex-auto flex-wrap items-center gap-x-6 gap-y-4">
-        <h2 class="my-0 mr-auto">{{ getFormattedMessage(messages.publishingChecklist) }}</h2>
-        <div class="flex flex-row gap-2">
-          <div class="flex items-center gap-1">
-            <AsteriskIcon class="size-4 text-red" />
-            <span class="text-secondary">{{ getFormattedMessage(messages.required) }}</span>
-          </div>
-          |
-          <div class="flex items-center gap-1">
-            <TriangleAlertIcon class="size-4 text-orange" />
-            <span class="text-secondary">{{ getFormattedMessage(messages.warning) }}</span>
-          </div>
-          |
-          <div class="flex items-center gap-1">
-            <LightBulbIcon class="size-4 text-purple" />
-            <span class="text-secondary">{{ getFormattedMessage(messages.suggestion) }}</span>
+    <div class="header__row">
+      <div class="header__title">
+        <h2>Publishing checklist</h2>
+        <div class="checklist">
+          <span class="checklist__title">Progress:</span>
+          <div class="checklist__items">
+            <div
+              v-for="nag in nags"
+              :key="`checklist-${nag.id}`"
+              v-tooltip="nag.title"
+              :aria-label="nag.title"
+              :class="'circle ' + (!nag.condition ? 'done' : '') + nag.status"
+              class="circle"
+            >
+              <CheckIcon v-if="!nag.condition" />
+              <AsteriskIcon v-else-if="nag.status === 'required'" />
+              <LightBulbIcon v-else-if="nag.status === 'suggestion'" />
+              <ScaleIcon v-else-if="nag.status === 'review'" />
+            </div>
           </div>
         </div>
       </div>
       <div class="input-group">
-        <ButtonStyled circular>
-          <button :class="!collapsed && '[&>svg]:rotate-180'" @click="toggleCollapsed()">
-            <DropdownIcon class="duration-250 transition-transform ease-in-out" />
-          </button>
-        </ButtonStyled>
+        <button
+          :class="{ 'not-collapsed': !collapsed }"
+          class="square-button"
+          @click="toggleCollapsed()"
+        >
+          <DropdownIcon />
+        </button>
       </div>
     </div>
-    <div v-if="!collapsed" class="grid-display width-16 mt-4">
-      <div v-for="nag in visibleNags" :key="nag.id" class="grid-display__item">
-        <span class="flex items-center gap-2 font-semibold">
-          <component
-            :is="nag.icon || getDefaultIcon(nag.status)"
-            v-tooltip="getStatusTooltip(nag.status)"
-            :class="[
-              'size-4',
-              nag.status === 'required' && 'text-red',
-              nag.status === 'warning' && 'text-orange',
-              nag.status === 'suggestion' && 'text-purple',
-            ]"
-            :aria-label="getStatusTooltip(nag.status)"
+    <div v-if="!collapsed" class="grid-display width-16">
+      <div
+        v-for="nag in nags.filter((x) => x.condition && !x.hide)"
+        :key="nag.id"
+        class="grid-display__item"
+      >
+        <span class="label">
+          <AsteriskIcon
+            v-if="nag.status === 'required'"
+            v-tooltip="'Required'"
+            :class="nag.status"
+            aria-label="Required"
           />
-          {{ getFormattedMessage(nag.title) }}
-        </span>
-        {{ getNagDescription(nag) }}
+          <LightBulbIcon
+            v-else-if="nag.status === 'suggestion'"
+            v-tooltip="'Suggestion'"
+            :class="nag.status"
+            aria-label="Suggestion"
+          />
+          <ScaleIcon
+            v-else-if="nag.status === 'review'"
+            v-tooltip="'Review'"
+            :class="nag.status"
+            aria-label="Review"
+          />{{ nag.title }}</span
+        >
+        {{ nag.description }}
         <NuxtLink
-          v-if="nag.link && shouldShowLink(nag)"
+          v-if="nag.link"
+          :class="{ invisible: nag.link.hide }"
           :to="`/${project.project_type}/${project.slug ? project.slug : project.id}/${
             nag.link.path
           }`"
           class="goto-link"
         >
-          {{ getFormattedMessage(nag.link.title) }}
+          {{ nag.link.title }}
           <ChevronRightIcon aria-hidden="true" class="featured-header-chevron" />
         </NuxtLink>
-        <ButtonStyled
-          v-if="nag.status === 'special-submit-action' && nag.id === 'submit-for-review'"
-          color="orange"
-          @click="submitForReview"
+        <button
+          v-else-if="nag.action"
+          :disabled="nag.action.disabled()"
+          class="btn btn-orange"
+          @click="nag.action.onClick"
         >
-          <button
-            :disabled="!canSubmitForReview"
-            v-tooltip="
-              !canSubmitForReview ? getFormattedMessage(messages.submitChecklistTooltip) : undefined
-            "
-          >
-            <SendIcon />
-            {{ getFormattedMessage(messages.submitForReview) }}
-          </button>
-        </ButtonStyled>
+          <SendIcon />
+          {{ nag.action.title }}
+        </button>
       </div>
     </div>
   </div>
 </template>
 
-<script setup lang="ts">
+<script setup>
 import {
   ChevronRightIcon,
   CheckIcon,
   XIcon,
   AsteriskIcon,
   LightBulbIcon,
-  TriangleAlertIcon,
-  DropdownIcon,
   SendIcon,
   ScaleIcon,
-  InfoIcon,
+  DropdownIcon,
 } from "@modrinth/assets";
+import { formatProjectType } from "@modrinth/utils";
 import { acceptTeamInvite, removeTeamMember } from "~/helpers/teams.js";
-import { nags } from "@modrinth/moderation";
-import { ButtonStyled } from "@modrinth/ui";
-import { useVIntl, defineMessages, type MessageDescriptor } from "@vintl/vintl";
-import type { Nag, NagContext, NagStatus } from "@modrinth/moderation";
-import type { Project, User, Version } from "@modrinth/utils";
-import type { Component } from "vue";
 
-interface Tags {
-  rejectedStatuses: string[];
-}
+const props = defineProps({
+  project: {
+    type: Object,
+    required: true,
+  },
+  versions: {
+    type: Array,
+    default() {
+      return [];
+    },
+  },
+  currentMember: {
+    type: Object,
+    default: null,
+  },
+  allMembers: {
+    type: Object,
+    default: null,
+  },
+  isSettings: {
+    type: Boolean,
+    default: false,
+  },
+  collapsed: {
+    type: Boolean,
+    default: false,
+  },
+  routeName: {
+    type: String,
+    default: "",
+  },
+  auth: {
+    type: Object,
+    required: true,
+  },
+  tags: {
+    type: Object,
+    required: true,
+  },
+  setProcessing: {
+    type: Function,
+    default() {
+      return () => {
+        addNotification({
+          group: "main",
+          title: "An error occurred",
+          text: "setProcessing function not found",
+          type: "error",
+        });
+      };
+    },
+  },
+  toggleCollapsed: {
+    type: Function,
+    default() {
+      return () => {
+        addNotification({
+          group: "main",
+          title: "An error occurred",
+          text: "toggleCollapsed function not found",
+          type: "error",
+        });
+      };
+    },
+  },
+  updateMembers: {
+    type: Function,
+    default() {
+      return () => {
+        addNotification({
+          group: "main",
+          title: "An error occurred",
+          text: "updateMembers function not found",
+          type: "error",
+        });
+      };
+    },
+  },
+});
 
-interface Auth {
-  user: {
-    id: string;
-  };
-}
+const featuredGalleryImage = computed(() => props.project.gallery.find((img) => img.featured));
 
-interface Member {
-  accepted?: boolean;
-  project_role?: string;
-  user?: Partial<User>;
-}
-
-interface Props {
-  project: Project;
-  versions?: Version[];
-  currentMember?: Member | null;
-  allMembers?: Member[] | null;
-  isSettings?: boolean;
-  collapsed?: boolean;
-  routeName?: string;
-  auth: Auth;
-  tags: Tags;
-  setProcessing?: (processing: boolean) => void;
-  toggleCollapsed?: () => void;
-  updateMembers?: () => void | Promise<void>;
-}
-
-const messages = defineMessages({
-  invitationTitle: {
-    id: "project-member-header.invitation-title",
-    defaultMessage: "Invitation to join project",
+const nags = computed(() => [
+  {
+    condition: props.versions.length < 1,
+    title: "Upload a version",
+    id: "upload-version",
+    description: "At least one version is required for a project to be submitted for review.",
+    status: "required",
+    link: {
+      path: "versions",
+      title: "Visit versions page",
+      hide: props.routeName === "type-id-versions",
+    },
   },
-  invitationWithRole: {
-    id: "project-member-header.invitation-with-role",
-    defaultMessage: "You've been invited be a member of this project with the role of '{role}'.",
+  {
+    condition:
+      props.project.body === "" || props.project.body.startsWith("# Placeholder description"),
+    title: "Add a description",
+    id: "add-description",
+    description:
+      "A description that clearly describes the project's purpose and function is required.",
+    status: "required",
+    link: {
+      path: "settings/description",
+      title: "Visit description settings",
+      hide: props.routeName === "type-id-settings-description",
+    },
   },
-  invitationNoRole: {
-    id: "project-member-header.invitation-no-role",
-    defaultMessage:
-      "You've been invited to join this project. Please accept or decline the invitation.",
+  {
+    condition: !props.project.icon_url,
+    title: "Add an icon",
+    id: "add-icon",
+    description:
+      "Your project should have a nice-looking icon to uniquely identify your project at a glance.",
+    status: "suggestion",
+    link: {
+      path: "settings",
+      title: "Visit general settings",
+      hide: props.routeName === "type-id-settings",
+    },
   },
-  accept: {
-    id: "project-member-header.accept",
-    defaultMessage: "Accept",
+  {
+    condition: props.project.gallery.length === 0 || !featuredGalleryImage,
+    title: "Feature a gallery image",
+    id: "feature-gallery-image",
+    description: "Featured gallery images may be the first impression of many users.",
+    status: "suggestion",
+    link: {
+      path: "gallery",
+      title: "Visit gallery page",
+      hide: props.routeName === "type-id-gallery",
+    },
   },
-  decline: {
-    id: "project-member-header.decline",
-    defaultMessage: "Decline",
+  {
+    hide: props.project.versions.length === 0,
+    condition: props.project.categories.length < 1,
+    title: "Select tags",
+    id: "select-tags",
+    description: "Select all tags that apply to your project.",
+    status: "suggestion",
+    link: {
+      path: "settings/tags",
+      title: "Visit tag settings",
+      hide: props.routeName === "type-id-settings-tags",
+    },
   },
-  publishingChecklist: {
-    id: "project-member-header.publishing-checklist",
-    defaultMessage: "Publishing checklist",
+  {
+    condition: !(
+      props.project.issues_url ||
+      props.project.source_url ||
+      props.project.wiki_url ||
+      props.project.discord_url ||
+      props.project.donation_urls.length > 0
+    ),
+    title: "Add external links",
+    id: "add-links",
+    description:
+      "Add any relevant links targeted outside of Modrinth, such as sources, issues, or a Discord invite.",
+    status: "suggestion",
+    link: {
+      path: "settings/links",
+      title: "Visit links settings",
+      hide: props.routeName === "type-id-settings-links",
+    },
   },
-  submitForReview: {
-    id: "project-member-header.submit-for-review",
-    defaultMessage: "Submit for review",
+  {
+    hide:
+      props.project.versions.length === 0 ||
+      props.project.project_type === "resourcepack" ||
+      props.project.project_type === "plugin" ||
+      props.project.project_type === "shader" ||
+      props.project.project_type === "datapack",
+    condition:
+      props.project.client_side === "unknown" ||
+      props.project.server_side === "unknown" ||
+      (props.project.client_side === "unsupported" && props.project.server_side === "unsupported"),
+    title: "Select supported environments",
+    id: "select-environments",
+    description: `Select if the ${formatProjectType(
+      props.project.project_type,
+    ).toLowerCase()} functions on the client-side and/or server-side.`,
+    status: "required",
+    link: {
+      path: "settings",
+      title: "Visit general settings",
+      hide: props.routeName === "type-id-settings",
+    },
   },
-  submitForReviewDesc: {
-    id: "project-member-header.submit-for-review-desc",
-    defaultMessage:
+  {
+    condition: props.project.license.id === "LicenseRef-Unknown",
+    title: "Select license",
+    id: "select-license",
+    description: `Select the license your ${formatProjectType(
+      props.project.project_type,
+    ).toLowerCase()} is distributed under.`,
+    status: "required",
+    link: {
+      path: "settings/license",
+      title: "Visit license settings",
+      hide: props.routeName === "type-id-settings-license",
+    },
+  },
+  {
+    condition: props.project.status === "draft",
+    title: "Submit for review",
+    id: "submit-for-review",
+    description:
       "Your project is only viewable by members of the project. It must be reviewed by moderators in order to be published.",
+    status: "review",
+    link: null,
+    action: {
+      onClick: submitForReview,
+      title: "Submit for review",
+      disabled: () => nags.value.filter((x) => x.condition && x.status === "required").length > 0,
+    },
   },
-  resubmitForReview: {
-    id: "project-member-header.resubmit-for-review",
-    defaultMessage: "Resubmit for review",
+  {
+    hide: props.project.stats === "draft",
+    condition: props.tags.rejectedStatuses.includes(props.project.status),
+    title: "Resubmit for review",
+    id: "resubmit-for-review",
+    description: `Your project has been ${props.project.status} by
+            Modrinth's staff. In most cases, you can resubmit for review after
+            addressing the staff's message.`,
+    status: "review",
+    link: {
+      path: "moderation",
+      title: "Visit moderation page",
+      hide: props.routeName === "type-id-moderation",
+    },
   },
-  resubmitForReviewDesc: {
-    id: "project-member-header.resubmit-for-review-desc",
-    defaultMessage:
-      "Your project has been {status} by Modrinth's staff. In most cases, you can resubmit for review after addressing the staff's message.",
-  },
-  showKey: {
-    id: "project-member-header.show-key",
-    defaultMessage: "Toggle key",
-  },
-  keyTitle: {
-    id: "project-member-header.key-title",
-    defaultMessage: "Status Key",
-  },
-  action: {
-    id: "project-member-header.action",
-    defaultMessage: "Action",
-  },
-  visitModerationPage: {
-    id: "project-member-header.visit-moderation-page",
-    defaultMessage: "Visit moderation page",
-  },
-  submitChecklistTooltip: {
-    id: "project-member-header.submit-checklist-tooltip",
-    defaultMessage: "You must complete the required steps in the publishing checklist!",
-  },
-  successJoin: {
-    id: "project-member-header.success-join",
-    defaultMessage: "You have joined the project team",
-  },
-  errorJoin: {
-    id: "project-member-header.error-join",
-    defaultMessage: "Failed to accept team invitation",
-  },
-  successDecline: {
-    id: "project-member-header.success-decline",
-    defaultMessage: "You have declined the team invitation",
-  },
-  errorDecline: {
-    id: "project-member-header.error-decline",
-    defaultMessage: "Failed to decline team invitation",
-  },
-  success: {
-    id: "project-member-header.success",
-    defaultMessage: "Success",
-  },
-  error: {
-    id: "project-member-header.error",
-    defaultMessage: "Error",
-  },
-  required: {
-    id: "project-member-header.required",
-    defaultMessage: "Required",
-  },
-  warning: {
-    id: "project-member-header.warning",
-    defaultMessage: "Warning",
-  },
-  suggestion: {
-    id: "project-member-header.suggestion",
-    defaultMessage: "Suggestion",
-  },
-});
+]);
 
-const { formatMessage } = useVIntl();
-
-function getNagDescription(nag: Nag): string {
-  if (typeof nag.description === "function") {
-    return nag.description(nagContext.value);
-  }
-  return formatMessage(nag.description);
-}
-
-function getFormattedMessage(message: string | MessageDescriptor): string {
-  if (typeof message === "string") {
-    return message;
-  }
-  return formatMessage(message);
-}
-
-const props = withDefaults(defineProps<Props>(), {
-  versions: () => [],
-  currentMember: null,
-  allMembers: null,
-  isSettings: false,
-  collapsed: false,
-  routeName: "",
-});
-
-const emit = defineEmits<{
-  toggleCollapsed: [];
-  updateMembers: [];
-  setProcessing: [processing: boolean];
-}>();
-
-const nagContext = computed<NagContext>(() => ({
-  project: props.project,
-  versions: props.versions,
-  currentMember: props.currentMember as User,
-  currentRoute: props.routeName,
-  tags: props.tags,
-  submitProject: submitForReview,
-}));
-
-const showKey = ref(false);
-function toggleKey(): void {
-  showKey.value = !showKey.value;
-}
-
-const canSubmitForReview = computed(() => {
-  return (
-    applicableNags.value.filter((nag) => nag.status === "required" && !isNagComplete(nag))
-      .length === 0
-  );
-});
-
-async function submitForReview() {
-  if (canSubmitForReview) {
-    await setProcessing(true);
-  }
-}
-
-const applicableNags = computed<Nag[]>(() => {
-  return nags.filter((nag) => {
-    return nag.shouldShow(nagContext.value);
-  });
-});
-
-function isNagComplete(nag: Nag): boolean {
-  const context = nagContext.value;
-  return !nag.shouldShow(context);
-}
-
-const visibleNags = computed<Nag[]>(() => {
-  const finalNags = applicableNags.value.filter((nag) => !isNagComplete(nag));
-
-  if (props.project.status === "draft") {
-    finalNags.push({
-      id: "submit-for-review",
-      title: messages.submitForReview,
-      description: () => formatMessage(messages.submitForReviewDesc),
-      status: "special-submit-action",
-      shouldShow: (ctx) => ctx.project.status === "draft",
-    });
-  }
-
-  if (props.tags.rejectedStatuses.includes(props.project.status)) {
-    finalNags.push({
-      id: "resubmit-for-review",
-      title: messages.resubmitForReview,
-      description: (ctx) =>
-        formatMessage(messages.resubmitForReviewDesc, { status: ctx.project.status }),
-      status: "special-submit-action",
-      shouldShow: (ctx) => ctx.tags.rejectedStatuses.includes(ctx.project.status),
-      link: {
-        path: "moderation",
-        title: messages.visitModerationPage,
-        shouldShow: () => props.routeName !== "type-id-moderation",
-      },
-    });
-  }
-
-  finalNags.sort((a, b) => {
-    const statusOrder = { required: 0, warning: 1, suggestion: 2, "special-submit-action": 3 };
-    return statusOrder[a.status] - statusOrder[b.status];
-  });
-
-  return finalNags;
-});
-
-function shouldShowLink(nag: Nag): boolean {
-  return nag.link?.shouldShow ? nag.link.shouldShow(nagContext.value) : false;
-}
-
-function getDefaultIcon(status: NagStatus): Component {
-  switch (status) {
-    case "required":
-      return AsteriskIcon;
-    case "warning":
-      return TriangleAlertIcon;
-    case "suggestion":
-      return LightBulbIcon;
-    case "special-submit-action":
-      return ScaleIcon;
-    default:
-      return AsteriskIcon;
-  }
-}
-
-function getStatusTooltip(status: NagStatus): string {
-  switch (status) {
-    case "required":
-      return formatMessage(messages.required);
-    case "warning":
-      return formatMessage(messages.warning);
-    case "suggestion":
-      return formatMessage(messages.suggestion);
-    default:
-      return formatMessage(messages.required);
-  }
-}
-
-const showInvitation = computed<boolean>(() => {
+const showInvitation = computed(() => {
   if (props.allMembers && props.auth) {
-    const member = props.allMembers.find((x) => x?.user?.id === props.auth.user.id);
-    return !!member && !member.accepted;
+    const member = props.allMembers.find((x) => x.user.id === props.auth.user.id);
+    return member && !member.accepted;
   }
   return false;
 });
 
-function toggleCollapsed(): void {
-  if (props.toggleCollapsed) {
-    props.toggleCollapsed();
-  } else {
-    emit("toggleCollapsed");
-  }
-}
+const acceptInvite = () => {
+  acceptTeamInvite(props.project.team);
+  props.updateMembers();
+};
 
-async function updateMembers(): Promise<void> {
-  if (props.updateMembers) {
-    await props.updateMembers();
-  } else {
-    emit("updateMembers");
-  }
-}
+const declineInvite = () => {
+  removeTeamMember(props.project.team, props.auth.user.id);
+  props.updateMembers();
+};
 
-function setProcessing(processing: boolean): void {
-  if (props.setProcessing) {
-    props.setProcessing(processing);
-  } else {
-    emit("setProcessing", processing);
+const submitForReview = async () => {
+  if (
+    !props.acknowledgedMessage ||
+    nags.value.filter((x) => x.condition && x.status === "required").length === 0
+  ) {
+    await props.setProcessing();
   }
-}
-
-async function acceptInvite(): Promise<void> {
-  try {
-    setProcessing(true);
-    await acceptTeamInvite(props.project.team);
-    await updateMembers();
-    addNotification({
-      group: "main",
-      title: formatMessage(messages.success),
-      text: formatMessage(messages.successJoin),
-      type: "success",
-    });
-  } catch (error) {
-    addNotification({
-      group: "main",
-      title: formatMessage(messages.error),
-      text: formatMessage(messages.errorJoin),
-      type: "error",
-    });
-  } finally {
-    setProcessing(false);
-  }
-}
-
-async function declineInvite(): Promise<void> {
-  try {
-    setProcessing(true);
-    await removeTeamMember(props.project.team, props.auth.user.id);
-    await updateMembers();
-    addNotification({
-      group: "main",
-      title: formatMessage(messages.success),
-      text: formatMessage(messages.successDecline),
-      type: "success",
-    });
-  } catch (error) {
-    addNotification({
-      group: "main",
-      title: formatMessage(messages.error),
-      text: formatMessage(messages.errorDecline),
-      type: "error",
-    });
-  } finally {
-    setProcessing(false);
-  }
-}
+};
 </script>
 
 <style lang="scss" scoped>
-.duration-250 {
-  transition-duration: 250ms;
+.invited {
+}
+
+.author-actions {
+  margin-top: var(--spacing-card-md);
+
+  &:empty {
+    display: none;
+  }
+
+  .invisible {
+    visibility: hidden;
+  }
+
+  .header__row {
+    align-items: center;
+    column-gap: var(--spacing-card-lg);
+    row-gap: var(--spacing-card-md);
+    max-width: 100%;
+
+    .header__title {
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      column-gap: var(--spacing-card-lg);
+      row-gap: var(--spacing-card-md);
+      flex-basis: min-content;
+
+      h2 {
+        margin: 0 auto 0 0;
+      }
+    }
+
+    button {
+      svg {
+        transition: transform 0.25s ease-in-out;
+      }
+
+      &.not-collapsed svg {
+        transform: rotate(180deg);
+      }
+    }
+  }
+
+  .grid-display__item .label {
+    display: flex;
+    gap: var(--spacing-card-xs);
+    align-items: center;
+
+    .required {
+      color: var(--color-red);
+    }
+
+    .suggestion {
+      color: var(--color-purple);
+    }
+
+    .review {
+      color: var(--color-orange);
+    }
+  }
+
+  .checklist {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: var(--spacing-card-xs);
+    width: fit-content;
+    flex-wrap: wrap;
+    max-width: 100%;
+
+    .checklist__title {
+      font-weight: bold;
+      margin-right: var(--spacing-card-xs);
+      color: var(--color-text-dark);
+    }
+
+    .checklist__items {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      gap: var(--spacing-card-xs);
+      width: fit-content;
+      max-width: 100%;
+    }
+
+    .circle {
+      --circle-size: 2rem;
+      --background-color: var(--color-bg);
+      --content-color: var(--color-gray);
+      width: var(--circle-size);
+      height: var(--circle-size);
+      border-radius: 50%;
+      background-color: var(--background-color);
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      svg {
+        color: var(--content-color);
+        width: calc(var(--circle-size) / 2);
+        height: calc(var(--circle-size) / 2);
+      }
+
+      &.required {
+        --content-color: var(--color-red);
+      }
+
+      &.suggestion {
+        --content-color: var(--color-purple);
+      }
+
+      &.review {
+        --content-color: var(--color-orange);
+      }
+
+      &.done {
+        --background-color: var(--color-green);
+        --content-color: var(--color-brand-inverted);
+      }
+    }
+  }
 }
 </style>

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

@@ -554,78 +554,6 @@
   "profile.user-id": {
     "message": "User ID: {id}"
   },
-  "project-member-header.accept": {
-    "message": "Accept"
-  },
-  "project-member-header.action": {
-    "message": "Action"
-  },
-  "project-member-header.decline": {
-    "message": "Decline"
-  },
-  "project-member-header.error": {
-    "message": "Error"
-  },
-  "project-member-header.error-decline": {
-    "message": "Failed to decline team invitation"
-  },
-  "project-member-header.error-join": {
-    "message": "Failed to accept team invitation"
-  },
-  "project-member-header.invitation-no-role": {
-    "message": "You've been invited to join this project. Please accept or decline the invitation."
-  },
-  "project-member-header.invitation-title": {
-    "message": "Invitation to join project"
-  },
-  "project-member-header.invitation-with-role": {
-    "message": "You've been invited be a member of this project with the role of '{role}'."
-  },
-  "project-member-header.key-title": {
-    "message": "Status Key"
-  },
-  "project-member-header.publishing-checklist": {
-    "message": "Publishing checklist"
-  },
-  "project-member-header.required": {
-    "message": "Required"
-  },
-  "project-member-header.resubmit-for-review": {
-    "message": "Resubmit for review"
-  },
-  "project-member-header.resubmit-for-review-desc": {
-    "message": "Your project has been {status} by Modrinth's staff. In most cases, you can resubmit for review after addressing the staff's message."
-  },
-  "project-member-header.show-key": {
-    "message": "Toggle key"
-  },
-  "project-member-header.submit-checklist-tooltip": {
-    "message": "You must complete the required steps in the publishing checklist!"
-  },
-  "project-member-header.submit-for-review": {
-    "message": "Submit for review"
-  },
-  "project-member-header.submit-for-review-desc": {
-    "message": "Your project is only viewable by members of the project. It must be reviewed by moderators in order to be published."
-  },
-  "project-member-header.success": {
-    "message": "Success"
-  },
-  "project-member-header.success-decline": {
-    "message": "You have declined the team invitation"
-  },
-  "project-member-header.success-join": {
-    "message": "You have joined the project team"
-  },
-  "project-member-header.suggestion": {
-    "message": "Suggestion"
-  },
-  "project-member-header.visit-moderation-page": {
-    "message": "Visit moderation page"
-  },
-  "project-member-header.warning": {
-    "message": "Warning"
-  },
   "project-type.collection.plural": {
     "message": "Collections"
   },

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

@@ -22,10 +22,6 @@
         "
         :on-image-upload="onUploadHandler"
       />
-      <div v-if="descriptionWarning" class="flex items-center gap-1.5 text-orange">
-        <TriangleAlertIcon class="my-auto" />
-        {{ descriptionWarning }}
-      </div>
       <div class="input-group markdown-disclaimer">
         <button
           :disabled="!hasChanges"
@@ -42,8 +38,7 @@
 </template>
 
 <script lang="ts" setup>
-import { SaveIcon, TriangleAlertIcon } from "@modrinth/assets";
-import { countText, MIN_DESCRIPTION_CHARS } from "@modrinth/moderation";
+import { SaveIcon } from "@modrinth/assets";
 import { MarkdownEditor } from "@modrinth/ui";
 import { type Project, type TeamMember, TeamMemberPermission } from "@modrinth/utils";
 import { computed, ref } from "vue";
@@ -58,17 +53,6 @@ const props = defineProps<{
 
 const description = ref(props.project.body);
 
-const descriptionWarning = computed(() => {
-  const text = description.value?.trim() || "";
-  const charCount = countText(text);
-
-  if (charCount < MIN_DESCRIPTION_CHARS) {
-    return `It's recommended to have a description with at least ${MIN_DESCRIPTION_CHARS} readable characters. (${charCount}/${MIN_DESCRIPTION_CHARS})`;
-  }
-
-  return null;
-});
-
 const patchRequestPayload = computed(() => {
   const payload: {
     body?: string;

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

@@ -82,10 +82,6 @@
       <label for="project-summary">
         <span class="label__title">Summary</span>
       </label>
-      <div v-if="summaryWarning" class="my-2 flex items-center gap-1.5 text-orange">
-        <TriangleAlertIcon class="my-auto" />
-        {{ summaryWarning }}
-      </div>
       <div class="textarea-wrapper summary-input">
         <textarea
           id="project-summary"
@@ -244,18 +240,9 @@
 
 <script setup>
 import { formatProjectStatus, formatProjectType } from "@modrinth/utils";
-import {
-  UploadIcon,
-  SaveIcon,
-  TrashIcon,
-  XIcon,
-  IssuesIcon,
-  CheckIcon,
-  TriangleAlertIcon,
-} from "@modrinth/assets";
+import { UploadIcon, SaveIcon, TrashIcon, XIcon, IssuesIcon, CheckIcon } from "@modrinth/assets";
 import { Multiselect } from "vue-multiselect";
 import { ConfirmModal, Avatar } from "@modrinth/ui";
-import { MIN_SUMMARY_CHARS } from "@modrinth/moderation";
 import FileInput from "~/components/ui/FileInput.vue";
 
 const props = defineProps({
@@ -313,17 +300,6 @@ const hasDeletePermission = computed(() => {
   return (props.currentMember.permissions & DELETE_PROJECT) === DELETE_PROJECT;
 });
 
-const summaryWarning = computed(() => {
-  const text = summary.value?.trim() || "";
-  const charCount = text.length;
-
-  if (charCount < MIN_SUMMARY_CHARS) {
-    return `It's recommended to have a summary with at least ${MIN_SUMMARY_CHARS} characters. (${charCount}/${MIN_SUMMARY_CHARS})`;
-  }
-
-  return null;
-});
-
 const sideTypes = ["required", "optional", "unsupported"];
 
 const patchData = computed(() => {

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

@@ -7,26 +7,11 @@
           id="project-issue-tracker"
           title="A place for users to report bugs, issues, and concerns about your project."
         >
-          <span class="label__title">Issue tracker </span>
+          <span class="label__title">Issue tracker</span>
           <span class="label__description">
             A place for users to report bugs, issues, and concerns about your project.
           </span>
         </label>
-        <TriangleAlertIcon
-          v-if="isIssuesLinkShortener"
-          v-tooltip="`Use of link shorteners is prohibited.`"
-          class="size-6 animate-pulse text-orange"
-        />
-        <TriangleAlertIcon
-          v-else-if="isIssuesDiscordUrl"
-          v-tooltip="`Discord invites are not appropriate for this link type.`"
-          class="size-6 animate-pulse text-orange"
-        />
-        <TriangleAlertIcon
-          v-else-if="!isIssuesUrlCommon"
-          v-tooltip="`Link includes a domain which isn't common for this link type.`"
-          class="size-6 animate-pulse text-orange"
-        />
         <input
           id="project-issue-tracker"
           v-model="issuesUrl"
@@ -41,26 +26,11 @@
           id="project-source-code"
           title="A page/repository containing the source code for your project"
         >
-          <span class="label__title">Source code </span>
+          <span class="label__title">Source code</span>
           <span class="label__description">
             A page/repository containing the source code for your project
           </span>
         </label>
-        <TriangleAlertIcon
-          v-if="isSourceLinkShortener"
-          v-tooltip="`Use of link shorteners is prohibited.`"
-          class="size-6 animate-pulse text-orange"
-        />
-        <TriangleAlertIcon
-          v-else-if="isSourceDiscordUrl"
-          v-tooltip="`Discord invites are not appropriate for this link type.`"
-          class="size-6 animate-pulse text-orange"
-        />
-        <TriangleAlertIcon
-          v-else-if="!isSourceUrlCommon"
-          v-tooltip="`Link includes a domain which isn't common for this link type.`"
-          class="size-6 animate-pulse text-orange"
-        />
         <input
           id="project-source-code"
           v-model="sourceUrl"
@@ -80,16 +50,6 @@
             A page containing information, documentation, and help for the project.
           </span>
         </label>
-        <TriangleAlertIcon
-          v-if="isWikiLinkShortener"
-          v-tooltip="`Use of link shorteners is prohibited.`"
-          class="size-6 animate-pulse text-orange"
-        />
-        <TriangleAlertIcon
-          v-else-if="isWikiDiscordUrl"
-          v-tooltip="`Discord invites are not appropriate for this link type.`"
-          class="size-6 animate-pulse text-orange"
-        />
         <input
           id="project-wiki-page"
           v-model="wikiUrl"
@@ -101,19 +61,9 @@
       </div>
       <div class="adjacent-input">
         <label id="project-discord-invite" title="An invitation link to your Discord server.">
-          <span class="label__title">Discord invite </span>
+          <span class="label__title">Discord invite</span>
           <span class="label__description"> An invitation link to your Discord server. </span>
         </label>
-        <TriangleAlertIcon
-          v-if="isDiscordLinkShortener"
-          v-tooltip="`Use of link shorteners is prohibited.`"
-          class="size-6 animate-pulse text-orange"
-        />
-        <TriangleAlertIcon
-          v-else-if="!isDiscordUrlCommon"
-          v-tooltip="`You're using a link which isn't common for this link type.`"
-          class="size-6 animate-pulse text-orange"
-        />
         <input
           id="project-discord-invite"
           v-model="discordUrl"
@@ -173,13 +123,7 @@
 
 <script setup>
 import { DropdownSelect } from "@modrinth/ui";
-import { SaveIcon, TriangleAlertIcon } from "@modrinth/assets";
-import {
-  isCommonUrl,
-  isDiscordUrl,
-  isLinkShortener,
-  commonLinkDomains,
-} from "@modrinth/moderation";
+import { SaveIcon } from "@modrinth/assets";
 
 const tags = useTags();
 
@@ -209,46 +153,6 @@ const sourceUrl = ref(props.project.source_url);
 const wikiUrl = ref(props.project.wiki_url);
 const discordUrl = ref(props.project.discord_url);
 
-const isIssuesUrlCommon = computed(() => {
-  if (!issuesUrl.value || issuesUrl.value.trim().length === 0) return true;
-  return isCommonUrl(issuesUrl.value, commonLinkDomains.issues);
-});
-
-const isSourceUrlCommon = computed(() => {
-  if (!sourceUrl.value || sourceUrl.value.trim().length === 0) return true;
-  return isCommonUrl(sourceUrl.value, commonLinkDomains.source);
-});
-
-const isDiscordUrlCommon = computed(() => {
-  if (!discordUrl.value || discordUrl.value.trim().length === 0) return true;
-  return isCommonUrl(discordUrl.value, commonLinkDomains.discord);
-});
-
-const isIssuesDiscordUrl = computed(() => {
-  return isDiscordUrl(issuesUrl.value);
-});
-
-const isSourceDiscordUrl = computed(() => {
-  return isDiscordUrl(sourceUrl.value);
-});
-
-const isWikiDiscordUrl = computed(() => {
-  return isDiscordUrl(wikiUrl.value);
-});
-
-const isIssuesLinkShortener = computed(() => {
-  return isLinkShortener(issuesUrl.value);
-});
-const isSourceLinkShortener = computed(() => {
-  return isLinkShortener(sourceUrl.value);
-});
-const isWikiLinkShortener = computed(() => {
-  return isLinkShortener(wikiUrl.value);
-});
-const isDiscordLinkShortener = computed(() => {
-  return isLinkShortener(discordUrl.value);
-});
-
 const rawDonationLinks = JSON.parse(JSON.stringify(props.project.donation_urls));
 rawDonationLinks.push({
   id: null,

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

@@ -6,31 +6,11 @@
           <span class="label__title size-card-header">Tags</span>
         </h3>
       </div>
-
-      <div
-        v-if="tooManyTagsWarning && !allTagsSelectedWarning"
-        class="my-2 flex items-center gap-1.5 text-orange"
-      >
-        <TriangleAlertIcon class="my-auto" />
-        {{ tooManyTagsWarning }}
-      </div>
-
-      <div v-if="multipleResolutionTagsWarning" class="my-2 flex items-center gap-1.5 text-orange">
-        <TriangleAlertIcon class="my-auto" />
-        {{ multipleResolutionTagsWarning }}
-      </div>
-
-      <div v-if="allTagsSelectedWarning" class="my-2 flex items-center gap-1.5 text-red">
-        <TriangleAlertIcon class="my-auto" />
-        <span>{{ allTagsSelectedWarning }}</span>
-      </div>
-
       <p>
         Accurate tagging is important to help people find your
         {{ formatProjectType(project.project_type).toLowerCase() }}. Make sure to select all tags
         that apply.
       </p>
-
       <p v-if="project.versions.length === 0" class="known-errors">
         Please upload a version first in order to select tags!
       </p>
@@ -132,188 +112,145 @@
   </div>
 </template>
 
-<script setup lang="ts">
-import { computed, ref } from "vue";
-import { StarIcon, SaveIcon, TriangleAlertIcon } from "@modrinth/assets";
-import {
-  formatCategory,
-  formatCategoryHeader,
-  formatProjectType,
-  sortedCategories,
-  type Project,
-} from "@modrinth/utils";
+<script>
+import { StarIcon, SaveIcon } from "@modrinth/assets";
+import { formatCategory, formatCategoryHeader, formatProjectType } from "@modrinth/utils";
 import Checkbox from "~/components/ui/Checkbox.vue";
 
-interface Category {
-  name: string;
-  header: string;
-  icon?: string;
-  project_type: string;
-}
+export default defineNuxtComponent({
+  components: {
+    Checkbox,
+    SaveIcon,
+    StarIcon,
+  },
+  props: {
+    project: {
+      type: Object,
+      default() {
+        return {};
+      },
+    },
+    allMembers: {
+      type: Array,
+      default() {
+        return [];
+      },
+    },
+    currentMember: {
+      type: Object,
+      default() {
+        return null;
+      },
+    },
+    patchProject: {
+      type: Function,
+      default() {
+        return () => {
+          this.$notify({
+            group: "main",
+            title: "An error occurred",
+            text: "Patch project function not found",
+            type: "error",
+          });
+        };
+      },
+    },
+  },
+  data() {
+    return {
+      selectedTags: this.$sortedCategories().filter(
+        (x) =>
+          x.project_type === this.project.actualProjectType &&
+          (this.project.categories.includes(x.name) ||
+            this.project.additional_categories.includes(x.name)),
+      ),
+      featuredTags: this.$sortedCategories().filter(
+        (x) =>
+          x.project_type === this.project.actualProjectType &&
+          this.project.categories.includes(x.name),
+      ),
+    };
+  },
+  computed: {
+    categoryLists() {
+      const lists = {};
+      this.$sortedCategories().forEach((x) => {
+        if (x.project_type === this.project.actualProjectType) {
+          const header = x.header;
+          if (!lists[header]) {
+            lists[header] = [];
+          }
+          lists[header].push(x);
+        }
+      });
+      return lists;
+    },
+    patchData() {
+      const data = {};
+      // Promote selected categories to featured if there are less than 3 featured
+      const newFeaturedTags = this.featuredTags.slice();
+      if (newFeaturedTags.length < 1 && this.selectedTags.length > newFeaturedTags.length) {
+        const nonFeaturedCategories = this.selectedTags.filter((x) => !newFeaturedTags.includes(x));
 
-interface Props {
-  project: Project & {
-    actualProjectType: string;
-  };
-  allMembers?: any[];
-  currentMember?: any;
-  patchProject?: (data: any) => void;
-}
+        nonFeaturedCategories
+          .slice(0, Math.min(nonFeaturedCategories.length, 3 - newFeaturedTags.length))
+          .forEach((x) => newFeaturedTags.push(x));
+      }
+      // Convert selected and featured categories to backend-usable arrays
+      const categories = newFeaturedTags.map((x) => x.name);
+      const additionalCategories = this.selectedTags
+        .filter((x) => !newFeaturedTags.includes(x))
+        .map((x) => x.name);
 
-const tags = useTags();
+      if (
+        categories.length !== this.project.categories.length ||
+        categories.some((value) => !this.project.categories.includes(value))
+      ) {
+        data.categories = categories;
+      }
 
-const props = withDefaults(defineProps<Props>(), {
-  allMembers: () => [],
-  currentMember: null,
-  patchProject: () => {
-    addNotification({
-      title: "An error occurred",
-      text: "Patch project function not found",
-      type: "error",
-    });
+      if (
+        additionalCategories.length !== this.project.additional_categories.length ||
+        additionalCategories.some((value) => !this.project.additional_categories.includes(value))
+      ) {
+        data.additional_categories = additionalCategories;
+      }
+
+      return data;
+    },
+    hasChanges() {
+      return Object.keys(this.patchData).length > 0;
+    },
+  },
+  methods: {
+    formatProjectType,
+    formatCategoryHeader,
+    formatCategory,
+    toggleCategory(category) {
+      if (this.selectedTags.includes(category)) {
+        this.selectedTags = this.selectedTags.filter((x) => x !== category);
+        if (this.featuredTags.includes(category)) {
+          this.featuredTags = this.featuredTags.filter((x) => x !== category);
+        }
+      } else {
+        this.selectedTags.push(category);
+      }
+    },
+    toggleFeaturedCategory(category) {
+      if (this.featuredTags.includes(category)) {
+        this.featuredTags = this.featuredTags.filter((x) => x !== category);
+      } else {
+        this.featuredTags.push(category);
+      }
+    },
+    saveChanges() {
+      if (this.hasChanges) {
+        this.patchProject(this.patchData);
+      }
+    },
   },
 });
-
-const selectedTags = ref<Category[]>(
-  sortedCategories(tags.value).filter(
-    (x: Category) =>
-      x.project_type === props.project.actualProjectType &&
-      (props.project.categories.includes(x.name) ||
-        props.project.additional_categories.includes(x.name)),
-  ),
-);
-
-const featuredTags = ref<Category[]>(
-  sortedCategories(tags.value).filter(
-    (x: Category) =>
-      x.project_type === props.project.actualProjectType &&
-      props.project.categories.includes(x.name),
-  ),
-);
-
-const categoryLists = computed(() => {
-  const lists: Record<string, Category[]> = {};
-  sortedCategories(tags.value).forEach((x: Category) => {
-    if (x.project_type === props.project.actualProjectType) {
-      const header = x.header;
-      if (!lists[header]) {
-        lists[header] = [];
-      }
-      lists[header].push(x);
-    }
-  });
-  return lists;
-});
-
-const tooManyTagsWarning = computed(() => {
-  const tagCount = selectedTags.value.length;
-  if (tagCount > 8) {
-    return `You've selected ${tagCount} tags. Consider reducing to 8 or fewer to keep your project focused and easier to discover.`;
-  }
-  return null;
-});
-
-const multipleResolutionTagsWarning = computed(() => {
-  if (props.project.project_type !== "resourcepack") return null;
-
-  const resolutionTags = selectedTags.value.filter((tag) =>
-    ["8x-", "16x", "32x", "48x", "64x", "128x", "256x", "512x+"].includes(tag.name),
-  );
-
-  if (resolutionTags.length > 1) {
-    return `You've selected ${resolutionTags.length} resolution tags (${resolutionTags
-      .map((t) => t.name)
-      .join(", ")
-      .replace("8x-", "8x or lower")
-      .replace(
-        "512x+",
-        "512x or higher",
-      )}). Resource packs should typically only have one resolution tag.`;
-  }
-  return null;
-});
-
-const allTagsSelectedWarning = computed(() => {
-  const categoriesForProjectType = sortedCategories(tags.value).filter(
-    (x: Category) => x.project_type === props.project.actualProjectType,
-  );
-  const totalSelectedTags = selectedTags.value.length;
-
-  if (
-    totalSelectedTags === categoriesForProjectType.length &&
-    categoriesForProjectType.length > 0
-  ) {
-    return `You've selected all ${categoriesForProjectType.length} available tags. Please select only the tags that truly apply to your project.`;
-  }
-  return null;
-});
-
-const patchData = computed(() => {
-  const data: Record<string, string[]> = {};
-
-  // Promote selected categories to featured if there are less than 3 featured
-  const newFeaturedTags = featuredTags.value.slice();
-  if (newFeaturedTags.length < 1 && selectedTags.value.length > newFeaturedTags.length) {
-    const nonFeaturedCategories = selectedTags.value.filter((x) => !newFeaturedTags.includes(x));
-
-    nonFeaturedCategories
-      .slice(0, Math.min(nonFeaturedCategories.length, 3 - newFeaturedTags.length))
-      .forEach((x) => newFeaturedTags.push(x));
-  }
-
-  // Convert selected and featured categories to backend-usable arrays
-  const categories = newFeaturedTags.map((x) => x.name);
-  const additionalCategories = selectedTags.value
-    .filter((x) => !newFeaturedTags.includes(x))
-    .map((x) => x.name);
-
-  if (
-    categories.length !== props.project.categories.length ||
-    categories.some((value) => !props.project.categories.includes(value))
-  ) {
-    data.categories = categories;
-  }
-
-  if (
-    additionalCategories.length !== props.project.additional_categories.length ||
-    additionalCategories.some((value) => !props.project.additional_categories.includes(value))
-  ) {
-    data.additional_categories = additionalCategories;
-  }
-
-  return data;
-});
-
-const hasChanges = computed(() => {
-  return Object.keys(patchData.value).length > 0;
-});
-
-const toggleCategory = (category: Category) => {
-  if (selectedTags.value.includes(category)) {
-    selectedTags.value = selectedTags.value.filter((x) => x !== category);
-    if (featuredTags.value.includes(category)) {
-      featuredTags.value = featuredTags.value.filter((x) => x !== category);
-    }
-  } else {
-    selectedTags.value.push(category);
-  }
-};
-
-const toggleFeaturedCategory = (category: Category) => {
-  if (featuredTags.value.includes(category)) {
-    featuredTags.value = featuredTags.value.filter((x) => x !== category);
-  } else {
-    featuredTags.value.push(category);
-  }
-};
-
-const saveChanges = () => {
-  if (hasChanges.value) {
-    props.patchProject(patchData.value);
-  }
-};
 </script>
-
 <style lang="scss" scoped>
 .label__title {
   display: flex;

apps/labrinth/.sqlx/query-139ba392ab53d975e63e2c328abad04831b4bed925bded054bb8a35d0680bed8.json

@@ -0,0 +1,34 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT id, metadata, unitary\n            FROM products\n            WHERE metadata ->> 'type' = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "metadata",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 2,
+        "name": "unitary",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "139ba392ab53d975e63e2c328abad04831b4bed925bded054bb8a35d0680bed8"
+}

apps/labrinth/.sqlx/query-1dea22589b0440cfeaf98b6869bdaad852d58c61cf2a1affb01acc4984d42341.json

@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE users_redeemals\n            SET status = $1\n            WHERE\n              status = $2\n              AND NOW() - last_attempt > INTERVAL '5 minutes'\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "1dea22589b0440cfeaf98b6869bdaad852d58c61cf2a1affb01acc4984d42341"
+}

apps/labrinth/.sqlx/query-2e18682890f7ec5a618991c2a4c77ca9546970f314f902a5197eb2d189cf81f7.json

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

apps/labrinth/.sqlx/query-58ccda393820a272d72a3e41eccc5db30ab6ad0bb346caf781efdb5aab524286.json

@@ -0,0 +1,59 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT * FROM users_redeemals WHERE status = $1 LIMIT $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 1,
+        "name": "user_id",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "offer",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 3,
+        "name": "redeemed",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 4,
+        "name": "status",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 5,
+        "name": "last_attempt",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 6,
+        "name": "n_attempts",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      false
+    ]
+  },
+  "hash": "58ccda393820a272d72a3e41eccc5db30ab6ad0bb346caf781efdb5aab524286"
+}

apps/labrinth/.sqlx/query-7adff98b270adc4a48e2c8a89a32ca1b83104102190597f4cda05e6f1c1e8f26.json

@@ -0,0 +1,27 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n          INSERT INTO users_redeemals\n          (user_id, offer, redeemed, status, last_attempt, n_attempts)\n          VALUES ($1, $2, $3, $4, $5, $6)\n          RETURNING id",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Varchar",
+        "Timestamptz",
+        "Varchar",
+        "Timestamptz",
+        "Int4"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "7adff98b270adc4a48e2c8a89a32ca1b83104102190597f4cda05e6f1c1e8f26"
+}

apps/labrinth/.sqlx/query-8d61d1ecc5321e2ac8932ef99de0f77e49cced9c7726ea746392a5fcbe75f2f5.json

@@ -0,0 +1,19 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n          UPDATE users_redeemals\n          SET\n            offer = $2,\n            status = $3,\n            redeemed = $4,\n            last_attempt = $5,\n            n_attempts = $6\n          WHERE id = $1\n          ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int4",
+        "Varchar",
+        "Varchar",
+        "Timestamptz",
+        "Timestamptz",
+        "Int4"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "8d61d1ecc5321e2ac8932ef99de0f77e49cced9c7726ea746392a5fcbe75f2f5"
+}

apps/labrinth/.sqlx/query-949da1b1e3c772f79dd1248f99774fa39f140d3943f975067799f46f2cb48a0f.json

@@ -0,0 +1,29 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n          SELECT\n            users.id,\n            users_redeemals.status AS \"status: Option<String>\"\n          FROM\n            users\n          LEFT JOIN\n            users_redeemals ON users_redeemals.user_id = users.id\n              AND users_redeemals.offer = $2\n          WHERE\n            users.username = $1\n          ORDER BY\n            users_redeemals.redeemed DESC\n          LIMIT 1\n          ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "status: Option<String>",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "949da1b1e3c772f79dd1248f99774fa39f140d3943f975067799f46f2cb48a0f"
+}

apps/labrinth/.sqlx/query-9898e9962ba497ef8482ffa57d6590f7933e9f2465e9458fab005fe33d96ec7a.json

@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT\n              EXISTS (\n                SELECT\n                  1\n                FROM\n                  users_redeemals\n                WHERE\n                  user_id = $1\n                  AND offer = $2\n               ) AS \"exists!\"\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "exists!",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "9898e9962ba497ef8482ffa57d6590f7933e9f2465e9458fab005fe33d96ec7a"
+}

apps/labrinth/.sqlx/query-c37fc91df7619ac5c10fd04fdc2556aa98b80ccbfc53813659464a0e5e09fae8.json

@@ -0,0 +1,41 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT id, product_id, prices, currency_code\n            FROM products_prices\n            WHERE product_id = ANY($1::bigint[])\n                AND public = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "product_id",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "prices",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 3,
+        "name": "currency_code",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8Array",
+        "Bool"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "c37fc91df7619ac5c10fd04fdc2556aa98b80ccbfc53813659464a0e5e09fae8"
+}

apps/labrinth/.sqlx/query-e3f6fa7e5ec6dee4fcdff904b3e692dccd55372d9cc827a1d68361fd036bc183.json

@@ -0,0 +1,18 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE users_redeemals\n            SET\n              status = $3,\n              last_attempt = $4,\n              n_attempts = $5\n            WHERE id = $1 AND status = $2\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int4",
+        "Text",
+        "Varchar",
+        "Timestamptz",
+        "Int4"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "e3f6fa7e5ec6dee4fcdff904b3e692dccd55372d9cc827a1d68361fd036bc183"
+}

apps/labrinth/.sqlx/query-fda7d5659efb2b6940a3247043945503c85e3f167216e0e2403e08095a3e32c9.json

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

apps/labrinth/migrations/20250804221014_users-redeemals.sql

@@ -0,0 +1,11 @@
+-- Add migration script here
+
+CREATE TABLE IF NOT EXISTS users_redeemals (
+    id            SERIAL PRIMARY KEY,
+    user_id       BIGINT NOT NULL REFERENCES users(id),
+    offer         VARCHAR NOT NULL,
+    redeemed      TIMESTAMP WITH TIME ZONE NOT NULL,
+    status        VARCHAR NOT NULL,
+    last_attempt  TIMESTAMP WITH TIME ZONE,
+    n_attempts    INTEGER NOT NULL
+);

apps/labrinth/migrations/20250805001654_product-prices-public.sql

@@ -0,0 +1,6 @@
+-- Add migration script here
+
+ALTER TABLE
+  products_prices
+ADD COLUMN
+  public BOOLEAN NOT NULL DEFAULT true;

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

@@ -197,7 +197,7 @@ impl DBCharge {
     ) -> Result<Option<DBCharge>, DatabaseError> {
         let user_subscription_id = user_subscription_id.0;
         let res = select_charges_with_predicate!(
-            "WHERE subscription_id = $1 AND (status = 'open' OR status = 'cancelled' OR status = 'failed')",
+            "WHERE subscription_id = $1 AND (status = 'open' OR status = 'expiring' OR status = 'cancelled' OR status = 'failed')",
             user_subscription_id
         )
         .fetch_optional(exec)
@@ -240,6 +240,7 @@ impl DBCharge {
                 charge_type = $1 AND
                 (
                     (status = 'cancelled' AND due < NOW()) OR
+                    (status = 'expiring' AND due < NOW()) OR
                     (status = 'failed' AND last_attempt < NOW() - INTERVAL '2 days')
                 )
             "#,

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

@@ -25,6 +25,7 @@ pub mod team_item;
 pub mod thread_item;
 pub mod user_item;
 pub mod user_subscription_item;
+pub mod users_redeemals;
 pub mod version_item;
 
 pub use collection_item::DBCollection;

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

@@ -57,6 +57,26 @@ impl DBProduct {
         Ok(Self::get_many(&[id], exec).await?.into_iter().next())
     }
 
+    pub async fn get_by_type<'a, E>(
+        exec: E,
+        r#type: &str,
+    ) -> Result<Vec<Self>, DatabaseError>
+    where
+        E: sqlx::PgExecutor<'a>,
+    {
+        let maybe_row = select_products_with_predicate!(
+            "WHERE metadata ->> 'type' = $1",
+            r#type
+        )
+        .fetch_all(exec)
+        .await?;
+
+        maybe_row
+            .into_iter()
+            .map(|r| r.try_into().map_err(Into::into))
+            .collect()
+    }
+
     pub async fn get_many(
         ids: &[DBProductId],
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
@@ -100,10 +120,11 @@ pub struct QueryProductWithPrices {
 }
 
 impl QueryProductWithPrices {
-    pub async fn list<'a, E>(
+    /// Lists products with at least one public price.
+    pub async fn list_purchaseable<'a, E>(
         exec: E,
         redis: &RedisPool,
-    ) -> Result<Vec<QueryProductWithPrices>, DatabaseError>
+    ) -> Result<Vec<Self>, DatabaseError>
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
     {
@@ -118,7 +139,51 @@ impl QueryProductWithPrices {
         }
 
         let all_products = product_item::DBProduct::get_all(exec).await?;
-        let prices = product_item::DBProductPrice::get_all_products_prices(
+        let prices =
+            product_item::DBProductPrice::get_all_public_products_prices(
+                &all_products.iter().map(|x| x.id).collect::<Vec<_>>(),
+                exec,
+            )
+            .await?;
+
+        let products = all_products
+            .into_iter()
+            .filter_map(|x| {
+                Some(QueryProductWithPrices {
+                    id: x.id,
+                    metadata: x.metadata,
+                    prices: prices
+                        .remove(&x.id)
+                        .map(|x| x.1)?
+                        .into_iter()
+                        .map(|x| DBProductPrice {
+                            id: x.id,
+                            product_id: x.product_id,
+                            prices: x.prices,
+                            currency_code: x.currency_code,
+                        })
+                        .collect(),
+                    unitary: x.unitary,
+                })
+            })
+            .collect::<Vec<_>>();
+
+        redis
+            .set_serialized_to_json(PRODUCTS_NAMESPACE, "all", &products, None)
+            .await?;
+
+        Ok(products)
+    }
+
+    pub async fn list_by_product_type<'a, E>(
+        exec: E,
+        r#type: &str,
+    ) -> Result<Vec<Self>, DatabaseError>
+    where
+        E: sqlx::PgExecutor<'a> + Copy,
+    {
+        let all_products = DBProduct::get_by_type(exec, r#type).await?;
+        let prices = DBProductPrice::get_all_products_prices(
             &all_products.iter().map(|x| x.id).collect::<Vec<_>>(),
             exec,
         )
@@ -126,29 +191,26 @@ impl QueryProductWithPrices {
 
         let products = all_products
             .into_iter()
-            .map(|x| QueryProductWithPrices {
-                id: x.id,
-                metadata: x.metadata,
-                prices: prices
-                    .remove(&x.id)
-                    .map(|x| x.1)
-                    .unwrap_or_default()
-                    .into_iter()
-                    .map(|x| DBProductPrice {
-                        id: x.id,
-                        product_id: x.product_id,
-                        prices: x.prices,
-                        currency_code: x.currency_code,
-                    })
-                    .collect(),
-                unitary: x.unitary,
+            .filter_map(|x| {
+                Some(QueryProductWithPrices {
+                    id: x.id,
+                    metadata: x.metadata,
+                    prices: prices
+                        .remove(&x.id)
+                        .map(|x| x.1)?
+                        .into_iter()
+                        .map(|x| DBProductPrice {
+                            id: x.id,
+                            product_id: x.product_id,
+                            prices: x.prices,
+                            currency_code: x.currency_code,
+                        })
+                        .collect(),
+                    unitary: x.unitary,
+                })
             })
             .collect::<Vec<_>>();
 
-        redis
-            .set_serialized_to_json(PRODUCTS_NAMESPACE, "all", &products, None)
-            .await?;
-
         Ok(products)
     }
 }
@@ -169,7 +231,11 @@ struct ProductPriceQueryResult {
 }
 
 macro_rules! select_prices_with_predicate {
-    ($predicate:tt, $param:ident) => {
+    ($predicate:tt, $param1:ident) => {
+        select_prices_with_predicate!($predicate, $param1, )
+    };
+
+    ($predicate:tt, $($param:ident,)+) => {
         sqlx::query_as!(
             ProductPriceQueryResult,
             r#"
@@ -177,7 +243,7 @@ macro_rules! select_prices_with_predicate {
             FROM products_prices
             "#
                 + $predicate,
-            $param
+            $($param),+
         )
     };
 }
@@ -231,33 +297,82 @@ impl DBProductPrice {
         Ok(res.remove(&product_id).map(|x| x.1).unwrap_or_default())
     }
 
+    pub async fn get_all_public_product_prices(
+        product_id: DBProductId,
+        exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
+    ) -> Result<Vec<DBProductPrice>, DatabaseError> {
+        let res =
+            Self::get_all_public_products_prices(&[product_id], exec).await?;
+
+        Ok(res.remove(&product_id).map(|x| x.1).unwrap_or_default())
+    }
+
+    /// Gets all public prices for the given products. If a product has no public price,
+    /// it won't be included in the resulting map.
+    pub async fn get_all_public_products_prices(
+        product_ids: &[DBProductId],
+        exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
+    ) -> Result<DashMap<DBProductId, Vec<DBProductPrice>>, DatabaseError> {
+        Self::get_all_products_prices_with_visibility(
+            product_ids,
+            Some(true),
+            exec,
+        )
+        .await
+    }
+
     pub async fn get_all_products_prices(
         product_ids: &[DBProductId],
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
+    ) -> Result<DashMap<DBProductId, Vec<DBProductPrice>>, DatabaseError> {
+        Self::get_all_products_prices_with_visibility(product_ids, None, exec)
+            .await
+    }
+
+    async fn get_all_products_prices_with_visibility(
+        product_ids: &[DBProductId],
+        public_filter: Option<bool>,
+        exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
     ) -> Result<DashMap<DBProductId, Vec<DBProductPrice>>, DatabaseError> {
         let ids = product_ids.iter().map(|id| id.0).collect_vec();
         let ids_ref: &[i64] = &ids;
 
         use futures_util::TryStreamExt;
-        let prices = select_prices_with_predicate!(
-            "WHERE product_id = ANY($1::bigint[])",
-            ids_ref
-        )
-        .fetch(exec)
-        .try_fold(
-            DashMap::new(),
-            |acc: DashMap<DBProductId, Vec<DBProductPrice>>, x| {
-                if let Ok(item) = <ProductPriceQueryResult as TryInto<
-                    DBProductPrice,
-                >>::try_into(x)
-                {
-                    acc.entry(item.product_id).or_default().push(item);
-                }
 
-                async move { Ok(acc) }
-            },
-        )
-        .await?;
+        let predicate = |acc: DashMap<DBProductId, Vec<DBProductPrice>>, x| {
+            if let Ok(item) = <ProductPriceQueryResult as TryInto<
+                DBProductPrice,
+            >>::try_into(x)
+            {
+                acc.entry(item.product_id).or_default().push(item);
+            }
+
+            async move { Ok(acc) }
+        };
+
+        let prices = match public_filter {
+            None => {
+                select_prices_with_predicate!(
+                    "WHERE product_id = ANY($1::bigint[])",
+                    ids_ref,
+                )
+                .fetch(exec)
+                .try_fold(DashMap::new(), predicate)
+                .await?
+            }
+
+            Some(public) => {
+                select_prices_with_predicate!(
+                    "WHERE product_id = ANY($1::bigint[])
+                AND public = $2",
+                    ids_ref,
+                    public,
+                )
+                .fetch(exec)
+                .try_fold(DashMap::new(), predicate)
+                .await?
+            }
+        };
 
         Ok(prices)
     }

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

@@ -0,0 +1,301 @@
+use crate::database::models::DBUserId;
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+use sqlx::{query, query_scalar};
+use std::fmt;
+
+#[derive(
+    Debug, Default, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize,
+)]
+#[serde(rename_all = "snake_case")]
+pub enum Offer {
+    #[default]
+    Medal,
+}
+
+impl Offer {
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            Offer::Medal => "medal",
+        }
+    }
+
+    pub fn from_str_or_default(s: &str) -> Self {
+        match s {
+            "medal" => Offer::Medal,
+            _ => Offer::Medal,
+        }
+    }
+}
+
+impl fmt::Display for Offer {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.as_str())
+    }
+}
+
+#[derive(
+    Debug, Default, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize,
+)]
+#[serde(rename_all = "snake_case")]
+pub enum Status {
+    #[default]
+    Pending,
+    Processing,
+    Processed,
+}
+
+impl Status {
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            Status::Pending => "pending",
+            Status::Processing => "processing",
+            Status::Processed => "processed",
+        }
+    }
+
+    pub fn from_str_or_default(s: &str) -> Self {
+        match s {
+            "pending" => Status::Pending,
+            "processing" => Status::Processing,
+            "processed" => Status::Processed,
+            _ => Status::default(),
+        }
+    }
+}
+
+impl fmt::Display for Status {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.as_str())
+    }
+}
+
+#[derive(Debug)]
+pub struct UserRedeemal {
+    pub id: i32,
+    pub user_id: DBUserId,
+    pub offer: Offer,
+    pub redeemed: DateTime<Utc>,
+    pub last_attempt: Option<DateTime<Utc>>,
+    pub n_attempts: i32,
+    pub status: Status,
+}
+
+impl UserRedeemal {
+    pub async fn get_pending<'a, E>(
+        exec: E,
+        limit: i64,
+    ) -> sqlx::Result<Vec<UserRedeemal>>
+    where
+        E: sqlx::PgExecutor<'a>,
+    {
+        let redeemals = query!(
+            r#"SELECT * FROM users_redeemals WHERE status = $1 LIMIT $2"#,
+            Status::Pending.as_str(),
+            limit
+        )
+        .fetch_all(exec)
+        .await?
+        .into_iter()
+        .map(|row| UserRedeemal {
+            id: row.id,
+            user_id: DBUserId(row.user_id),
+            offer: Offer::from_str_or_default(&row.offer),
+            redeemed: row.redeemed,
+            last_attempt: row.last_attempt,
+            n_attempts: row.n_attempts,
+            status: Status::from_str_or_default(&row.status),
+        })
+        .collect();
+
+        Ok(redeemals)
+    }
+
+    pub async fn update_stuck_5_minutes<'a, E>(exec: E) -> sqlx::Result<()>
+    where
+        E: sqlx::PgExecutor<'a>,
+    {
+        query!(
+            r#"
+            UPDATE users_redeemals
+            SET status = $1
+            WHERE
+              status = $2
+              AND NOW() - last_attempt > INTERVAL '5 minutes'
+            "#,
+            Status::Pending.as_str(),
+            Status::Processing.as_str(),
+        )
+        .execute(exec)
+        .await?;
+
+        Ok(())
+    }
+
+    pub async fn exists_by_user_and_offer<'a, E>(
+        exec: E,
+        user_id: DBUserId,
+        offer: Offer,
+    ) -> sqlx::Result<bool>
+    where
+        E: sqlx::PgExecutor<'a>,
+    {
+        query_scalar!(
+            r#"SELECT
+              EXISTS (
+                SELECT
+                  1
+                FROM
+                  users_redeemals
+                WHERE
+                  user_id = $1
+                  AND offer = $2
+               ) AS "exists!"
+            "#,
+            user_id.0,
+            offer.as_str(),
+        )
+        .fetch_one(exec)
+        .await
+    }
+
+    pub async fn insert<'a, E>(&mut self, exec: E) -> sqlx::Result<()>
+    where
+        E: sqlx::PgExecutor<'a>,
+    {
+        let query = query_scalar!(
+            r#"
+          INSERT INTO users_redeemals
+          (user_id, offer, redeemed, status, last_attempt, n_attempts)
+          VALUES ($1, $2, $3, $4, $5, $6)
+          RETURNING id"#,
+            self.user_id.0,
+            self.offer.as_str(),
+            self.redeemed,
+            self.status.as_str(),
+            self.last_attempt,
+            self.n_attempts,
+        );
+
+        let id = query.fetch_one(exec).await?;
+
+        self.id = id;
+
+        Ok(())
+    }
+
+    /// Updates `status`, `last_attempt`, and `n_attempts` only if `status` is currently pending.
+    /// Returns `true` if the status was updated, `false` otherwise.
+    pub async fn update_status_if_pending<'a, E>(
+        &self,
+        exec: E,
+    ) -> sqlx::Result<bool>
+    where
+        E: sqlx::PgExecutor<'a>,
+    {
+        let query = query!(
+            r#"
+            UPDATE users_redeemals
+            SET
+              status = $3,
+              last_attempt = $4,
+              n_attempts = $5
+            WHERE id = $1 AND status = $2
+            "#,
+            self.id,
+            Status::Pending.as_str(),
+            self.status.as_str(),
+            self.last_attempt,
+            self.n_attempts,
+        );
+
+        let query_result = query.execute(exec).await?;
+
+        Ok(query_result.rows_affected() > 0)
+    }
+
+    pub async fn update<'a, E>(&self, exec: E) -> sqlx::Result<()>
+    where
+        E: sqlx::PgExecutor<'a>,
+    {
+        let query = query!(
+            r#"
+          UPDATE users_redeemals
+          SET
+            offer = $2,
+            status = $3,
+            redeemed = $4,
+            last_attempt = $5,
+            n_attempts = $6
+          WHERE id = $1
+          "#,
+            self.id,
+            self.offer.as_str(),
+            self.status.as_str(),
+            self.redeemed,
+            self.last_attempt,
+            self.n_attempts,
+        );
+
+        query.execute(exec).await?;
+
+        Ok(())
+    }
+}
+
+#[derive(Debug)]
+pub struct RedeemalLookupFields {
+    pub user_id: DBUserId,
+    pub redeemal_status: Option<Status>,
+}
+
+impl RedeemalLookupFields {
+    /// Returns the redeemal status of a user for an offer, while looking up the user
+    /// itself. **This expects a single redeemal per user/offer pair**.
+    ///
+    /// If the returned value is `Ok(None)`, the user doesn't exist.
+    ///
+    /// If the returned value is `Ok(Some(fields))`, but `redeemal_status` is `None`,
+    /// the user exists and has not redeemed the offer.
+    pub async fn redeemal_status_by_username_and_offer<'a, E>(
+        exec: E,
+        user_username: &str,
+        offer: Offer,
+    ) -> sqlx::Result<Option<RedeemalLookupFields>>
+    where
+        E: sqlx::PgExecutor<'a>,
+    {
+        let maybe_row = query!(
+            r#"
+          SELECT
+            users.id,
+            users_redeemals.status AS "status: Option<String>"
+          FROM
+            users
+          LEFT JOIN
+            users_redeemals ON users_redeemals.user_id = users.id
+              AND users_redeemals.offer = $2
+          WHERE
+            users.username = $1
+          ORDER BY
+            users_redeemals.redeemed DESC
+          LIMIT 1
+          "#,
+            user_username,
+            offer.as_str(),
+        )
+        .fetch_optional(exec)
+        .await?;
+
+        // If no row was returned, the user doesn't exist.
+        // If a row NULL status was returned, the user exists but has no redeemed the offer.
+
+        Ok(maybe_row.map(|row| RedeemalLookupFields {
+            user_id: DBUserId(row.id),
+            redeemal_status: row
+                .status
+                .as_deref()
+                .map(Status::from_str_or_default),
+        }))
+    }
+}

apps/labrinth/src/models/v3/billing.rs

@@ -24,6 +24,13 @@ pub enum ProductMetadata {
         swap: u32,
         storage: u32,
     },
+    Medal {
+        cpu: u32,
+        ram: u32,
+        swap: u32,
+        storage: u32,
+        region: String,
+    },
 }
 
 #[derive(Serialize, Deserialize)]
@@ -48,6 +55,7 @@ pub enum Price {
 #[derive(Serialize, Deserialize, Hash, Eq, PartialEq, Debug, Copy, Clone)]
 #[serde(rename_all = "kebab-case")]
 pub enum PriceDuration {
+    FiveDays,
     Monthly,
     Quarterly,
     Yearly,
@@ -56,6 +64,7 @@ pub enum PriceDuration {
 impl PriceDuration {
     pub fn duration(&self) -> chrono::Duration {
         match self {
+            PriceDuration::FiveDays => chrono::Duration::days(5),
             PriceDuration::Monthly => chrono::Duration::days(30),
             PriceDuration::Quarterly => chrono::Duration::days(90),
             PriceDuration::Yearly => chrono::Duration::days(365),
@@ -64,6 +73,7 @@ impl PriceDuration {
 
     pub fn from_string(string: &str) -> PriceDuration {
         match string {
+            "five-days" => PriceDuration::FiveDays,
             "monthly" => PriceDuration::Monthly,
             "quarterly" => PriceDuration::Quarterly,
             "yearly" => PriceDuration::Yearly,
@@ -76,6 +86,7 @@ impl PriceDuration {
             PriceDuration::Monthly => "monthly",
             PriceDuration::Quarterly => "quarterly",
             PriceDuration::Yearly => "yearly",
+            PriceDuration::FiveDays => "five-days",
         }
     }
 
@@ -84,6 +95,7 @@ impl PriceDuration {
             PriceDuration::Monthly,
             PriceDuration::Quarterly,
             PriceDuration::Yearly,
+            PriceDuration::FiveDays,
         ]
         .into_iter()
     }
@@ -146,6 +158,7 @@ impl SubscriptionStatus {
 #[serde(tag = "type", rename_all = "kebab-case")]
 pub enum SubscriptionMetadata {
     Pyro { id: String, region: Option<String> },
+    Medal { id: String },
 }
 
 #[derive(Serialize, Deserialize)]
@@ -207,6 +220,10 @@ pub enum ChargeStatus {
     Succeeded,
     Failed,
     Cancelled,
+    // Expiring charges are charges that aren't expected to be processed
+    // but can be promoted to a full charge, like for trials/freebies. When
+    // due, the underlying subscription is unprovisioned.
+    Expiring,
 }
 
 impl ChargeStatus {
@@ -217,6 +234,7 @@ impl ChargeStatus {
             "failed" => ChargeStatus::Failed,
             "open" => ChargeStatus::Open,
             "cancelled" => ChargeStatus::Cancelled,
+            "expiring" => ChargeStatus::Expiring,
             _ => ChargeStatus::Failed,
         }
     }
@@ -228,6 +246,7 @@ impl ChargeStatus {
             ChargeStatus::Failed => "failed",
             ChargeStatus::Open => "open",
             ChargeStatus::Cancelled => "cancelled",
+            ChargeStatus::Expiring => "expiring",
         }
     }
 }
@@ -235,12 +254,14 @@ impl ChargeStatus {
 #[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq)]
 pub enum PaymentPlatform {
     Stripe,
+    None,
 }
 
 impl PaymentPlatform {
     pub fn from_string(string: &str) -> PaymentPlatform {
         match string {
             "stripe" => PaymentPlatform::Stripe,
+            "none" => PaymentPlatform::None,
             _ => PaymentPlatform::Stripe,
         }
     }
@@ -248,6 +269,7 @@ impl PaymentPlatform {
     pub fn as_str(&self) -> &'static str {
         match self {
             PaymentPlatform::Stripe => "stripe",
+            PaymentPlatform::None => "none",
         }
     }
 }

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

@@ -1,5 +1,8 @@
 use crate::auth::{get_user_from_headers, send_email};
 use crate::database::models::charge_item::DBCharge;
+use crate::database::models::user_item::DBUser;
+use crate::database::models::user_subscription_item::DBUserSubscription;
+use crate::database::models::users_redeemals::{self, UserRedeemal};
 use crate::database::models::{
     generate_charge_id, generate_user_subscription_id, product_item,
     user_subscription_item,
@@ -14,6 +17,7 @@ use crate::models::pats::Scopes;
 use crate::models::users::Badges;
 use crate::queue::session::AuthQueue;
 use crate::routes::ApiError;
+use crate::util::archon::{ArchonClient, CreateServerRequest, Specs};
 use actix_web::{HttpRequest, HttpResponse, delete, get, patch, post, web};
 use ariadne::ids::base62_impl::{parse_base62, to_base62};
 use chrono::{Duration, Utc};
@@ -59,8 +63,10 @@ pub async fn products(
     pool: web::Data<PgPool>,
     redis: web::Data<RedisPool>,
 ) -> Result<HttpResponse, ApiError> {
-    let products =
-        product_item::QueryProductWithPrices::list(&**pool, &redis).await?;
+    let products = product_item::QueryProductWithPrices::list_purchaseable(
+        &**pool, &redis,
+    )
+    .await?;
 
     let products = products
         .into_iter()
@@ -182,7 +188,9 @@ pub async fn refund_charge(
                 ChargeStatus::Open
                 | ChargeStatus::Processing
                 | ChargeStatus::Succeeded => Some(x.amount),
-                ChargeStatus::Failed | ChargeStatus::Cancelled => None,
+                ChargeStatus::Failed
+                | ChargeStatus::Cancelled
+                | ChargeStatus::Expiring => None,
             })
             .sum::<i64>();
 
@@ -256,6 +264,12 @@ pub async fn refund_charge(
                         ));
                     }
                 }
+                PaymentPlatform::None => {
+                    return Err(ApiError::InvalidInput(
+                        "This charge was not processed via a payment platform."
+                            .to_owned(),
+                    ));
+                }
             }
         };
 
@@ -370,6 +384,7 @@ pub async fn edit_subscription(
         })?;
 
         if let Some(cancelled) = &edit_subscription.cancelled {
+            // Notably, cannot cancel/uncancel expiring charges.
             if !matches!(
                 open_charge.status,
                 ChargeStatus::Open
@@ -394,14 +409,17 @@ pub async fn edit_subscription(
 
         if let Some(interval) = &edit_subscription.interval {
             if let Price::Recurring { intervals } = &current_price.prices {
-                if let Some(price) = intervals.get(interval) {
-                    open_charge.subscription_interval = Some(*interval);
-                    open_charge.amount = *price as i64;
-                } else {
-                    return Err(ApiError::InvalidInput(
-                        "Interval is not valid for this subscription!"
-                            .to_string(),
-                    ));
+                // For expiring charges, the interval is handled in the Product branch.
+                if open_charge.status != ChargeStatus::Expiring {
+                    if let Some(price) = intervals.get(interval) {
+                        open_charge.subscription_interval = Some(*interval);
+                        open_charge.amount = *price as i64;
+                    } else {
+                        return Err(ApiError::InvalidInput(
+                            "Interval is not valid for this subscription!"
+                                .to_string(),
+                        ));
+                    }
                 }
             }
         }
@@ -429,48 +447,14 @@ pub async fn edit_subscription(
                 ));
             }
 
-            let interval = open_charge.due - Utc::now();
-            let duration = PriceDuration::Monthly;
+            // If the charge is an expiring charge, we need to create a payment
+            // intent as if the user was subscribing to the product, as opposed
+            // to a proration.
+            if open_charge.status == ChargeStatus::Expiring {
+                // We need a new interval when promoting the charge.
+                let interval = edit_subscription.interval
+                    .ok_or_else(|| ApiError::InvalidInput("You need to specify an interval when promoting an expiring charge.".to_owned()))?;
 
-            let current_amount = match &current_price.prices {
-                Price::OneTime { price } => *price,
-                Price::Recurring { intervals } => *intervals.get(&duration).ok_or_else(|| {
-                    ApiError::InvalidInput(
-                        "Could not find a valid price for the user's duration".to_string(),
-                    )
-                })?,
-            };
-
-            let amount = match &product_price.prices {
-                Price::OneTime { price } => *price,
-                Price::Recurring { intervals } => *intervals.get(&duration).ok_or_else(|| {
-                    ApiError::InvalidInput(
-                        "Could not find a valid price for the user's duration".to_string(),
-                    )
-                })?,
-            };
-
-            let complete = Decimal::from(interval.num_seconds())
-                / Decimal::from(duration.duration().num_seconds());
-            let proration = (Decimal::from(amount - current_amount) * complete)
-                .floor()
-                .to_i32()
-                .ok_or_else(|| {
-                    ApiError::InvalidInput(
-                        "Could not convert proration to i32".to_string(),
-                    )
-                })?;
-
-            // First branch: Plan downgrade, update future charge
-            // Second branch: For small transactions (under 30 cents), we make a loss on the
-            // proration due to fees. In these situations, just give it to them for free, because
-            // their next charge will be in a day or two anyway.
-            if current_amount > amount || proration < 30 {
-                open_charge.price_id = product_price.id;
-                open_charge.amount = amount as i64;
-
-                None
-            } else {
                 let charge_id = generate_charge_id(&mut transaction).await?;
 
                 let customer_id = get_or_create_customer(
@@ -483,6 +467,15 @@ pub async fn edit_subscription(
                 )
                 .await?;
 
+                let new_price_value = match product_price.prices {
+                    Price::OneTime { ref price } => *price,
+                    Price::Recurring { ref intervals } => {
+                        *intervals
+                            .get(&interval)
+                            .ok_or_else(|| ApiError::InvalidInput("Could not find a valid price for the specified duration".to_owned()))?
+                    }
+                };
+
                 let currency = Currency::from_str(
                     &current_price.currency_code.to_lowercase(),
                 )
@@ -491,7 +484,7 @@ pub async fn edit_subscription(
                 })?;
 
                 let mut intent =
-                    CreatePaymentIntent::new(proration as i64, currency);
+                    CreatePaymentIntent::new(new_price_value as i64, currency);
 
                 let mut metadata = HashMap::new();
                 metadata.insert(
@@ -512,15 +505,11 @@ pub async fn edit_subscription(
                 );
                 metadata.insert(
                     "modrinth_subscription_interval".to_string(),
-                    open_charge
-                        .subscription_interval
-                        .unwrap_or(PriceDuration::Monthly)
-                        .as_str()
-                        .to_string(),
+                    interval.as_str().to_string(),
                 );
                 metadata.insert(
                     "modrinth_charge_type".to_string(),
-                    ChargeType::Proration.as_str().to_string(),
+                    ChargeType::Subscription.as_str().to_string(),
                 );
 
                 intent.customer = Some(customer_id);
@@ -545,7 +534,139 @@ pub async fn edit_subscription(
                     stripe::PaymentIntent::create(&stripe_client, intent)
                         .await?;
 
-                Some((proration, 0, intent))
+                // We do NOT update the open charge here. It will be patched to be the next
+                // charge of the subscription in the stripe webhook.
+                //
+                // We also shouldn't delete it, because if the payment fails, the expiring
+                // charge will be gone and the preview subscription will never be unprovisioned.
+
+                Some((new_price_value, 0, intent))
+            } else {
+                // The charge is not an expiring charge, need to prorate.
+
+                let interval = open_charge.due - Utc::now();
+                let duration = PriceDuration::Monthly;
+
+                let current_amount = match &current_price.prices {
+                    Price::OneTime { price } => *price,
+                    Price::Recurring { intervals } => *intervals.get(&duration).ok_or_else(|| {
+                        ApiError::InvalidInput(
+                            "Could not find a valid price for the user's duration".to_string(),
+                        )
+                    })?,
+                };
+
+                let amount = match &product_price.prices {
+                    Price::OneTime { price } => *price,
+                    Price::Recurring { intervals } => *intervals.get(&duration).ok_or_else(|| {
+                        ApiError::InvalidInput(
+                            "Could not find a valid price for the user's duration".to_string(),
+                        )
+                    })?,
+                };
+
+                let complete = Decimal::from(interval.num_seconds())
+                    / Decimal::from(duration.duration().num_seconds());
+                let proration = (Decimal::from(amount - current_amount)
+                    * complete)
+                    .floor()
+                    .to_i32()
+                    .ok_or_else(|| {
+                        ApiError::InvalidInput(
+                            "Could not convert proration to i32".to_string(),
+                        )
+                    })?;
+
+                // First condition: Plan downgrade, update future charge
+                // Second condition: For small transactions (under 30 cents), we make a loss on the
+                //  proration due to fees. In these situations, just give it to them for free, because
+                //  their next charge will be in a day or two anyway.
+                if current_amount > amount || proration < 30 {
+                    open_charge.price_id = product_price.id;
+                    open_charge.amount = amount as i64;
+
+                    None
+                } else {
+                    let charge_id =
+                        generate_charge_id(&mut transaction).await?;
+
+                    let customer_id = get_or_create_customer(
+                        user.id,
+                        user.stripe_customer_id.as_deref(),
+                        user.email.as_deref(),
+                        &stripe_client,
+                        &pool,
+                        &redis,
+                    )
+                    .await?;
+
+                    let currency = Currency::from_str(
+                        &current_price.currency_code.to_lowercase(),
+                    )
+                    .map_err(|_| {
+                        ApiError::InvalidInput(
+                            "Invalid currency code".to_string(),
+                        )
+                    })?;
+
+                    let mut intent =
+                        CreatePaymentIntent::new(proration as i64, currency);
+
+                    let mut metadata = HashMap::new();
+                    metadata.insert(
+                        "modrinth_user_id".to_string(),
+                        to_base62(user.id.0),
+                    );
+                    metadata.insert(
+                        "modrinth_charge_id".to_string(),
+                        to_base62(charge_id.0 as u64),
+                    );
+                    metadata.insert(
+                        "modrinth_subscription_id".to_string(),
+                        to_base62(subscription.id.0 as u64),
+                    );
+                    metadata.insert(
+                        "modrinth_price_id".to_string(),
+                        to_base62(product_price.id.0 as u64),
+                    );
+                    metadata.insert(
+                        "modrinth_subscription_interval".to_string(),
+                        open_charge
+                            .subscription_interval
+                            .unwrap_or(PriceDuration::Monthly)
+                            .as_str()
+                            .to_string(),
+                    );
+                    metadata.insert(
+                        "modrinth_charge_type".to_string(),
+                        ChargeType::Proration.as_str().to_string(),
+                    );
+
+                    intent.customer = Some(customer_id);
+                    intent.metadata = Some(metadata);
+                    intent.receipt_email = user.email.as_deref();
+                    intent.setup_future_usage =
+                        Some(PaymentIntentSetupFutureUsage::OffSession);
+
+                    if let Some(payment_method) =
+                        &edit_subscription.payment_method
+                    {
+                        let Ok(payment_method_id) =
+                            PaymentMethodId::from_str(payment_method)
+                        else {
+                            return Err(ApiError::InvalidInput(
+                                "Invalid payment method id".to_string(),
+                            ));
+                        };
+                        intent.payment_method = Some(payment_method_id);
+                    }
+
+                    let intent =
+                        stripe::PaymentIntent::create(&stripe_client, intent)
+                            .await?;
+
+                    Some((proration, 0, intent))
+                }
             }
         } else {
             None
@@ -948,14 +1069,17 @@ pub async fn active_servers(
     let server_ids = servers
         .into_iter()
         .filter_map(|x| {
-            x.metadata.as_ref().map(|metadata| match metadata {
-                SubscriptionMetadata::Pyro { id, region } => ActiveServer {
-                    user_id: x.user_id.into(),
-                    server_id: id.clone(),
-                    price_id: x.price_id.into(),
-                    interval: x.interval,
-                    region: region.clone(),
-                },
+            x.metadata.as_ref().and_then(|metadata| match metadata {
+                SubscriptionMetadata::Pyro { id, region } => {
+                    Some(ActiveServer {
+                        user_id: x.user_id.into(),
+                        server_id: id.clone(),
+                        price_id: x.price_id.into(),
+                        interval: x.interval,
+                        region: region.clone(),
+                    })
+                }
+                SubscriptionMetadata::Medal { .. } => None,
             })
         })
         .collect::<Vec<ActiveServer>>();
@@ -1187,7 +1311,7 @@ pub async fn initiate_payment(
                         })?;
 
                 let mut product_prices =
-                    product_item::DBProductPrice::get_all_product_prices(
+                    product_item::DBProductPrice::get_all_public_product_prices(
                         product.id, &**pool,
                     )
                     .await?;
@@ -1704,6 +1828,13 @@ pub async fn stripe_webhook(
 
                     // Provision subscription
                     match metadata.product_item.metadata {
+                        // A payment shouldn't be processed for Medal subscriptions.
+                        ProductMetadata::Medal { .. } => {
+                            warn!(
+                                "A payment processed for a free subscription"
+                            );
+                        }
+
                         ProductMetadata::Midas => {
                             let badges =
                                 metadata.user_item.badges | Badges::MIDAS;
@@ -1833,6 +1964,7 @@ pub async fn stripe_webhook(
                                             "region": server_region,
                                             "source": source,
                                             "payment_interval": metadata.charge_item.subscription_interval.map(|x| match x {
+                                                PriceDuration::FiveDays => 1,
                                                 PriceDuration::Monthly => 1,
                                                 PriceDuration::Quarterly => 3,
                                                 PriceDuration::Yearly => 12,
@@ -1879,10 +2011,32 @@ pub async fn stripe_webhook(
                             }
                         };
 
+                        // If the next open charge is actually an expiring charge,
+                        // this means the subscription was promoted from a temporary
+                        // free subscription to a paid subscription.
+                        //
+                        // In this case, we need to modify this expiring charge to be the
+                        // next charge of the subscription, turn it into a normal open charge.
+                        //
+                        // Otherwise, if there *is* an open charge, the subscription was upgraded
+                        // and the just-processed payment was the proration charge. In this case,
+                        // the existing open charge must be updated to reflect the new product's price.
+                        //
+                        // If there are no open charges, the just-processed payment was a recurring
+                        // or initial subscription charge, and we need to create the next charge.
                         if let Some(mut charge) = open_charge {
-                            charge.price_id = metadata.product_price_item.id;
-                            charge.amount = new_price as i64;
-
+                            if charge.status == ChargeStatus::Expiring {
+                                charge.status = ChargeStatus::Open;
+                                charge.due = Utc::now()
+                                    + subscription.interval.duration();
+                                charge.payment_platform =
+                                    PaymentPlatform::Stripe;
+                                charge.last_attempt = None;
+                            } else {
+                                charge.price_id =
+                                    metadata.product_price_item.id;
+                                charge.amount = new_price as i64;
+                            }
                             charge.upsert(&mut transaction).await?;
                         } else if metadata.charge_item.status
                             != ChargeStatus::Cancelled
@@ -2105,7 +2259,11 @@ pub async fn index_subscriptions(pool: PgPool, redis: RedisPool) {
         let mut transaction = pool.begin().await?;
         let mut clear_cache_users = Vec::new();
 
-        // If an active subscription has a canceled charge OR a failed charge more than two days ago, it should be cancelled
+        // If an active subscription has:
+        // - A canceled charge due now
+        // - An expiring charge due now
+        // - A failed charge more than two days ago
+        // It should be unprovisioned.
         let all_charges = DBCharge::get_unprovision(&pool).await?;
 
         let mut all_subscriptions =
@@ -2201,33 +2359,37 @@ pub async fn index_subscriptions(pool: PgPool, redis: RedisPool) {
 
                     true
                 }
-                ProductMetadata::Pyro { .. } => {
-                    if let Some(SubscriptionMetadata::Pyro { id, region: _ }) =
-                        &subscription.metadata
-                    {
-                        let res = reqwest::Client::new()
-                            .post(format!(
-                                "{}/modrinth/v0/servers/{}/suspend",
-                                dotenvy::var("ARCHON_URL")?,
-                                id
-                            ))
-                            .header("X-Master-Key", dotenvy::var("PYRO_API_KEY")?)
-                            .json(&serde_json::json!({
-                                "reason": if charge.status == ChargeStatus::Cancelled {
-                                    "cancelled"
-                                } else {
-                                    "paymentfailed"
-                                }
-                            }))
-                            .send()
-                            .await;
 
-                        if let Err(e) = res {
-                            warn!("Error suspending pyro server: {:?}", e);
-                            false
-                        } else {
-                            true
+                ProductMetadata::Pyro { .. }
+                | ProductMetadata::Medal { .. } => 'server: {
+                    let server_id = match &subscription.metadata {
+                        Some(SubscriptionMetadata::Pyro { id, region: _ }) => {
+                            id
                         }
+                        Some(SubscriptionMetadata::Medal { id }) => id,
+                        _ => break 'server true,
+                    };
+
+                    let res = reqwest::Client::new()
+                        .post(format!(
+                            "{}/modrinth/v0/servers/{}/suspend",
+                            dotenvy::var("ARCHON_URL")?,
+                            server_id
+                        ))
+                        .header("X-Master-Key", dotenvy::var("PYRO_API_KEY")?)
+                        .json(&serde_json::json!({
+                            "reason": if charge.status == ChargeStatus::Cancelled || charge.status == ChargeStatus::Expiring {
+                                "cancelled"
+                            } else {
+                                "paymentfailed"
+                            }
+                        }))
+                        .send()
+                        .await;
+
+                    if let Err(e) = res {
+                        warn!("Error suspending pyro server: {:?}", e);
+                        false
                     } else {
                         true
                     }
@@ -2252,6 +2414,20 @@ pub async fn index_subscriptions(pool: PgPool, redis: RedisPool) {
         .await?;
         transaction.commit().await?;
 
+        // If an offer redeemal has been processing for over 5 minutes, it should be set pending.
+        UserRedeemal::update_stuck_5_minutes(&pool).await?;
+
+        // If an offer redeemal is pending, try processing it.
+        // Try processing it.
+        let pending_redeemals = UserRedeemal::get_pending(&pool, 100).await?;
+        for redeemal in pending_redeemals {
+            if let Err(error) =
+                try_process_user_redeemal(&pool, &redis, redeemal).await
+            {
+                warn!(%error, "Failed to process a redeemal.")
+            }
+        }
+
         Ok::<(), ApiError>(())
     };
 
@@ -2262,6 +2438,161 @@ pub async fn index_subscriptions(pool: PgPool, redis: RedisPool) {
     info!("Done indexing subscriptions");
 }
 
+/// Attempts to process a user redeemal.
+///
+/// Returns `Ok` if the entry has been succesfully processed, or will not be processed.
+pub async fn try_process_user_redeemal(
+    pool: &PgPool,
+    redis: &RedisPool,
+    mut user_redeemal: UserRedeemal,
+) -> Result<(), ApiError> {
+    // Immediately update redeemal row
+    user_redeemal.last_attempt = Some(Utc::now());
+    user_redeemal.n_attempts += 1;
+    user_redeemal.status = users_redeemals::Status::Processing;
+    let updated = user_redeemal.update_status_if_pending(pool).await?;
+
+    if !updated {
+        return Ok(());
+    }
+
+    let user_id = user_redeemal.user_id;
+
+    // Find the Medal product's price & metadata
+
+    let mut medal_products =
+        product_item::QueryProductWithPrices::list_by_product_type(
+            pool, "medal",
+        )
+        .await?;
+
+    let Some(product_item::QueryProductWithPrices {
+        id: _product_id,
+        metadata,
+        mut prices,
+        unitary: _,
+    }) = medal_products.pop()
+    else {
+        return Err(ApiError::Conflict(
+            "Missing Medal subscription product".to_owned(),
+        ));
+    };
+
+    let ProductMetadata::Medal {
+        cpu,
+        ram,
+        swap,
+        storage,
+        region,
+    } = metadata
+    else {
+        return Err(ApiError::Conflict(
+            "Missing or incorrect metadata for Medal subscription".to_owned(),
+        ));
+    };
+
+    let Some(medal_price) = prices.pop() else {
+        return Err(ApiError::Conflict(
+            "Missing price for Medal subscription".to_owned(),
+        ));
+    };
+
+    let (price_duration, price_amount) = match medal_price.prices {
+        Price::OneTime { price: _ } => {
+            return Err(ApiError::Conflict(
+                "Unexpected metadata for Medal subscription price".to_owned(),
+            ));
+        }
+
+        Price::Recurring { intervals } => {
+            let Some((price_duration, price_amount)) =
+                intervals.into_iter().next()
+            else {
+                return Err(ApiError::Conflict(
+                    "Missing price interval for Medal subscription".to_owned(),
+                ));
+            };
+
+            (price_duration, price_amount)
+        }
+    };
+
+    let price_id = medal_price.id;
+
+    // Get the user's username
+
+    let user = DBUser::get_id(user_id, pool, redis)
+        .await?
+        .ok_or(ApiError::NotFound)?;
+
+    // Send the provision request to Archon. On failure, the redeemal will be "stuck" processing,
+    // and moved back to pending by `index_subscriptions`.
+
+    let archon_client = ArchonClient::from_env()?;
+    let server_id = archon_client
+        .create_server(&CreateServerRequest {
+            user_id: to_base62(user_id.0 as u64),
+            name: format!("{}'s Medal server", user.username),
+            specs: Specs {
+                memory_mb: ram,
+                cpu,
+                swap_mb: swap,
+                storage_mb: storage,
+            },
+            source: crate::util::archon::Empty::default(),
+            region,
+            tags: vec!["medal".to_owned()],
+        })
+        .await?;
+
+    let mut txn = pool.begin().await?;
+
+    // Build a subscription using this price ID.
+    let subscription = DBUserSubscription {
+        id: generate_user_subscription_id(&mut txn).await?,
+        user_id,
+        price_id,
+        interval: PriceDuration::FiveDays,
+        created: Utc::now(),
+        status: SubscriptionStatus::Provisioned,
+        metadata: Some(SubscriptionMetadata::Medal {
+            id: server_id.to_string(),
+        }),
+    };
+
+    subscription.upsert(&mut txn).await?;
+
+    // Insert an expiring charge, `index_subscriptions` will unprovision the
+    // subscription when expired.
+    DBCharge {
+        id: generate_charge_id(&mut txn).await?,
+        user_id,
+        price_id,
+        amount: price_amount.into(),
+        currency_code: medal_price.currency_code,
+        status: ChargeStatus::Expiring,
+        due: Utc::now() + price_duration.duration(),
+        last_attempt: None,
+        type_: ChargeType::Subscription,
+        subscription_id: Some(subscription.id),
+        subscription_interval: Some(subscription.interval),
+        payment_platform: PaymentPlatform::None,
+        payment_platform_id: None,
+        parent_charge_id: None,
+        net: None,
+    }
+    .upsert(&mut txn)
+    .await?;
+
+    // Update `users_redeemal`, mark subscription as redeemed.
+    user_redeemal.status = users_redeemals::Status::Processed;
+    user_redeemal.update(&mut *txn).await?;
+
+    txn.commit().await?;
+
+    Ok(())
+}
+
 pub async fn index_billing(
     stripe_client: stripe::Client,
     pool: PgPool,

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

@@ -0,0 +1,109 @@
+use actix_web::{HttpResponse, post, web};
+use ariadne::ids::UserId;
+use chrono::Utc;
+use serde::{Deserialize, Serialize};
+use sqlx::PgPool;
+use tracing::warn;
+
+use crate::database::models::users_redeemals::{
+    Offer, RedeemalLookupFields, Status, UserRedeemal,
+};
+use crate::database::redis::RedisPool;
+use crate::routes::ApiError;
+use crate::routes::internal::billing::try_process_user_redeemal;
+use crate::util::guards::medal_key_guard;
+
+pub fn config(cfg: &mut web::ServiceConfig) {
+    cfg.service(web::scope("medal").service(verify).service(redeem));
+}
+
+#[derive(Deserialize)]
+struct MedalQuery {
+    username: String,
+}
+
+#[post("verify", guard = "medal_key_guard")]
+pub async fn verify(
+    pool: web::Data<PgPool>,
+    web::Query(MedalQuery { username }): web::Query<MedalQuery>,
+) -> Result<HttpResponse, ApiError> {
+    let maybe_fields =
+        RedeemalLookupFields::redeemal_status_by_username_and_offer(
+            &**pool,
+            &username,
+            Offer::Medal,
+        )
+        .await?;
+
+    #[derive(Serialize)]
+    struct VerifyResponse {
+        user_id: UserId,
+        redeemed: bool,
+    }
+
+    match maybe_fields {
+        None => Err(ApiError::NotFound),
+        Some(fields) => Ok(HttpResponse::Ok().json(VerifyResponse {
+            user_id: fields.user_id.into(),
+            redeemed: fields.redeemal_status.is_some(),
+        })),
+    }
+}
+
+#[post("redeem", guard = "medal_key_guard")]
+pub async fn redeem(
+    pool: web::Data<PgPool>,
+    redis: web::Data<RedisPool>,
+    web::Query(MedalQuery { username }): web::Query<MedalQuery>,
+) -> Result<HttpResponse, ApiError> {
+    // Check the offer hasn't been redeemed yet, then insert into the table.
+    // In a transaction to avoid double inserts.
+
+    let mut txn = pool.begin().await?;
+
+    let maybe_fields =
+        RedeemalLookupFields::redeemal_status_by_username_and_offer(
+            &mut *txn,
+            &username,
+            Offer::Medal,
+        )
+        .await?;
+
+    let user_id = match maybe_fields {
+        None => return Err(ApiError::NotFound),
+        Some(fields) => {
+            if fields.redeemal_status.is_some() {
+                return Err(ApiError::Conflict(
+                    "User already redeemed this offer".to_string(),
+                ));
+            }
+
+            fields.user_id
+        }
+    };
+
+    // Link user to offer redeemal.
+    let mut redeemal = UserRedeemal {
+        id: 0,
+        user_id,
+        offer: Offer::Medal,
+        redeemed: Utc::now(),
+        status: Status::Pending,
+        last_attempt: None,
+        n_attempts: 0,
+    };
+
+    redeemal.insert(&mut *txn).await?;
+
+    txn.commit().await?;
+
+    // Immediately try to process the redeemal
+    if let Err(error) = try_process_user_redeemal(&pool, &redis, redeemal).await
+    {
+        warn!(%error, "Medal redeemal processing failed");
+
+        Ok(HttpResponse::Accepted().finish())
+    } else {
+        Ok(HttpResponse::Created().finish())
+    }
+}

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

@@ -2,6 +2,7 @@ pub(crate) mod admin;
 pub mod billing;
 pub mod flows;
 pub mod gdpr;
+pub mod medal;
 pub mod moderation;
 pub mod pats;
 pub mod session;
@@ -24,6 +25,7 @@ pub fn config(cfg: &mut actix_web::web::ServiceConfig) {
             .configure(moderation::config)
             .configure(billing::config)
             .configure(gdpr::config)
-            .configure(statuses::config),
+            .configure(statuses::config)
+            .configure(medal::config),
     );
 }

apps/labrinth/src/routes/mod.rs

@@ -137,6 +137,8 @@ pub enum ApiError {
     Io(#[from] std::io::Error),
     #[error("Resource not found")]
     NotFound,
+    #[error("Conflict: {0}")]
+    Conflict(String),
     #[error(
         "You are being rate-limited. Please wait {0} milliseconds. 0/{1} remaining."
     )]
@@ -172,6 +174,7 @@ impl ApiError {
                 ApiError::Clickhouse(..) => "clickhouse_error",
                 ApiError::Reroute(..) => "reroute_error",
                 ApiError::NotFound => "not_found",
+                ApiError::Conflict(..) => "conflict",
                 ApiError::Zip(..) => "zip_error",
                 ApiError::Io(..) => "io_error",
                 ApiError::RateLimitError(..) => "ratelimit_error",
@@ -208,6 +211,7 @@ impl actix_web::ResponseError for ApiError {
             ApiError::Mail(..) => StatusCode::INTERNAL_SERVER_ERROR,
             ApiError::Reroute(..) => StatusCode::INTERNAL_SERVER_ERROR,
             ApiError::NotFound => StatusCode::NOT_FOUND,
+            ApiError::Conflict(..) => StatusCode::CONFLICT,
             ApiError::Zip(..) => StatusCode::BAD_REQUEST,
             ApiError::Io(..) => StatusCode::BAD_REQUEST,
             ApiError::RateLimitError(..) => StatusCode::TOO_MANY_REQUESTS,

apps/labrinth/src/util/archon.rs

@@ -0,0 +1,75 @@
+use reqwest::header::HeaderName;
+use serde::{Deserialize, Serialize};
+use uuid::Uuid;
+
+use crate::routes::ApiError;
+
+const X_MASTER_KEY: HeaderName = HeaderName::from_static("x-master-key");
+
+#[derive(Debug, Default, Serialize, Deserialize)]
+pub struct Empty {}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Specs {
+    pub memory_mb: u32,
+    pub cpu: u32,
+    pub swap_mb: u32,
+    pub storage_mb: u32,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct CreateServerRequest {
+    pub user_id: String,
+    pub name: String,
+    pub specs: Specs,
+    // Must be included because archon doesn't accept null values, only
+    // an empty struct, as a source.
+    pub source: Empty,
+    pub region: String,
+    pub tags: Vec<String>,
+}
+
+#[derive(Clone)]
+pub struct ArchonClient {
+    client: reqwest::Client,
+    base_url: String,
+    pyro_api_key: String,
+}
+
+impl ArchonClient {
+    /// Builds an Archon client from environment variables. Returns `None` if the
+    /// required environment variables are not set.
+    pub fn from_env() -> Result<Self, ApiError> {
+        let client = reqwest::Client::new();
+
+        let base_url =
+            dotenvy::var("ARCHON_URL")?.trim_end_matches('/').to_owned();
+
+        Ok(Self {
+            client,
+            base_url,
+            pyro_api_key: dotenvy::var("PYRO_API_KEY")?,
+        })
+    }
+
+    pub async fn create_server(
+        &self,
+        request: &CreateServerRequest,
+    ) -> Result<Uuid, reqwest::Error> {
+        #[derive(Deserialize)]
+        struct CreateServerResponse {
+            uuid: Uuid,
+        }
+
+        let response = self
+            .client
+            .post(format!("{}/modrinth/v0/servers/create", self.base_url))
+            .header(X_MASTER_KEY, &self.pyro_api_key)
+            .json(request)
+            .send()
+            .await?
+            .error_for_status()?;
+
+        Ok(response.json::<CreateServerResponse>().await?.uuid)
+    }
+}

apps/labrinth/src/util/guards.rs

@@ -1,6 +1,8 @@
 use actix_web::guard::GuardContext;
 
 pub const ADMIN_KEY_HEADER: &str = "Modrinth-Admin";
+pub const MEDAL_KEY_HEADER: &str = "X-Medal-Access-Key";
+
 pub fn admin_key_guard(ctx: &GuardContext) -> bool {
     let admin_key = std::env::var("LABRINTH_ADMIN_KEY").expect(
         "No admin key provided, this should have been caught by check_env_vars",
@@ -10,3 +12,16 @@ pub fn admin_key_guard(ctx: &GuardContext) -> bool {
         .get(ADMIN_KEY_HEADER)
         .is_some_and(|it| it.as_bytes() == admin_key.as_bytes())
 }
+
+pub fn medal_key_guard(ctx: &GuardContext) -> bool {
+    let maybe_medal_key = dotenvy::var("LABRINTH_MEDAL_KEY").ok();
+
+    match maybe_medal_key {
+        None => false,
+        Some(medal_key) => ctx
+            .head()
+            .headers()
+            .get(MEDAL_KEY_HEADER)
+            .is_some_and(|it| it.as_bytes() == medal_key.as_bytes()),
+    }
+}

apps/labrinth/src/util/mod.rs

@@ -1,4 +1,5 @@
 pub mod actix;
+pub mod archon;
 pub mod bitflag;
 pub mod captcha;
 pub mod cors;

package.json

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

packages/moderation/README.md

@@ -1,8 +1,6 @@
-<!-- TODO: After checklist v1.5, move everything into src directory. -->
-
 # @modrinth/moderation
 
-This package contains both the moderation checklist system used by moderators for reviewing projects on Modrinth, and the publishing checklist (nag system) that provides automated feedback to project authors during the submission process.
+This package contains the moderation checklist system used for reviewing projects on Modrinth. It provides a structured and transparent way to define moderation stages, actions, and messages that are displayed to moderators during the review process.
 
 ## Structure
 
@@ -11,30 +9,22 @@ The package is organized as follows:
 ```
 /packages/moderation/
 ├── data/
-│   ├── checklist.ts        # Main moderation checklist definition - imports and exports all stages
-│   ├── messages/           # Markdown files containing message templates for moderation
+│   ├── checklist.ts        # Main checklist definition - imports and exports all stages
+│   ├── messages/           # Markdown files containing message templates
 │   │   ├── title/          # Messages for the title stage
 │   │   ├── description/    # Messages for the description stage
 │   │   └── ...             # One directory per stage
-│   ├── stages/             # Moderation stage definition files
-│   │   ├── title.ts        # Title stage definition
-│   │   ├── description.ts  # Description stage definition
-│   │   └── ...             # One file per stage
-│   └── nags/               # Publishing checklist (nag system) files
-│       ├── core.ts         # Core nags (required fields, basic validation)
-│       └── ...
+│   └── stages/             # Stage definition files
+│       ├── title.ts        # Title stage definition
+│       ├── description.ts  # Description stage definition
+│       └── ...             # One file per stage
 └── types/                  # Type definitions
-    ├── actions.ts          # Action-related types (moderation)
-    ├── messages.ts         # Message-related types (moderation)
-    ├── stage.ts            # Stage-related types (moderation)
-    └── nags.ts             # Nag-related types (publishing checklist)
+    ├── actions.ts          # Action-related types
+    ├── messages.ts         # Message-related types
+    └── stage.ts            # Stage-related types
 ```
 
-## Moderation Checklist System
-
-The moderation checklist provides a structured and transparent way to define moderation stages, actions, and messages that are displayed to moderators during the review process.
-
-### Stages
+## Stages
 
 A stage represents a discrete step in the moderation process, like checking a project's title, description, or links. Each stage has:
 
@@ -45,7 +35,7 @@ A stage represents a discrete step in the moderation process, like checking a pr
 
 Stages are defined in individual files in the `data/stages` directory and are assembled into the complete checklist in `data/checklist.ts`.
 
-### Actions
+## Actions
 
 Actions represent decisions moderators can make for each stage. They can be buttons, dropdowns, toggles, etc. Actions can have:
 
@@ -57,11 +47,11 @@ Actions represent decisions moderators can make for each stage. They can be butt
 
 Each action requires a unique `id` field that is used for conditional logic and action relationships. The `suggestedStatus` and `severity` fields help determine the overall moderation outcome.
 
-### Messages
+## Messages
 
 Messages are the actual text that will be included in communications to project authors. To promote maintainability and reuse, messages are stored as Markdown files in the `data/messages` directory, organized by stage.
 
-#### Variable replacement
+### Variable replacement
 
 You can use variables in your messages that will be replaced with user input:
 
@@ -91,11 +81,11 @@ More text after the variable.
 
 The `%MESSAGE%` placeholder will be replaced with the text entered by the moderator.
 
-### Conditional logic
+## Conditional logic
 
 The moderation system supports conditional behavior that changes based on the selection of other actions.
 
-#### Conditional messages
+### Conditional messages
 
 You can define different messages for an action based on other selected actions:
 
@@ -118,7 +108,7 @@ You can define different messages for an action based on other selected actions:
 }
 ```
 
-#### Enabling and disabling actions
+### Enabling and disabling actions
 
 Actions can enable or disable other actions when selected:
 
@@ -141,7 +131,7 @@ Actions can enable or disable other actions when selected:
 }
 ```
 
-#### Conditional text inputs
+### Conditional text inputs
 
 Text inputs can be conditionally shown based on selected actions:
 
@@ -157,86 +147,3 @@ relevantExtraInput: [
   },
 ]
 ```
-
-## Publishing Checklist (Nag System)
-
-The nag system provides automated feedback to project authors during the submission process, helping them improve their projects before they reach moderation. It analyzes project data and provides suggestions, warnings, and requirements.
-
-### Nags
-
-A nag represents a specific issue or suggestion for improvement. Each nag has:
-
-- A unique `id` for identification
-- A `title` and `description` displayed to the user
-- A `status` indicating severity: `'required'`, `'warning'`, or `'suggestion'`
-- A `shouldShow` function that determines when the nag should be displayed
-- An optional `link` to help users address the issue
-
-### Internationalization
-
-Use vintl's `defineMessage` syntax.
-
-If you want to use context in the messages, you can do so like this:
-
-```typescript
-description: (context: NagContext) => {
-  const { formatMessage } = useVIntl()
-
-  return formatMessage(defineMessage(...), {
-    length: context.project.body?.length || 0,
-    minChars: MIN_DESCRIPTION_CHARS,
-  })
-}
-```
-
-### Nag Context
-
-The `NagContext` type provides access to:
-
-- `project`: Current project data
-- `versions`: Project versions
-- `tags`: Frontend "tags" (generated state)
-- `currentRoute`: Current page route
-- and other data...
-
-### Adding New Nags
-
-To add a new nag:
-
-1. Add the nag definition to the appropriate category file (or make a new category file and add it to `data/nags.ts`)
-2. Add corresponding i18n messages to the `.i18n.ts` file
-3. Implement the `shouldShow` logic based on project state
-4. Add appropriate links to help users resolve the issue
-5. Run `pnpm run fix` to fix lint issues & generate the root locale index.json file.
-
-Example:
-
-```typescript
-// In description.ts
-{
-  id: 'new-nag',
-  title: messages.newNagTitle,
-  description: messages.newNagDescription,
-  status: 'warning',
-  shouldShow: (context: NagContext) => {
-    // Your validation logic here
-    return someCondition
-  },
-  link: {
-    path: 'settings/description',
-    title: messages.editDescriptionTitle,
-    shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-description',
-  },
-}
-```
-
-```typescript
-// In description.i18n.ts
-newNagTitle: {
-  id: 'nags.new-nag.title',
-  defaultMessage: 'New Nag Title',
-},
-newNagDescription: {
-  id: 'nags.new-nag.description',
-  defaultMessage: 'Description of the new nag issue.',
-```

packages/moderation/data/nags.ts

@@ -1,7 +0,0 @@
-import type { Nag } from '../types/nags'
-import { coreNags } from './nags/core'
-import { descriptionNags } from './nags/description'
-import { linksNags } from './nags/links'
-import { tagsNags } from './nags/tags'
-
-export default [...coreNags, ...linksNags, ...descriptionNags, ...tagsNags] as Nag[]

packages/moderation/data/nags/core.ts

@@ -1,241 +0,0 @@
-import type { Nag, NagContext } from '../../types/nags'
-import { formatProjectType } from '@modrinth/utils'
-import { useVIntl, defineMessage } from '@vintl/vintl'
-
-export const coreNags: Nag[] = [
-  {
-    id: 'moderator-feedback',
-    title: defineMessage({
-      id: 'nags.moderator-feedback.title',
-      defaultMessage: 'Review moderator feedback',
-    }),
-    description: defineMessage({
-      id: 'nags.moderator-feedback.description',
-      defaultMessage:
-        'Review and address all concerns from the moderation team before resubmitting.',
-    }),
-    status: 'warning',
-    shouldShow: (context: NagContext) =>
-      context.tags.rejectedStatuses.includes(context.project.status),
-    link: {
-      path: 'moderation',
-      title: defineMessage({
-        id: 'nags.moderation.title',
-        defaultMessage: 'Visit moderation thread',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-moderation',
-    },
-  },
-  {
-    id: 'upload-version',
-    title: defineMessage({
-      id: 'nags.upload-version.title',
-      defaultMessage: 'Upload a version',
-    }),
-    description: defineMessage({
-      id: 'nags.upload-version.description',
-      defaultMessage: 'At least one version is required for a project to be submitted for review.',
-    }),
-    status: 'required',
-    shouldShow: (context: NagContext) => context.versions.length < 1,
-    link: {
-      path: 'versions',
-      title: defineMessage({
-        id: 'nags.versions.title',
-        defaultMessage: 'Visit versions page',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-versions',
-    },
-  },
-  {
-    id: 'add-description',
-    title: defineMessage({
-      id: 'nags.add-description.title',
-      defaultMessage: 'Add a description',
-    }),
-    description: defineMessage({
-      id: 'nags.add-description.description',
-      defaultMessage:
-        "A description that clearly describes the project's purpose and function is required.",
-    }),
-    status: 'required',
-    shouldShow: (context: NagContext) => context.project.body === '',
-    link: {
-      path: 'settings/description',
-      title: defineMessage({
-        id: 'nags.settings.description.title',
-        defaultMessage: 'Visit description settings',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-description',
-    },
-  },
-  {
-    id: 'add-icon',
-    title: defineMessage({
-      id: 'nags.add-icon.title',
-      defaultMessage: 'Add an icon',
-    }),
-    description: defineMessage({
-      id: 'nags.add-icon.description',
-      defaultMessage:
-        'Adding a unique, relevant, and engaging icon makes your project identifiable and helps it stand out.',
-    }),
-    status: 'suggestion',
-    shouldShow: (context: NagContext) => !context.project.icon_url,
-    link: {
-      path: 'settings',
-      title: defineMessage({
-        id: 'nags.settings.title',
-        defaultMessage: 'Visit general settings',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings',
-    },
-  },
-  {
-    id: 'feature-gallery-image',
-    title: defineMessage({
-      id: 'nags.feature-gallery-image.title',
-      defaultMessage: 'Feature a gallery image',
-    }),
-    description: defineMessage({
-      id: 'nags.feature-gallery-image.description',
-      defaultMessage:
-        'The featured gallery image is often how your project makes its first impression.',
-    }),
-    status: 'suggestion',
-    shouldShow: (context: NagContext) => {
-      const featuredGalleryImage = context.project.gallery?.find((img) => img.featured)
-      return context.project?.gallery?.length === 0 || !featuredGalleryImage
-    },
-    link: {
-      path: 'gallery',
-      title: defineMessage({
-        id: 'nags.gallery.title',
-        defaultMessage: 'Visit gallery page',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-gallery',
-    },
-  },
-  {
-    id: 'select-tags',
-    title: defineMessage({
-      id: 'nags.select-tags.title',
-      defaultMessage: 'Select tags',
-    }),
-    description: defineMessage({
-      id: 'nags.select-tags.description',
-      defaultMessage:
-        'Select the tags that correctly apply to your project to help the right users find it.',
-    }),
-    status: 'suggestion',
-    shouldShow: (context: NagContext) =>
-      context.project.versions.length > 0 && context.project.categories.length < 1,
-    link: {
-      path: 'settings/tags',
-      title: defineMessage({
-        id: 'nags.settings.tags.title',
-        defaultMessage: 'Visit tag settings',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-tags',
-    },
-  },
-  {
-    id: 'add-links',
-    title: defineMessage({
-      id: 'nags.add-links.title',
-      defaultMessage: 'Add external links',
-    }),
-    description: defineMessage({
-      id: 'nags.add-links.description',
-      defaultMessage:
-        'Add any relevant links targeted outside of Modrinth, such as source code, an issue tracker, or a Discord invite.',
-    }),
-    status: 'suggestion',
-    shouldShow: (context: NagContext) =>
-      !(
-        context.project.issues_url ||
-        context.project.source_url ||
-        context.project.wiki_url ||
-        context.project.discord_url ||
-        context.project.donation_urls.length > 0
-      ),
-    link: {
-      path: 'settings/links',
-      title: defineMessage({
-        id: 'nags.settings.links.title',
-        defaultMessage: 'Visit links settings',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-links',
-    },
-  },
-  {
-    id: 'select-environments',
-    title: defineMessage({
-      id: 'nags.select-environments.title',
-      defaultMessage: 'Select supported environments',
-    }),
-    description: (context: NagContext) => {
-      const { formatMessage } = useVIntl()
-
-      return formatMessage(
-        defineMessage({
-          id: 'nags.select-environments.description',
-          defaultMessage: `Select if the {projectType} functions on the client-side and/or server-side.`,
-        }),
-        {
-          projectType: formatProjectType(context.project.project_type).toLowerCase(),
-        },
-      )
-    },
-    status: 'required',
-    shouldShow: (context: NagContext) => {
-      const excludedTypes = ['resourcepack', 'plugin', 'shader', 'datapack']
-      return (
-        context.project.versions.length > 0 &&
-        !excludedTypes.includes(context.project.project_type) &&
-        (context.project.client_side === 'unknown' ||
-          context.project.server_side === 'unknown' ||
-          (context.project.client_side === 'unsupported' &&
-            context.project.server_side === 'unsupported'))
-      )
-    },
-    link: {
-      path: 'settings',
-      title: defineMessage({
-        id: 'nags.settings.environments.title',
-        defaultMessage: 'Visit general settings',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings',
-    },
-  },
-  {
-    id: 'select-license',
-    title: defineMessage({
-      id: 'nags.select-license.title',
-      defaultMessage: 'Select a license',
-    }),
-    description: (context: NagContext) => {
-      const { formatMessage } = useVIntl()
-
-      return formatMessage(
-        defineMessage({
-          id: 'nags.select-license.description',
-          defaultMessage: 'Select the license your {projectType} is distributed under.',
-        }),
-        {
-          projectType: formatProjectType(context.project.project_type).toLowerCase(),
-        },
-      )
-    },
-    status: 'required',
-    shouldShow: (context: NagContext) => context.project.license.id === 'LicenseRef-Unknown',
-    link: {
-      path: 'settings/license',
-      title: defineMessage({
-        id: 'nags.settings.license.title',
-        defaultMessage: 'Visit license settings',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-license',
-    },
-  },
-]

packages/moderation/data/nags/description.ts

@@ -1,343 +0,0 @@
-import { renderHighlightedString } from '@modrinth/utils'
-import type { Nag, NagContext } from '../../types/nags'
-import { useVIntl, defineMessage } from '@vintl/vintl'
-
-export const MIN_DESCRIPTION_CHARS = 200
-export const MAX_HEADER_LENGTH = 80
-export const MIN_SUMMARY_CHARS = 30
-export const MIN_CHARS_PER_IMAGE = 60
-
-export function analyzeHeaderLength(markdown: string): {
-  hasLongHeaders: boolean
-  longHeaders: string[]
-} {
-  if (!markdown) return { hasLongHeaders: false, longHeaders: [] }
-
-  const withoutCodeBlocks = markdown.replace(/```[\s\S]*?```/g, '').replace(/`[^`]*`/g, '')
-
-  const headerRegex = /^(#{1,3})\s+(.+)$/gm
-  const headers = [...withoutCodeBlocks.matchAll(headerRegex)]
-
-  const longHeaders: string[] = []
-
-  headers.forEach((match) => {
-    const headerText = match[2].trim()
-    const sentenceEnders = /[.!?]+/g
-    const sentences = headerText.split(sentenceEnders).filter((s) => s.trim().length > 0)
-
-    const isVeryLong = headerText.length > MAX_HEADER_LENGTH
-    const hasMultipleSentences = sentences.length > 1
-
-    if (isVeryLong || hasMultipleSentences) {
-      longHeaders.push(headerText)
-    }
-  })
-
-  return {
-    hasLongHeaders: longHeaders.length > 0,
-    longHeaders,
-  }
-}
-
-export function analyzeImageContent(markdown: string): {
-  imageHeavy: boolean
-  hasEmptyAltText: boolean
-} {
-  if (!markdown) return { imageHeavy: false, hasEmptyAltText: false }
-
-  const withoutCodeBlocks = markdown.replace(/```[\s\S]*?```/g, '').replace(/`[^`]*`/g, '')
-
-  const imageRegex = /!\[([^\]]*)\]\([^)]+\)/g
-  const images = [...withoutCodeBlocks.matchAll(imageRegex)]
-
-  const htmlImageRegex = /<img[^>]*>/gi
-  const htmlImages = [...withoutCodeBlocks.matchAll(htmlImageRegex)]
-
-  const totalImages = images.length + htmlImages.length
-  if (totalImages === 0) return { imageHeavy: false, hasEmptyAltText: false }
-
-  const textWithoutImages = withoutCodeBlocks
-    .replace(/!\[([^\]]*)\]\([^)]+\)/g, '')
-    .replace(/<img[^>]*>/gi, '')
-    .replace(/\s+/g, ' ')
-    .trim()
-
-  const textLength = textWithoutImages.length
-  const recommendedTextLength = MIN_CHARS_PER_IMAGE * totalImages
-
-  const imageHeavy =
-    recommendedTextLength > MIN_DESCRIPTION_CHARS && textLength < recommendedTextLength
-
-  const hasEmptyAltText =
-    images.some((match) => !match[1]?.trim()) ||
-    htmlImages.some((match) => {
-      const altMatch = match[0].match(/alt\s*=\s*["']([^"']*)["']/i)
-      return !altMatch || !altMatch[1]?.trim()
-    })
-
-  return { imageHeavy, hasEmptyAltText }
-}
-
-export function countText(markdown: string): number {
-  const htmlString = renderHighlightedString(markdown)
-  const parser = new DOMParser()
-  const doc = parser.parseFromString(htmlString, 'text/html')
-  const walker = document.createTreeWalker(doc, NodeFilter.SHOW_TEXT)
-
-  const textList: string[] = []
-  let currentNode: Node | null = walker.currentNode
-
-  while (currentNode) {
-    if (currentNode.textContent !== null) {
-      textList.push(currentNode.textContent)
-    }
-    currentNode = walker.nextNode()
-  }
-
-  return textList.join(' ').trim().length
-}
-
-export const descriptionNags: Nag[] = [
-  {
-    id: 'description-too-short',
-    title: defineMessage({
-      id: 'nags.description-too-short.title',
-      defaultMessage: 'Expand the description',
-    }),
-    description: (context: NagContext) => {
-      const { formatMessage } = useVIntl()
-      const readableLength = countText(context.project.body || '')
-
-      return formatMessage(
-        defineMessage({
-          id: 'nags.description-too-short.description',
-          defaultMessage:
-            'Your description is {length} readable characters. At least {minChars} characters is recommended to create a clear and informative description.',
-        }),
-        {
-          length: readableLength,
-          minChars: MIN_DESCRIPTION_CHARS,
-        },
-      )
-    },
-    status: 'warning',
-    shouldShow: (context: NagContext) => {
-      const readableLength = countText(context.project.body || '')
-      return readableLength < MIN_DESCRIPTION_CHARS && readableLength > 0
-    },
-    link: {
-      path: 'settings/description',
-      title: defineMessage({
-        id: 'nags.edit-description.title',
-        defaultMessage: 'Edit description',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-description',
-    },
-  },
-  {
-    id: 'long-headers',
-    title: defineMessage({
-      id: 'nags.long-headers.title',
-      defaultMessage: 'Shorten headers',
-    }),
-    description: (context: NagContext) => {
-      const { formatMessage } = useVIntl()
-      const { longHeaders } = analyzeHeaderLength(context.project.body || '')
-      const count = longHeaders.length
-
-      return formatMessage(
-        defineMessage({
-          id: 'nags.long-headers.description',
-          defaultMessage:
-            '{count, plural, one {# header} other {# headers}} in your description {count, plural, one {is} other {are}} too long. Headers should be concise and act as section titles, not full sentences.',
-        }),
-        {
-          count,
-        },
-      )
-    },
-    status: 'warning',
-    shouldShow: (context: NagContext) => {
-      const { hasLongHeaders } = analyzeHeaderLength(context.project.body || '')
-      return hasLongHeaders
-    },
-    link: {
-      path: 'settings/description',
-      title: defineMessage({
-        id: 'nags.edit-description.title',
-        defaultMessage: 'Edit description',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-description',
-    },
-  },
-  {
-    id: 'summary-too-short',
-    title: defineMessage({
-      id: 'nags.summary-too-short.title',
-      defaultMessage: 'Expand the summary',
-    }),
-    description: (context: NagContext) => {
-      const { formatMessage } = useVIntl()
-
-      return formatMessage(
-        defineMessage({
-          id: 'nags.summary-too-short.description',
-          defaultMessage:
-            'Your summary is {length} characters. At least {minChars} characters is recommended to create an informative and enticing summary.',
-        }),
-        {
-          length: context.project.description?.length || 0,
-          minChars: MIN_SUMMARY_CHARS,
-        },
-      )
-    },
-    status: 'warning',
-    shouldShow: (context: NagContext) => {
-      const summaryLength = context.project.description?.trim()?.length || 0
-      return summaryLength < MIN_SUMMARY_CHARS && summaryLength !== 0
-    },
-    link: {
-      path: 'settings',
-      title: defineMessage({
-        id: 'nags.edit-summary.title',
-        defaultMessage: 'Edit summary',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings',
-    },
-  },
-  {
-    id: 'minecraft-title-clause',
-    title: defineMessage({
-      id: 'nags.minecraft-title-clause.title',
-      defaultMessage: 'Avoid brand infringement',
-    }),
-    description: defineMessage({
-      id: 'nags.minecraft-title-clause.description',
-      defaultMessage: `Projects must not use Minecraft's branding or include "Minecraft" as a significant part of the name.`,
-    }),
-    status: 'warning',
-    shouldShow: (context: NagContext) => {
-      const title = context.project.title?.toLowerCase() || ''
-      const wordsInTitle = title.split(' ').filter((word) => word.length > 0)
-      return title.includes('minecraft') && title.length > 0 && wordsInTitle.length <= 3
-    },
-    link: {
-      path: 'settings',
-      title: defineMessage({
-        id: 'nags.edit-title.title',
-        defaultMessage: 'Edit title',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings',
-    },
-  },
-  {
-    id: 'title-contains-technical-info',
-    title: defineMessage({
-      id: 'nags.title-contains-technical-info.title',
-      defaultMessage: 'Clean up the name',
-    }),
-    description: defineMessage({
-      id: 'nags.title-contains-technical-info.description',
-      defaultMessage:
-        "Keeping your project's Name clean and makes it memorable easier to find. Version and loader information is automatically displayed alongside your project.",
-    }),
-    status: 'warning',
-    shouldShow: (context: NagContext) => {
-      const title = context.project.title?.toLowerCase() || ''
-      if (!title) return false
-
-      const loaderNames =
-        context.tags.loaders?.map((loader: { name: string }) => loader.name?.toLowerCase()) || []
-      const hasLoader = loaderNames.some((loader) => loader && title.includes(loader.toLowerCase()))
-      const versionPatterns = [/\b1\.\d+(\.\d+)?\b/]
-      const hasVersionPattern = versionPatterns.some((pattern) => pattern.test(title))
-
-      return hasLoader || hasVersionPattern
-    },
-    link: {
-      path: 'settings',
-      title: defineMessage({
-        id: 'nags.edit-title.title',
-        defaultMessage: 'Edit title',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings',
-    },
-  },
-  {
-    id: 'summary-same-as-title',
-    title: defineMessage({
-      id: 'nags.summary-same-as-title.title',
-      defaultMessage: 'Make the summary unique',
-    }),
-    description: defineMessage({
-      id: 'nags.summary-same-as-title.description',
-      defaultMessage:
-        "Your summary can not be the same as your project's Name. It's important to create an informative and enticing Summary.",
-    }),
-    status: 'required',
-    shouldShow: (context: NagContext) => {
-      const title = context.project.title?.trim() || ''
-      const summary = context.project.description?.trim() || ''
-      return title === summary && title.length > 0 && summary.length > 0
-    },
-    link: {
-      path: 'settings',
-      title: defineMessage({
-        id: 'nags.edit-summary.title',
-        defaultMessage: 'Edit summary',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings',
-    },
-  },
-  {
-    // Don't like this one, is this needed?
-    id: 'image-heavy-description',
-    title: defineMessage({
-      id: 'nags.image-heavy-description.title',
-      defaultMessage: 'Ensure accessibility',
-    }),
-    description: defineMessage({
-      id: 'nags.image-heavy-description.description',
-      defaultMessage:
-        'Your Description should contain sufficient plain text or image alt-text, keeping it accessible to those using screen readers or with slow internet connections.',
-    }),
-    status: 'warning',
-    shouldShow: (context: NagContext) => {
-      const { imageHeavy } = analyzeImageContent(context.project.body || '')
-      return imageHeavy
-    },
-    link: {
-      path: 'settings/description',
-      title: defineMessage({
-        id: 'nags.edit-description.title',
-        defaultMessage: 'Edit description',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-description',
-    },
-  },
-  {
-    id: 'missing-alt-text',
-    title: defineMessage({
-      id: 'nags.missing-alt-text.title',
-      defaultMessage: 'Add image alt text',
-    }),
-    description: defineMessage({
-      id: 'nags.missing-alt-text.description',
-      defaultMessage:
-        'Some of your images are missing alt text, which is important for accessibility, especially for visually impaired users.',
-    }),
-    status: 'warning',
-    shouldShow: (context: NagContext) => {
-      const { hasEmptyAltText } = analyzeImageContent(context.project.body || '')
-      return hasEmptyAltText
-    },
-    link: {
-      path: 'settings/description',
-      title: defineMessage({
-        id: 'nags.edit-description.title',
-        defaultMessage: 'Edit description',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-description',
-    },
-  },
-]

packages/moderation/data/nags/index.ts

@@ -1,4 +0,0 @@
-export * from './core'
-export * from './links'
-export * from './description'
-export * from './tags'

packages/moderation/data/nags/links.ts

@@ -1,269 +0,0 @@
-import type { Nag, NagContext } from '../../types/nags'
-import { formatProjectType } from '@modrinth/utils'
-import { useVIntl, defineMessage } from '@vintl/vintl'
-
-export const commonLinkDomains = {
-  source: ['github.com', 'gitlab.com', 'bitbucket.org', 'codeberg.org', 'git.sr.ht'],
-  issues: ['github.com', 'gitlab.com', 'bitbucket.org', 'codeberg.org', 'docs.google.com'],
-  discord: ['discord.gg', 'discord.com', 'dsc.gg'],
-  licenseBlocklist: [
-    'youtube.com',
-    'youtu.be',
-    'modrinth.com',
-    'curseforge.com',
-    'twitter.com',
-    'x.com',
-    'discord.gg',
-    'discord.com',
-    'instagram.com',
-    'facebook.com',
-    'tiktok.com',
-    'reddit.com',
-    'twitch.tv',
-    'patreon.com',
-    'ko-fi.com',
-    'paypal.com',
-    'buymeacoffee.com',
-    'google.com',
-    'example.com',
-    't.me',
-  ],
-  linkShorteners: ['bit.ly', 'adf.ly', 'tinyurl.com', 'short.io', 'is.gd'],
-}
-
-export function isCommonUrl(url: string | null, commonDomains: string[]): boolean {
-  if (url === null || url === '') return true
-  try {
-    const domain = new URL(url).hostname.toLowerCase()
-    return commonDomains.some((allowed) => domain.includes(allowed))
-  } catch {
-    return false
-  }
-}
-
-export function isCommonUrlOfType(url: string | null, commonDomains: string[]): boolean {
-  if (url === null || url === '') return false
-  return isCommonUrl(url, commonDomains)
-}
-
-export function isDiscordUrl(url: string | null): boolean {
-  return isCommonUrlOfType(url, commonLinkDomains.discord)
-}
-
-export function isLinkShortener(url: string | null): boolean {
-  return isCommonUrlOfType(url, commonLinkDomains.linkShorteners)
-}
-
-export function isUncommonLicenseUrl(url: string | null): boolean {
-  return isCommonUrlOfType(url, commonLinkDomains.licenseBlocklist)
-}
-
-export const linksNags: Nag[] = [
-  {
-    id: 'verify-external-links',
-    title: defineMessage({
-      id: 'nags.verify-external-links.title',
-      defaultMessage: 'Verify external links',
-    }),
-    description: defineMessage({
-      id: 'nags.verify-external-links.description',
-      defaultMessage:
-        'Some of your external links may be using domains that are inappropriate for that type of link.',
-    }),
-    status: 'warning',
-    shouldShow: (context: NagContext) => {
-      return (
-        !isCommonUrl(context.project.source_url, commonLinkDomains.source) ||
-        !isCommonUrl(context.project.issues_url, commonLinkDomains.issues) ||
-        !isCommonUrl(context.project.discord_url, commonLinkDomains.discord)
-      )
-    },
-    link: {
-      path: 'settings/links',
-      title: defineMessage({
-        id: 'nags.visit-links-settings.title',
-        defaultMessage: 'Visit links settings',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-links',
-    },
-  },
-  {
-    id: 'misused-discord-link',
-    title: defineMessage({
-      id: 'nags.misused-discord-link.title',
-      defaultMessage: 'Move Discord invite',
-    }),
-    description: defineMessage({
-      id: 'nags.misused-discord-link-description',
-      defaultMessage:
-        'Discord invites can not be used for other link types. Please put your Discord link in the Discord Invite link field only.',
-    }),
-    status: 'required',
-    shouldShow: (context: NagContext) =>
-      isDiscordUrl(context.project.source_url) ||
-      isDiscordUrl(context.project.issues_url) ||
-      isDiscordUrl(context.project.wiki_url),
-    link: {
-      path: 'settings/links',
-      title: defineMessage({
-        id: 'nags.visit-links-settings.title',
-        defaultMessage: 'Visit links settings',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-links',
-    },
-  },
-  {
-    id: 'link-shortener-usage',
-    title: defineMessage({
-      id: 'nags.link-shortener-usage.title',
-      defaultMessage: "Don't use link shorteners",
-    }),
-    description: defineMessage({
-      id: 'nags.link-shortener-usage.description',
-      defaultMessage:
-        'Use of link shorteners or other methods to obscure where a link may lead in your external links or license link is prohibited, please only use appropriate full length links.',
-    }),
-    status: 'required',
-    shouldShow: (context: NagContext) =>
-      isLinkShortener(context.project.source_url) ||
-      isLinkShortener(context.project.issues_url) ||
-      isLinkShortener(context.project.wiki_url) ||
-      Boolean(context.project.license.url && isLinkShortener(context.project.license.url)),
-  },
-  {
-    id: 'invalid-license-url',
-    title: defineMessage({
-      id: 'nags.invalid-license-url.title',
-      defaultMessage: 'Add a valid license link',
-    }),
-    description: (context: NagContext) => {
-      const { formatMessage } = useVIntl()
-      const licenseUrl = context.project.license.url
-
-      if (!licenseUrl) {
-        return formatMessage(
-          defineMessage({
-            id: 'nags.invalid-license-url.description.default',
-            defaultMessage: 'License URL is invalid.',
-          }),
-        )
-      }
-
-      try {
-        const domain = new URL(licenseUrl).hostname.toLowerCase()
-        return formatMessage(
-          defineMessage({
-            id: 'nags.invalid-license-url.description.domain',
-            defaultMessage:
-              'Your license URL points to {domain}, which is not appropriate for license information. License URLs should link directly to your license file, not social media, gaming platforms, etc.',
-          }),
-          { domain },
-        )
-      } catch {
-        return formatMessage(
-          defineMessage({
-            id: 'nags.invalid-license-url.description.malformed',
-            defaultMessage:
-              'Your license URL appears to be malformed. Please provide a valid URL to your license text.',
-          }),
-        )
-      }
-    },
-    status: 'required',
-    shouldShow: (context: NagContext) => {
-      const licenseUrl = context.project.license.url
-      if (!licenseUrl) return false
-
-      const isBlocklisted = isUncommonLicenseUrl(licenseUrl)
-
-      try {
-        new URL(licenseUrl)
-        return isBlocklisted
-      } catch {
-        return true
-      }
-    },
-    link: {
-      path: 'settings',
-      title: defineMessage({
-        id: 'nags.edit-license.title',
-        defaultMessage: 'Edit license',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings',
-    },
-  },
-  {
-    id: 'gpl-license-source-required',
-    title: defineMessage({
-      id: 'nags.gpl-license-source-required.title',
-      defaultMessage: 'Provide source code',
-    }),
-    description: (context: NagContext) => {
-      const { formatMessage } = useVIntl()
-
-      return formatMessage(
-        defineMessage({
-          id: 'nags.gpl-license-source-required.description',
-          defaultMessage:
-            'Your {projectType} uses a license which requires source code to be available. Please provide a source code link or sources file for each additional version, or consider using a different license.',
-        }),
-        {
-          projectType: formatProjectType(context.project.project_type).toLowerCase(),
-        },
-      )
-    },
-    status: 'required',
-    shouldShow: (context: NagContext) => {
-      const gplLicenses = [
-        'GPL-2.0',
-        'GPL-2.0+',
-        'GPL-2.0-only',
-        'GPL-2.0-or-later',
-        'GPL-3.0',
-        'GPL-3.0+',
-        'GPL-3.0-only',
-        'GPL-3.0-or-later',
-        'LGPL-2.1',
-        'LGPL-2.1+',
-        'LGPL-2.1-only',
-        'LGPL-2.1-or-later',
-        'LGPL-3.0',
-        'LGPL-3.0+',
-        'LGPL-3.0-only',
-        'LGPL-3.0-or-later',
-        'AGPL-3.0',
-        'AGPL-3.0+',
-        'AGPL-3.0-only',
-        'AGPL-3.0-or-later',
-        'MPL-2.0',
-      ]
-
-      const isGplLicense = gplLicenses.includes(context.project.license.id)
-      const hasSourceUrl = !!context.project.source_url
-      const hasAdditionalFiles = (context: NagContext) => {
-        let hasAdditional = true
-        context.versions.forEach((version) => {
-          if (version.files.length < 2) hasAdditional = false
-        })
-        return hasAdditional
-      }
-      const notSourceAsDistributed = (context: NagContext) =>
-        context.project.project_type === 'mod' || context.project.project_type === 'plugin'
-
-      return (
-        isGplLicense &&
-        notSourceAsDistributed(context) &&
-        !hasSourceUrl &&
-        !hasAdditionalFiles(context)
-      )
-    },
-    link: {
-      path: 'settings/links',
-      title: defineMessage({
-        id: 'nags.visit-links-settings.title',
-        defaultMessage: 'Visit links settings',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-links',
-    },
-  },
-]

packages/moderation/data/nags/tags.ts

@@ -1,160 +0,0 @@
-import type { Project } from '@modrinth/utils'
-import type { Nag, NagContext } from '../../types/nags'
-import { useVIntl, defineMessage } from '@vintl/vintl'
-
-const allResolutionTags = ['8x-', '16x', '32x', '48x', '64x', '128x', '256x', '512x+']
-
-const MAX_TAG_COUNT = 8
-
-function getCategories(
-  project: Project & { actualProjectType: string },
-  tags: {
-    categories?: {
-      project_type: string
-    }[]
-  },
-) {
-  return (
-    tags.categories?.filter(
-      (category: { project_type: string }) => category.project_type === project.actualProjectType,
-    ) ?? []
-  )
-}
-
-export const tagsNags: Nag[] = [
-  {
-    id: 'too-many-tags',
-    title: defineMessage({
-      id: 'nags.too-many-tags.title',
-      defaultMessage: 'Select accurate tags',
-    }),
-    description: (context: NagContext) => {
-      const { formatMessage } = useVIntl()
-      const tagCount =
-        context.project.categories.length + (context.project.additional_categories?.length || 0)
-      const maxTagCount = MAX_TAG_COUNT
-
-      return formatMessage(
-        defineMessage({
-          id: 'nags.too-many-tags.description',
-          defaultMessage:
-            "You've selected {tagCount} tags. Consider reducing to {maxTagCount} or fewer to make sure your project appears in relevant search results.",
-        }),
-        {
-          tagCount,
-          maxTagCount,
-        },
-      )
-    },
-    status: 'warning',
-    shouldShow: (context: NagContext) => {
-      const tagCount =
-        context.project.categories.length + (context.project.additional_categories?.length || 0)
-      return tagCount > MAX_TAG_COUNT
-    },
-    link: {
-      path: 'settings/tags',
-      title: defineMessage({
-        id: 'nags.edit-tags.title',
-        defaultMessage: 'Edit tags',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-tags',
-    },
-  },
-  {
-    id: 'multiple-resolution-tags',
-    title: defineMessage({
-      id: 'nags.multiple-resolution-tags.title',
-      defaultMessage: 'Select correct resolution',
-    }),
-    description: (context: NagContext) => {
-      const { formatMessage } = useVIntl()
-      const resolutionTags = context.project.categories
-        .concat(context.project.additional_categories)
-        .filter((tag: string) => allResolutionTags.includes(tag))
-
-      const sortedTags = resolutionTags.toSorted((a, b) => {
-        return allResolutionTags.indexOf(a) - allResolutionTags.indexOf(b)
-      })
-
-      return formatMessage(
-        defineMessage({
-          id: 'nags.multiple-resolution-tags.description',
-          defaultMessage:
-            "You've selected {count} resolution tags ({tags}). Resource packs should typically only have one resolution tag that matches their primary resolution.",
-        }),
-        {
-          count: resolutionTags.length,
-          tags: sortedTags
-            .join(', ')
-            .replace('8x-', '8x or lower')
-            .replace('512x+', '512x or higher'),
-        },
-      )
-    },
-    status: 'warning',
-    shouldShow: (context: NagContext) => {
-      if (context.project.project_type !== 'resourcepack') return false
-
-      const resolutionTags = context.project.categories
-        .concat(context.project.additional_categories)
-        .filter((tag: string) => allResolutionTags.includes(tag))
-      return resolutionTags.length > 1
-    },
-    link: {
-      path: 'settings/tags',
-      title: defineMessage({
-        id: 'nags.edit-tags.title',
-        defaultMessage: 'Edit tags',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-tags',
-    },
-  },
-  {
-    id: 'all-tags-selected',
-    title: defineMessage({
-      id: 'nags.all-tags-selected.title',
-      defaultMessage: 'Select accurate tags',
-    }),
-    description: (context: NagContext) => {
-      const { formatMessage } = useVIntl()
-      const categoriesForProjectType = getCategories(
-        context.project as Project & { actualProjectType: string },
-        context.tags,
-      )
-      const totalAvailableTags = categoriesForProjectType.length
-
-      return formatMessage(
-        defineMessage({
-          id: 'nags.all-tags-selected.description',
-          defaultMessage:
-            "You've selected all {totalAvailableTags} available tags. This defeats the purpose of tags, which are meant to help users find relevant projects. Please select only the tags that are relevant to your project.",
-        }),
-        {
-          totalAvailableTags,
-        },
-      )
-    },
-    status: 'required',
-    shouldShow: (context: NagContext) => {
-      const categoriesForProjectType = getCategories(
-        context.project as Project & { actualProjectType: string },
-        context.tags,
-      )
-      const totalSelectedTags =
-        context.project.categories.length + (context.project.additional_categories?.length || 0)
-      return (
-        totalSelectedTags === categoriesForProjectType.length &&
-        context.project.project_type !== 'project'
-      )
-    },
-    link: {
-      path: 'settings/tags',
-      title: defineMessage({
-        id: 'nags.edit-tags.title',
-        defaultMessage: 'Edit tags',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-tags',
-    },
-  },
-]

packages/moderation/index.ts

@@ -2,12 +2,9 @@ export * from './types/actions'
 export * from './types/messages'
 export * from './types/stage'
 export * from './types/keybinds'
-export * from './types/nags'
 export * from './types/reports'
 export * from './utils'
 
-export * from './data/nags/index'
-export { default as nags } from './data/nags'
 export { finalPermissionMessages } from './data/modpack-permissions-stage'
 export { default as checklist } from './data/checklist'
 export { default as keybinds } from './data/keybinds'

packages/moderation/locales/en-US/index.json

@@ -1,203 +0,0 @@
-{
-  "nags.add-description.description": {
-    "defaultMessage": "A description that clearly describes the project's purpose and function is required."
-  },
-  "nags.add-description.title": {
-    "defaultMessage": "Add a description"
-  },
-  "nags.add-icon.description": {
-    "defaultMessage": "Adding a unique, relevant, and engaging icon makes your project identifiable and helps it stand out."
-  },
-  "nags.add-icon.title": {
-    "defaultMessage": "Add an icon"
-  },
-  "nags.add-links.description": {
-    "defaultMessage": "Add any relevant links targeted outside of Modrinth, such as source code, an issue tracker, or a Discord invite."
-  },
-  "nags.add-links.title": {
-    "defaultMessage": "Add external links"
-  },
-  "nags.all-tags-selected.description": {
-    "defaultMessage": "You've selected all {totalAvailableTags} available tags. This defeats the purpose of tags, which are meant to help users find relevant projects. Please select only the tags that are relevant to your project."
-  },
-  "nags.all-tags-selected.title": {
-    "defaultMessage": "Select accurate tags"
-  },
-  "nags.description-too-short.description": {
-    "defaultMessage": "Your description is {length} readable characters. At least {minChars} characters is recommended to create a clear and informative description."
-  },
-  "nags.description-too-short.title": {
-    "defaultMessage": "Expand the description"
-  },
-  "nags.edit-description.title": {
-    "defaultMessage": "Edit description"
-  },
-  "nags.edit-license.title": {
-    "defaultMessage": "Edit license"
-  },
-  "nags.edit-summary.title": {
-    "defaultMessage": "Edit summary"
-  },
-  "nags.edit-tags.title": {
-    "defaultMessage": "Edit tags"
-  },
-  "nags.edit-title.title": {
-    "defaultMessage": "Edit title"
-  },
-  "nags.feature-gallery-image.description": {
-    "defaultMessage": "The featured gallery image is often how your project makes its first impression."
-  },
-  "nags.feature-gallery-image.title": {
-    "defaultMessage": "Feature a gallery image"
-  },
-  "nags.gallery.title": {
-    "defaultMessage": "Visit gallery page"
-  },
-  "nags.gpl-license-source-required.description": {
-    "defaultMessage": "Your {projectType} uses a license which requires source code to be available. Please provide a source code link or sources file for each additional version, or consider using a different license."
-  },
-  "nags.gpl-license-source-required.title": {
-    "defaultMessage": "Provide source code"
-  },
-  "nags.image-heavy-description.description": {
-    "defaultMessage": "Your Description should contain sufficient plain text or image alt-text, keeping it accessible to those using screen readers or with slow internet connections."
-  },
-  "nags.image-heavy-description.title": {
-    "defaultMessage": "Ensure accessibility"
-  },
-  "nags.invalid-license-url.description.default": {
-    "defaultMessage": "License URL is invalid."
-  },
-  "nags.invalid-license-url.description.domain": {
-    "defaultMessage": "Your license URL points to {domain}, which is not appropriate for license information. License URLs should link directly to your license file, not social media, gaming platforms, etc."
-  },
-  "nags.invalid-license-url.description.malformed": {
-    "defaultMessage": "Your license URL appears to be malformed. Please provide a valid URL to your license text."
-  },
-  "nags.invalid-license-url.title": {
-    "defaultMessage": "Add a valid license link"
-  },
-  "nags.link-shortener-usage.description": {
-    "defaultMessage": "Use of link shorteners or other methods to obscure where a link may lead in your external links or license link is prohibited, please only use appropriate full length links."
-  },
-  "nags.link-shortener-usage.title": {
-    "defaultMessage": "Don't use link shorteners"
-  },
-  "nags.long-headers.description": {
-    "defaultMessage": "{count, plural, one {# header} other {# headers}} in your description {count, plural, one {is} other {are}} too long. Headers should be concise and act as section titles, not full sentences."
-  },
-  "nags.long-headers.title": {
-    "defaultMessage": "Shorten headers"
-  },
-  "nags.minecraft-title-clause.description": {
-    "defaultMessage": "Projects must not use Minecraft's branding or include \"Minecraft\" as a significant part of the name."
-  },
-  "nags.minecraft-title-clause.title": {
-    "defaultMessage": "Avoid brand infringement"
-  },
-  "nags.missing-alt-text.description": {
-    "defaultMessage": "Some of your images are missing alt text, which is important for accessibility, especially for visually impaired users."
-  },
-  "nags.missing-alt-text.title": {
-    "defaultMessage": "Add image alt text"
-  },
-  "nags.misused-discord-link-description": {
-    "defaultMessage": "Discord invites can not be used for other link types. Please put your Discord link in the Discord Invite link field only."
-  },
-  "nags.misused-discord-link.title": {
-    "defaultMessage": "Move Discord invite"
-  },
-  "nags.moderation.title": {
-    "defaultMessage": "Visit moderation thread"
-  },
-  "nags.moderator-feedback.description": {
-    "defaultMessage": "Review and address all concerns from the moderation team before resubmitting."
-  },
-  "nags.moderator-feedback.title": {
-    "defaultMessage": "Review moderator feedback"
-  },
-  "nags.multiple-resolution-tags.description": {
-    "defaultMessage": "You've selected {count} resolution tags ({tags}). Resource packs should typically only have one resolution tag that matches their primary resolution."
-  },
-  "nags.multiple-resolution-tags.title": {
-    "defaultMessage": "Select correct resolution"
-  },
-  "nags.select-environments.description": {
-    "defaultMessage": "Select if the {projectType} functions on the client-side and/or server-side."
-  },
-  "nags.select-environments.title": {
-    "defaultMessage": "Select supported environments"
-  },
-  "nags.select-license.description": {
-    "defaultMessage": "Select the license your {projectType} is distributed under."
-  },
-  "nags.select-license.title": {
-    "defaultMessage": "Select a license"
-  },
-  "nags.select-tags.description": {
-    "defaultMessage": "Select the tags that correctly apply to your project to help the right users find it."
-  },
-  "nags.select-tags.title": {
-    "defaultMessage": "Select tags"
-  },
-  "nags.settings.description.title": {
-    "defaultMessage": "Visit description settings"
-  },
-  "nags.settings.environments.title": {
-    "defaultMessage": "Visit general settings"
-  },
-  "nags.settings.license.title": {
-    "defaultMessage": "Visit license settings"
-  },
-  "nags.settings.links.title": {
-    "defaultMessage": "Visit links settings"
-  },
-  "nags.settings.tags.title": {
-    "defaultMessage": "Visit tag settings"
-  },
-  "nags.settings.title": {
-    "defaultMessage": "Visit general settings"
-  },
-  "nags.summary-same-as-title.description": {
-    "defaultMessage": "Your summary can not be the same as your project's Name. It's important to create an informative and enticing Summary."
-  },
-  "nags.summary-same-as-title.title": {
-    "defaultMessage": "Make the summary unique"
-  },
-  "nags.summary-too-short.description": {
-    "defaultMessage": "Your summary is {length} characters. At least {minChars} characters is recommended to create an informative and enticing summary."
-  },
-  "nags.summary-too-short.title": {
-    "defaultMessage": "Expand the summary"
-  },
-  "nags.title-contains-technical-info.description": {
-    "defaultMessage": "Keeping your project's Name clean and makes it memorable easier to find. Version and loader information is automatically displayed alongside your project."
-  },
-  "nags.title-contains-technical-info.title": {
-    "defaultMessage": "Clean up the name"
-  },
-  "nags.too-many-tags.description": {
-    "defaultMessage": "You've selected {tagCount} tags. Consider reducing to {maxTagCount} or fewer to make sure your project appears in relevant search results."
-  },
-  "nags.too-many-tags.title": {
-    "defaultMessage": "Select accurate tags"
-  },
-  "nags.upload-version.description": {
-    "defaultMessage": "At least one version is required for a project to be submitted for review."
-  },
-  "nags.upload-version.title": {
-    "defaultMessage": "Upload a version"
-  },
-  "nags.verify-external-links.description": {
-    "defaultMessage": "Some of your external links may be using domains that are inappropriate for that type of link."
-  },
-  "nags.verify-external-links.title": {
-    "defaultMessage": "Verify external links"
-  },
-  "nags.versions.title": {
-    "defaultMessage": "Visit versions page"
-  },
-  "nags.visit-links-settings.title": {
-    "defaultMessage": "Visit links settings"
-  }
-}

packages/moderation/package.json

@@ -6,17 +6,14 @@
   "types": "./index.d.ts",
   "scripts": {
     "lint": "eslint . && prettier --check .",
-    "fix": "eslint . --fix && prettier --write . && pnpm run intl:extract",
-    "intl:extract": "formatjs extract \"**/*.{vue,ts,tsx,js,jsx,mts,cts,mjs,cjs}\" --ignore \"**/*.d.ts\" --ignore \"node_modules/**/*\" --out-file locales/en-US/index.json --preserve-whitespace"
+    "fix": "eslint . --fix && prettier --write ."
   },
   "dependencies": {
-    "@modrinth/assets": "workspace:*",
     "@modrinth/utils": "workspace:*",
+    "@modrinth/assets": "workspace:*",
     "vue": "^3.5.13"
   },
   "devDependencies": {
-    "@formatjs/cli": "^6.2.12",
-    "@vintl/vintl": "^4.4.1",
     "eslint": "^8.57.0",
     "eslint-config-custom": "workspace:*",
     "tsconfig": "workspace:*"

packages/moderation/types/nags.ts

@@ -1,96 +0,0 @@
-import type { Project, User, Version } from '@modrinth/utils'
-import type { MessageDescriptor } from '@vintl/vintl'
-import type { FunctionalComponent, SVGAttributes } from 'vue'
-
-/**
- * Type which represents the status type of a nag.
- *
- * - `required` indicates that the nag must be addressed.
- * - `warning` indicates that the nag is important but not critical, and can be ignored. It is often used for issues that should be resolved but do not block project submission.
- * - `suggestion` indicates that the nag is a recommendation and can be ignored.
- */
-export type NagStatus = 'required' | 'warning' | 'suggestion' | 'special-submit-action'
-
-/**
- * Interface representing the context in which a nag is displayed.
- * It includes the project, versions, current member, all members, and the current route.
- * This context is used to determine whether a nag or it's link should be shown and how it should be presented.
- */
-export interface NagContext {
-  /**
-   * The project associated with the nag.
-   */
-  project: Project
-  /**
-   * The versions associated with the project.
-   */
-  versions: Version[]
-  /**
-   * The current project member viewing the nag.
-   */
-  currentMember: User
-  /**
-   * The current route in the application.
-   */
-  currentRoute: string
-  /* eslint-disable @typescript-eslint/no-explicit-any */
-  tags: any
-  submitProject: (...any: any) => any
-  /* eslint-enable @typescript-eslint/no-explicit-any */
-}
-
-/**
- * Interface representing a nag's link.
- */
-export interface NagLink {
-  /**
-   * A relative path to the nag's link, e.g. '/settings'.
-   */
-  path: string
-  /**
-   * The text to display for the nag's link.
-   */
-  title: MessageDescriptor | string
-  /**
-   * The status of the nag, which can be 'required', 'warning', or 'suggestion'.
-   */
-  shouldShow?: (context: NagContext) => boolean
-}
-
-/**
- * Interface representing a nag.
- */
-export interface Nag {
-  /**
-   * A unique identifier for the nag.
-   */
-  id: string
-  /**
-   * The title of the nag.
-   */
-  title: MessageDescriptor | string
-  /**
-   * A function that returns the description of the nag.
-   * It can accept a context to provide dynamic descriptions.
-   */
-  description: MessageDescriptor | ((context: NagContext) => string)
-  /**
-   * The status of the nag, which can be 'required', 'warning', or 'suggestion'.
-   */
-  status: NagStatus
-  /**
-   * An optional icon for the nag, usually from `@modrinth/assets`.
-   * If not specified it will use the default icon associated with the nag status.
-   */
-  icon?: FunctionalComponent<SVGAttributes>
-
-  /**
-   * A function that determines whether the nag should be shown based on the context.
-   */
-  shouldShow: (context: NagContext) => boolean
-  /**
-   * An optional link associated with the nag.
-   * If provided, it should be displayed alongside the nag.
-   */
-  link?: NagLink
-}

packages/utils/types.ts

@@ -18,14 +18,7 @@ export type DonationPlatform =
   | { short: 'ko-fi'; name: 'Ko-fi' }
   | { short: 'other'; name: 'Other' }
 
-export type ProjectType =
-  | 'mod'
-  | 'modpack'
-  | 'resourcepack'
-  | 'shader'
-  | 'plugin'
-  | 'datapack'
-  | 'project'
+export type ProjectType = 'mod' | 'modpack' | 'resourcepack' | 'shader' | 'plugin' | 'datapack'
 export type MonetizationStatus = 'monetized' | 'demonetized' | 'force-demonetized'
 
 export type GameVersion = string
@@ -77,10 +70,10 @@ export interface Project {
   thread_id: ModrinthId
   organization: ModrinthId
 
-  issues_url: string | null
-  source_url: string | null
-  wiki_url: string | null
-  discord_url: string | null
+  issues_url?: string
+  source_url?: string
+  wiki_url?: string
+  discord_url?: string
   donation_urls: DonationLink<DonationPlatform>[]
 
   published: string

pnpm-lock.yaml

@@ -479,12 +479,6 @@ importers:
         specifier: ^3.5.13
         version: 3.5.13(typescript@5.8.3)
     devDependencies:
-      '@formatjs/cli':
-        specifier: ^6.2.12
-        version: 6.2.12(@vue/compiler-core@3.5.13)(vue@3.5.13(typescript@5.8.3))
-      '@vintl/vintl':
-        specifier: ^4.4.1
-        version: 4.4.1(typescript@5.8.3)(vue@3.5.13(typescript@5.8.3))
       eslint:
         specifier: ^8.57.0
         version: 8.57.0
@@ -4178,8 +4172,8 @@ packages:
   ee-first@1.1.1:
     resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
 
-  electron-to-chromium@1.5.182:
-    resolution: {integrity: sha512-Lv65Btwv9W4J9pyODI6EWpdnhfvrve/us5h1WspW8B2Fb0366REPtY3hX7ounk1CkV/TBjWCEvCBBbYbmV0qCA==}
+  electron-to-chromium@1.5.191:
+    resolution: {integrity: sha512-xcwe9ELcuxYLUFqZZxL19Z6HVKcvNkIwhbHUz7L3us6u12yR+7uY89dSl570f/IqNthx8dAw3tojG7i4Ni4tDA==}
 
   electron-to-chromium@1.5.71:
     resolution: {integrity: sha512-dB68l59BI75W1BUGVTAEJy45CEVuEGy9qPVVQ8pnHyHMn36PLPPoE1mjLH+lo9rKulO3HC2OhbACI/8tCqJBcA==}
@@ -8969,10 +8963,6 @@ snapshots:
     dependencies:
       vue: 3.5.13(typescript@5.5.4)
 
-  '@braw/async-computed@5.0.2(vue@3.5.13(typescript@5.8.3))':
-    dependencies:
-      vue: 3.5.13(typescript@5.8.3)
-
   '@cloudflare/kv-asset-handler@0.3.4':
     dependencies:
       mime: 3.0.0
@@ -9500,11 +9490,6 @@ snapshots:
       '@vue/compiler-core': 3.5.13
       vue: 3.5.13(typescript@5.5.4)
 
-  '@formatjs/cli@6.2.12(@vue/compiler-core@3.5.13)(vue@3.5.13(typescript@5.8.3))':
-    optionalDependencies:
-      '@vue/compiler-core': 3.5.13
-      vue: 3.5.13(typescript@5.8.3)
-
   '@formatjs/ecma402-abstract@1.18.3':
     dependencies:
       '@formatjs/intl-localematcher': 0.5.4
@@ -9562,18 +9547,6 @@ snapshots:
     optionalDependencies:
       typescript: 5.5.4
 
-  '@formatjs/intl@2.10.4(typescript@5.8.3)':
-    dependencies:
-      '@formatjs/ecma402-abstract': 2.0.0
-      '@formatjs/fast-memoize': 2.2.0
-      '@formatjs/icu-messageformat-parser': 2.7.8
-      '@formatjs/intl-displaynames': 6.6.8
-      '@formatjs/intl-listformat': 7.5.7
-      intl-messageformat: 10.5.14
-      tslib: 2.6.3
-    optionalDependencies:
-      typescript: 5.8.3
-
   '@formatjs/ts-transformer@3.13.14':
     dependencies:
       '@formatjs/icu-messageformat-parser': 2.7.8
@@ -11261,17 +11234,6 @@ snapshots:
     transitivePeerDependencies:
       - typescript
 
-  '@vintl/vintl@4.4.1(typescript@5.8.3)(vue@3.5.13(typescript@5.8.3))':
-    dependencies:
-      '@braw/async-computed': 5.0.2(vue@3.5.13(typescript@5.8.3))
-      '@formatjs/icu-messageformat-parser': 2.7.8
-      '@formatjs/intl': 2.10.4(typescript@5.8.3)
-      '@formatjs/intl-localematcher': 0.4.2
-      intl-messageformat: 10.5.14
-      vue: 3.5.13(typescript@5.8.3)
-    transitivePeerDependencies:
-      - typescript
-
   '@vitejs/plugin-vue-jsx@4.1.1(vite@5.4.11(@types/node@20.14.11)(sass@1.77.6)(terser@5.43.1))(vue@3.5.13(typescript@5.5.4))':
     dependencies:
       '@babel/core': 7.26.0
@@ -12077,7 +12039,7 @@ snapshots:
   browserslist@4.25.1:
     dependencies:
       caniuse-lite: 1.0.30001727
-      electron-to-chromium: 1.5.182
+      electron-to-chromium: 1.5.191
       node-releases: 2.0.19
       update-browserslist-db: 1.1.3(browserslist@4.25.1)
     optional: true
@@ -12655,7 +12617,7 @@ snapshots:
 
   ee-first@1.1.1: {}
 
-  electron-to-chromium@1.5.182:
+  electron-to-chromium@1.5.191:
     optional: true
 
   electron-to-chromium@1.5.71: {}
@@ -17414,7 +17376,7 @@ snapshots:
       magic-string: 0.30.17
       mlly: 1.7.4
       pathe: 2.0.3
-      picomatch: 4.0.2
+      picomatch: 4.0.3
       pkg-types: 2.2.0
       scule: 1.3.0
       strip-literal: 3.0.0