From 1274b61b4ea1db6f2260fcba934a2a9c2b192ef9 Mon Sep 17 00:00:00 2001 From: Bob Date: Wed, 24 Jul 2024 14:18:21 +0800 Subject: [PATCH] Problem: merit requests that are only a github are annyoing --- src/components/MeritRequestDashboard.svelte | 14 +++--- src/components/MeritRequests.svelte | 10 +++- src/components/MeritSummaryCard.svelte | 19 ++++++-- src/lib/helpers.ts | 53 +++++++++++++++++++++ 4 files changed, 83 insertions(+), 13 deletions(-) diff --git a/src/components/MeritRequestDashboard.svelte b/src/components/MeritRequestDashboard.svelte index 02a8e39..db59fc5 100644 --- a/src/components/MeritRequestDashboard.svelte +++ b/src/components/MeritRequestDashboard.svelte @@ -2,7 +2,7 @@ import { base } from '$app/paths'; import * as Breadcrumb from '$lib/components/ui/breadcrumb/index.js'; import type { MeritRequest } from '@/event_helpers/merits'; - import { getRocketURL } from '@/helpers'; + import { getRocketURL, parseProblem } from '@/helpers'; import type { NDKEvent } from '@nostr-dev-kit/ndk'; import MeritSummaryCard from './MeritSummaryCard.svelte'; @@ -27,11 +27,13 @@ - {merit - .Problem() - .substring(0, 16)}{#if merit.Problem().length > 16}...{/if} + + {#await parseProblem(merit.Problem())} + {merit.Problem().substring(0, 16)}{#if merit.Problem().length > 16}...{/if} + {:then parsed} + {parsed.substring(0, 16)}{#if parsed.length > 16}...{/if} + {/await} + diff --git a/src/components/MeritRequests.svelte b/src/components/MeritRequests.svelte index e3c3ee0..3d34a50 100644 --- a/src/components/MeritRequests.svelte +++ b/src/components/MeritRequests.svelte @@ -5,7 +5,7 @@ import * as Table from '@/components/ui/table'; import { MapOfMeritResult, MeritRequest } from '@/event_helpers/merits'; import { Rocket, RocketATagFilter } from '@/event_helpers/rockets'; - import { unixToRelativeTime } from '@/helpers'; + import { parseProblem, unixToRelativeTime } from '@/helpers'; import { ndk } from '@/ndk'; import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk'; import { Avatar, Name } from '@nostr-dev-kit/ndk-svelte-components'; @@ -114,7 +114,13 @@ /> - + {merit.Sats} {merit.Merits}