From df71664f20312e81134ee90ad561f55d3020ee0a Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Fri, 30 Aug 2024 20:04:29 -0700 Subject: typescript --- src/routes/(app)/send/[...text]/+page.server.js | 19 ----------- src/routes/(app)/send/[...text]/+page.server.ts | 19 +++++++++++ .../[amount]/[...feeRate]/+page.server.js | 35 -------------------- .../[amount]/[...feeRate]/+page.server.ts | 35 ++++++++++++++++++++ src/routes/(app)/send/ecash/+page.server.js | 19 ----------- src/routes/(app)/send/ecash/+page.server.ts | 19 +++++++++++ .../send/fund/[name]/[...amount]/+page.server.js | 17 ---------- .../send/fund/[name]/[...amount]/+page.server.ts | 17 ++++++++++ src/routes/(app)/send/invoice/[id]/+page.server.js | 37 ---------------------- src/routes/(app)/send/invoice/[id]/+page.server.ts | 37 ++++++++++++++++++++++ .../(app)/send/lightning/[payreq]/+page.server.js | 24 -------------- .../(app)/send/lightning/[payreq]/+page.server.ts | 24 ++++++++++++++ 12 files changed, 151 insertions(+), 151 deletions(-) delete mode 100644 src/routes/(app)/send/[...text]/+page.server.js create mode 100644 src/routes/(app)/send/[...text]/+page.server.ts delete mode 100644 src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.server.js create mode 100644 src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.server.ts delete mode 100644 src/routes/(app)/send/ecash/+page.server.js create mode 100644 src/routes/(app)/send/ecash/+page.server.ts delete mode 100644 src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js create mode 100644 src/routes/(app)/send/fund/[name]/[...amount]/+page.server.ts delete mode 100644 src/routes/(app)/send/invoice/[id]/+page.server.js create mode 100644 src/routes/(app)/send/invoice/[id]/+page.server.ts delete mode 100644 src/routes/(app)/send/lightning/[payreq]/+page.server.js create mode 100644 src/routes/(app)/send/lightning/[payreq]/+page.server.ts (limited to 'src/routes/(app)/send') diff --git a/src/routes/(app)/send/[...text]/+page.server.js b/src/routes/(app)/send/[...text]/+page.server.js deleted file mode 100644 index ba5d6190..00000000 --- a/src/routes/(app)/send/[...text]/+page.server.js +++ /dev/null @@ -1,19 +0,0 @@ -import { auth, fd, get } from "$lib/utils"; -import { fail, redirect } from "@sveltejs/kit"; -import parse from "$lib/parse"; - -export async function load({ cookies, params, request, url }) { - let { text } = params; - - await parse(text, url.host, cookies); - let contacts = await get("/contacts", auth(cookies)); - return { contacts }; -} - -export const actions = { - default: async ({ cookies, request, url }) => { - let { text } = await fd(request); - let msg = await parse(text, url.host, cookies); - return fail(400, { error: msg || "default" }); - }, -}; diff --git a/src/routes/(app)/send/[...text]/+page.server.ts b/src/routes/(app)/send/[...text]/+page.server.ts new file mode 100644 index 00000000..ba5d6190 --- /dev/null +++ b/src/routes/(app)/send/[...text]/+page.server.ts @@ -0,0 +1,19 @@ +import { auth, fd, get } from "$lib/utils"; +import { fail, redirect } from "@sveltejs/kit"; +import parse from "$lib/parse"; + +export async function load({ cookies, params, request, url }) { + let { text } = params; + + await parse(text, url.host, cookies); + let contacts = await get("/contacts", auth(cookies)); + return { contacts }; +} + +export const actions = { + default: async ({ cookies, request, url }) => { + let { text } = await fd(request); + let msg = await parse(text, url.host, cookies); + return fail(400, { error: msg || "default" }); + }, +}; diff --git a/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.server.js b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.server.js deleted file mode 100644 index d4498b39..00000000 --- a/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.server.js +++ /dev/null @@ -1,35 +0,0 @@ -import { fail, redirect } from "@sveltejs/kit"; -import { auth, post, fd } from "$lib/utils"; - -let seen = {}; - -export async function load({ params: { address, amount, feeRate }, cookies }) { - try { - let { fee, fees, ourfee, hex } = await post( - "/bitcoin/fee", - { address, amount, feeRate }, - auth(cookies) - ); - - return { amount, address, fee, fees, feeRate, ourfee, hex }; - } catch (e) { - return { amount, address, feeRate, message: e.message }; - } -} - -export const actions = { - default: async ({ - cookies, - params: { address, amount, feeRate }, - request, - }) => { - try { - let r = await post("/bitcoin/send", await fd(request), auth(cookies)); - } catch (e) { - console.log("problem sending bitcoin", e); - return fail(400, { address, amount, feeRate, message: e.message }); - } - - redirect(307, "/sent"); - }, -}; diff --git a/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.server.ts b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.server.ts new file mode 100644 index 00000000..d4498b39 --- /dev/null +++ b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.server.ts @@ -0,0 +1,35 @@ +import { fail, redirect } from "@sveltejs/kit"; +import { auth, post, fd } from "$lib/utils"; + +let seen = {}; + +export async function load({ params: { address, amount, feeRate }, cookies }) { + try { + let { fee, fees, ourfee, hex } = await post( + "/bitcoin/fee", + { address, amount, feeRate }, + auth(cookies) + ); + + return { amount, address, fee, fees, feeRate, ourfee, hex }; + } catch (e) { + return { amount, address, feeRate, message: e.message }; + } +} + +export const actions = { + default: async ({ + cookies, + params: { address, amount, feeRate }, + request, + }) => { + try { + let r = await post("/bitcoin/send", await fd(request), auth(cookies)); + } catch (e) { + console.log("problem sending bitcoin", e); + return fail(400, { address, amount, feeRate, message: e.message }); + } + + redirect(307, "/sent"); + }, +}; diff --git a/src/routes/(app)/send/ecash/+page.server.js b/src/routes/(app)/send/ecash/+page.server.js deleted file mode 100644 index cef1ba78..00000000 --- a/src/routes/(app)/send/ecash/+page.server.js +++ /dev/null @@ -1,19 +0,0 @@ -import { error, redirect, Cookies } from "@sveltejs/kit"; -import { auth, post, fd } from "$lib/utils"; -import { v4 } from "uuid"; - -export const actions = { - default: async ({ cookies, request }) => { - let id; - let body = await fd(request); - - try { - ({ id } = await post("/mint", body, auth(cookies))); - } catch (e) { - console.log("problem creating ecash", e); - error(400, { message: e.message }); - } - - redirect(307, `/ecash/${id}`); - }, -}; diff --git a/src/routes/(app)/send/ecash/+page.server.ts b/src/routes/(app)/send/ecash/+page.server.ts new file mode 100644 index 00000000..cef1ba78 --- /dev/null +++ b/src/routes/(app)/send/ecash/+page.server.ts @@ -0,0 +1,19 @@ +import { error, redirect, Cookies } from "@sveltejs/kit"; +import { auth, post, fd } from "$lib/utils"; +import { v4 } from "uuid"; + +export const actions = { + default: async ({ cookies, request }) => { + let id; + let body = await fd(request); + + try { + ({ id } = await post("/mint", body, auth(cookies))); + } catch (e) { + console.log("problem creating ecash", e); + error(400, { message: e.message }); + } + + redirect(307, `/ecash/${id}`); + }, +}; diff --git a/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js b/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js deleted file mode 100644 index 51277e5d..00000000 --- a/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js +++ /dev/null @@ -1,17 +0,0 @@ -import { fail, redirect } from "@sveltejs/kit"; -import { auth, fd, post } from "$lib/utils"; - -export const actions = { - default: async ({ cookies, request }) => { - let body = await fd(request); - let p; - - try { - p = await post("/payments", body, auth(cookies)); - } catch (e) { - return fail(400, { message: e.message }); - } - - if (p) redirect(307, `/fund/${body.name}`); - }, -}; diff --git a/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.ts b/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.ts new file mode 100644 index 00000000..51277e5d --- /dev/null +++ b/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.ts @@ -0,0 +1,17 @@ +import { fail, redirect } from "@sveltejs/kit"; +import { auth, fd, post } from "$lib/utils"; + +export const actions = { + default: async ({ cookies, request }) => { + let body = await fd(request); + let p; + + try { + p = await post("/payments", body, auth(cookies)); + } catch (e) { + return fail(400, { message: e.message }); + } + + 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 deleted file mode 100644 index 2662e771..00000000 --- a/src/routes/(app)/send/invoice/[id]/+page.server.js +++ /dev/null @@ -1,37 +0,0 @@ -import { error, redirect } from "@sveltejs/kit"; -import { fd, auth, get, post } from "$lib/utils"; - -export async function load({ params: { id }, parent, url }) { - let { rates, user } = await parent(); - - let invoice = await get(`/invoice/${id}`); - - if (invoice.prompt && invoice.tip === null) - redirect(307, `/${invoice.user.username}/invoice/${id}/tip`); - - if (invoice.memoPrompt && invoice.memo === null) - redirect(307, `/${invoice.user.username}/invoice/${id}/memo`); - - if (invoice.user.username === user?.username) - error(500, { message: "Cannot send to self" }); - - if (!user) redirect(307, `/${invoice.user.username}/invoice/${id}`); - - return { invoice, rates, user }; -} - -export const actions = { - default: async ({ cookies, params: { id }, request }) => { - try { - let body = await fd(request); - body.hash = id; - - await post("/payments", body, auth(cookies)); - } catch (e) { - console.log("payment failed", id, e); - error(500, e.message); - } - - redirect(307, "/sent"); - }, -}; diff --git a/src/routes/(app)/send/invoice/[id]/+page.server.ts b/src/routes/(app)/send/invoice/[id]/+page.server.ts new file mode 100644 index 00000000..2662e771 --- /dev/null +++ b/src/routes/(app)/send/invoice/[id]/+page.server.ts @@ -0,0 +1,37 @@ +import { error, redirect } from "@sveltejs/kit"; +import { fd, auth, get, post } from "$lib/utils"; + +export async function load({ params: { id }, parent, url }) { + let { rates, user } = await parent(); + + let invoice = await get(`/invoice/${id}`); + + if (invoice.prompt && invoice.tip === null) + redirect(307, `/${invoice.user.username}/invoice/${id}/tip`); + + if (invoice.memoPrompt && invoice.memo === null) + redirect(307, `/${invoice.user.username}/invoice/${id}/memo`); + + if (invoice.user.username === user?.username) + error(500, { message: "Cannot send to self" }); + + if (!user) redirect(307, `/${invoice.user.username}/invoice/${id}`); + + return { invoice, rates, user }; +} + +export const actions = { + default: async ({ cookies, params: { id }, request }) => { + try { + let body = await fd(request); + body.hash = id; + + await post("/payments", body, auth(cookies)); + } catch (e) { + console.log("payment failed", id, e); + error(500, e.message); + } + + 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 deleted file mode 100644 index 89bcc3c3..00000000 --- a/src/routes/(app)/send/lightning/[payreq]/+page.server.js +++ /dev/null @@ -1,24 +0,0 @@ -import { fail, redirect } from "@sveltejs/kit"; -import { fd, auth, post } from "$lib/utils"; - -export async function load({ cookies, params }) { - return post("/parse", params, auth(cookies)); -} - -export const actions = { - setAmount: async ({ cookies, request }) => fd(request), - - send: async ({ cookies, request }) => { - try { - let body = await fd(request); - - await post("/payments", body, auth(cookies)); - } catch (e) { - if (e.message.includes("unusable")) - e.message = "Failed to route payment, try sending a lower amount"; - return fail(400, { message: e.message }); - } - - redirect(307, "/sent"); - }, -}; diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.server.ts b/src/routes/(app)/send/lightning/[payreq]/+page.server.ts new file mode 100644 index 00000000..89bcc3c3 --- /dev/null +++ b/src/routes/(app)/send/lightning/[payreq]/+page.server.ts @@ -0,0 +1,24 @@ +import { fail, redirect } from "@sveltejs/kit"; +import { fd, auth, post } from "$lib/utils"; + +export async function load({ cookies, params }) { + return post("/parse", params, auth(cookies)); +} + +export const actions = { + setAmount: async ({ cookies, request }) => fd(request), + + send: async ({ cookies, request }) => { + try { + let body = await fd(request); + + await post("/payments", body, auth(cookies)); + } catch (e) { + if (e.message.includes("unusable")) + e.message = "Failed to route payment, try sending a lower amount"; + return fail(400, { message: e.message }); + } + + redirect(307, "/sent"); + }, +}; -- cgit v1.2.3