From dbb00917d84a341f67b11bdfb6d8c50154f691c2 Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam@coinos.io>
Date: Sat, 25 Jan 2025 10:50:51 -0800
Subject: capture ln comments

---
 src/routes/(app)/ln/[lnurl]/+page.server.ts        |   4 +-
 .../(app)/send/lightning/[payreq]/+page.server.ts  |  49 -------
 .../(app)/send/lightning/[payreq]/+page.svelte     | 140 --------------------
 .../lightning/[payreq]/[...memo]/+page.server.ts   |  49 +++++++
 .../send/lightning/[payreq]/[...memo]/+page.svelte | 141 +++++++++++++++++++++
 5 files changed, 193 insertions(+), 190 deletions(-)
 delete mode 100644 src/routes/(app)/send/lightning/[payreq]/+page.server.ts
 delete mode 100644 src/routes/(app)/send/lightning/[payreq]/+page.svelte
 create mode 100644 src/routes/(app)/send/lightning/[payreq]/[...memo]/+page.server.ts
 create mode 100644 src/routes/(app)/send/lightning/[payreq]/[...memo]/+page.svelte

(limited to 'src')

diff --git a/src/routes/(app)/ln/[lnurl]/+page.server.ts b/src/routes/(app)/ln/[lnurl]/+page.server.ts
index 7b63e6f5..778e48f5 100644
--- a/src/routes/(app)/ln/[lnurl]/+page.server.ts
+++ b/src/routes/(app)/ln/[lnurl]/+page.server.ts
@@ -42,7 +42,9 @@ export const actions = {
 		if (comment) url += `&comment=${comment}`;
 
 		const { pr } = await fetch(url).then((r) => r.json());
-		redirect(307, `/send/lightning/${pr}`);
+		let path = `/send/lightning/${pr}`;
+		if (comment) path += `/${comment}`;
+		redirect(307, path);
 	},
 
 	withdraw: async ({ cookies, fetch, request }) => {
diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.server.ts b/src/routes/(app)/send/lightning/[payreq]/+page.server.ts
deleted file mode 100644
index 0f7b4003..00000000
--- a/src/routes/(app)/send/lightning/[payreq]/+page.server.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import getRates from "$lib/rates";
-import { auth, fd, post } from "$lib/utils";
-import { fail, redirect } from "@sveltejs/kit";
-
-export async function load({ cookies, params, parent }) {
-	const { user } = await parent();
-	let data = { ...params };
-	const rates = await getRates();
-	if (!params.payreq.startsWith("lno")) {
-		data = { ...data, ...(await post("/parse", params, auth(cookies))) };
-	}
-
-	data.rate = rates[user.currency];
-	return data;
-}
-
-export const actions = {
-	setAmount: async ({ cookies, params, request }) => {
-		let data = await fd(request);
-		const { payreq } = params;
-		const { amount } = data;
-		if (payreq.startsWith("lno")) {
-			const { invoice } = await post("/fetchinvoice", {
-				amount,
-				offer: payreq,
-			});
-
-			data = await post("/parse", { payreq: invoice }, auth(cookies));
-			data.payreq = invoice;
-		}
-
-		return data;
-	},
-
-	send: async ({ cookies, request }) => {
-		let p;
-		try {
-			const body = await fd(request);
-
-			p = await post("/payments", body, auth(cookies));
-		} catch (e) {
-			let { message } = e as Error;
-			if (!message.includes("Insufficient")) message = "payments.failedToRoute";
-			return fail(400, { message });
-		}
-
-		redirect(307, `/sent/${p.id}`);
-	},
-};
diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.svelte b/src/routes/(app)/send/lightning/[payreq]/+page.svelte
deleted file mode 100644
index bc526d16..00000000
--- a/src/routes/(app)/send/lightning/[payreq]/+page.svelte
+++ /dev/null
@@ -1,140 +0,0 @@
-<script>
-  import { untrack } from "svelte";
-  import { t } from "$lib/translations";
-  import { enhance } from "$app/forms";
-  import Amount from "$comp/Amount.svelte";
-  import Numpad from "$comp/Numpad.svelte";
-  import Spinner from "$comp/Spinner.svelte";
-  import { page } from "$app/stores";
-  import { loc, back, toFiat, f, s, focus } from "$lib/utils";
-  import { rate, pin } from "$lib/store";
-
-  let { data, form } = $props();
-
-  let { alias, payreq, ourfee, user } = $derived({ ...data, ...form });
-  let a = $state();
-  let { currency } = $derived(user);
-  let locale = loc(user);
-
-  $effect(() => ($rate ||= data.rate));
-  $effect(() => form && (loading = false));
-
-  let showMax = $state();
-
-  let loading = $state();
-  let submit = () => (loading = true);
-
-  let next = $state();
-  let toggle = () => (show = !show);
-  let amount = $derived(form?.amount || data.amount);
-  let maxfee = $state(Math.max(5, Math.round(untrack(() => amount) * 0.005)));
-</script>
-
-<div class="container px-4 max-w-xl mx-auto text-center space-y-2">
-  {#if form?.message}
-    <div class="text-red-600 text-center">
-      {$t(form.message)}
-    </div>
-  {/if}
-  {#if amount}
-    <div>
-      <h1 class="text-lg text-secondary">
-        {$t("payments.send")}
-      </h1>
-
-      <Amount {amount} rate={$rate} {currency} {locale} />
-    </div>
-
-    <div class="text-xl">
-      <span class="text-secondary">{$t("payments.to")}</span>
-      <span class="break-words font-semibold">{alias}</span>
-    </div>
-
-    {#if ourfee}
-      <div class="text-center">
-        <h2 class="text-secondary text-lg">{$t("payments.platformFee")}</h2>
-
-        <div class="flex flex-wrap gap-4 justify-center">
-          <div class="my-auto">
-            <h2 class="text-xl">
-              {f(toFiat(ourfee, $rate), currency)}
-            </h2>
-            <h3 class="text-secondary">⚡️{s(ourfee)}</h3>
-          </div>
-        </div>
-      </div>
-    {/if}
-
-    <form
-      method="POST"
-      use:enhance
-      onsubmit={submit}
-      action="?/send"
-      class="space-y-2"
-    >
-      <input name="payreq" value={payreq} type="hidden" />
-      <input name="amount" value={amount} type="hidden" />
-      <input name="pin" value={$pin} type="hidden" />
-
-      {#if form?.message || showMax}
-        <div class="mx-auto space-y-2">
-          <label for="maxfee" class="text-lg text-secondary"
-            >{$t("payments.maxfee")}</label
-          >
-
-          <div class="text-secondary">
-            {$t("payments.maxFeeDesc")}
-          </div>
-
-          <label
-            class="input input-bordered border-primary input-lg rounded-2xl flex items-center gap-2 text-left"
-          >
-            <input
-              id="maxfee"
-              name="maxfee"
-              bind:value={maxfee}
-              class="clean !grow"
-            />
-            <div class="ml-auto">⚡️</div>
-          </label>
-        </div>
-      {/if}
-
-      <button
-        type="submit"
-        class="btn btn-primary"
-        disabled={loading}
-        use:focus
-      >
-        {#if loading}
-          <Spinner />
-        {:else}
-          {$t("payments.send")}
-        {/if}
-      </button>
-
-      {#if !(form?.message || showMax)}
-        <button type="button" class="btn" onclick={() => (showMax = !showMax)}
-          >{$t("payments.advancedSettings")}</button
-        >
-        <input name="maxfee" type="hidden" bind:value={maxfee} />
-      {/if}
-    </form>
-  {:else}
-    <form method="POST" action="?/setAmount" class="space-y-2" use:enhance>
-      <input type="hidden" value={a} name="amount" />
-      <input name="rate" value={$rate} type="hidden" />
-
-      <Numpad
-        bind:amount={a}
-        {currency}
-        {locale}
-        bind:rate={$rate}
-        submit={next}
-      />
-      <button type="submit" class="btn" bind:this={next}
-        >{$t("payments.next")}</button
-      >
-    </form>
-  {/if}
-</div>
diff --git a/src/routes/(app)/send/lightning/[payreq]/[...memo]/+page.server.ts b/src/routes/(app)/send/lightning/[payreq]/[...memo]/+page.server.ts
new file mode 100644
index 00000000..0f7b4003
--- /dev/null
+++ b/src/routes/(app)/send/lightning/[payreq]/[...memo]/+page.server.ts
@@ -0,0 +1,49 @@
+import getRates from "$lib/rates";
+import { auth, fd, post } from "$lib/utils";
+import { fail, redirect } from "@sveltejs/kit";
+
+export async function load({ cookies, params, parent }) {
+	const { user } = await parent();
+	let data = { ...params };
+	const rates = await getRates();
+	if (!params.payreq.startsWith("lno")) {
+		data = { ...data, ...(await post("/parse", params, auth(cookies))) };
+	}
+
+	data.rate = rates[user.currency];
+	return data;
+}
+
+export const actions = {
+	setAmount: async ({ cookies, params, request }) => {
+		let data = await fd(request);
+		const { payreq } = params;
+		const { amount } = data;
+		if (payreq.startsWith("lno")) {
+			const { invoice } = await post("/fetchinvoice", {
+				amount,
+				offer: payreq,
+			});
+
+			data = await post("/parse", { payreq: invoice }, auth(cookies));
+			data.payreq = invoice;
+		}
+
+		return data;
+	},
+
+	send: async ({ cookies, request }) => {
+		let p;
+		try {
+			const body = await fd(request);
+
+			p = await post("/payments", body, auth(cookies));
+		} catch (e) {
+			let { message } = e as Error;
+			if (!message.includes("Insufficient")) message = "payments.failedToRoute";
+			return fail(400, { message });
+		}
+
+		redirect(307, `/sent/${p.id}`);
+	},
+};
diff --git a/src/routes/(app)/send/lightning/[payreq]/[...memo]/+page.svelte b/src/routes/(app)/send/lightning/[payreq]/[...memo]/+page.svelte
new file mode 100644
index 00000000..cfbeef76
--- /dev/null
+++ b/src/routes/(app)/send/lightning/[payreq]/[...memo]/+page.svelte
@@ -0,0 +1,141 @@
+<script>
+  import { untrack } from "svelte";
+  import { t } from "$lib/translations";
+  import { enhance } from "$app/forms";
+  import Amount from "$comp/Amount.svelte";
+  import Numpad from "$comp/Numpad.svelte";
+  import Spinner from "$comp/Spinner.svelte";
+  import { page } from "$app/stores";
+  import { loc, back, toFiat, f, s, focus } from "$lib/utils";
+  import { rate, pin } from "$lib/store";
+
+  let { data, form } = $props();
+
+  let { alias, memo, payreq, ourfee, user } = $derived({ ...data, ...form });
+  let a = $state();
+  let { currency } = $derived(user);
+  let locale = loc(user);
+
+  $effect(() => ($rate ||= data.rate));
+  $effect(() => form && (loading = false));
+
+  let showMax = $state();
+
+  let loading = $state();
+  let submit = () => (loading = true);
+
+  let next = $state();
+  let toggle = () => (show = !show);
+  let amount = $derived(form?.amount || data.amount);
+  let maxfee = $state(Math.max(5, Math.round(untrack(() => amount) * 0.005)));
+</script>
+
+<div class="container px-4 max-w-xl mx-auto text-center space-y-2">
+  {#if form?.message}
+    <div class="text-red-600 text-center">
+      {$t(form.message)}
+    </div>
+  {/if}
+  {#if amount}
+    <div>
+      <h1 class="text-lg text-secondary">
+        {$t("payments.send")}
+      </h1>
+
+      <Amount {amount} rate={$rate} {currency} {locale} />
+    </div>
+
+    <div class="text-xl">
+      <span class="text-secondary">{$t("payments.to")}</span>
+      <span class="break-words font-semibold">{alias}</span>
+    </div>
+
+    {#if ourfee}
+      <div class="text-center">
+        <h2 class="text-secondary text-lg">{$t("payments.platformFee")}</h2>
+
+        <div class="flex flex-wrap gap-4 justify-center">
+          <div class="my-auto">
+            <h2 class="text-xl">
+              {f(toFiat(ourfee, $rate), currency)}
+            </h2>
+            <h3 class="text-secondary">⚡️{s(ourfee)}</h3>
+          </div>
+        </div>
+      </div>
+    {/if}
+
+    <form
+      method="POST"
+      use:enhance
+      onsubmit={submit}
+      action="?/send"
+      class="space-y-2"
+    >
+      <input name="payreq" value={payreq} type="hidden" />
+      <input name="amount" value={amount} type="hidden" />
+      <input name="pin" value={$pin} type="hidden" />
+      <input name="memo" type="hidden" value={memo} />
+
+      {#if form?.message || showMax}
+        <div class="mx-auto space-y-2">
+          <label for="maxfee" class="text-lg text-secondary"
+            >{$t("payments.maxfee")}</label
+          >
+
+          <div class="text-secondary">
+            {$t("payments.maxFeeDesc")}
+          </div>
+
+          <label
+            class="input input-bordered border-primary input-lg rounded-2xl flex items-center gap-2 text-left"
+          >
+            <input
+              id="maxfee"
+              name="maxfee"
+              bind:value={maxfee}
+              class="clean !grow"
+            />
+            <div class="ml-auto">⚡️</div>
+          </label>
+        </div>
+      {/if}
+
+      <button
+        type="submit"
+        class="btn btn-primary"
+        disabled={loading}
+        use:focus
+      >
+        {#if loading}
+          <Spinner />
+        {:else}
+          {$t("payments.send")}
+        {/if}
+      </button>
+
+      {#if !(form?.message || showMax)}
+        <button type="button" class="btn" onclick={() => (showMax = !showMax)}
+          >{$t("payments.advancedSettings")}</button
+        >
+        <input name="maxfee" type="hidden" bind:value={maxfee} />
+      {/if}
+    </form>
+  {:else}
+    <form method="POST" action="?/setAmount" class="space-y-2" use:enhance>
+      <input type="hidden" value={a} name="amount" />
+      <input name="rate" value={$rate} type="hidden" />
+
+      <Numpad
+        bind:amount={a}
+        {currency}
+        {locale}
+        bind:rate={$rate}
+        submit={next}
+      />
+      <button type="submit" class="btn" bind:this={next}
+        >{$t("payments.next")}</button
+      >
+    </form>
+  {/if}
+</div>
-- 
cgit v1.2.3