From 4747299ade2c2a4b80d4defda2ddd5f5cfabe80d Mon Sep 17 00:00:00 2001
From: Ren Amamiya <123083837+reyamir@users.noreply.github.com>
Date: Sat, 8 Jul 2023 15:21:06 +0700
Subject: [PATCH] update composer

---
 src/shared/composer/types/post.tsx   | 51 +++++++++++++---------------
 src/shared/notes/mentions/note.tsx   |  2 +-
 src/shared/notes/metadata/repost.tsx | 16 +++++++--
 src/shared/user.tsx                  |  4 +--
 src/stores/composer.tsx              | 13 -------
 src/utils/hooks/useProfile.tsx       | 36 ++++++++------------
 6 files changed, 54 insertions(+), 68 deletions(-)

diff --git a/src/shared/composer/types/post.tsx b/src/shared/composer/types/post.tsx
index 06db00ba..0ed67d1c 100644
--- a/src/shared/composer/types/post.tsx
+++ b/src/shared/composer/types/post.tsx
@@ -7,7 +7,7 @@ import { usePublish } from '@libs/ndk';
 
 import { Button } from '@shared/button';
 import { ImageUploader } from '@shared/composer/imageUploader';
-import { TrashIcon } from '@shared/icons';
+import { CancelIcon, TrashIcon } from '@shared/icons';
 import { MentionNote } from '@shared/notes/mentions/note';
 
 import { useComposer } from '@stores/composer';
