refactor publish event

src/app/new/post.tsx

@@ -1,4 +1,4 @@
-import { NDKEvent, NDKKind, NDKTag } from '@nostr-dev-kit/ndk';
+import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk';
 import CharacterCount from '@tiptap/extension-character-count';
 import Image from '@tiptap/extension-image';
 import Placeholder from '@tiptap/extension-placeholder';
@@ -21,7 +21,7 @@ import { WIDGET_KIND } from '@stores/constants';
 import { useWidget } from '@utils/hooks/useWidget';
 
 export function NewPostScreen() {
-  const { ndk, relayUrls } = useNDK();
+  const { ndk } = useNDK();
   const { addWidget } = useWidget();
 
   const [loading, setLoading] = useState(false);
@@ -56,12 +56,6 @@ export function NewPostScreen() {
     try {
       setLoading(true);
 
-      const reply = {
-        id: searchParams.get('id'),
-        root: searchParams.get('root'),
-        pubkey: searchParams.get('pubkey'),
-      };
-
       // get plaintext content
       const html = editor.getHTML();
       const serializedContent = convert(html, {
@@ -71,37 +65,23 @@ export function NewPostScreen() {
         ],
       });
 
-      // define tags
-      let tags: NDKTag[] = [];
-
-      // add reply to tags if present
-      if (reply.id && reply.pubkey) {
-        if (reply.root) {
-          tags = [
-            ['e', reply.root, relayUrls[0], 'root'],
-            ['e', reply.id, relayUrls[0], 'reply'],
-            ['p', reply.pubkey],
-          ];
-        } else {
-          tags = [
-            ['e', reply.id, relayUrls[0], 'reply'],
-            ['p', reply.pubkey],
-          ];
-        }
-      }
-
-      // add hashtag to tags if present
-      const hashtags = serializedContent
-        .split(/\s/gm)
-        .filter((s: string) => s.startsWith('#'));
-      hashtags?.forEach((tag: string) => {
-        tags.push(['t', tag.replace('#', '')]);
-      });
-
       const event = new NDKEvent(ndk);
       event.content = serializedContent;
       event.kind = NDKKind.Text;
-      event.tags = tags;
+
+      // add reply to tags if present
+      const replyTo = searchParams.get('replyTo');
+      const rootReplyTo = searchParams.get('rootReplyTo');
+
+      if (rootReplyTo) {
+        const rootEvent = await ndk.fetchEvent(rootReplyTo);
+        event.tag(rootEvent, 'root');
+      }
+
+      if (replyTo) {
+        const replyEvent = await ndk.fetchEvent(replyTo);
+        event.tag(replyEvent, 'reply');
+      }
 
       // publish event
       const publishedRelays = await event.publish();
@@ -114,7 +94,7 @@ export function NewPostScreen() {
         setSearchParams({});
 
         // open new widget with this event id
-        if (!reply.id && !reply.pubkey) {
+        if (!replyTo) {
           addWidget.mutate({
             title: 'Thread',
             content: event.id,
@@ -146,9 +126,9 @@ export function NewPostScreen() {
           autoCorrect="off"
           autoCapitalize="off"
         />
-        {searchParams.get('id') && (
+        {searchParams.get('replyTo') && (
           <div className="relative max-w-lg">
-            <MentionNote id={searchParams.get('id')} editing />
+            <MentionNote id={searchParams.get('replyTo')} editing />
             <button
               type="button"
               onClick={() => setSearchParams({})}

src/app/notes/text.tsx

@@ -111,14 +111,14 @@ export function TextNoteScreen() {
                 <User pubkey={data.pubkey} time={data.created_at} variant="thread" />
                 <div className="mt-3">{renderKind(data)}</div>
                 <div className="mt-3">
-                  <NoteActions id={id} pubkey={data.pubkey} extraButtons={false} />
+                  <NoteActions event={data} canOpenEvent={false} />
                 </div>
               </div>
             </div>
           )}
           <div ref={replyRef} className="px-3">
             <div className="mb-3 border-b border-neutral-100 pb-3 dark:border-neutral-900">
-              <NoteReplyForm eventId={id} />
+              <NoteReplyForm rootEvent={data} />
             </div>
             <ReplyList eventId={id} />
           </div>

src/app/personal/components/relayCard.tsx

@@ -15,7 +15,10 @@ export function RelayCard() {
     queryKey: ['relays'],
     queryFn: async () => {
       const user = ndk.getUser({ pubkey: db.account.pubkey });
-      return await user.relayList();
+      const relays = await user.relayList();
+
+      if (!relays) return Promise.reject(new Error("user's relay set not found"));
+      return relays;
     },
     refetchOnWindowFocus: false,
   });
@@ -29,7 +32,7 @@ export function RelayCard() {
       ) : (
         <div className="flex h-full w-full flex-col justify-between p-4">
           <h3 className="pt-1 text-5xl font-semibold tabular-nums text-neutral-900 dark:text-neutral-100">
-            {compactNumber.format(data?.relays?.length)}
+            {compactNumber.format(data?.relays?.length || 0)}
           </h3>
           <div className="mt-auto flex h-6 w-full items-center justify-between">
             <p className="text-xl font-medium leading-none text-neutral-600 dark:text-neutral-400">

src/app/personal/components/zapCard.tsx

@@ -40,7 +40,7 @@ export function ZapCard() {
         <div className="flex h-full w-full flex-col justify-between p-4">
           <h3 className="pt-1 text-5xl font-semibold tabular-nums text-neutral-900 dark:text-neutral-100">
             {compactNumber.format(
-              data.stats[db.account.pubkey].zaps_received.msats / 1000
+              data?.stats[db.account.pubkey]?.zaps_received?.msats / 1000 || 0
             )}
           </h3>
           <div className="mt-auto flex h-6 items-center text-xl font-medium leading-none text-neutral-600 dark:text-neutral-400">