diff --git a/apps/frontend/src/components/ui/moderation/checklist/ModerationChecklist.vue b/apps/frontend/src/components/ui/moderation/checklist/ModerationChecklist.vue index d456c5b8b..0bb5c7362 100644 --- a/apps/frontend/src/components/ui/moderation/checklist/ModerationChecklist.vue +++ b/apps/frontend/src/components/ui/moderation/checklist/ModerationChecklist.vue @@ -259,7 +259,7 @@ - @@ -355,6 +355,7 @@ import { renderHighlightedString, type ModerationJudgements, type ModerationModpackItem, + type ProjectStatus, } from "@modrinth/utils"; import { computedAsync, useLocalStorage } from "@vueuse/core"; import { @@ -527,7 +528,7 @@ function handleKeybinds(event: KeyboardEvent) { tryResetProgress: resetProgress, tryExitModeration: () => emit("exit"), - tryApprove: () => sendMessage("approved"), + tryApprove: () => sendMessage(props.project.requested_status), tryReject: () => sendMessage("rejected"), tryWithhold: () => sendMessage("withheld"), tryEditMessage: goBackToStages, @@ -1208,7 +1209,7 @@ function generateModpackMessage(allFiles: { } const hasNextProject = ref(false); -async function sendMessage(status: "approved" | "rejected" | "withheld") { +async function sendMessage(status: ProjectStatus) { try { await useBaseFetch(`project/${props.project.id}`, { method: "PATCH", diff --git a/apps/frontend/src/composables/servers/servers-fetch.ts b/apps/frontend/src/composables/servers/servers-fetch.ts index 45bd48c68..29a63f7cc 100644 --- a/apps/frontend/src/composables/servers/servers-fetch.ts +++ b/apps/frontend/src/composables/servers/servers-fetch.ts @@ -147,7 +147,7 @@ export async function useServersFetch( 404: "Not Found", 405: "Method Not Allowed", 408: "Request Timeout", - 429: "Too Many Requests", + 429: "You're making requests too quickly. Please wait a moment and try again.", 500: "Internal Server Error", 502: "Bad Gateway", 503: "Service Unavailable", @@ -167,11 +167,17 @@ export async function useServersFetch( console.error("Fetch error:", error); const fetchError = new ModrinthServersFetchError( - `[Modrinth Servers] ${message}`, + `[Modrinth Servers] ${error.message}`, statusCode, error, ); - throw new ModrinthServerError(error.message, statusCode, fetchError, module, v1Error); + throw new ModrinthServerError( + `[Modrinth Servers] ${message}`, + statusCode, + fetchError, + module, + v1Error, + ); } const baseDelay = statusCode && statusCode >= 500 ? 5000 : 1000; diff --git a/apps/frontend/src/pages/servers/manage/[id]/options/startup.vue b/apps/frontend/src/pages/servers/manage/[id]/options/startup.vue index bd9a7edd4..7080f0e1c 100644 --- a/apps/frontend/src/pages/servers/manage/[id]/options/startup.vue +++ b/apps/frontend/src/pages/servers/manage/[id]/options/startup.vue @@ -42,7 +42,7 @@