refactor: simplify feed fetchFn params (#2068)

Author: aeharding

src/features/feed/Feed.tsx

@@ -32,12 +32,8 @@ import { useRangeChange } from "./useRangeChange";
 
 const ABORT_REASON_UNMOUNT = "unmount";
 
-interface PageData {
-  page_cursor?: PageCursor;
-}
-
 export type FetchFn<I> = (
-  pageData: PageData,
+  page_cursor: PageCursor | undefined,
   options?: Pick<RequestInit, "signal">,
 ) => Promise<FetchFnResult<I>>;
 
@@ -176,12 +172,9 @@ export default function Feed<I>({
       abortControllerRef.current = abortController;
 
       try {
-        result = await fetchFn(
-          { page_cursor: currentCursor },
-          {
-            signal: abortController.signal,
-          },
-        );
+        result = await fetchFn(currentCursor, {
+          signal: abortController.signal,
+        });
       } catch (error) {
         // Aborted requests are expected. Silently return to avoid spamming console with DOM errors
         // Also don't set loading to false, component will unmount (or shortly rerender)

src/features/feed/sort/durations.ts

@@ -49,5 +49,7 @@ export function convertDurationToSeconds(duration: VgerDuration) {
       return 2147483647;
     case "All":
       return undefined;
+    default:
+      duration satisfies never; // type exhaustiveness check
   }
 }

src/features/settings/tags/browse/BrowseTags.tsx

@@ -18,11 +18,10 @@ export default function BrowseTags({ filter }: BrowseTagsProps) {
     {},
   );
 
-  const fetchFn: FetchFn<UserTagType> = async (pageData) => {
-    if (typeof pageData.page_cursor === "string")
-      throw new Error("Invalid page data");
+  const fetchFn: FetchFn<UserTagType> = async (cursor) => {
+    if (typeof cursor === "string") throw new Error("Invalid page data");
 
-    const page = pageData.page_cursor ?? 0;
+    const page = cursor ?? 1;
 
     const data = await db.getUserTagsPaginated(
       page,
@@ -31,7 +30,7 @@ export default function BrowseTags({ filter }: BrowseTagsProps) {
     );
 
     // Reset removed state on refresh
-    if (!pageData.page_cursor) setRemovedByHandle({});
+    if (!cursor) setRemovedByHandle({});
 
     return { data, next_page: page + 1 };
   };

src/features/user/Profile.tsx

@@ -49,10 +49,10 @@ export default function Profile({ person, onPull }: ProfileProps) {
 
   const isSelf = getRemoteHandle(person.person) === myHandle;
 
-  const fetchFn: FetchFn<PostCommentItem> = async (pageData, ...rest) => {
+  const fetchFn: FetchFn<PostCommentItem> = async (page_cursor, ...rest) => {
     const response = await client.listPersonContent(
       {
-        ...pageData,
+        page_cursor,
         limit: LIMIT,
         person_id: person.person.id,
       },

src/routes/pages/inbox/InboxPage.tsx

@@ -28,13 +28,13 @@ export default function InboxPage({ showRead }: InboxPageProps) {
   );
   const totalUnread = useAppSelector(totalUnreadSelector);
 
-  const fetchFn: FetchFn<InboxItemView> = async (pageData, ...rest) => {
+  const fetchFn: FetchFn<InboxItemView> = async (page_cursor, ...rest) => {
     if (!myUserId) throw new Error("Logged out");
 
     const response = await client.getNotifications(
       {
         limit: 50,
-        ...pageData,
+        page_cursor,
         unread_only: !showRead,
       },
       ...rest,

src/routes/pages/inbox/MentionsPage.tsx

@@ -17,10 +17,10 @@ export default function MentionsPage() {
   const dispatch = useAppDispatch();
   const client = useClient();
 
-  const fetchFn: FetchFn<PersonMentionView> = async (pageData, ...rest) => {
+  const fetchFn: FetchFn<PersonMentionView> = async (page_cursor, ...rest) => {
     const response = await client.getPersonMentions(
       {
-        ...pageData,
+        page_cursor,
         limit: LIMIT,
         unread_only: false,
       },

src/routes/pages/inbox/RepliesPage.tsx

@@ -20,12 +20,12 @@ export default function RepliesPage({ type }: RepliesPageProps) {
   const dispatch = useAppDispatch();
   const client = useClient();
 
-  const fetchFn: FetchFn<CommentReplyView> = async (pageData, ...rest) => {
+  const fetchFn: FetchFn<CommentReplyView> = async (page_cursor, ...rest) => {
     // TODO - actually paginate properly if Lemmy implements
     // reply pagination filtering by comment and post
     const response = await client.getReplies(
       {
-        ...pageData,
+        page_cursor,
         limit: 50,
         unread_only: false,
       },

src/routes/pages/profile/ProfileFeedCommentsPage.tsx

@@ -27,14 +27,14 @@ export default function ProfileFeedCommentsPage() {
   );
   const sortParams = useFeedSortParams("search", sort);
 
-  const fetchFn: FetchFn<PostCommentItem> = async (pageData, ...rest) => {
+  const fetchFn: FetchFn<PostCommentItem> = async (page_cursor, ...rest) => {
     if (sortParams === undefined) throw new AbortLoadError();
 
     const person = await dispatch(getUserIfNeeded(handle));
 
     return client.listPersonContent(
       {
-        ...pageData,
+        page_cursor,
         type: "Comments",
         limit: LIMIT,
         person_id: person.id,

src/routes/pages/profile/ProfileFeedHiddenPostsPage.tsx

@@ -43,11 +43,11 @@ export default function ProfileFeedHiddenPostsPage() {
   const lastPageNumberRef = useRef(1);
   const lastPageItemsRef = useRef<IPostMetadata[]>([]);
 
-  const fetchFn: FetchFn<PostCommentItem> = async (pageData, ...rest) => {
+  const fetchFn: FetchFn<PostCommentItem> = async (page_cursor, ...rest) => {
     postHiddenById; // eslint-disable-line @typescript-eslint/no-unused-expressions -- Trigger rerender when this changes
 
     if (!handle) return { data: [] };
-    const page = pageData.page_cursor ?? 1;
+    const page = page_cursor ?? 1;
     if (typeof page === "string") return { data: [] };
 
     const hiddenPostMetadatas = await db.getHiddenPostMetadatasPaginated(

src/routes/pages/profile/ProfileFeedPostsPage.tsx

@@ -27,14 +27,14 @@ export default function ProfileFeedPostsPage() {
   );
   const sortParams = useFeedSortParams("search", sort ?? "New");
 
-  const fetchFn: FetchFn<PostCommentItem> = async (pageData, ...rest) => {
+  const fetchFn: FetchFn<PostCommentItem> = async (page_cursor, ...rest) => {
     if (sortParams === undefined) throw new AbortLoadError();
 
     const person = await dispatch(getUserIfNeeded(handle));
 
     return client.listPersonContent(
       {
-        ...pageData,
+        page_cursor,
         type: "Posts",
         limit: LIMIT,
         person_id: person.id,