From ceb4e746ec3b2fa88700275363eec6e2b54ca1e7 Mon Sep 17 00:00:00 2001 From: stringsplit <77242831+nbitzz@users.noreply.github.com> Date: Fri, 4 Aug 2023 02:30:12 +0000 Subject: [PATCH] try fixing errmsgs --- src/server/lib/errors.ts | 1 + src/svelte/elem/prompts/account.js | 16 ++++++++-------- src/svelte/elem/prompts/admin.js | 10 +++++----- src/svelte/elem/prompts/uploads.js | 10 +++++----- src/svelte/elem/pulldowns/Accounts.svelte | 2 +- 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/server/lib/errors.ts b/src/server/lib/errors.ts index 9aec54b..6e67f33 100644 --- a/src/server/lib/errors.ts +++ b/src/server/lib/errors.ts @@ -22,6 +22,7 @@ export default async function ServeError( // serve error res.statusMessage = reason res.status(code) + res.header("x-backup-status-message", reason) // glitch default nginx configuration res.send( errorPage .replace(/\$code/g,code.toString()) diff --git a/src/svelte/elem/prompts/account.js b/src/svelte/elem/prompts/account.js index b2584ab..13c7f60 100644 --- a/src/svelte/elem/prompts/account.js +++ b/src/svelte/elem/prompts/account.js @@ -44,7 +44,7 @@ export function deleteAccount(optPicker) { })}).then((response) => { if (response.status != 200) { - optPicker.picker(`${response.status} ${response.statusText}`,[]) + optPicker.picker(`${response.status} ${res.headers.get("x-backup-status-message") || response.statusText || ""}`,[]) } fetchAccountData() @@ -77,7 +77,7 @@ export function userChange(optPicker) { })}).then((response) => { if (response.status != 200) { - optPicker.picker(`${response.status} ${response.statusText}`,[]) + optPicker.picker(`${response.status} ${res.headers.get("x-backup-status-message") || response.statusText || ""}`,[]) } fetchAccountData() @@ -106,7 +106,7 @@ export function forgotPassword(optPicker) { account:exp.user })}).then((response) => { if (response.status != 200) { - optPicker.picker(`${response.status} ${response.statusText}`,[]) + optPicker.picker(`${response.status} ${res.headers.get("x-backup-status-message") || response.statusText || ""}`,[]) } else { optPicker.picker(`Please follow the instructions sent to your inbox.`,[]) } @@ -135,7 +135,7 @@ export function emailChange(optPicker) { email:exp.email })}).then((response) => { if (response.status != 200) { - optPicker.picker(`${response.status} ${response.statusText}`,[]) + optPicker.picker(`${response.status} ${res.headers.get("x-backup-status-message") || response.statusText || ""}`,[]) } else { optPicker.picker(`Please continue to your inbox at ${exp.email.split("@")[1]} and click on the attached link.`,[]) } @@ -167,7 +167,7 @@ export function pwdChng(optPicker) { })}).then((response) => { if (response.status != 200) { - optPicker.picker(`${response.status} ${response.statusText}`,[]) + optPicker.picker(`${response.status} ${res.headers.get("x-backup-status-message") || response.statusText || ""}`,[]) } fetchAccountData() @@ -197,7 +197,7 @@ export function customcss(optPicker) { })}).then((response) => { if (response.status != 200) { - optPicker.picker(`${response.status} ${response.statusText}`,[]) + optPicker.picker(`${response.status} ${res.headers.get("x-backup-status-message") || response.statusText || ""}`,[]) } fetchAccountData() @@ -229,7 +229,7 @@ export function embedColor(optPicker) { })}).then((response) => { if (response.status != 200) { - optPicker.picker(`${response.status} ${response.statusText}`,[]) + optPicker.picker(`${response.status} ${res.headers.get("x-backup-status-message") || response.statusText || ""}`,[]) } fetchAccountData() @@ -260,7 +260,7 @@ export function embedSize(optPicker) { })}).then((response) => { if (response.status != 200) { - optPicker.picker(`${response.status} ${response.statusText}`,[]) + optPicker.picker(`${response.status} ${res.headers.get("x-backup-status-message") || response.statusText || ""}`,[]) } fetchAccountData() diff --git a/src/svelte/elem/prompts/admin.js b/src/svelte/elem/prompts/admin.js index fb19931..07e0b59 100644 --- a/src/svelte/elem/prompts/admin.js +++ b/src/svelte/elem/prompts/admin.js @@ -31,7 +31,7 @@ export function pwdReset(optPicker) { })}).then((response) => { if (response.status != 200) { - optPicker.picker(`${response.status} ${response.statusText}`,[]) + optPicker.picker(`${response.status} ${res.headers.get("x-backup-status-message") || response.statusText || ""}`,[]) } }) @@ -67,7 +67,7 @@ export function chgOwner(optPicker) { })}).then((response) => { if (response.status != 200) { - optPicker.picker(`${response.status} ${response.statusText}`,[]) + optPicker.picker(`${response.status} ${res.headers.get("x-backup-status-message") || response.statusText || ""}`,[]) } }) @@ -96,7 +96,7 @@ export function delFile(optPicker) { })}).then((response) => { if (response.status != 200) { - optPicker.picker(`${response.status} ${response.statusText}`,[]) + optPicker.picker(`${response.status} ${res.headers.get("x-backup-status-message") || response.statusText || ""}`,[]) } }) @@ -125,7 +125,7 @@ export function elevateUser(optPicker) { })}).then((response) => { if (response.status != 200) { - optPicker.picker(`${response.status} ${response.statusText}`,[]) + optPicker.picker(`${response.status} ${res.headers.get("x-backup-status-message") || response.statusText || ""}`,[]) } }) @@ -181,7 +181,7 @@ export function deleteAccount(optPicker) { })}).then((response) => { if (response.status != 200) { - optPicker.picker(`${response.status} ${response.statusText}`,[]) + optPicker.picker(`${response.status} ${res.headers.get("x-backup-status-message") || response.statusText || ""}`,[]) } fetchAccountData() diff --git a/src/svelte/elem/prompts/uploads.js b/src/svelte/elem/prompts/uploads.js index 295adf5..441594d 100644 --- a/src/svelte/elem/prompts/uploads.js +++ b/src/svelte/elem/prompts/uploads.js @@ -59,7 +59,7 @@ export function dfv(optPicker) { })}).then((response) => { if (response.status != 200) { - optPicker.picker(`${response.status} ${response.statusText}`,[]) + optPicker.picker(`${response.status} ${res.headers.get("x-backup-status-message") || response.statusText || ""}`,[]) } fetchAccountData() @@ -86,7 +86,7 @@ export function update_all_files(optPicker) { })}).then((response) => { if (response.status != 200) { - optPicker.picker(`${response.status} ${response.statusText}`,[]) + optPicker.picker(`${response.status} ${res.headers.get("x-backup-status-message") || response.statusText || ""}`,[]) } fetchAccountData() @@ -129,7 +129,7 @@ export function fileOptions(optPicker,file) { })}).then((response) => { if (response.status != 200) { - optPicker.picker(`${response.status} ${response.statusText}`,[]) + optPicker.picker(`${response.status} ${res.headers.get("x-backup-status-message") || response.statusText || ""}`,[]) } fetchFilePointers(); @@ -151,7 +151,7 @@ export function fileOptions(optPicker,file) { })}).then((response) => { if (response.status != 200) { - optPicker.picker(`${response.status} ${response.statusText}`,[]) + optPicker.picker(`${response.status} ${res.headers.get("x-backup-status-message") || response.statusText || ""}`,[]) } fetchFilePointers(); @@ -198,7 +198,7 @@ export function fileOptions(optPicker,file) { })}).then((response) => { if (response.status != 200) { - optPicker.picker(`${response.status} ${response.statusText}`,[]) + optPicker.picker(`${response.status} ${res.headers.get("x-backup-status-message") || response.statusText || ""}`,[]) } fetchFilePointers(); diff --git a/src/svelte/elem/pulldowns/Accounts.svelte b/src/svelte/elem/pulldowns/Accounts.svelte index 2e76f43..f02efc3 100644 --- a/src/svelte/elem/pulldowns/Accounts.svelte +++ b/src/svelte/elem/pulldowns/Accounts.svelte @@ -39,7 +39,7 @@ authError = await res.json().catch(() => { return { status: res.status, - message: res.statusText + message: res.headers.get("x-backup-status-message") || res.statusText || "" } }) } else {