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
commit6fe4607f7e9439d0b24d8e3e4a891921e91e8243 (patch)
tree13f5d689d1b59348e6b6d878d3e40851e663c0dd /src
parente8cc91dd342aaad03493356e8e5d538dbb46de17 (diff)
parentc799056bf29e8c3a2c20049fe1ce16a7765c7aec (diff)
downloadcoinos-ui-6fe4607f7e9439d0b24d8e3e4a891921e91e8243.tar.gz
coinos-ui-6fe4607f7e9439d0b24d8e3e4a891921e91e8243.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 = {