aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Soltys <[email protected]>2022-10-06 00:29:46 -0700
committerAdam Soltys <[email protected]>2022-10-06 00:29:46 -0700
commit5e1ed8ee833daf0578c28bc738bf26ae9491cf85 (patch)
tree13f5d689d1b59348e6b6d878d3e40851e663c0dd /src
parentf8b1415475759e7c64a97dadbcd283a3131a4b9f (diff)
parent97948ce65ec1ea90c17ef8813929cbd12b0c4bfc (diff)
downloadcoinos-ui-5e1ed8ee833daf0578c28bc738bf26ae9491cf85.tar.gz
coinos-ui-5e1ed8ee833daf0578c28bc738bf26ae9491cf85.zip
Merge branch 'master' into prod
Diffstat (limited to 'src')
-rw-r--r--src/routes/send/[...text]/+page.server.js14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/routes/send/[...text]/+page.server.js b/src/routes/send/[...text]/+page.server.js
index ec764882..c93287ed 100644
--- a/src/routes/send/[...text]/+page.server.js
+++ b/src/routes/send/[...text]/+page.server.js
@@ -8,7 +8,14 @@ let parse = async (t) => {
// lightning
if (t.startsWith('ln')) {
- throw redirect(303, `/send/lightning/${t}`);
+ let user;
+ try {
+ ({ user } = await get(`/invoice/${t}`));
+ } catch (e) {
+ throw redirect(303, `/send/lightning/${t}`);
+ }
+
+ if (user) throw redirect(303, `/send/user/${user.username}`);
}
// bitcoin
@@ -41,8 +48,13 @@ let parse = async (t) => {
};
export async function load({ params }) {
+<<<<<<< HEAD
let { text } = params;
await parse(text);
+=======
+ let { text } = params;
+ await parse(text);
+>>>>>>> master
}
export const actions = {