Kieran/snort
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: reactions loading

Browse Source
This commit is contained in:
kieran
2024-04-25 11:59:20 +01:00
parent a6a1198f04
commit 52688e6389
5 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/app/src/Components/Event/LongFormText.tsx
View File

@ -1,9 +1,8 @@
import "./LongFormText.css";
import { NostrLink, TaggedNostrEvent } from "@snort/system";
import { useEventReactions, useReactions } from "@snort/system-react";
import { TaggedNostrEvent } from "@snort/system";
import classNames from "classnames";
import React, { CSSProperties, useCallback, useRef, useState } from "react";
import { CSSProperties, useCallback, useRef, useState } from "react";
import { FormattedMessage, FormattedNumber } from "react-intl";
import Text from "@/Components/Text/Text";
@ -32,8 +31,6 @@ export function LongFormText(props: LongFormTextProps) {
const [reading, setReading] = useState(false);
const [showMore, setShowMore] = useState(false);
const ref = useRef<HTMLDivElement>(null);
const related = useReactions("note:reactions", [NostrLink.fromEvent(props.ev)], undefined, false);
const { reactions, reposts, zaps } = useEventReactions(NostrLink.fromEvent(props.ev), related);
function previewText() {
return (
@ -114,7 +111,7 @@ export function LongFormText(props: LongFormTextProps) {
function fullText() {
return (
<>
<NoteFooter ev={props.ev} reposts={reposts} zaps={zaps} positive={reactions.positive} />
<NoteFooter ev={props.ev} />
<hr />
<div className="flex g8">
<div>
@ -143,7 +140,7 @@ export function LongFormText(props: LongFormTextProps) {
<Markdown content={content} tags={props.ev.tags} ref={ref} />
{shouldTruncate && !showMore && <ToggleShowMore />}
<hr />
<NoteFooter ev={props.ev} reposts={reposts} zaps={zaps} positive={reactions.positive} />
<NoteFooter ev={props.ev} />
</>
);
}

3
packages/app/src/Components/Event/Note/NoteFooter/NoteFooter.tsx
View File

@ -19,10 +19,9 @@ export interface NoteFooterProps {
export default function NoteFooter(props: NoteFooterProps) {
const { ev } = props;
const link = useMemo(() => NostrLink.fromEvent(ev), [ev.id]);
const ids = useMemo(() => [link], [link]);
const [showReactions, setShowReactions] = useState(false);
const related = useReactions("reactions", ids, undefined, false);
const related = useReactions(`reactions:${link.tagKey}`, link);
const { replies, reactions, zaps, reposts } = useEventReactions(link, related);
const { positive } = reactions;

2
packages/app/src/Components/Event/Note/ReactionsModal.tsx
View File

@ -25,7 +25,7 @@ const ReactionsModal = ({ onClose, event, initialTab = 0 }: ReactionsModalProps)
const link = NostrLink.fromEvent(event);
const related = useReactions("note:reactions", [link], undefined, false);
const related = useReactions(`reactions:${link.tagKey}`, link, undefined, false);
const { reactions, zaps, reposts } = useEventReactions(link, related);
const { positive, negative } = reactions;