diff options
| -rw-r--r-- | src/routes/(app)/e/[id]/+page.server.ts | 14 | ||||
| -rw-r--r-- | src/routes/(app)/e/[id]/+page.svelte | 2 | ||||
| -rw-r--r-- | src/routes/(app)/send/invoice/[id]/+page.server.ts | 7 | ||||
| -rw-r--r-- | src/routes/(app)/settings/+layout.svelte | 1 |
4 files changed, 18 insertions, 6 deletions
diff --git a/src/routes/(app)/e/[id]/+page.server.ts b/src/routes/(app)/e/[id]/+page.server.ts index e544d261..4bad1b9b 100644 --- a/src/routes/(app)/e/[id]/+page.server.ts +++ b/src/routes/(app)/e/[id]/+page.server.ts @@ -1,8 +1,14 @@ import { get } from "$lib/utils"; +import { error } from "@sveltejs/kit"; export async function load({ params }) { - const event = await get(`/event/${params.id}`); - const author = await get(`/users/${event.pubkey}`); - const zaps = await get(`/zaps/${params.id}`); - return { author, event, zaps }; + try { + const event = await get(`/event/${params.id}`); + const author = await get(`/users/${event.pubkey}`); + const zaps = await get(`/zaps/${params.id}`); + return { author, event, zaps }; + } catch (e) { + console.log(e); + error(500, { message: "Failed to get event" }); + } } diff --git a/src/routes/(app)/e/[id]/+page.svelte b/src/routes/(app)/e/[id]/+page.svelte index 6e8c1b56..891ee0eb 100644 --- a/src/routes/(app)/e/[id]/+page.svelte +++ b/src/routes/(app)/e/[id]/+page.svelte @@ -12,7 +12,7 @@ </h1> <div class="flex items-center gap-2 text-2xl"> <Avatar user={author} size={16} /> - <div>{event.content}</div> + <div class="break-words overflow-wrap">{event.content}</div> </div> <a href={`/send/zap/${event.pubkey}/${event.id}`} class="btn btn-accent"> <iconify-icon noobserver icon="ph:lightning-fill" class="text-yellow-300" diff --git a/src/routes/(app)/send/invoice/[id]/+page.server.ts b/src/routes/(app)/send/invoice/[id]/+page.server.ts index 658629ef..3ef933d4 100644 --- a/src/routes/(app)/send/invoice/[id]/+page.server.ts +++ b/src/routes/(app)/send/invoice/[id]/+page.server.ts @@ -17,7 +17,12 @@ export async function load({ cookies, params: { id }, parent }) { if (user && invoice.aid === aid) error(500, { message: "Cannot send to self" }); else if (user && ![types.lightning, types.bolt12].includes(invoice.type)) - redirect(307, `/send/${invoice.type === types.ecash ? "ecash" : "bitcoin"}/${invoice.hash}`); + redirect( + 307, + `/send/${invoice.type === types.ecash ? "ecash" : "bitcoin"}/${ + invoice.hash + }`, + ); if (!user) redirect(307, `/invoice/${id}`); diff --git a/src/routes/(app)/settings/+layout.svelte b/src/routes/(app)/settings/+layout.svelte index 6c5717cc..c094949d 100644 --- a/src/routes/(app)/settings/+layout.svelte +++ b/src/routes/(app)/settings/+layout.svelte @@ -114,6 +114,7 @@ picture: user.picture, banner: user.banner, displayName: user.display, + lud16: `${user.username}@${$page.url.hostname}`, }), tags: [], }; |