roland/stream
1
0
Fork 0
forked from Kieran/zap.stream
Code Pull Requests Activity

Merge pull request 'fix: only show awards from stream start' (#77) from awards-times into main

Browse Source 
Reviewed-on: Kieran/stream#77
Reviewed-by: Kieran <kieran@noreply.localhost>
This commit is contained in:
Kieran 2023-08-06 14:00:49 +00:00
commit c74b0e5b42
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/element/live-chat.tsx
View File

@ -8,6 +8,7 @@ import {
parseZap,
encodeTLV,
} from "@snort/system";
import { unixNow } from "@snort/shared";
import { useEffect, useMemo } from "react";
import uniqBy from "lodash.uniqby";
@ -28,7 +29,7 @@ import { useLogin } from "hooks/login";
import useTopZappers from "hooks/top-zappers";
import { useAddress } from "hooks/event";
import { formatSats } from "number";
import { LIVE_STREAM_CHAT } from "const";
import { WEEK, LIVE_STREAM_CHAT } from "const";
import { findTag, getTagValues, getHost } from "utils";
import { System } from "index";
@ -91,7 +92,6 @@ export function LiveChat({
height?: number;
}) {
const host = getHost(ev);
const { badges, awards } = useBadges(host);
const feed = useLiveChatFeed(link, goal ? [goal.id] : undefined);
const login = useLogin();
useEffect(() => {
@ -101,6 +101,11 @@ export function LiveChat({
System.ProfileLoader.TrackMetadata(pubkeys);
return () => System.ProfileLoader.UntrackMetadata(pubkeys);
}, [feed.zaps]);
const started = useMemo(() => {
const starts = findTag(ev, "starts");
return starts ? Number(starts) : unixNow() - WEEK;
}, [ev]);
const { badges, awards } = useBadges(host, started);
const mutedPubkeys = useMemo(() => {
return new Set(getTagValues(login?.muted.tags ?? [], "p"));
}, [login]);

4
src/hooks/badges.ts
View File

@ -7,18 +7,16 @@ import {
RequestBuilder,
} from "@snort/system";
import { useRequestBuilder } from "@snort/system-react";
import { unixNow } from "@snort/shared";
import { findTag, toAddress, getTagValues } from "utils";
import { WEEK } from "const";
import { System } from "index";
import type { Badge } from "types";
export function useBadges(
pubkey: string,
since: number,
leaveOpen = true
): { badges: Badge[]; awards: TaggedRawEvent[] } {
const since = useMemo(() => unixNow() - WEEK, [pubkey]);
const rb = useMemo(() => {
const rb = new RequestBuilder(`badges:${pubkey.slice(0, 12)}`);
rb.withOptions({ leaveOpen });