From 250c7f9e9621d9eae1a3b364dd7d0716e7c49e31 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Sun, 18 Aug 2024 13:09:41 -0700 Subject: ecash --- src/routes/(app)/send/[...text]/+page.server.js | 91 ++----------------------- src/routes/(app)/send/[...text]/+page.svelte | 34 ++++++--- src/routes/(app)/send/ecash/+page.server.js | 19 ++++++ src/routes/(app)/send/ecash/+page.svelte | 60 ++++++++++++++++ 4 files changed, 110 insertions(+), 94 deletions(-) create mode 100644 src/routes/(app)/send/ecash/+page.server.js create mode 100644 src/routes/(app)/send/ecash/+page.svelte (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 index 3e8623eb..c1ba5945 100644 --- a/src/routes/(app)/send/[...text]/+page.server.js +++ b/src/routes/(app)/send/[...text]/+page.server.js @@ -1,98 +1,19 @@ -import { validate } from "bitcoin-address-validation"; -import bip21 from "bip21"; -import { auth, get, isLiquid, post } from "$lib/utils"; +import { auth, get } from "$lib/utils"; import { fail, redirect } from "@sveltejs/kit"; -import { PUBLIC_DOMAIN } from "$env/static/public"; - -let parse = async (t, host) => { - if (!t) return; - - if (t.startsWith("http")) redirect(307, t); - if (t.startsWith(host)) redirect(307, `http://${t}`); - - let amount, user, id; - - t = t.trim(); - t.toLowerCase().startsWith("bitcoin:") && - ({ - address: t, - options: { amount }, - } = bip21.decode(t)); - - if (t.startsWith("lightning:")) t = t.replace("lightning:", ""); - if (t.endsWith(`@${PUBLIC_DOMAIN}`)) t = t.split("@")[0]; - if (t.includes("@") && t.includes(".")) { - try { - t = await get(`/encode?address=${t}`); - } catch (e) {} - } - - if (t.includes("/fund")) redirect(307, t.substring(t.indexOf("/fund"))); - - // lightning - if (t.toLowerCase().startsWith("lightning:")) - t = t.toLowerCase().replace("lightning:", ""); - if (t.toLowerCase().startsWith("lnurl")) redirect(307, `/ln/${t}`); - if (t.includes(":")) t = t.split(":")[1]; - - if (t.toLowerCase().startsWith("ln")) { - try { - ({ id } = await get(`/invoice/${t}`)); - } catch (e) { - redirect(307, `/send/lightning/${t}`); - } - } - - // bitcoin - if (validate(t) || isLiquid(t)) { - try { - ({ id, user } = await get(`/invoice/${t}`)); - } catch (e) { - let r = `/send/bitcoin/${t}`; - if (amount) r += "/" + amount; - redirect(307, r); - } - - if (user) redirect(307, `/pay/${user.username}`); - else if (id) redirect(307, `/send/${id}`); - } - - // user - try { - user = await get(`/users/${t.split("/")[0]}`); - if (user.anon) user = null; - } catch (e) {} - - if (user) redirect(307, `/pay/${t}`); - - let fund; - try { - fund = await get(`/fund/${t}`); - } catch (e) {} - - if (fund) redirect(307, `/send/fund/${t}`); - - // invoice - let invoice; - try { - invoice = await get(`/invoice/${t}`); - } catch (e) {} - - if (invoice) redirect(307, `/send/invoice/${invoice.id}`); -}; +import parse from "$lib/parse"; export async function load({ cookies, params, request, url }) { let { text } = params; - await parse(text, url.host); + await parse(text, url.host, cookies); let contacts = await get("/contacts", auth(cookies)); return { contacts }; } export const actions = { - default: async ({ request, url }) => { + default: async ({ cookies, request, url }) => { const form = await request.formData(); let t = form.get("text"); - await parse(t, url.host); - return fail(400, { error: true }); + let msg = await parse(t, url.host, cookies); + return fail(400, { error: msg || "default" }); }, }; diff --git a/src/routes/(app)/send/[...text]/+page.svelte b/src/routes/(app)/send/[...text]/+page.svelte index f9267105..e677760f 100644 --- a/src/routes/(app)/send/[...text]/+page.svelte +++ b/src/routes/(app)/send/[...text]/+page.svelte @@ -16,15 +16,17 @@ data.subject = data.user; let { contacts } = data; - let w; - let el, text; + let el, text, pasted, w; let keypress = (e) => e.key === "Enter" && (e.preventDefault() || el.click()); let paste = async () => { text = await navigator.clipboard.readText(); + pasted = true; }; + + $: if (browser && pasted && text) el.click() && (pasted = false); @@ -39,7 +41,9 @@ {#if form?.error}
- {$t("error.unrecognizedInput")} + {form.error === "default" + ? $t("error.unrecognizedInput") + : form.error}
{/if} @@ -52,6 +56,7 @@ on:keypress={keypress} class="w-full p-4 border rounded-xl h-48 text-xl" bind:value={text} + on:paste={() => (pasted = true)} autocapitalize="none" /> @@ -60,19 +65,19 @@ @@ -80,12 +85,23 @@ + + + + {#if contacts.length}

diff --git a/src/routes/(app)/send/ecash/+page.server.js b/src/routes/(app)/send/ecash/+page.server.js new file mode 100644 index 00000000..2fb43a2f --- /dev/null +++ b/src/routes/(app)/send/ecash/+page.server.js @@ -0,0 +1,19 @@ +import { fail, redirect } from "@sveltejs/kit"; +import { auth, post, fd } from "$lib/utils"; + +export const actions = { + default: async ({ cookies, request }) => { + let token; + try { + let body = await fd(request); + ({ token } = await post("/mint", body, auth(cookies))); + } catch (e) { + console.log("problem creating ecash", e); + return fail(400, { message: e.message }); + } + + cookies.set("ecash", token, { path: "/" }); + + redirect(307, `/${cookies.get("username")}/ecash`); + }, +}; diff --git a/src/routes/(app)/send/ecash/+page.svelte b/src/routes/(app)/send/ecash/+page.svelte new file mode 100644 index 00000000..d8e2dd46 --- /dev/null +++ b/src/routes/(app)/send/ecash/+page.svelte @@ -0,0 +1,60 @@ + + + + + + +
+

+ {$t("payments.createEcash")} +

+ +
+ + + +
+ + + +
+ +
-- cgit v1.2.3