fixed duplicate note in newsfeed and minor fixes

src/app/newsfeed/following/page.tsx

@@ -4,19 +4,19 @@ import FormBase from '@components/form/base';
 import { NoteBase } from '@components/note/base';
 import { Placeholder } from '@components/note/placeholder';
 
-import { hasNewerNoteAtom } from '@stores/note';
+import { filteredNotesAtom, hasNewerNoteAtom, notesAtom } from '@stores/note';
 
 import { dateToUnix } from '@utils/getDate';
-import { filterDuplicateParentID } from '@utils/transform';
 
 import { ArrowUp } from 'iconoir-react';
-import { useAtom } from 'jotai';
+import { useAtom, useAtomValue, useSetAtom } from 'jotai';
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { useCallback, useEffect, useRef } from 'react';
 import { Virtuoso } from 'react-virtuoso';
 
 export default function Page() {
-  const [data, setData] = useState([]);
   const [hasNewerNote, setHasNewerNote] = useAtom(hasNewerNoteAtom);
+  const setData = useSetAtom(notesAtom);
+  const data = useAtomValue(filteredNotesAtom);
 
   const virtuosoRef = useRef(null);
   const now = useRef(new Date());
@@ -45,7 +45,7 @@ export default function Page() {
       offset: offset.current,
     });
     setData((data) => [...data, ...result]);
