diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/routes/(app)/[username]/payments/[...page]/+page.svelte | 9 | ||||
| -rw-r--r-- | src/routes/(app)/send/[...text]/+page.server.js | 18 |
2 files changed, 23 insertions, 4 deletions
diff --git a/src/routes/(app)/[username]/payments/[...page]/+page.svelte b/src/routes/(app)/[username]/payments/[...page]/+page.svelte index 7161f50c..db591e01 100644 --- a/src/routes/(app)/[username]/payments/[...page]/+page.svelte +++ b/src/routes/(app)/[username]/payments/[...page]/+page.svelte @@ -15,7 +15,8 @@ internal: 'internal', bitcoin: 'bitcoin', lightning: 'lightning', - pot: 'pot' + pot: 'pot', + classic: 'classic' }; let { start, end, user } = data; @@ -187,6 +188,12 @@ <div class="my-auto ml-1 text-secondary">{p.with.username}</div> </div> </a> + {:else if p.type === types.classic} + <img + src="/images/classic.png" + class="w-24 border-4 border-transparent" + alt="Bitcoin" + /><div class="my-auto">{p.memo}</div> {:else} <div class="text-secondary flex"> {#if p.type === types.lightning} diff --git a/src/routes/(app)/send/[...text]/+page.server.js b/src/routes/(app)/send/[...text]/+page.server.js index 096c60e9..4c2776f5 100644 --- a/src/routes/(app)/send/[...text]/+page.server.js +++ b/src/routes/(app)/send/[...text]/+page.server.js @@ -23,7 +23,7 @@ let parse = async (t, host) => { if (t.endsWith('@classic')) { ({ uuid: id } = await get(`/invoice/classic/${t.replace('@classic', '')}`)); - if (id) throw redirect(307, `/send/${id}`); + if (id) throw redirect(307, `/send/invoice/${id}`); } if (t.includes('/pot')) throw redirect(307, t.substring(t.indexOf('/pot'))); @@ -58,17 +58,29 @@ let parse = async (t, host) => { // user try { user = await get(`/users/${t}`); - if (user.anon) user = null; + if (user.anon) user = null; } catch (e) {} if (user) throw redirect(307, `/send/user/${t}`); + // pot let pot; try { pot = await get(`/pot/${t}`); - } catch (e) {} + console.log(pot); + } catch (e) { + } if (pot) throw redirect(307, `/send/pot/${t}`); + + // invoice + let invoice; + try { + invoice = await get(`/invoice/${t}`); + } catch (e) { + } + + if (invoice) throw redirect(307, `/send/invoice/${invoice.hash}`); }; export async function load({ cookies, params, request, url }) { |