From 76a27611c594e70420d2b49ef6e6130fcd6d7375 Mon Sep 17 00:00:00 2001 From: zmeyer44 Date: Fri, 3 Nov 2023 09:14:20 -0400 Subject: [PATCH] temp fix --- .../explore/_components/CalendarCard.tsx | 20 ++++++++++++++++++- .../EventsTimeline/EventsFromCalendar.tsx | 20 ++++++++++++++++++- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/app/(app)/explore/_components/CalendarCard.tsx b/app/(app)/explore/_components/CalendarCard.tsx index 511f716..de4e4c0 100644 --- a/app/(app)/explore/_components/CalendarCard.tsx +++ b/app/(app)/explore/_components/CalendarCard.tsx @@ -42,7 +42,25 @@ export default function CalendarCard({ calendar }: CalendarCardProps) { const calendarEvents = getTagsValues("a", tags); const calendarEventIdentifiers = calendarEvents .filter(Boolean) - .map((e) => nip19.decode(e)) + .map((e) => { + if (nip19.BECH32_REGEX.test(e) && e.includes(":")) { + const [kind, pubkey, identifier] = e.split(":") as [ + string, + string, + string, + ]; + return { + type: "naddr", + data: { + kind, + pubkey, + identifier, + }, + }; + } else { + return nip19.decode(e); + } + }) .filter(({ type }) => type === "naddr") .map((e) => e.data as nip19.AddressPointer); const { events } = useEvents({ diff --git a/containers/EventsTimeline/EventsFromCalendar.tsx b/containers/EventsTimeline/EventsFromCalendar.tsx index 2ad0152..225407e 100644 --- a/containers/EventsTimeline/EventsFromCalendar.tsx +++ b/containers/EventsTimeline/EventsFromCalendar.tsx @@ -25,7 +25,25 @@ export default function EventsFromCalendar({ const calendarEventIdentifiers = calendarEvents .filter(Boolean) - .map((e) => nip19.decode(e)) + .map((e) => { + if (nip19.BECH32_REGEX.test(e) && e.includes(":")) { + const [kind, pubkey, identifier] = e.split(":") as [ + string, + string, + string, + ]; + return { + type: "naddr", + data: { + kind, + pubkey, + identifier, + }, + }; + } else { + return nip19.decode(e); + } + }) .filter(({ type }) => type === "naddr") .map((e) => e.data as nip19.AddressPointer); const { events, isLoading } = useEvents({