diff --git a/src/Element/DM.tsx b/src/Element/DM.tsx index 3026308..3131512 100644 --- a/src/Element/DM.tsx +++ b/src/Element/DM.tsx @@ -24,6 +24,7 @@ export default function DM(props: DMProps) { const [decrypted, setDecrypted] = useState(false); const { ref, inView } = useInView(); const isMe = props.data.pubkey === pubKey; + const otherPubkey = isMe ? pubKey : props.data.tags.find(a => a[0] === "p")![1]; async function decrypt() { let e = new Event(props.data); @@ -46,7 +47,7 @@ export default function DM(props: DMProps) {
{fragments}
- } - return <>{fragments}> -} - -function transformText(frag: TextFragment) { - if (frag.body === undefined) { - debugger; - } - let fragments = extractMentions(frag); - fragments = extractLinks(fragments, frag.pref); - fragments = extractInvoices(fragments); - fragments = extractHashtags(fragments); - return fragments; -} +import HyperText from 'Element/HyperText'; +import { HexKey } from 'Nostr'; export type Fragment = string | JSX.Element; export interface TextFragment { body: Fragment[], tags: Tag[], - users: Map{fragments}
+ } + return <>{fragments}> + } + + function transformText(frag: TextFragment) { + if (frag.body === undefined) { + debugger; + } + let fragments = extractMentions(frag); + fragments = extractLinks(fragments); + fragments = extractInvoices(fragments); + fragments = extractHashtags(fragments); + return fragments; + } + const components = useMemo(() => { return { - p: (x: any) => transformParagraph({ body: x.children ?? [], tags, users, pref }), - a: (x: any) => transformHttpLink(x.href, pref), - li: (x: any) => transformLi({ body: x.children ?? [], tags, users, pref }), + p: (x: any) => transformParagraph({ body: x.children ?? [], tags, users }), + a: (x: any) =>