diff options
Diffstat (limited to 'src')
35 files changed, 81 insertions, 82 deletions
diff --git a/src/lib/invoice.js b/src/lib/invoice.js index 87707c89..e8164408 100644 --- a/src/lib/invoice.js +++ b/src/lib/invoice.js @@ -25,13 +25,13 @@ export default async ({ cookies, request, url }) => { if (request_id) { if (url.pathname.endsWith("tip")) { - throw redirect(307, `/send/invoice/${id}`); + redirect(307, `/send/invoice/${id}`); } - throw redirect(307, `/${user.username}/request/${request_id}`); + redirect(307, `/${user.username}/request/${request_id}`); } if (invoice.prompt) - throw redirect(307, `/${user.username}/invoice/${id}/tip`); - else throw redirect(307, `/${user.username}/invoice/${id}`); + redirect(307, `/${user.username}/invoice/${id}/tip`); + else redirect(307, `/${user.username}/invoice/${id}`); }; diff --git a/src/routes/(app)/+layout.server.js b/src/routes/(app)/+layout.server.js index 67250769..50d51584 100644 --- a/src/routes/(app)/+layout.server.js +++ b/src/routes/(app)/+layout.server.js @@ -16,7 +16,7 @@ export async function load({ cookies, request, url, params }) { } if (user?.needsMigration) { - throw redirect(307, `/migrate`); + redirect(307, `/migrate`); } if ( @@ -24,18 +24,18 @@ export async function load({ cookies, request, url, params }) { ["/login", "/register"].includes(pathname) && request.method === "GET" ) { - throw redirect(307, `/${user.username}`); + redirect(307, `/${user.username}`); } if ( protectedRoutes.find((p) => pathname.match(p)) && (!user || user.username !== params.username) ) { - throw redirect(307, "/login"); + redirect(307, "/login"); } if (user && !user.pubkey && !pathname.includes("generate")) { - throw redirect(303, `/${user.username}/generate`); + redirect(303, `/${user.username}/generate`); } try { diff --git a/src/routes/(app)/[username]/(profile)/event/[id]/+page.server.js b/src/routes/(app)/[username]/(profile)/event/[id]/+page.server.js index ec4da865..24f2b611 100644 --- a/src/routes/(app)/[username]/(profile)/event/[id]/+page.server.js +++ b/src/routes/(app)/[username]/(profile)/event/[id]/+page.server.js @@ -4,9 +4,9 @@ import { error } from "@sveltejs/kit"; export async function load({ params: { id } }) { try { let event = await get(`/event/${id}`); - if (!event) throw error(500, "Event not found"); + if (!event) error(500, "Event not found"); return { event }; } catch (e) { - throw error(500, e.message); + error(500, e.message); } } diff --git a/src/routes/(app)/[username]/(profile)/request/+page.server.js b/src/routes/(app)/[username]/(profile)/request/+page.server.js index 754c5805..f22dcbb7 100644 --- a/src/routes/(app)/[username]/(profile)/request/+page.server.js +++ b/src/routes/(app)/[username]/(profile)/request/+page.server.js @@ -5,7 +5,7 @@ export const actions = { create: async ({ cookies, params, request, url }) => { let form = await fd(request); let { id, requester } = await post("/requests", form, auth(cookies)); - throw redirect(307, `/${params.username}/request/${id}`); + redirect(307, `/${params.username}/request/${id}`); }, delete: async ({ cookies, request }) => { diff --git a/src/routes/(app)/[username]/+layout.server.js b/src/routes/(app)/[username]/+layout.server.js index 3b25b3b5..11e6d45c 100644 --- a/src/routes/(app)/[username]/+layout.server.js +++ b/src/routes/(app)/[username]/+layout.server.js @@ -13,6 +13,6 @@ export let load = async ({ cookies, depends, params: { username } }) => { return { subject }; } catch (e) { - throw error(500, "Unable to retrieve user account data"); + error(500, "Unable to retrieve user account data"); } }; diff --git a/src/routes/(app)/[username]/address/+page.server.js b/src/routes/(app)/[username]/address/+page.server.js index 1a782f9d..f8e271f9 100644 --- a/src/routes/(app)/[username]/address/+page.server.js +++ b/src/routes/(app)/[username]/address/+page.server.js @@ -6,5 +6,5 @@ export async function load({ cookies, params, parent }) { let rates = await get("/rates"); let invoice = { type: "bitcoin" }; let { hash } = await post(`/invoice`, { invoice, user }, auth(cookies)); - throw redirect(307, `/${user.username}/invoice/${hash}`); + redirect(307, `/${user.username}/invoice/${hash}`); } diff --git a/src/routes/(app)/[username]/card/[serial]/+page.server.js b/src/routes/(app)/[username]/card/[serial]/+page.server.js index 20b657a1..945eee30 100644 --- a/src/routes/(app)/[username]/card/[serial]/+page.server.js +++ b/src/routes/(app)/[username]/card/[serial]/+page.server.js @@ -10,7 +10,7 @@ export let load = async ({ cookies, params }) => { console.log(e); } - if (fund) throw redirect(307, `/fund/${serial}`); + if (fund) redirect(307, `/fund/${serial}`); return params; }; diff --git a/src/routes/(app)/[username]/generate/+server.js b/src/routes/(app)/[username]/generate/+server.js index 1dca1ece..3e3a9358 100644 --- a/src/routes/(app)/[username]/generate/+server.js +++ b/src/routes/(app)/[username]/generate/+server.js @@ -6,6 +6,6 @@ export async function POST({ cookies, request }) { let body = await request.json(); return json(await post(`/user`, body, auth(cookies))); } catch (e) { - throw error(500, e.message); + error(500, e.message); } } diff --git a/src/routes/(app)/[username]/invoice/[id]/+layout.server.js b/src/routes/(app)/[username]/invoice/[id]/+layout.server.js index b9d1c43d..b887d407 100644 --- a/src/routes/(app)/[username]/invoice/[id]/+layout.server.js +++ b/src/routes/(app)/[username]/invoice/[id]/+layout.server.js @@ -16,7 +16,7 @@ export async function load({ depends, params, url, parent }) { !url.pathname.includes("tip") && !options ) { - throw redirect(307, `/send/invoice/${id}`); + redirect(307, `/send/invoice/${id}`); } let { amount, pending, received } = invoice; @@ -26,11 +26,11 @@ export async function load({ depends, params, url, parent }) { (!amount && received) || (amount > 0 && (pending >= amount || received >= amount)); if (paid && !url.pathname.endsWith("paid")) { - throw redirect( - 307, - `/${params.username}/invoice/${id}/paid` + - (options ? "?options=true" : "") - ); + redirect( + 307, + `/${params.username}/invoice/${id}/paid` + + (options ? "?options=true" : "") + ); } let sm = Qr.drawImg(invoice.text || "", { size: 300 }); diff --git a/src/routes/(app)/[username]/invoice/[id]/tip/+page.server.js b/src/routes/(app)/[username]/invoice/[id]/tip/+page.server.js index c9377e36..b81e2364 100644 --- a/src/routes/(app)/[username]/invoice/[id]/tip/+page.server.js +++ b/src/routes/(app)/[username]/invoice/[id]/tip/+page.server.js @@ -4,7 +4,7 @@ import { redirect } from "@sveltejs/kit"; export async function load({ parent, params }) { let { invoice } = await parent(); if (!invoice.amount) - throw redirect(307, `/${params.username}/invoice/${invoice.id}`); + redirect(307, `/${params.username}/invoice/${invoice.id}`); } export const actions = { diff --git a/src/routes/(app)/[username]/request/[id]/+page.server.js b/src/routes/(app)/[username]/request/[id]/+page.server.js index 09cce465..2712c7ca 100644 --- a/src/routes/(app)/[username]/request/[id]/+page.server.js +++ b/src/routes/(app)/[username]/request/[id]/+page.server.js @@ -5,7 +5,7 @@ export let load = async ({ cookies, depends, params, parent }) => { depends("app:invoice"); let { user } = await parent(); - if (!user) throw redirect(307, "/login"); + if (!user) redirect(307, "/login"); let { request } = await get(`/request/${params.id}`, auth(cookies)); let { invoice } = request; @@ -16,10 +16,10 @@ export let load = async ({ cookies, depends, params, parent }) => { request.recipient.username === user.username && ((received && !amount) || received >= amount) ) - throw redirect(307, `/${user.username}/invoice/${id}/paid`); + redirect(307, `/${user.username}/invoice/${id}/paid`); if (request.requester.username === user.username) - throw redirect(307, `/send/${id}`); + redirect(307, `/send/${id}`); } return { request }; diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.server.js b/src/routes/(app)/[username]/settings/[...tab]/+page.server.js index c035da12..b9717b82 100644 --- a/src/routes/(app)/[username]/settings/[...tab]/+page.server.js +++ b/src/routes/(app)/[username]/settings/[...tab]/+page.server.js @@ -3,7 +3,7 @@ import { fd, auth, get, post } from "$lib/utils"; export function load({ cookies, params, url }) { if (url.pathname.endsWith("settings")) - throw redirect(307, url.pathname + "/account"); + redirect(307, url.pathname + "/account"); params.cookies = cookies.getAll(); return params; } diff --git a/src/routes/(app)/[username]/verify/[code]/+page.server.js b/src/routes/(app)/[username]/verify/[code]/+page.server.js index 3ddcd412..19453d9d 100644 --- a/src/routes/(app)/[username]/verify/[code]/+page.server.js +++ b/src/routes/(app)/[username]/verify/[code]/+page.server.js @@ -10,5 +10,5 @@ export let load = async ({ params: { code } }) => { return { error: "Verification failed" }; } - throw redirect(307, `/${user.username}/settings/account?verified=true`); + redirect(307, `/${user.username}/settings/account?verified=true`); }; diff --git a/src/routes/(app)/admin/+layout.server.js b/src/routes/(app)/admin/+layout.server.js index e49c6e40..9250a7d4 100644 --- a/src/routes/(app)/admin/+layout.server.js +++ b/src/routes/(app)/admin/+layout.server.js @@ -3,9 +3,9 @@ import { redirect } from "@sveltejs/kit"; export async function load({ cookies, parent }) { let token = cookies.get("token"); - if (!token) throw redirect(307, "/login"); + if (!token) redirect(307, "/login"); let user = await get("/me", auth(cookies)); - if (!user) throw redirect(307, "/login"); + if (!user) redirect(307, "/login"); return { user }; } diff --git a/src/routes/(app)/admin/+page.server.js b/src/routes/(app)/admin/+page.server.js index 93931aa3..96a1cd78 100644 --- a/src/routes/(app)/admin/+page.server.js +++ b/src/routes/(app)/admin/+page.server.js @@ -3,7 +3,7 @@ import { redirect } from "@sveltejs/kit"; export async function load({ cookies, parent }) { let { user } = await parent(); - if (!user) throw redirect(307, "/login"); + if (!user) redirect(307, "/login"); let users = (await get("/users", auth(cookies))).sort( (a, b) => b.balance - a.balance diff --git a/src/routes/(app)/buy/+page.server.js b/src/routes/(app)/buy/+page.server.js index 3d3265cb..b8897741 100644 --- a/src/routes/(app)/buy/+page.server.js +++ b/src/routes/(app)/buy/+page.server.js @@ -23,6 +23,6 @@ export const actions = { auth(cookies) ); - throw redirect(307, `/${form.get("username")}/payments`); + redirect(307, `/${form.get("username")}/payments`); }, }; diff --git a/src/routes/(app)/disable2fa/+server.js b/src/routes/(app)/disable2fa/+server.js index 1e264398..0afda3b9 100644 --- a/src/routes/(app)/disable2fa/+server.js +++ b/src/routes/(app)/disable2fa/+server.js @@ -8,6 +8,6 @@ export async function POST({ cookies, request }) { return json(res); } catch (e) { - throw error(500, "Problem disabling 2fa"); + error(500, "Problem disabling 2fa"); } } diff --git a/src/routes/(app)/fund/[id]/+page.server.js b/src/routes/(app)/fund/[id]/+page.server.js index 6c5c943f..c5c8db2f 100644 --- a/src/routes/(app)/fund/[id]/+page.server.js +++ b/src/routes/(app)/fund/[id]/+page.server.js @@ -15,9 +15,9 @@ export const actions = { if (user) { await post("/redeem", params, auth(cookies)); - throw redirect(307, `/${user.username}/payments`); + redirect(307, `/${user.username}/payments`); } - throw redirect(307, "/register"); + redirect(307, "/register"); }, }; diff --git a/src/routes/(app)/fund/[id]/sweep/+page.server.js b/src/routes/(app)/fund/[id]/sweep/+page.server.js index 05fb18b6..613cf8e2 100644 --- a/src/routes/(app)/fund/[id]/sweep/+page.server.js +++ b/src/routes/(app)/fund/[id]/sweep/+page.server.js @@ -6,8 +6,8 @@ export async function load({ cookies, params, parent }) { let { id } = params; let { amount } = await get(`/fund/${id}`); - if (!amount) throw redirect(307, `/fund/${id}`); - if (!user) throw redirect(307, `/register?redirect=/fund/${id}/sweep`); + if (!amount) redirect(307, `/fund/${id}`); + if (!user) redirect(307, `/register?redirect=/fund/${id}/sweep`); await post("/take", { amount, id }, auth(cookies)); return { amount, id }; } diff --git a/src/routes/(app)/fund/[id]/withdraw/+page.server.js b/src/routes/(app)/fund/[id]/withdraw/+page.server.js index 6fb08f61..1da349f8 100644 --- a/src/routes/(app)/fund/[id]/withdraw/+page.server.js +++ b/src/routes/(app)/fund/[id]/withdraw/+page.server.js @@ -3,7 +3,7 @@ import { fd, auth, post } from "$lib/utils"; export async function load({ parent }) { let { user } = await parent(); - if (!user) throw redirect(307, "/register"); + if (!user) redirect(307, "/register"); } export const actions = { @@ -15,6 +15,6 @@ export const actions = { return fail(400, { message: e.message }); } - throw redirect(307, `/fund/${body.id}`); + redirect(307, `/fund/${body.id}`); }, }; diff --git a/src/routes/(app)/launch/purchase/+page.server.js b/src/routes/(app)/launch/purchase/+page.server.js index 58669606..d34c1f41 100644 --- a/src/routes/(app)/launch/purchase/+page.server.js +++ b/src/routes/(app)/launch/purchase/+page.server.js @@ -10,7 +10,7 @@ export const load = async ({ parent }) => { let tickets = await get("/tickets"); let { user } = await parent(); let hasTicket = !!user?.accounts.find((a) => tickets.includes(a.asset)); - if (hasTicket) throw redirect(307, "/launch/ticket"); + if (hasTicket) redirect(307, "/launch/ticket"); return { tickets }; }; @@ -24,7 +24,7 @@ export const actions = { auth(cookies) ); - throw redirect(307, `/launch/thanks/${asset}`); + redirect(307, `/launch/thanks/${asset}`); }, lightning: async ({ cookies, request }) => { @@ -44,6 +44,6 @@ export const actions = { let { id } = await post("/invoice", { invoice, user }, auth(cookies)); - throw redirect(307, `/${user.username}/invoice/${id}`); + redirect(307, `/${user.username}/invoice/${id}`); }, }; diff --git a/src/routes/(app)/launch/purchase/card/+page.server.js b/src/routes/(app)/launch/purchase/card/+page.server.js index bca601d3..416a66e4 100644 --- a/src/routes/(app)/launch/purchase/card/+page.server.js +++ b/src/routes/(app)/launch/purchase/card/+page.server.js @@ -44,9 +44,9 @@ export const actions = { }).then((r) => r.json()); if (status !== "succeeded") - throw error(500, { message: "Card payment failed" }); + error(500, { message: "Card payment failed" }); let asset = await createTicket(cookies, form.get("username")); - throw redirect(307, `/launch/thanks/${asset}`); + redirect(307, `/launch/thanks/${asset}`); }, }; diff --git a/src/routes/(app)/ln/[lnurl]/+page.server.js b/src/routes/(app)/ln/[lnurl]/+page.server.js index 332bc9e3..910ce5a5 100644 --- a/src/routes/(app)/ln/[lnurl]/+page.server.js +++ b/src/routes/(app)/ln/[lnurl]/+page.server.js @@ -3,7 +3,7 @@ import { error, fail, redirect } from "@sveltejs/kit"; export async function load({ params, parent }) { let { user } = await parent(); - if (!user) throw redirect(307, "/register"); + if (!user) redirect(307, "/register"); let data; @@ -11,11 +11,11 @@ export async function load({ params, parent }) { let { lnurl } = params; data = await get(`/decode?text=${lnurl}`); } catch (e) { - throw error(500, e.message); + error(500, e.message); } if (!["payRequest", "withdrawRequest"].includes(data.tag)) - throw error(500, "We only support LNURLp and LNURLw at this time"); + error(500, "We only support LNURLp and LNURLw at this time"); return data; } @@ -37,7 +37,7 @@ export const actions = { let { pr } = await fetch(`${callback}?amount=${amount * 1000}`).then((r) => r.json() ); - throw redirect(307, `/send/lightning/${pr}`); + redirect(307, `/send/lightning/${pr}`); }, withdraw: async ({ cookies, fetch, request }) => { @@ -70,6 +70,6 @@ export const actions = { let c = callback.includes("?") ? "&" : "?"; await fetch(`${callback}${c}k1=${k1}&pr=${pr}`).then((r) => r.json()); - throw redirect(307, `/ln/withdrawal/sent`); + redirect(307, `/ln/withdrawal/sent`); }, }; diff --git a/src/routes/(app)/login/+page.server.js b/src/routes/(app)/login/+page.server.js index 6876c93d..7b977024 100644 --- a/src/routes/(app)/login/+page.server.js +++ b/src/routes/(app)/login/+page.server.js @@ -3,7 +3,7 @@ import { login, fd } from "$lib/utils"; export const load = async ({ parent }) => { let { user } = await parent(); - if (user?.pubkey) throw redirect(307, `/${user.username}`); + if (user?.pubkey) redirect(307, `/${user.username}`); }; export const actions = { @@ -24,6 +24,6 @@ export const actions = { return fail(400, { error: "Login failed", message: e.message, ...form }); } - throw redirect(303, loginRedirect || `/${user.username}`); + redirect(307, loginRedirect || `/${user.username}`); }, }; diff --git a/src/routes/(app)/logout/+page.server.js b/src/routes/(app)/logout/+page.server.js index 60750dfa..97bb1e73 100644 --- a/src/routes/(app)/logout/+page.server.js +++ b/src/routes/(app)/logout/+page.server.js @@ -8,5 +8,5 @@ const opts = { export async function load({ cookies }) { cookies.set("username", "", opts); cookies.set("token", "", opts); - throw redirect(307, "/login"); + redirect(307, "/login"); } diff --git a/src/routes/(app)/redeem/[redeemcode]/+page.server.js b/src/routes/(app)/redeem/[redeemcode]/+page.server.js index f227f22e..25153533 100644 --- a/src/routes/(app)/redeem/[redeemcode]/+page.server.js +++ b/src/routes/(app)/redeem/[redeemcode]/+page.server.js @@ -8,10 +8,10 @@ export async function load({ cookies, locals, params }) { try { await post("/redeem", params, auth(cookies)); } catch (e) { - throw redirect(307, "/"); + redirect(307, "/"); } - throw redirect(307, `/${user.username}/payments`); + redirect(307, `/${user.username}/payments`); } - throw redirect(307, "/login"); + redirect(307, "/login"); } diff --git a/src/routes/(app)/register/+page.server.js b/src/routes/(app)/register/+page.server.js index babeeb03..cdb5736e 100644 --- a/src/routes/(app)/register/+page.server.js +++ b/src/routes/(app)/register/+page.server.js @@ -3,7 +3,7 @@ import { fd, post, login } from "$lib/utils"; export const load = async ({ parent }) => { let { user } = await parent(); - if (user) throw redirect(307, `/${user.username}`); + if (user) redirect(307, `/${user.username}`); let index = Math.floor(Math.random() * 64) + 1; @@ -32,7 +32,6 @@ export const actions = { try { await post("/register", { user }, { "cf-connecting-ip": ip }); } catch (e) { - console.log(e); if (e.message.includes("taken")) error = e.message; } @@ -44,6 +43,6 @@ export const actions = { } if (error) return fail(400, { error }); - throw redirect(307, loginRedirect || `/${user.username}`); + redirect(307, loginRedirect || `/${user.username}`); }, }; diff --git a/src/routes/(app)/reset/[code]/+page.server.js b/src/routes/(app)/reset/[code]/+page.server.js index 5dbf72d4..67f2d919 100644 --- a/src/routes/(app)/reset/[code]/+page.server.js +++ b/src/routes/(app)/reset/[code]/+page.server.js @@ -21,7 +21,7 @@ export const actions = { } if (error) return fail(400, { error }); - throw redirect(307, `/${user.username}`); + redirect(307, `/${user.username}`); } catch (e) { console.log(e.message); return fail(400, { error: e.message }); diff --git a/src/routes/(app)/send/[...text]/+page.server.js b/src/routes/(app)/send/[...text]/+page.server.js index 9a76f21d..3e6b7c13 100644 --- a/src/routes/(app)/send/[...text]/+page.server.js +++ b/src/routes/(app)/send/[...text]/+page.server.js @@ -7,8 +7,8 @@ import { PUBLIC_DOMAIN } from "$env/static/public"; let parse = async (t, host) => { if (!t) return; - if (t.startsWith("http")) throw redirect(307, t); - if (t.startsWith(host)) throw redirect(307, `http://${t}`); + if (t.startsWith("http")) redirect(307, t); + if (t.startsWith(host)) redirect(307, `http://${t}`); let amount, user, id; @@ -28,12 +28,12 @@ let parse = async (t, host) => { if (t.endsWith("@classic")) { ({ uuid: id } = await get(`/invoice/classic/${t.replace("@classic", "")}`)); - if (id) throw redirect(307, `/send/invoice/${id}`); + if (id) redirect(307, `/send/invoice/${id}`); } - if (t.includes("/fund")) throw redirect(307, t.substring(t.indexOf("/fund"))); + if (t.includes("/fund")) redirect(307, t.substring(t.indexOf("/fund"))); - if (t.toLowerCase().startsWith("lnurl")) throw redirect(307, `/ln/${t}`); + if (t.toLowerCase().startsWith("lnurl")) redirect(307, `/ln/${t}`); if (t.includes(":")) t = t.split(":")[1]; // lightning @@ -41,7 +41,7 @@ let parse = async (t, host) => { try { ({ id } = await get(`/invoice/${t}`)); } catch (e) { - throw redirect(307, `/send/lightning/${t}`); + redirect(307, `/send/lightning/${t}`); } } @@ -52,11 +52,11 @@ let parse = async (t, host) => { } catch (e) { let r = `/send/bitcoin/${t}`; if (amount) r += "/" + amount; - throw redirect(307, r); + redirect(307, r); } - if (user) throw redirect(307, `/send/${user.username}`); - else if (id) throw redirect(307, `/send/${id}`); + if (user) redirect(307, `/send/${user.username}`); + else if (id) redirect(307, `/send/${id}`); } // user @@ -65,14 +65,14 @@ let parse = async (t, host) => { if (user.anon) user = null; } catch (e) {} - if (user) throw redirect(307, `/send/user/${t}`); + if (user) redirect(307, `/send/user/${t}`); let fund; try { fund = await get(`/fund/${t}`); } catch (e) {} - if (fund) throw redirect(307, `/send/fund/${t}`); + if (fund) redirect(307, `/send/fund/${t}`); // invoice let invoice; @@ -80,7 +80,7 @@ let parse = async (t, host) => { invoice = await get(`/invoice/${t}`); } catch (e) {} - if (invoice) throw redirect(307, `/send/invoice/${invoice.hash}`); + if (invoice) redirect(307, `/send/invoice/${invoice.hash}`); }; export async function load({ cookies, params, request, url }) { diff --git a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js index aaccf762..2998f22a 100644 --- a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js +++ b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js @@ -35,6 +35,6 @@ export const actions = { return fail(400, { message: e.message }); } - throw redirect(307, "/sent"); + redirect(307, "/sent"); }, }; diff --git a/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js b/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js index 3318a60b..51277e5d 100644 --- a/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js +++ b/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js @@ -12,6 +12,6 @@ export const actions = { return fail(400, { message: e.message }); } - if (p) throw redirect(307, `/fund/${body.name}`); + if (p) redirect(307, `/fund/${body.name}`); }, }; diff --git a/src/routes/(app)/send/invoice/[id]/+page.server.js b/src/routes/(app)/send/invoice/[id]/+page.server.js index aa284328..39f2a5dd 100644 --- a/src/routes/(app)/send/invoice/[id]/+page.server.js +++ b/src/routes/(app)/send/invoice/[id]/+page.server.js @@ -17,9 +17,9 @@ export async function load({ params: { id }, parent, url }) { } = await get(`/invoice/${id}`); if (prompt && tip === null) - throw redirect(307, `/${recipient.username}/invoice/${id}/tip`); + redirect(307, `/${recipient.username}/invoice/${id}/tip`); if (recipient.username === user.username) - throw error(500, { message: "Cannot send to self" }); + error(500, { message: "Cannot send to self" }); return { amount, address, @@ -43,6 +43,6 @@ export const actions = { return fail(400, { message: e.message }); } - throw redirect(307, "/sent"); + redirect(307, "/sent"); }, }; diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.server.js b/src/routes/(app)/send/lightning/[payreq]/+page.server.js index d9e791e1..49c952bf 100644 --- a/src/routes/(app)/send/lightning/[payreq]/+page.server.js +++ b/src/routes/(app)/send/lightning/[payreq]/+page.server.js @@ -19,6 +19,6 @@ export const actions = { return fail(400, { message: e.message }); } - throw redirect(307, "/sent"); + redirect(307, "/sent"); }, }; diff --git a/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js b/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js index 1f3a0420..e5fa4452 100644 --- a/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js +++ b/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js @@ -9,12 +9,12 @@ export async function load({ cookies, params, parent }) { let [amount, currency] = params.amount.split("/"); if (subject.username === user?.username) - throw error(500, { message: "Cannot send to self" }); + error(500, { message: "Cannot send to self" }); let rate; if (amount) { rate = rates[currency ? currency.toUpperCase() : subject.currency]; - if (!rate) throw error(500, "Invalid currency symbol"); + if (!rate) error(500, "Invalid currency symbol"); if (currency) amount = (amount * sats) / rate; let { hash } = await post( @@ -26,7 +26,7 @@ export async function load({ cookies, params, parent }) { auth(cookies) ); - throw redirect(307, `/${username}/invoice/${hash}`); + redirect(307, `/${username}/invoice/${hash}`); } return { amount, rate, subject }; @@ -42,6 +42,6 @@ export const actions = { return fail(400, { message: e.message }); } - throw redirect(307, "/sent"); + redirect(307, "/sent"); }, }; diff --git a/src/routes/start/+server.js b/src/routes/start/+server.js index e5d93497..babe7db6 100644 --- a/src/routes/start/+server.js +++ b/src/routes/start/+server.js @@ -4,8 +4,8 @@ import { redirect } from "@sveltejs/kit"; export async function GET({ cookies }) { let username = cookies.get("username"); if (username) { - throw redirect(307, `/${username}/receive`); + redirect(307, `/${username}/receive`); } - throw redirect(307, "/"); + redirect(307, "/"); } |