-  }, []);
+  }, [setData]);
 
   const loadMore = useCallback(async () => {
     const { getNotes } = await import('@utils/bindings');
@@ -57,14 +57,14 @@ export default function Page() {
       offset: offset.current,
     });
     setData((data) => [...data, ...result]);
-  }, []);
+  }, [setData]);
 
   const loadLatest = useCallback(async () => {
     const { getLatestNotes } = await import('@utils/bindings');
     // next query
     const result: any = await getLatestNotes({ date: dateToUnix(now.current) });
     // update data
-    if (result.length > 0) {
+    if (Array.isArray(result)) {
       setData((data) => [...data, ...result]);
     } else {
       setData((data) => [...data, result]);
@@ -72,8 +72,8 @@ export default function Page() {
     // hide newer trigger
     setHasNewerNote(false);
     // scroll to top
-    virtuosoRef.current.scrollToIndex({ index: 0 });
+    virtuosoRef.current.scrollToIndex({ index: -1 });
-  }, [setHasNewerNote]);
+  }, [setData, setHasNewerNote]);
 
   useEffect(() => {
     initialData().catch(console.error);
@@ -94,7 +94,7 @@ export default function Page() {
       )}
       <Virtuoso
         ref={virtuosoRef}
-        data={filterDuplicateParentID(data)}
+        data={data}
         itemContent={itemContent}
         computeItemKey={computeItemKey}
         components={COMPONENTS}

src/app/page.tsx

@@ -123,7 +123,7 @@ export default function Page() {
         },
         undefined,
         () => {
-          if (eose.current > relays.length - 7) {
+          if (eose.current > relays.length / 2) {
             router.replace('/newsfeed/following');
           } else {
             eose.current += 1;

src/components/eventCollector.tsx

@@ -32,15 +32,17 @@ export default function EventCollector() {
       const { createPleb } = await import('@utils/bindings');
       for (const tag of tags) {
         const pubkey = tag[1];
-        const metadata: any = await fetchMetadata(pubkey);
+        fetchMetadata(pubkey)
-
+          .then((res: { content: string }) => {
             createPleb({
               pleb_id: pubkey + '-lume' + activeAccount.id.toString(),
               pubkey: pubkey,
               kind: 0,
-          metadata: metadata.content,
+              metadata: res.content,
               account_id: activeAccount.id,
             }).catch(console.error);
+          })
+          .catch(console.error);
       }
     },
     [activeAccount.id]

src/components/note/base.tsx

@@ -2,7 +2,7 @@ import NoteMetadata from '@components/note/metadata';
 import { NoteParent } from '@components/note/parent';
 import { ImagePreview } from '@components/note/preview/image';
 import { VideoPreview } from '@components/note/preview/video';
-import { NoteRepost } from '@components/note/repost';
+import { NoteQuote } from '@components/note/quote';
 import { UserExtend } from '@components/user/extend';
 import { UserMention } from '@components/user/mention';
 
@@ -48,10 +48,10 @@ export const NoteBase = memo(function NoteBase({ event }: { event: any }) {
       parsedContent = reactStringReplace(parsedContent, /\#\[(\d+)\]/gm, (match, i) => {
         if (tags[match][0] === 'p') {
           // @-mentions
-          return <UserMention key={match + i} pubkey={tags[match][1]} />;
+          return <UserMention key={tags[match][1]} pubkey={tags[match][1]} />;
         } else if (tags[match][0] === 'e') {
-          // note-mentions
+          // note-quotes
-          return <NoteRepost key={match + i} id={tags[match][1]} />;
+          return <NoteQuote key={tags[match][1]} id={tags[match][1]} />;
         } else {
           return;
         }
@@ -61,10 +61,10 @@ export const NoteBase = memo(function NoteBase({ event }: { event: any }) {
     return parsedContent;
   }, [event.content, event.tags]);
 
-  const getParent = useMemo(() => {
+  const parentNote = useMemo(() => {
     if (event.parent_id) {
       if (event.parent_id !== event.eventId && !event.content.includes('#[0]')) {
-        return <NoteParent id={event.parent_id} />;
+        return <NoteParent key={event.parent_id} id={event.parent_id} />;
       }
     }
 
@@ -90,7 +90,7 @@ export const NoteBase = memo(function NoteBase({ event }: { event: any }) {
       onClick={(e) => openThread(e)}
       className="relative z-10 m-0 flex h-min min-h-min w-full select-text flex-col border-b border-zinc-800 px-3 py-5 hover:bg-black/20"
     >
-      <>{getParent}</>
+      <>{parentNote}</>
       <div className="relative z-10 flex flex-col">
         <div onClick={(e) => openUserPage(e)}>
           <UserExtend pubkey={event.pubkey} time={event.createdAt || event.created_at} />

src/components/note/comment.tsx

@@ -1,7 +1,7 @@
 import NoteMetadata from '@components/note/metadata';
 import { ImagePreview } from '@components/note/preview/image';
 import { VideoPreview } from '@components/note/preview/video';
-import { NoteRepost } from '@components/note/repost';
+import { NoteQuote } from '@components/note/quote';
 import { UserExtend } from '@components/user/extend';
 import { UserMention } from '@components/user/mention';
 
@@ -46,8 +46,8 @@ export const NoteComment = memo(function NoteComment({ event }: { event: any })
           // @-mentions
           return <UserMention key={match + i} pubkey={tags[match][1]} />;
         } else if (tags[match][0] === 'e') {
-          // note-mentions
+          // note-quotes
-          return <NoteRepost key={match + i} id={tags[match][1]} />;
+          return <NoteQuote key={match + i} id={tags[match][1]} />;
         } else {
           return;
         }

src/components/note/extend.tsx

@@ -1,7 +1,7 @@
 import NoteMetadata from '@components/note/metadata';
 import { ImagePreview } from '@components/note/preview/image';
 import { VideoPreview } from '@components/note/preview/video';
-import { NoteRepost } from '@components/note/repost';
+import { NoteQuote } from '@components/note/quote';
 import { UserLarge } from '@components/user/large';
 import { UserMention } from '@components/user/mention';
 
@@ -46,8 +46,8 @@ export const NoteExtend = memo(function NoteExtend({ event }: { event: any }) {
           // @-mentions
           return <UserMention key={match + i} pubkey={tags[match][1]} />;
         } else if (tags[match][0] === 'e') {
-          // note-mentions
+          // note-quotes
-          return <NoteRepost key={match + i} id={tags[match][1]} />;
+          return <NoteQuote key={match + i} id={tags[match][1]} />;
         } else {
           return;
         }

src/components/note/parent.tsx

@@ -1,7 +1,7 @@
 import NoteMetadata from '@components/note/metadata';
 import { ImagePreview } from '@components/note/preview/image';
 import { VideoPreview } from '@components/note/preview/video';
-import { NoteRepost } from '@components/note/repost';
+import { NoteQuote } from '@components/note/quote';
 import { RelayContext } from '@components/relaysProvider';
 import { UserExtend } from '@components/user/extend';
 import { UserMention } from '@components/user/mention';
@@ -117,10 +117,10 @@ export const NoteParent = memo(function NoteParent({ id }: { id: string }) {
         parsedContent = reactStringReplace(parsedContent, /\#\[(\d+)\]/gm, (match, i) => {
           if (tags[match][0] === 'p') {
             // @-mentions
-            return <UserMention key={match + i} pubkey={tags[match][1]} />;
+            return <UserMention key={tags[match][1]} pubkey={tags[match][1]} />;
           } else if (tags[match][0] === 'e') {
-            // note-mentions
+            // note-quotes
-            return <NoteRepost key={match + i} id={tags[match][1]} />;
+            return <NoteQuote key={tags[match][1]} id={tags[match][1]} />;
           } else {
             return;
           }

src/components/note/preview/image.tsx

@@ -3,16 +3,14 @@ import { memo } from 'react';
 
 export const ImagePreview = memo(function ImagePreview({ url }: { url: string }) {
   return (
-    <div className="relative mt-3 mb-2 h-full w-full rounded-lg xl:w-2/3">
+    <div className="relative mb-2 mt-3 h-full w-full rounded-lg border border-zinc-800 xl:w-2/3">
       <Image
         src={url}
         alt={url}
         width="0"
         height="0"
         sizes="100vw"
-        className="h-auto w-full rounded-lg border border-zinc-800 object-cover"
+        className="h-auto w-full rounded-lg object-cover"
-        placeholder="blur"
-        blurDataURL="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkqAcAAIUAgUW0RjgAAAAASUVORK5CYII="
         priority
       />
     </div>

src/components/note/quote.tsx

@@ -9,7 +9,7 @@ import destr from 'destr';
 import { memo, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
 import reactStringReplace from 'react-string-replace';
 
-export const NoteRepost = memo(function NoteRepost({ id }: { id: string }) {
+export const NoteQuote = memo(function NoteRepost({ id }: { id: string }) {
   const [pool, relays]: any = useContext(RelayContext);
 
   const [activeAccount]: any = useLocalStorage('activeAccount', {});

src/stores/note.tsx

@@ -1,7 +1,15 @@
 import { atom } from 'jotai';
 import { atomWithReset } from 'jotai/utils';
 
+// notes
+export const notesAtom = atom([]);
+export const filteredNotesAtom = atom((get) => {
+  const notes = get(notesAtom);
+  return notes.filter((item, index) => index === notes.findIndex((other) => item.parent_id === other.parent_id));
+});
+
 // note content
 export const noteContentAtom = atomWithReset('');
+
 // notify user that connector has receive newer note
 export const hasNewerNoteAtom = atom(false);