highperfocused/nostrudel
1
0
Fork 0
mirror of https://github.com/hzrd149/nostrudel.git synced 2025-09-20 13:01:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix bug with parsing zaps in streams

Browse Source
This commit is contained in:
hzrd149
2024-04-12 15:03:19 -05:00
parent 5af8be46f1
commit 9817797195
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/helpers/nostr/zaps.ts
View File

@@ -3,7 +3,7 @@ import { isETag, isPTag, NostrEvent } from "../../types/nostr-event";
import { ParsedInvoice, parsePaymentRequest } from "../bolt11";
import { Kind0ParsedContent } from "./user-metadata";
import { nip57, utils } from "nostr-tools";
import { nip57, utils, validateEvent } from "nostr-tools";
// based on https://github.com/nbd-wtf/nostr-tools/blob/master/nip57.ts
export async function getZapEndpoint(metadata: Kind0ParsedContent): Promise<null | string> {
@@ -61,7 +61,12 @@ export function getParsedZap(event: NostrEvent, quite: true, returnError: false)
export function getParsedZap(event: NostrEvent, quite?: boolean, returnError?: boolean): ParsedZap | undefined;
export function getParsedZap(event: NostrEvent, quite: boolean = true, returnError?: boolean) {
const e = event as ParsedZapEvent;
if (Object.hasOwn(e, parsedZapSymbol)) return e[parsedZapSymbol];
if (Object.hasOwn(e, parsedZapSymbol)) {
const cached = e[parsedZapSymbol];
if (!returnError && cached instanceof Error) return undefined;
if (!quite && cached instanceof Error) throw cached;
return cached;
}
try {
return (e[parsedZapSymbol] = parseZapEvent(e));
@@ -88,15 +93,16 @@ export function parseZapEvents(events: NostrEvent[]) {
/** @deprecated use getParsedZap instead */
export function parseZapEvent(event: NostrEvent): ParsedZap {
const zapRequestStr = event.tags.find(([t, v]) => t === "description")?.[1];
if (!zapRequestStr) throw new Error("no description tag");
if (!zapRequestStr) throw new Error("No description tag");
const bolt11 = event.tags.find((t) => t[0] === "bolt11")?.[1];
if (!bolt11) throw new Error("missing bolt11 invoice");
if (!bolt11) throw new Error("Missing bolt11 invoice");
const error = nip57.validateZapRequest(zapRequestStr);
if (error) throw new Error(error);
const request = JSON.parse(zapRequestStr) as NostrEvent;
if (!validateEvent(request)) throw new Error("Invalid zap request");
const payment = parsePaymentRequest(bolt11);
return {

3
src/views/streams/components/top-zappers.tsx
View File

@@ -1,5 +1,6 @@
import { useMemo } from "react";
import { Flex, FlexProps, Text } from "@chakra-ui/react";
import { kinds } from "nostr-tools";
import { parseZapEvents } from "../../../helpers/nostr/zaps";
import UserLink from "../../../components/user/user-link";
@@ -13,7 +14,7 @@ import UserAvatarLink from "../../../components/user/user-avatar-link";
export default function TopZappers({ stream, ...props }: FlexProps & { stream: ParsedStream }) {
const timeline = useStreamChatTimeline(stream);
const events = useSubject(timeline.timeline);
const zaps = useMemo(() => parseZapEvents(events), [events]);
const zaps = useMemo(() => parseZapEvents(events.filter((e) => e.kind === kinds.Zap)), [events]);
const totals: Record<string, number> = {};
for (const zap of zaps) {