@@ -60,9 +60,9 @@ export function Post() {
   const publish = usePublish();
   const editor = useMemo(() => withReact(withImages(withHistory(createEditor()))), []);
 
-  const [repost, reply, toggle] = useComposer((state) => [
-    state.repost,
+  const [reply, clearReply, toggle] = useComposer((state) => [
     state.reply,
+    state.clearReply,
     state.toggleModal,
   ]);
   const [content, setContent] = useState<Node[]>([
@@ -79,30 +79,14 @@ export function Post() {
     return nodes.map((n) => Node.string(n)).join('\n');
   }, []);
 
-  const getRef = () => {
-    if (repost.id) {
-      return repost.id;
-    } else if (reply.id) {
-      return reply.id;
-    } else {
-      return null;
-    }
+  const removeReply = () => {
+    clearReply();
   };
 
-  const refID = getRef();
-
   const submit = async () => {
     let tags: string[][] = [];
-    let kind: number;
 
-    if (repost.id && repost.pubkey) {
-      kind = 6;
-      tags = [
-        ['e', repost.id, FULL_RELAYS[0], 'root'],
-        ['p', repost.pubkey],
-      ];
-    } else if (reply.id && reply.pubkey) {
-      kind = 1;
+    if (reply.id && reply.pubkey) {
       if (reply.root && reply.root !== reply.id) {
         tags = [
           ['e', reply.id, FULL_RELAYS[0], 'root'],
@@ -116,7 +100,6 @@ export function Post() {
         ];
       }
     } else {
-      kind = 1;
       tags = [];
     }
 
@@ -124,7 +107,7 @@ export function Post() {
     const serializedContent = serialize(content);
 
     // publish message
-    await publish({ content: serializedContent, kind, tags });
+    await publish({ content: serializedContent, kind: 1, tags });
 
     // close modal
     toggle(false);
@@ -151,14 +134,28 @@ export function Post() {
           </div>
           <div className="w-full">
             <Editable
-              placeholder={refID ? 'Share your thoughts on it' : "What's on your mind?"}
+              placeholder={
+                reply.id ? 'Share your thoughts on it' : "What's on your mind?"
+              }
               spellCheck="false"
               className={`${
-                refID ? '!min-h-42' : '!min-h-[86px]'
+                reply.id ? '!min-h-42' : '!min-h-[86px]'
               } markdown max-h-[500px] overflow-y-auto`}
               renderElement={renderElement}
             />
-            {refID && <MentionNote id={refID} />}
+            {reply.id && (
+              <div className="relative">
+                <MentionNote id={reply.id} />
+                <button
+                  type="button"
+                  onClick={() => removeReply()}
+                  className="absolute right-3 top-3 inline-flex h-6 w-max items-center justify-center gap-2 rounded bg-zinc-800 px-2 hover:bg-zinc-700"
+                >
+                  <CancelIcon className="h-4 w-4 text-zinc-100" />
+                  <span className="text-sm">Stop reply</span>
+                </button>
+              </div>
+            )}
           </div>
         </div>
         <div className="mt-4 flex items-center justify-between">
diff --git a/src/shared/notes/mentions/note.tsx b/src/shared/notes/mentions/note.tsx
index dc58eaae..671412c7 100644
--- a/src/shared/notes/mentions/note.tsx
+++ b/src/shared/notes/mentions/note.tsx
@@ -45,7 +45,7 @@ export const MentionNote = memo(function MentionNote({ id }: { id: string }) {
       ) : status === 'success' ? (
         <>
           <User pubkey={data.pubkey} time={data.created_at} size="small" />
-          <div className="mt-2">
+          <div>
             {data.kind === 1 && <Kind1 content={data.content} truncate={true} />}
             {data.kind === 1063 && <Kind1063 metadata={data.tags} />}
             {data.kind !== 1 && data.kind !== 1063 && (
diff --git a/src/shared/notes/metadata/repost.tsx b/src/shared/notes/metadata/repost.tsx
index 36d66978..ff9b8000 100644
--- a/src/shared/notes/metadata/repost.tsx
+++ b/src/shared/notes/metadata/repost.tsx
@@ -1,8 +1,10 @@
 import * as Tooltip from '@radix-ui/react-tooltip';
 
+import { usePublish } from '@libs/ndk';
+
 import { RepostIcon } from '@shared/icons';
 
-import { useComposer } from '@stores/composer';
+import { FULL_RELAYS } from '@stores/constants';
 
 import { compactNumber } from '@utils/number';
 
@@ -15,13 +17,21 @@ export function NoteRepost({
   pubkey: string;
   reposts: number;
 }) {
-  const setRepost = useComposer((state) => state.setRepost);
+  const publish = usePublish();
+
+  const submit = async () => {
+    const tags = [
+      ['e', id, FULL_RELAYS[0], 'root'],
+      ['p', pubkey],
+    ];
+    await publish({ content: '', kind: 6, tags: tags });
+  };
 
   return (
     <Tooltip.Root delayDuration={150}>
       <button
         type="button"
-        onClick={() => setRepost(id, pubkey)}
+        onClick={() => submit()}
         className="group group inline-flex h-6 w-20 items-center gap-1.5"
       >
         <Tooltip.Trigger asChild>
diff --git a/src/shared/user.tsx b/src/shared/user.tsx
index 349cc6c4..0e15c89f 100644
--- a/src/shared/user.tsx
+++ b/src/shared/user.tsx
@@ -50,8 +50,8 @@ export function User({
 
   return (
     <Popover
-      className={`relative flex gap-3 ${
-        size === 'small' ? 'items-center' : 'items-start'
+      className={`relative flex ${
+        size === 'small' ? 'items-center gap-2' : 'items-start gap-3'
       }`}
     >
       <Popover.Button
diff --git a/src/stores/composer.tsx b/src/stores/composer.tsx
index 14b5d484..50fe059f 100644
--- a/src/stores/composer.tsx
+++ b/src/stores/composer.tsx
@@ -3,35 +3,22 @@ import { create } from 'zustand';
 interface ComposerState {
   open: boolean;
   reply: { id: string; root: string; pubkey: string };
-  repost: { id: string; pubkey: string };
   toggleModal: (status: boolean) => void;
   setReply: (id: string, root: string, pubkey: string) => void;
-  setRepost: (id: string, pubkey: string) => void;
   clearReply: () => void;
-  clearRepost: () => void;
 }
 
 export const useComposer = create<ComposerState>((set) => ({
   open: false,
   reply: { id: null, root: null, pubkey: null },
-  repost: { id: null, pubkey: null },
   toggleModal: (status: boolean) => {
     set({ open: status });
   },
   setReply: (id: string, root: string, pubkey: string) => {
     set({ reply: { id: id, root: root, pubkey: pubkey } });
-    set({ repost: { id: null, pubkey: null } });
-    set({ open: true });
-  },
-  setRepost: (id: string, pubkey: string) => {
-    set({ repost: { id: id, pubkey: pubkey } });
-    set({ reply: { id: null, root: null, pubkey: null } });
     set({ open: true });
   },
   clearReply: () => {
     set({ reply: { id: null, root: null, pubkey: null } });
   },
-  clearRepost: () => {
-    set({ repost: { id: null, pubkey: null } });
-  },
 }));
diff --git a/src/utils/hooks/useProfile.tsx b/src/utils/hooks/useProfile.tsx
index 834e9534..60884419 100644
--- a/src/utils/hooks/useProfile.tsx
+++ b/src/utils/hooks/useProfile.tsx
@@ -12,31 +12,23 @@ export function useProfile(pubkey: string, fallback?: string) {
     data: user,
     error,
     isFetching,
-  } = useQuery(
-    ['user', pubkey],
-    async () => {
-      if (!fallback) {
-        const current = Math.floor(Date.now() / 1000);
-        const cache = await getUserMetadata(pubkey);
-        if (cache && parseInt(cache.created_at) + 86400 >= current) {
-          console.log('use cache', cache);
-          return cache;
-        } else {
-          const user = ndk.getUser({ hexpubkey: pubkey });
-          await user.fetchProfile();
-          await createMetadata(pubkey, pubkey, JSON.stringify(user.profile));
-          return user.profile;
-        }
+  } = useQuery(['user', pubkey], async () => {
+    if (!fallback) {
+      const current = Math.floor(Date.now() / 1000);
+      const cache = await getUserMetadata(pubkey);
+      if (cache && parseInt(cache.created_at) + 86400 >= current) {
+        return cache;
       } else {
-        const profile = JSON.parse(fallback);
-        return profile;
+        const user = ndk.getUser({ hexpubkey: pubkey });
+        await user.fetchProfile();
+        await createMetadata(pubkey, pubkey, JSON.stringify(user.profile));
+        return user.profile;
       }
-    },
-    {
-      refetchOnWindowFocus: false,
-      refetchOnReconnect: false,
+    } else {
+      const profile = JSON.parse(fallback);
+      return profile;
     }
-  );
+  });
 
   return { status, user, error, isFetching };
 }