+
+
+ Preserve your freedom
-
+
);
}
diff --git a/src/app/prefetch/pages/index.page.tsx b/src/app/prefetch/pages/index.page.tsx
index 8ab070e2..61055580 100644
--- a/src/app/prefetch/pages/index.page.tsx
+++ b/src/app/prefetch/pages/index.page.tsx
@@ -15,19 +15,11 @@ import useSWRSubscription from "swr/subscription";
import { navigate } from "vite-plugin-ssr/client/router";
let totalNotes: number;
+
if (typeof window !== "undefined") {
totalNotes = await countTotalNotes();
}
-function isJSON(str: string) {
- try {
- JSON.parse(str);
- } catch (e) {
- return false;
- }
- return true;
-}
-
export function Page() {
const pool: any = useContext(RelayContext);
const [account, lastLogin] = useActiveAccount((state: any) => [
@@ -92,7 +84,7 @@ export function Page() {
}, [account]);
useSWRSubscription(account ? "prefetch" : null, () => {
- console.log("data prefetching... ", account.pubkey);
+ let timeout: string | number | NodeJS.Timeout;
const query = getQuery();
const unsubscribe = pool.subscribe(
query,
@@ -178,22 +170,18 @@ export function Page() {
);
break;
// long post
- case 30023: {
- const verifyMetadata = isJSON(event.tags);
- if (verifyMetadata) {
- createNote(
- event.id,
- account.id,
- event.pubkey,
- event.kind,
- event.tags,
- event.content,
- event.created_at,
- "",
- );
- }
+ case 30023:
+ createNote(
+ event.id,
+ account.id,
+ event.pubkey,
+ event.kind,
+ event.tags,
+ event.content,
+ event.created_at,
+ event.id,
+ );
break;
- }
default:
break;
}
@@ -202,7 +190,7 @@ export function Page() {
() => {
eose.current += 1;
if (eose.current === READONLY_RELAYS.length) {
- setTimeout(
+ timeout = setTimeout(
() => navigate("/app/space", { overwriteLastHistoryEntry: true }),
2000,
);
@@ -212,6 +200,7 @@ export function Page() {
return () => {
unsubscribe();
+ clearTimeout(timeout);
};
});
diff --git a/src/app/threads/pages/index.page.tsx b/src/app/threads/pages/index.page.tsx
index 05028553..dd8e3d99 100644
--- a/src/app/threads/pages/index.page.tsx
+++ b/src/app/threads/pages/index.page.tsx
@@ -1,13 +1,15 @@
import { NoteSkeleton } from "@app/note/components/skeleton";
import { ThreadBase } from "@app/threads/components/base";
-import { useInfiniteQuery } from "@tanstack/react-query";
import { useVirtualizer } from "@tanstack/react-virtual";
import { getLongNotes } from "@utils/storage";
-import { useEffect, useRef } from "react";
+import { useEffect, useMemo, useRef } from "react";
+import useSWRInfinite from "swr/infinite";
const ITEM_PER_PAGE = 10;
const TIME = Math.floor(Date.now() / 1000);
+const fetcher = async ([, offset]) => getLongNotes(TIME, ITEM_PER_PAGE, offset);
+
function isJSON(str: string) {
try {
JSON.parse(str);
@@ -18,32 +20,26 @@ function isJSON(str: string) {
}
export function Page() {
- const {
- status,
- error,
- data,
- fetchNextPage,
- hasNextPage,
- isFetching,
- isFetchingNextPage,
- }: any = useInfiniteQuery({
- queryKey: ["threads"],
- queryFn: async ({ pageParam = 0 }) => {
- return await getLongNotes(TIME, ITEM_PER_PAGE, pageParam);
- },
- getNextPageParam: (lastPage) => lastPage.nextCursor,
- });
+ const getKey = (pageIndex, previousPageData) => {
+ if (previousPageData && !previousPageData.data) return null;
+ if (pageIndex === 0) return ["following", 0];
+ return ["following", previousPageData.nextCursor];
+ };
+
+ const { data, isLoading, size, setSize } = useSWRInfinite(getKey, fetcher);
+
+ const notes = useMemo(
+ () => (data ? data.flatMap((d) => d.data) : []),
+ [data],
+ );
- const allRows = data ? data.pages.flatMap((d: { data: any }) => d.data) : [];
const parentRef = useRef();
-
const rowVirtualizer = useVirtualizer({
- count: hasNextPage ? allRows.length + 1 : allRows.length,
+ count: notes.length,
getScrollElement: () => parentRef.current,
- estimateSize: () => 500,
+ estimateSize: () => 400,
overscan: 2,
});
-
const itemsVirtualizer = rowVirtualizer.getVirtualItems();
useEffect(() => {
@@ -53,14 +49,10 @@ export function Page() {
return;
}
- if (
- lastItem.index >= allRows.length - 1 &&
- hasNextPage &&
- !isFetchingNextPage
- ) {
- fetchNextPage();
+ if (lastItem.index >= notes.length - 1) {
+ setSize(size + 1);
}
- }, [fetchNextPage, allRows.length, rowVirtualizer.getVirtualItems()]);
+ }, [notes.length, rowVirtualizer.getVirtualItems()]);
return (
- {status === "loading" ? (
+ {!data || isLoading ? (
- ) : status === "error" ? (
-
{error.message}
) : (
{rowVirtualizer.getVirtualItems().map((virtualRow) => {
- const note = allRows[virtualRow.index];
+ const note = notes[virtualRow.index];
if (note && isJSON(note.tags)) {
return (
)}
-
- {isFetching && !isFetchingNextPage ? (
-
- ) : null}
-
);
}