refactor newsfeed widget

src/shared/widgets/eventLoader.tsx

@@ -1,78 +0,0 @@
-import { useQueryClient } from '@tanstack/react-query';
-import { useEffect, useState } from 'react';
-
-import { useStorage } from '@libs/storage/provider';
-
-import { useWidgets } from '@stores/widgets';
-
-import { useNostr } from '@utils/hooks/useNostr';
-
-export function EventLoader({ firstTime }: { firstTime: boolean }) {
-  const { db } = useStorage();
-  const { getAllEventsSinceLastLogin } = useNostr();
-
-  const [progress, setProgress] = useState(0);
-
-  const queryClient = useQueryClient();
-  const setIsFetched = useWidgets((state) => state.setIsFetched);
-
-  useEffect(() => {
-    async function getEvents() {
-      const events = await getAllEventsSinceLastLogin();
-      console.log('total new events has found: ', events.length);
-
-      if (events) {
-        setProgress(100);
-        setIsFetched();
-
-        // invalidate queries
-        await queryClient.invalidateQueries({
-          queryKey: ['local-network-widget'],
-        });
-
-        // update last login time, use for next fetch
-        await db.updateLastLogin();
-      }
-    }
-
-    // only start download if progress === 0
-    if (progress === 0) getEvents();
-
-    // auto increase progress after 2 secs
-    setInterval(() => setProgress((prev) => (prev += 5)), 2000);
-  }, []);
-
-  return (
-    <div className="mb-3 px-3">
-      <div className="h-max w-full rounded-lg bg-neutral-100 p-3 dark:bg-neutral-900">
-        <div className="flex flex-col items-center gap-3">
-          {firstTime ? (
-            <div>
-              <span className="text-4xl">👋</span>
-              <h3 className="mt-2 font-semibold leading-tight text-neutral-900 dark:text-neutral-100">
-                Hello, this is the first time you&apos;re using Lume
-              </h3>
-              <p className="text-sm text-neutral-600 dark:text-neutral-500">
-                Lume is downloading all events since the last 24 hours. It will auto
-                refresh when it done, please be patient
-              </p>
-            </div>
-          ) : (
-            <div className="text-center">
-              <h3 className="font-semibold leading-tight text-neutral-500 dark:text-neutral-300">
-                Downloading all events while you&apos;re away...
-              </h3>
-            </div>
-          )}
-          <div className="flex h-1.5 w-full overflow-hidden rounded-full bg-neutral-200 dark:bg-neutral-800">
-            <div
-              className="flex flex-col justify-center overflow-hidden bg-blue-500 transition-all duration-1000 ease-smooth"
-              role="progressbar"
-              style={{ width: `${progress}%` }}
-            />
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}

src/shared/widgets/index.ts

@@ -6,7 +6,6 @@ export * from './local/thread';
 export * from './local/files';
 export * from './local/articles';
 export * from './local/follows';
-export * from './local/notification';
 export * from './global/articles';
 export * from './global/files';
 export * from './global/hashtag';
@@ -16,3 +15,5 @@ export * from './tmp/feeds';
 export * from './tmp/hashtag';
 export * from './other/learnNostr';
 export * from './eventLoader';
+export * from './newsfeed';
+export * from './notification';

src/shared/widgets/local/follows.tsx

@@ -46,8 +46,6 @@ export function LocalFollowsWidget({ params }: { params: Widget }) {
             <NoteWrapper
               key={dbEvent.id + dbEvent.root_id + dbEvent.reply_id}
               event={event}
-              root={dbEvent.root_id}
-              reply={dbEvent.reply_id}
             >
               <MemoizedTextNote />
             </NoteWrapper>

src/shared/widgets/local/network.tsx

@@ -1,184 +0,0 @@
-import { NDKEvent, NDKFilter, NDKKind } from '@nostr-dev-kit/ndk';
-import { useInfiniteQuery } from '@tanstack/react-query';
-import { useCallback, useEffect, useMemo } from 'react';
-import { VList } from 'virtua';
-
-import { useStorage } from '@libs/storage/provider';
-
-import { ArrowRightCircleIcon, ArrowRightIcon, LoaderIcon } from '@shared/icons';
-import {
-  MemoizedArticleNote,
-  MemoizedFileNote,
-  MemoizedRepost,
-  MemoizedTextNote,
-  NoteWrapper,
-  UnknownNote,
-} from '@shared/notes';
-import { NoteSkeleton } from '@shared/notes/skeleton';
-import { TitleBar } from '@shared/titleBar';
-import { EventLoader, WidgetWrapper } from '@shared/widgets';
-
-import { WidgetKinds, useWidgets } from '@stores/widgets';
-
-import { useNostr } from '@utils/hooks/useNostr';
-import { DBEvent } from '@utils/types';
-
-export function LocalNetworkWidget() {
-  const { sub } = useNostr();
-  const { db } = useStorage();
-  const { status, data, hasNextPage, isFetchingNextPage, fetchNextPage } =
-    useInfiniteQuery({
-      queryKey: ['local-network-widget'],
-      initialPageParam: 0,
-      queryFn: async ({ pageParam = 0 }) => {
-        return await db.getAllEvents(20, pageParam);
-      },
-      getNextPageParam: (lastPage) => lastPage.nextCursor,
-    });
-
-  const setWidget = useWidgets((state) => state.setWidget);
-  const isFetched = useWidgets((state) => state.isFetched);
-  const dbEvents = useMemo(
-    () => (data ? data.pages.flatMap((d: { data: DBEvent[] }) => d.data) : []),
-    [data]
-  );
-
-  // render event match event kind
-  const renderItem = useCallback(
-    (dbEvent: DBEvent) => {
-      const event: NDKEvent = JSON.parse(dbEvent.event as string);
-      switch (event.kind) {
-        case NDKKind.Text:
-          return (
-            <NoteWrapper
-              key={dbEvent.id + dbEvent.root_id + dbEvent.reply_id}
-              event={event}
-              root={dbEvent.root_id}
-              reply={dbEvent.reply_id}
-            >
-              <MemoizedTextNote />
-            </NoteWrapper>
-          );
-        case NDKKind.Repost:
-          return <MemoizedRepost key={dbEvent.id} event={event} />;
-        case 1063:
-          return (
-            <NoteWrapper key={dbEvent.id} event={event}>
-              <MemoizedFileNote />
-            </NoteWrapper>
-          );
-        case NDKKind.Article:
-          return (
-            <NoteWrapper key={dbEvent.id} event={event}>
-              <MemoizedArticleNote />
-            </NoteWrapper>
-          );
-        default:
-          return (
-            <NoteWrapper key={dbEvent.id} event={event}>
-              <UnknownNote />
-            </NoteWrapper>
-          );
-      }
-    },
-    [dbEvents]
-  );
-
-  const openTrendingWidgets = async () => {
-    setWidget(db, {
-      kind: WidgetKinds.nostrBand.trendingAccounts,
-      title: 'Trending Accounts',
-      content: '',
-    });
-  };
-
-  // subscribe for new event
-  // sub will be managed by lru-cache
-  useEffect(() => {
-    if (db.account && db.account.circles.length > 0 && dbEvents.length > 0) {
-      const filter: NDKFilter = {
-        kinds: [NDKKind.Text, NDKKind.Repost],
-        authors: db.account.circles,
-        since: Math.floor(Date.now() / 1000),
-      };
-
-      sub(filter, async (event) => {
-        await db.createEvent(event);
-      });
-    }
-  }, [data]);
-
-  if (db.account.circles.length < 1) {
-    return (
-      <WidgetWrapper>
-        <div className="flex h-full w-full items-center justify-center">
-          <div className="px-8 text-center">
-            <p className="mb-2 text-3xl">👋</p>
-            <h1 className="text-lg font-semibold">You have not follow anyone yet</h1>
-            <h5 className="text-sm text-neutral-600 dark:text-neutral-400">
-              If you are new to Nostr, you can click button below to open trending users
-              and start follow some of theme
-            </h5>
-            <button
-              type="button"
-              onClick={() => openTrendingWidgets()}
-              className="mt-4 inline-flex h-9 w-max items-center justify-center gap-2 rounded-lg bg-blue-500 px-3 font-semibold text-white hover:bg-blue-600"
-            >
-              Open trending
-              <ArrowRightIcon className="h-4 w-4" />
-            </button>
-          </div>
-        </div>
-      </WidgetWrapper>
-    );
-  }
-
-  return (
-    <WidgetWrapper>
-      <TitleBar id="9999" />
-      <div className="flex-1">
-        {status === 'pending' ? (
-          <div className="px-3 py-1.5">
-            <div className="rounded-xl bg-neutral-100 px-3 py-3 dark:bg-neutral-900">
-              <NoteSkeleton />
-            </div>
-          </div>
-        ) : dbEvents.length === 0 ? (
-          <EventLoader firstTime={true} />
-        ) : (
-          <VList className="h-full" style={{ contentVisibility: 'auto' }}>
-            {!isFetched ? <EventLoader firstTime={false} /> : null}
-            {dbEvents.map((item) => renderItem(item))}
-            <div className="flex items-center justify-center px-3 py-1.5">
-              {dbEvents.length > 0 ? (
-                <button
-                  onClick={() => fetchNextPage()}
-                  disabled={!hasNextPage || isFetchingNextPage}
-                  className="inline-flex h-10 w-max items-center justify-center gap-2 rounded-full bg-blue-500 px-6 font-medium text-white hover:bg-blue-600 focus:outline-none"
-                >
-                  {isFetchingNextPage ? (
-                    <>
-                      <span>Loading...</span>
-                      <LoaderIcon className="h-5 w-5 animate-spin" />
-                    </>
-                  ) : hasNextPage ? (
-                    <>
-                      <ArrowRightCircleIcon className="h-5 w-5" />
-                      <span>Load more</span>
-                    </>
-                  ) : (
-                    <>
-                      <ArrowRightCircleIcon className="h-5 w-5" />
-                      <span>Nothing more to load</span>
-                    </>
-                  )}
-                </button>
-              ) : null}
-            </div>
-            <div className="h-14" />
-          </VList>
-        )}
-      </div>
-    </WidgetWrapper>
-  );
-}

src/shared/widgets/newsfeed.tsx

@@ -0,0 +1,187 @@
+import { NDKEvent, NDKFilter, NDKKind } from '@nostr-dev-kit/ndk';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useCallback, useEffect } from 'react';
+import { VList } from 'virtua';
+
+import { useNDK } from '@libs/ndk/provider';
+import { useStorage } from '@libs/storage/provider';
+
+import { ArrowRightCircleIcon, LoaderIcon } from '@shared/icons';
+import {
+  MemoizedArticleNote,
+  MemoizedFileNote,
+  MemoizedRepost,
+  MemoizedTextNote,
+  NoteSkeleton,
+  NoteWrapper,
+  UnknownNote,
+} from '@shared/notes';
+import { TitleBar } from '@shared/titleBar';
+import { WidgetWrapper } from '@shared/widgets';
+
+import { nHoursAgo } from '@utils/date';
+import { useNostr } from '@utils/hooks/useNostr';
+
+export function NewsfeedWidget() {
+  const { db } = useStorage();
+  const { sub } = useNostr();
+  const { relayUrls, ndk, fetcher } = useNDK();
+  const { status, data } = useQuery({
+    queryKey: ['newsfeed'],
+    queryFn: async ({ signal }: { signal: AbortSignal }) => {
+      const rootIds = new Set();
+      const dedupQueue = new Set();
+
+      const events = await fetcher.fetchAllEvents(
+        relayUrls,
+        {
+          kinds: [NDKKind.Text, NDKKind.Repost, 1063, NDKKind.Article],
+          authors: db.account.circles,
+        },
+        {
+          since: db.account.last_login_at === 0 ? nHoursAgo(4) : db.account.last_login_at,
+        },
+        { abortSignal: signal }
+      );
+
+      const ndkEvents = events.map((event) => {
+        return new NDKEvent(ndk, event);
+      });
+
+      ndkEvents.forEach((event) => {
+        const tags = event.tags.filter((el) => el[0] === 'e');
+        if (tags && tags.length > 0) {
+          const rootId = tags.filter((el) => el[3] === 'root')[1] ?? tags[0][1];
+          if (rootIds.has(rootId)) return dedupQueue.add(event.id);
+          rootIds.add(rootId);
+        }
+      });
+
+      return ndkEvents
+        .filter((event) => !dedupQueue.has(event.id))
+        .sort((a, b) => b.created_at - a.created_at);
+    },
+  });
+
+  const queryClient = useQueryClient();
+  const mutation = useMutation({
+    mutationFn: async () => {
+      const currentLastEvent = data.at(-1);
+      const lastCreatedAt = currentLastEvent.created_at - 1;
+
+      const rootIds = new Set();
+      const dedupQueue = new Set();
+
+      const events = await fetcher.fetchLatestEvents(
+        relayUrls,
+        {
+          kinds: [NDKKind.Text, NDKKind.Repost, 1063, NDKKind.Article],
+          authors: db.account.circles,
+        },
+        100,
+        {
+          asOf: lastCreatedAt,
+        }
+      );
+
+      const ndkEvents = events.map((event) => {
+        return new NDKEvent(ndk, event);
+      });
+
+      ndkEvents.forEach((event) => {
+        const tags = event.tags.filter((el) => el[0] === 'e');
+        if (tags && tags.length > 0) {
+          const rootId = tags.filter((el) => el[3] === 'root')[1] ?? tags[0][1];
+          if (rootIds.has(rootId)) return dedupQueue.add(event.id);
+          rootIds.add(rootId);
+        }
+      });
+
+      return ndkEvents
+        .filter((event) => !dedupQueue.has(event.id))
+        .sort((a, b) => b.created_at - a.created_at);
+    },
+    onSuccess: async (data) => {
+      queryClient.setQueryData(['newsfeed'], (old: NDKEvent[]) => [...old, ...data]);
+    },
+  });
+
+  const renderItem = useCallback((event: NDKEvent) => {
+    switch (event.kind) {
+      case NDKKind.Text:
+        return (
+          <NoteWrapper key={event.id} event={event}>
+            <MemoizedTextNote />
+          </NoteWrapper>
+        );
+      case NDKKind.Repost:
+        return <MemoizedRepost key={event.id} event={event} />;
+      case 1063:
+        return (
+          <NoteWrapper key={event.id} event={event}>
+            <MemoizedFileNote />
+          </NoteWrapper>
+        );
+      case NDKKind.Article:
+        return (
+          <NoteWrapper key={event.id} event={event}>
+            <MemoizedArticleNote />
+          </NoteWrapper>
+        );
+      default:
+        return (
+          <NoteWrapper key={event.id} event={event}>
+            <UnknownNote />
+          </NoteWrapper>
+        );
+    }
+  }, []);
+
+  useEffect(() => {
+    if (db.account && db.account.circles.length > 0) {
+      const filter: NDKFilter = {
+        kinds: [NDKKind.Text, NDKKind.Repost],
+        authors: db.account.circles,
+        since: Math.floor(Date.now() / 1000),
+      };
+
+      sub(filter, async (event) => {
+        queryClient.setQueryData(['newsfeed'], (old: NDKEvent[]) => [event, ...old]);
+      });
+    }
+  }, []);
+
+  return (
+    <WidgetWrapper>
+      <TitleBar id="9999" />
+      <VList className="flex-1">
+        {status === 'pending' ? (
+          <div>
+            <div className="px-3 py-1.5">
+              <div className="rounded-xl bg-neutral-100 px-3 py-3 dark:bg-neutral-900">
+                <NoteSkeleton />
+              </div>
+            </div>
+            <div className="flex h-11 items-center justify-center">
+              <LoaderIcon className="h-4 w-4 animate-spin" />
+            </div>
+          </div>
+        ) : (
+          data.map((item) => renderItem(item))
+        )}
+        <div className="flex h-16 items-center justify-center px-3 pb-3">
+          {data ? (
+            <button
+              type="button"
+              onClick={() => mutation.mutate()}
+              className="inline-flex h-10 w-max items-center justify-center gap-2 rounded-full bg-blue-500 px-6 font-medium text-white hover:bg-blue-600 focus:outline-none"
+            >
+              <ArrowRightCircleIcon className="h-5 w-5" />
+              Load more
+            </button>
+          ) : null}
+        </div>
+      </VList>
+    </WidgetWrapper>
+  );
+}

src/shared/widgets/notification.tsx

@@ -10,7 +10,6 @@ import { TitleBar } from '@shared/titleBar';
 import { WidgetWrapper } from '@shared/widgets';
 
 import { useActivities } from '@stores/activities';
-import { useWidgets } from '@stores/widgets';
 
 import { useNostr } from '@utils/hooks/useNostr';
 import { Widget } from '@utils/types';
@@ -24,8 +23,6 @@ export function LocalNotificationWidget({ params }: { params: Widget }) {
     state.setActivities,
   ]);
 
-  const isFetched = useWidgets((state) => state.isFetched);
-
   const renderEvent = useCallback(
     (event: NDKEvent) => {
       if (event.pubkey === db.account.pubkey) return null;
@@ -40,8 +37,8 @@ export function LocalNotificationWidget({ params }: { params: Widget }) {
       setActivities(events);
     }
 
-    if (isFetched) getActivities();
-  }, [isFetched]);
+    getActivities();
+  }, []);
 
   return (
     <WidgetWrapper>