diff --git a/src/lib/util.server.js b/src/lib/status.js similarity index 74% rename from src/lib/util.server.js rename to src/lib/status.js index d849d2b..db6848b 100644 --- a/src/lib/util.server.js +++ b/src/lib/status.js @@ -1,16 +1,3 @@ -import { fail } from "@sveltejs/kit"; - -/** - * @param {import("$types/status").Error} error - * @returns {import("@sveltejs/kit").ActionFailure} - */ -export function errorToFail(error) { - if (error.expected) { - return fail(400, error); - } - return fail(500, error); -} - /** * @param {any} result * @returns {import("$types/status").Error | null} diff --git a/src/lib/status.server.js b/src/lib/status.server.js new file mode 100644 index 0000000..8d1983e --- /dev/null +++ b/src/lib/status.server.js @@ -0,0 +1,12 @@ +import { fail } from "@sveltejs/kit"; + +/** + * @param {import("$types/status").Error} error + * @returns {import("@sveltejs/kit").ActionFailure} + */ +export function errorToFail(error) { + if (error.expected) { + return fail(400, error); + } + return fail(500, error); +} diff --git a/src/routes/(app)/compose/+page.server.js b/src/routes/(app)/compose/+page.server.js index 5e0cd89..32ef0a6 100644 --- a/src/routes/(app)/compose/+page.server.js +++ b/src/routes/(app)/compose/+page.server.js @@ -1,10 +1,9 @@ -import { addToast } from '$lib/memory/toast.js'; import { getCategories, getCategoriesCached } from '$lib/server/db/category.js'; import { createPost } from '$lib/server/db/post.js'; -import { getUserIDOfSession } from '$lib/server/db/user.js'; +import { runIfError, runIfSuccess } from '$lib/status.js'; +import { errorToFail } from '$lib/status.server.js'; import { parseIntNull } from '$lib/util.js'; -import { errorToFail, getError, getSuccess, runIfError, runIfSuccess } from '$lib/util.server.js'; -import { error, fail, redirect } from '@sveltejs/kit'; +import { fail, redirect } from '@sveltejs/kit'; export async function load({ cookies }) { if (!cookies.get('token')) { diff --git a/src/routes/(entry)/login/+page.server.js b/src/routes/(entry)/login/+page.server.js index 5d07760..b3ab3b7 100644 --- a/src/routes/(entry)/login/+page.server.js +++ b/src/routes/(entry)/login/+page.server.js @@ -1,5 +1,6 @@ import { createUserSession } from "$lib/server/db/user"; -import { errorToFail, runIfError } from "$lib/util.server"; +import { runIfError } from "$lib/status"; +import { errorToFail } from "$lib/status.server"; import { fail, redirect } from "@sveltejs/kit"; /** @type {import("@sveltejs/kit").ServerLoad} */ diff --git a/src/routes/(entry)/register/+page.server.js b/src/routes/(entry)/register/+page.server.js index 1d763eb..52b48f3 100644 --- a/src/routes/(entry)/register/+page.server.js +++ b/src/routes/(entry)/register/+page.server.js @@ -1,5 +1,6 @@ import { createUser } from '$lib/server/db/user'; -import { errorToFail, runIfError } from '$lib/util.server'; +import { runIfError } from '$lib/status'; +import { errorToFail } from '$lib/status.server'; import { fail, redirect } from '@sveltejs/kit'; /** @type {import('@sveltejs/kit').ServerLoad} */