detect internal payments

2 files changed, 17 insertions, 14 deletions

diff --git a/src/lib/invoice.ts b/src/lib/invoice.ts
index fec845f9..a48e02a4 100644
--- a/src/lib/invoice.ts
+++ b/src/lib/invoice.ts
@@ -2,11 +2,11 @@ import { auth, get, post } from "$lib/utils";
 import { redirect } from "@sveltejs/kit";
 
 export default async ({ cookies, request }) => {
-	let aid = cookies.get("aid");
-	let form = await request.formData();
+	const form = await request.formData();
+	const aid = form.get("aid") || cookies.get("aid");
 
-	let rates = await get("/rates");
-	let amount = parseInt(form.get("amount"));
+	const rates = await get("/rates");
+	const amount = parseInt(form.get("amount"));
 
 	let invoice = {
 		aid,
@@ -21,10 +21,13 @@ export default async ({ cookies, request }) => {
 		id: undefined,
 	};
 
-	let user = { username: form.get("username"), currency: form.get("currency") };
+	const user = {
+		username: form.get("username"),
+		currency: form.get("currency"),
+	};
 
 	invoice = await post("/invoice", { invoice, user }, auth(cookies));
-	let { id } = invoice;
+	const { id } = invoice;
 
 	if (invoice.prompt && invoice.tip === null)
 		redirect(307, `/invoice/${id}/tip`);
diff --git a/src/lib/parse.ts b/src/lib/parse.ts
index fcce7e1e..0ebbe003 100644
--- a/src/lib/parse.ts
+++ b/src/lib/parse.ts
@@ -29,6 +29,14 @@ export default async (t, host) => {
 
 	if (t.includes("/fund")) redirect(307, t.substring(t.indexOf("/fund")));
 
+	// invoice
+	let invoice;
+	try {
+		invoice = await get(`/invoice/${t}`);
+	} catch (e) {}
+
+	if (invoice) redirect(307, `/send/invoice/${invoice.id}`);
+
 	// lightning
 	if (t.toLowerCase().startsWith("lightning:"))
 		t = t.toLowerCase().replace("lightning:", "");
@@ -69,12 +77,4 @@ export default async (t, host) => {
 	} 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}`);
 };