>;
+}
+
+function renderToken(t: Token | Footnotes | Footnote | FootnoteRef): ReactNode {
+ try {
+ switch (t.type) {
+ case "paragraph": {
+ return {t.tokens ? t.tokens.map(renderToken) : t.raw}
;
+ }
+ case "image": {
+ return ;
+ }
+ case "heading": {
+ switch (t.depth) {
+ case 1:
+ return {t.tokens ? t.tokens.map(renderToken) : t.raw}
;
+ case 2:
+ return {t.tokens ? t.tokens.map(renderToken) : t.raw}
;
+ case 3:
+ return {t.tokens ? t.tokens.map(renderToken) : t.raw}
;
+ case 4:
+ return {t.tokens ? t.tokens.map(renderToken) : t.raw}
;
+ case 5:
+ return {t.tokens ? t.tokens.map(renderToken) : t.raw}
;
+ case 6:
+ return {t.tokens ? t.tokens.map(renderToken) : t.raw}
;
+ }
+ throw new Error("Invalid heading");
+ }
+ case "codespan": {
+ return {t.raw};
+ }
+ case "code": {
+ return {t.raw};
+ }
+ case "br": {
+ return
;
+ }
+ case "hr": {
+ return
;
+ }
+ case "blockquote": {
+ return {t.tokens ? t.tokens.map(renderToken) : t.raw}
;
+ }
+ case "link": {
+ return (
+
+ {t.tokens ? t.tokens.map(renderToken) : t.raw}
+
+ );
+ }
+ case "list": {
+ if (t.ordered) {
+ return {t.items.map(renderToken)}
;
+ } else {
+ return {t.items.map(renderToken)}
;
+ }
+ }
+ case "list_item": {
+ return {t.tokens ? t.tokens.map(renderToken) : t.raw};
+ }
+ case "em": {
+ return {t.tokens ? t.tokens.map(renderToken) : t.raw};
+ }
+ case "del": {
+ return {t.tokens ? t.tokens.map(renderToken) : t.raw};
+ }
+ case "footnoteRef": {
+ return (
+
+
+ [{t.label}]
+
+
+ );
+ }
+ case "footnotes":
+ case "footnote": {
+ return;
+ }
+ default: {
+ if ("tokens" in t) {
+ return (t.tokens as Array).map(renderToken);
+ }
+ return t.raw;
+ }
+ }
+ } catch (e) {
+ console.error(e);
+ }
+}
+
+export function Markdown({ content, tags = [] }: MarkdownProps) {
+ const parsed = useMemo(() => {
+ return marked.use(markedFootnote()).lexer(content);
+ }, [content, tags]);
+
+ return (
+
+ {parsed.filter(a => a.type !== "footnote" && a.type !== "footnotes").map(a => renderToken(a))}
+
+ );
+}
diff --git a/packages/app/src/Element/Event/Note.tsx b/packages/app/src/Element/Event/Note.tsx
index aba48e7cd..9b54a6e5b 100644
--- a/packages/app/src/Element/Event/Note.tsx
+++ b/packages/app/src/Element/Event/Note.tsx
@@ -9,6 +9,7 @@ import { ZapGoal } from "Element/Event/ZapGoal";
import NoteReaction from "Element/Event/NoteReaction";
import ProfilePreview from "Element/User/ProfilePreview";
import { NoteInner } from "./NoteInner";
+import { LongFormText } from "./LongFormText";
export interface NoteProps {
data: TaggedNostrEvent;
@@ -32,6 +33,7 @@ export interface NoteProps {
canUnbookmark?: boolean;
canClick?: boolean;
showMediaSpotlight?: boolean;
+ longFormPreview?: boolean;
};
}
@@ -58,6 +60,9 @@ export default function Note(props: NoteProps) {
if (ev.kind === (9041 as EventKind)) {
return ;
}
+ if (ev.kind === EventKind.LongFormTextNote) {
+ return ;
+ }
return ;
}
diff --git a/packages/app/src/Element/Event/NoteCreator.tsx b/packages/app/src/Element/Event/NoteCreator.tsx
index 37a207aef..4008c91a6 100644
--- a/packages/app/src/Element/Event/NoteCreator.tsx
+++ b/packages/app/src/Element/Event/NoteCreator.tsx
@@ -359,6 +359,7 @@ export function NoteCreator() {
showTime: false,
canClick: false,
showMedia: false,
+ longFormPreview: true,
}}
/>
)}
diff --git a/packages/app/src/Element/Event/NoteInner.tsx b/packages/app/src/Element/Event/NoteInner.tsx
index 4fc00af58..864a7cc0b 100644
--- a/packages/app/src/Element/Event/NoteInner.tsx
+++ b/packages/app/src/Element/Event/NoteInner.tsx
@@ -1,27 +1,18 @@
import { Link, useNavigate } from "react-router-dom";
-import React, { ReactNode, useMemo, useState } from "react";
-import {
- dedupeByPubkey,
- findTag,
- getReactions,
- hexToBech32,
- normalizeReaction,
- profileLink,
- Reaction,
- tagFilterOfTextRepost,
-} from "../../SnortUtils";
-import useModeration from "../../Hooks/useModeration";
+import React, { ReactNode, useState } from "react";
import { useInView } from "react-intersection-observer";
-import useLogin from "../../Hooks/useLogin";
-import useEventPublisher from "../../Hooks/useEventPublisher";
-import { NoteContextMenu, NoteTranslation } from "./NoteContextMenu";
import { FormattedMessage, useIntl } from "react-intl";
+import { EventExt, EventKind, HexKey, Lists, NostrLink, NostrPrefix, TaggedNostrEvent } from "@snort/system";
+import { findTag, hexToBech32, profileLink } from "SnortUtils";
+import useModeration from "Hooks/useModeration";
+import useLogin from "Hooks/useLogin";
+import useEventPublisher from "Hooks/useEventPublisher";
+import { NoteContextMenu, NoteTranslation } from "./NoteContextMenu";
import { UserCache } from "../../Cache";
import messages from "../messages";
import { System } from "../../index";
import { setBookmarked, setPinned } from "../../Login";
import Text from "../Text";
-import { ProxyImg } from "../ProxyImg";
import Reveal from "./Reveal";
import Poll from "./Poll";
import ProfileImage from "../User/ProfileImage";
@@ -31,7 +22,7 @@ import NoteFooter from "./NoteFooter";
import Reactions from "./Reactions";
import HiddenNote from "./HiddenNote";
import { NoteProps } from "./Note";
-import { EventExt, EventKind, HexKey, Lists, NostrLink, NostrPrefix, parseZap, TaggedNostrEvent } from "@snort/system";
+import { useEventReactions } from "Hooks/useEventReactions";
export function NoteInner(props: NoteProps) {
const { data: ev, related, highlight, options: opt, ignoreModeration = false, className } = props;
@@ -39,50 +30,17 @@ export function NoteInner(props: NoteProps) {
const baseClassName = `note card${className ? ` ${className}` : ""}`;
const navigate = useNavigate();
const [showReactions, setShowReactions] = useState(false);
- const deletions = useMemo(() => getReactions(related, ev.id, EventKind.Deletion), [related]);
+
const { isEventMuted } = useModeration();
const { ref, inView } = useInView({ triggerOnce: true });
+ const { reactions, reposts, deletions, zaps } = useEventReactions(ev, related);
const login = useLogin();
const { pinned, bookmarked } = login;
const publisher = useEventPublisher();
const [translated, setTranslated] = useState();
const { formatMessage } = useIntl();
- const reactions = useMemo(() => getReactions(related, ev.id, EventKind.Reaction), [related, ev]);
- const groupReactions = useMemo(() => {
- const result = reactions?.reduce(
- (acc, reaction) => {
- const kind = normalizeReaction(reaction.content);
- const rs = acc[kind] || [];
- return { ...acc, [kind]: [...rs, reaction] };
- },
- {
- [Reaction.Positive]: [] as TaggedNostrEvent[],
- [Reaction.Negative]: [] as TaggedNostrEvent[],
- },
- );
- return {
- [Reaction.Positive]: dedupeByPubkey(result[Reaction.Positive]),
- [Reaction.Negative]: dedupeByPubkey(result[Reaction.Negative]),
- };
- }, [reactions]);
- const positive = groupReactions[Reaction.Positive];
- const negative = groupReactions[Reaction.Negative];
- const reposts = useMemo(
- () =>
- dedupeByPubkey([
- ...getReactions(related, ev.id, EventKind.TextNote).filter(e => e.tags.some(tagFilterOfTextRepost(e, ev.id))),
- ...getReactions(related, ev.id, EventKind.Repost),
- ]),
- [related, ev],
- );
- const zaps = useMemo(() => {
- const sortedZaps = getReactions(related, ev.id, EventKind.ZapReceipt)
- .map(a => parseZap(a, UserCache, ev))
- .filter(z => z.valid);
- sortedZaps.sort((a, b) => b.amount - a.amount);
- return sortedZaps;
- }, [related]);
- const totalReactions = positive.length + negative.length + reposts.length + zaps.length;
+
+ const totalReactions = reactions.positive.length + reactions.negative.length + reposts.length + zaps.length;
const options = {
showHeader: true,
@@ -117,45 +75,19 @@ export function NoteInner(props: NoteProps) {
}
const innerContent = () => {
- if (ev.kind === EventKind.LongFormTextNote) {
- const title = findTag(ev, "title");
- const summary = findTag(ev, "simmary");
- const image = findTag(ev, "image");
- return (
-
-
{title}
-
-
{summary}
-
- {image &&
}
-
-