add nostr-fetch

src/app/root.tsx

@@ -1,53 +1,67 @@
-import { NDKFilter } from '@nostr-dev-kit/ndk';
-import { useEffect, useRef } from 'react';
+import { NDKUser } from '@nostr-dev-kit/ndk';
+import { nip19 } from 'nostr-tools';
+import { useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
 
 import { useNDK } from '@libs/ndk/provider';
-import { prefetchEvents } from '@libs/ndk/utils';
 import {
   countTotalNotes,
   createChat,
   createNote,
   getLastLogin,
+  updateAccount,
   updateLastLogin,
 } from '@libs/storage';
 
 import { LoaderIcon, LumeIcon } from '@shared/icons';
 
-import { dateToUnix, getHourAgo } from '@utils/date';
+import { nHoursAgo } from '@utils/date';
 import { useAccount } from '@utils/hooks/useAccount';
 
 const totalNotes = await countTotalNotes();
 const lastLogin = await getLastLogin();
 
 export function Root() {
-  const now = useRef(new Date());
   const navigate = useNavigate();
 
-  const { ndk } = useNDK();
+  const { ndk, relayUrls, fetcher } = useNDK();
   const { status, account } = useAccount();
 
+  async function getFollows() {
+    const authors: string[] = [];
+
+    const user = ndk.getUser({ hexpubkey: account.pubkey });
+    const follows = await user.follows();
+
+    follows.forEach((follow: NDKUser) => {
+      authors.push(nip19.decode(follow.npub).data as string);
+    });
+
+    // update follows in db
+    await updateAccount('follows', authors, account.pubkey);
+
+    return authors;
+  }
+
   async function fetchNotes() {
     try {
-      const follows = JSON.parse(account.follows);
+      const follows = await getFollows();
 
       if (follows.length > 0) {
         let since: number;
-
         if (totalNotes === 0 || lastLogin === 0) {
-          since = dateToUnix(getHourAgo(48, now.current));
+          since = nHoursAgo(48);
         } else {
           since = lastLogin;
         }
 
-        const filter: NDKFilter = {
-          kinds: [1, 6],
-          authors: follows,
-          since: since,
-        };
-
-        const events = await prefetchEvents(ndk, filter);
-        for (const event of events) {
+        const events = fetcher.allEventsIterator(
+          relayUrls,
+          { kinds: [1], authors: follows },
+          { since: since },
+          { skipVerification: true }
+        );
+        for await (const event of events) {
           await createNote(
             event.id,
             event.pubkey,
@@ -67,20 +81,23 @@ export function Root() {
 
   async function fetchChats() {
     try {
-      const sendFilter: NDKFilter = {
-        kinds: [4],
-        authors: [account.pubkey],
-        since: lastLogin,
-      };
+      const sendMessages = await fetcher.fetchAllEvents(
+        relayUrls,
+        {
+          kinds: [4],
+          authors: [account.pubkey],
+        },
+        { since: lastLogin }
+      );
 
-      const receiveFilter: NDKFilter = {
-        kinds: [4],
-        '#p': [account.pubkey],
-        since: lastLogin,
-      };
-
-      const sendMessages = await prefetchEvents(ndk, sendFilter);
-      const receiveMessages = await prefetchEvents(ndk, receiveFilter);
+      const receiveMessages = await fetcher.fetchAllEvents(
+        relayUrls,
+        {
+          kinds: [4],
+          '#p': [account.pubkey],
+        },
+        { since: lastLogin }
+      );
 
       const events = [...sendMessages, ...receiveMessages];
       for (const event of events) {

src/app/user/components/feed.tsx

@@ -1,24 +1,22 @@
-import { NDKFilter } from '@nostr-dev-kit/ndk';
 import { useQuery } from '@tanstack/react-query';
 
 import { useNDK } from '@libs/ndk/provider';
 
 import { Note } from '@shared/notes/note';
 
-import { dateToUnix, getHourAgo } from '@utils/date';
+import { nHoursAgo } from '@utils/date';
 import { LumeEvent } from '@utils/types';
 
 export function UserFeed({ pubkey }: { pubkey: string }) {
-  const { ndk } = useNDK();
+  const { fetcher, relayUrls } = useNDK();
   const { status, data } = useQuery(['user-feed', pubkey], async () => {
-    const now = new Date();
-    const filter: NDKFilter = {
-      kinds: [1],
-      authors: [pubkey],
-      since: dateToUnix(getHourAgo(48, now)),
-    };
-    const events = await ndk.fetchEvents(filter);
-    return [...events];
+    const events = await fetcher.fetchAllEvents(
+      relayUrls,
+      { kinds: [1], authors: [pubkey] },
+      { since: nHoursAgo(48) },
+      { sort: true }
+    );
+    return events as unknown as LumeEvent[];
   });
 
   return (