bip21 and socket fixes

1 files changed, 18 insertions, 14 deletions

diff --git a/src/lib/parse.ts b/src/lib/parse.ts
index 6483aaa0..7ddb2104 100644
--- a/src/lib/parse.ts
+++ b/src/lib/parse.ts
@@ -1,7 +1,7 @@
 import { PUBLIC_DOMAIN } from "$env/static/public";
+import { decode } from "$lib/bip21";
 import { get, isLiquid, post, sats } from "$lib/utils";
 import { redirect } from "@sveltejs/kit";
-import bip21 from "bip21";
 import { validate } from "bitcoin-address-validation";
 
 export default async (s, host) => {
@@ -21,6 +21,23 @@ export default async (s, host) => {
 		} catch (e) {}
 	}
 
+	// bitcoin
+	if (
+		t.toLowerCase().startsWith("bitcoin:") ||
+		t.toLowerCase().startsWith("liquidnetwork:")
+	) {
+		({
+			address: t,
+			options: { amount },
+		} = decode(t));
+	}
+
+	if (validate(t) || isLiquid(t)) {
+		let r = `/send/bitcoin/${t}`;
+		if (amount) r += `/${Math.round(amount * sats)}`;
+		redirect(307, r);
+	}
+
 	// lightning
 	if (t.toLowerCase().startsWith("lightning:"))
 		t = t.toLowerCase().replace("lightning:", "");
@@ -47,19 +64,6 @@ export default async (s, host) => {
 		}
 	}
 
-	// bitcoin
-	if (t.toLowerCase().startsWith("bitcoin:"))
-		({
-			address: t,
-			options: { amount },
-		} = bip21.decode(t));
-
-	if (validate(t) || isLiquid(t)) {
-		let r = `/send/bitcoin/${t}`;
-		if (amount) r += `/${Math.round(amount * sats)}`;
-		redirect(307, r);
-	}
-
 	if (t.startsWith("cashu")) {
 		const { id } = await post("/cash", { token: t });
 		redirect(307, `/ecash/${id}`);