useSubscribe initial state, faster feeds

irislib · Aug 23, 2023 · 0aab992 · 0aab992
1 parent 602587d
commit 0aab992
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/js/nostr/hooks/useSubscribe.ts b/src/js/nostr/hooks/useSubscribe.ts
@@ -32,18 +32,22 @@ const useSubscribe = (ops: SubscribeOptions) => {
     mergeSubscriptions = defaultOps.mergeSubscriptions,
   } = ops;
 
-  const [events, setEvents] = useState<Event[]>([]);
-  const lastUntilRef = useRef<number | null>(null);
-
-  const updateEvents = useCallback(() => {
+  const getEvents = useCallback(() => {
     // maybe we should still add filter by displaycount?
     let e = EventDB.findArray({ ...filter, limit: undefined });
     if (filterFn) {
       e = e.filter(filterFn);
     }
-    setEvents(e);
+    return e;
   }, [filter, filterFn]);
 
+  const [events, setEvents] = useState<Event[]>(getEvents());
+  const lastUntilRef = useRef<number | null>(null);
+
+  const updateEvents = useCallback(() => {
+    setEvents(getEvents());
+  }, [getEvents]);
+
   useEffect(() => {
     setEvents([]);
     if (!enabled || !filter) return;