Revert unneeded changes

oxlint-suppressions.json

@@ -1584,5 +1584,16 @@
     "typescript/no-unsafe-member-access": {
       "count": 3
     }
+  },
+  "webpack.config.js": {
+    "import/no-nodejs-modules": {
+      "count": 1
+    },
+    "typescript/no-unsafe-call": {
+      "count": 12
+    },
+    "typescript/no-unsafe-member-access": {
+      "count": 33
+    }
   }
 }

src/state/queries/activity-subscriptions.ts

@@ -9,7 +9,6 @@ import {
 } from '@tanstack/react-query'
 
 import {isRecordNotFoundError} from '#/lib/xrpc-error'
-import {useAutoPagination} from '#/state/queries/util'
 import {useAppviewClient, usePdsClient, useSession} from '#/state/session'
 import * as Toast from '#/components/Toast'
 import {app} from '#/lexicons'
@@ -20,7 +19,7 @@ export const RQKEY_getNotificationDeclaration = ['notification-declaration']
 export function useActivitySubscriptionsQuery() {
   const client = useAppviewClient()
 
-  const query = useInfiniteQuery({
+  return useInfiniteQuery({
     queryKey: RQKEY_getActivitySubscriptions,
     queryFn: async ({pageParam}) => {
       return await client.call(
@@ -31,13 +30,6 @@ export function useActivitySubscriptionsQuery() {
     initialPageParam: undefined as string | undefined,
     getNextPageParam: prev => prev.cursor,
   })
-  const itemCount =
-    query.data?.pages.reduce(
-      (count, page) => count + page.subscriptions.length,
-      0,
-    ) ?? 0
-  useAutoPagination(query, itemCount, 50)
-  return query
 }
 
 export function useNotificationDeclarationQuery() {

src/state/queries/actor-search.ts

@@ -7,7 +7,6 @@ import {
 } from '@tanstack/react-query'
 
 import {STALE} from '#/state/queries'
-import {useAutoPagination} from '#/state/queries/util'
 import {useAppviewClient} from '#/state/session'
 import {app} from '#/lexicons'
 
@@ -30,7 +29,7 @@ export function useActorSearch({
   limit?: number
 }) {
   const client = useAppviewClient()
-  const result = useInfiniteQuery<
+  return useInfiniteQuery<
     app.bsky.actor.searchActors.$OutputBody,
     Error,
     InfiniteData<app.bsky.actor.searchActors.$OutputBody>,
@@ -52,11 +51,6 @@ export function useActorSearch({
     placeholderData: maintainData ? keepPreviousData : undefined,
     select,
   })
-  const itemCount =
-    result.data?.pages.reduce((count, page) => count + page.actors.length, 0) ??
-    0
-  useAutoPagination(result, itemCount, limit)
-  return result
 }
 
 function select(data: InfiniteData<app.bsky.actor.searchActors.$OutputBody>) {

src/state/queries/actor-starter-packs.ts

@@ -1,12 +1,9 @@
 import {type DidString} from '@atproto/syntax'
 import {type QueryClient, useInfiniteQuery} from '@tanstack/react-query'
 
-import {useAutoPagination} from '#/state/queries/util'
 import {useAppviewClient} from '#/state/session'
 import {app} from '#/lexicons'
 
-const PAGE_SIZE = 10
-
 export const RQKEY_ROOT = 'actor-starter-packs'
 export const RQKEY_WITH_MEMBERSHIP_ROOT = 'actor-starter-packs-with-membership'
 export const RQKEY = (did?: string) => [RQKEY_ROOT, did]
@@ -24,13 +21,13 @@ export function useActorStarterPacksQuery({
 }) {
   const client = useAppviewClient()
 
-  const query = useInfiniteQuery({
+  return useInfiniteQuery({
     queryKey: RQKEY(did),
     queryFn: async ({pageParam}: {pageParam?: string}) => {
       return await client.call(app.bsky.graph.getActorStarterPacks, {
         // the enabled flag prevents this from running until did is set
         actor: did! as DidString,
-        limit: PAGE_SIZE,
+        limit: 10,
         cursor: pageParam,
       })
     },
@@ -38,13 +35,6 @@ export function useActorStarterPacksQuery({
     initialPageParam: undefined,
     getNextPageParam: lastPage => lastPage.cursor,
   })
-  const itemCount =
-    query.data?.pages.reduce(
-      (count, page) => count + page.starterPacks.length,
-      0,
-    ) ?? 0
-  useAutoPagination(query, itemCount, PAGE_SIZE)
-  return query
 }
 
 export function useActorStarterPacksWithMembershipsQuery({
@@ -56,13 +46,13 @@ export function useActorStarterPacksWithMembershipsQuery({
 }) {
   const client = useAppviewClient()
 
-  const query = useInfiniteQuery({
+  return useInfiniteQuery({
     queryKey: RQKEY_WITH_MEMBERSHIP(did),
     queryFn: async ({pageParam}: {pageParam?: string}) => {
       return await client.call(app.bsky.graph.getStarterPacksWithMembership, {
         // the enabled flag prevents this from running until did is set
         actor: did! as DidString,
-        limit: PAGE_SIZE,
+        limit: 10,
         cursor: pageParam,
       })
     },
@@ -70,13 +60,6 @@ export function useActorStarterPacksWithMembershipsQuery({
     initialPageParam: undefined,
     getNextPageParam: lastPage => lastPage.cursor,
   })
-  const itemCount =
-    query.data?.pages.reduce(
-      (count, page) => count + page.starterPacksWithMembership.length,
-      0,
-    ) ?? 0
-  useAutoPagination(query, itemCount, PAGE_SIZE)
-  return query
 }
 
 export async function invalidateActorStarterPacksQuery({

src/state/queries/bookmarks/useBookmarksQuery.ts

@@ -11,7 +11,6 @@ import {
   didOrHandleUriMatches,
   embedViewRecordToPostView,
   getEmbeddedPost,
-  useAutoPagination,
 } from '#/state/queries/util'
 import {useAppviewClient} from '#/state/session'
 import {app} from '#/lexicons'
@@ -23,7 +22,7 @@ export const createBookmarksQueryKey = () => [bookmarksQueryKeyRoot]
 export function useBookmarksQuery() {
   const client = useAppviewClient()
 
-  const query = useInfiniteQuery<
+  return useInfiniteQuery<
     app.bsky.bookmark.getBookmarks.$OutputBody,
     Error,
     InfiniteData<app.bsky.bookmark.getBookmarks.$OutputBody>,
@@ -39,13 +38,6 @@ export function useBookmarksQuery() {
     initialPageParam: undefined,
     getNextPageParam: lastPage => lastPage.cursor,
   })
-  const itemCount =
-    query.data?.pages.reduce(
-      (count, page) => count + page.bookmarks.length,
-      0,
-    ) ?? 0
-  useAutoPagination(query, itemCount, 50)
-  return query
 }
 
 export async function truncateAndInvalidate(qc: QueryClient) {

src/state/queries/find-contacts.ts

@@ -5,7 +5,6 @@ import {
   useQuery,
 } from '@tanstack/react-query'
 
-import {useAutoPagination} from '#/state/queries/util'
 import {useAppviewClient} from '#/state/session'
 import {type Match} from '#/components/contacts/state'
 import {app} from '#/lexicons'
@@ -32,7 +31,7 @@ export const findContactsGetMatchesQueryKey = [RQ_KEY_ROOT, 'matches']
 export function useContactsMatchesQuery() {
   const client = useAppviewClient()
 
-  const query = useInfiniteQuery({
+  return useInfiniteQuery({
     queryKey: findContactsGetMatchesQueryKey,
     queryFn: async ({pageParam}) => {
       return await client.call(app.bsky.contact.getMatches, {
@@ -43,11 +42,6 @@ export function useContactsMatchesQuery() {
     getNextPageParam: lastPage => lastPage.cursor,
     staleTime: STALE.MINUTES.ONE,
   })
-  const itemCount =
-    query.data?.pages.reduce((count, page) => count + page.matches.length, 0) ??
-    0
-  useAutoPagination(query, itemCount, 50)
-  return query
 }
 
 export function optimisticRemoveMatch(queryClient: QueryClient, did: string) {

src/state/queries/list-members.ts

@@ -9,7 +9,6 @@ import {
 } from '@tanstack/react-query'
 
 import {STALE} from '#/state/queries'
-import {useAutoPagination} from '#/state/queries/util'
 import {useAppviewClient} from '#/state/session'
 import {app} from '#/lexicons'
 
@@ -23,7 +22,7 @@ export const RQKEY_ALL = (uri: string) => [RQKEY_ROOT_ALL, uri]
 
 export function useListMembersQuery(uri?: string, limit: number = PAGE_SIZE) {
   const client = useAppviewClient()
-  const query = useInfiniteQuery<
+  return useInfiniteQuery<
     app.bsky.graph.getList.$OutputBody,
     Error,
     InfiniteData<app.bsky.graph.getList.$OutputBody>,
@@ -44,10 +43,6 @@ export function useListMembersQuery(uri?: string, limit: number = PAGE_SIZE) {
     getNextPageParam: lastPage => lastPage.cursor,
     enabled: Boolean(uri),
   })
-  const itemCount =
-    query.data?.pages.reduce((count, page) => count + page.items.length, 0) ?? 0
-  useAutoPagination(query, itemCount, limit)
-  return query
 }
 
 export function useAllListMembersQuery(uri?: string) {

src/state/queries/lists-with-membership.ts

@@ -6,7 +6,7 @@ import {
   useInfiniteQuery,
 } from '@tanstack/react-query'
 
-import {createQueryKey, useAutoPagination} from '#/state/queries/util'
+import {createQueryKey} from '#/state/queries/util'
 import {useAppviewClient} from '#/state/session'
 import {app} from '#/lexicons'
 
@@ -26,7 +26,7 @@ export function useListsWithMembershipQuery({
 }) {
   const client = useAppviewClient()
 
-  const query = useInfiniteQuery<
+  return useInfiniteQuery<
     app.bsky.graph.getListsWithMembership.$OutputBody,
     Error,
     InfiniteData<app.bsky.graph.getListsWithMembership.$OutputBody>,
@@ -46,13 +46,6 @@ export function useListsWithMembershipQuery({
     initialPageParam: undefined,
     getNextPageParam: lastPage => lastPage.cursor,
   })
-  const itemCount =
-    query.data?.pages.reduce(
-      (count, page) => count + page.listsWithMembership.length,
-      0,
-    ) ?? 0
-  useAutoPagination(query, itemCount, 50)
-  return query
 }
 
 export function updateListMembershipOptimistically({

src/state/queries/my-blocked-accounts.ts

@@ -7,16 +7,14 @@ import {
 
 import {useAppviewClient} from '#/state/session'
 import {app} from '#/lexicons'
-import {useAutoPagination} from './util'
 
 const RQKEY_ROOT = 'my-blocked-accounts'
-const PAGE_SIZE = 30
 export const RQKEY = () => [RQKEY_ROOT]
 type RQPageParam = string | undefined
 
 export function useMyBlockedAccountsQuery() {
   const client = useAppviewClient()
-  const query = useInfiniteQuery<
+  return useInfiniteQuery<
     app.bsky.graph.getBlocks.$OutputBody,
     Error,
     InfiniteData<app.bsky.graph.getBlocks.$OutputBody>,
@@ -26,18 +24,13 @@ export function useMyBlockedAccountsQuery() {
     queryKey: RQKEY(),
     async queryFn({pageParam}: {pageParam: RQPageParam}) {
       return await client.call(app.bsky.graph.getBlocks, {
-        limit: PAGE_SIZE,
+        limit: 30,
         cursor: pageParam,
       })
     },
     initialPageParam: undefined,
     getNextPageParam: lastPage => lastPage.cursor,
   })
-  const itemCount =
-    query.data?.pages.reduce((count, page) => count + page.blocks.length, 0) ??
-    0
-  useAutoPagination(query, itemCount, PAGE_SIZE)
-  return query
 }
 
 export function* findAllProfilesInQueryData(

src/state/queries/my-muted-accounts.ts

@@ -7,16 +7,14 @@ import {
 
 import {useAppviewClient} from '#/state/session'
 import {app} from '#/lexicons'
-import {useAutoPagination} from './util'
 
 const RQKEY_ROOT = 'my-muted-accounts'
-const PAGE_SIZE = 30
 export const RQKEY = () => [RQKEY_ROOT]
 type RQPageParam = string | undefined
 
 export function useMyMutedAccountsQuery() {
   const client = useAppviewClient()
-  const query = useInfiniteQuery<
+  return useInfiniteQuery<
     app.bsky.graph.getMutes.$OutputBody,
     Error,
     InfiniteData<app.bsky.graph.getMutes.$OutputBody>,
@@ -26,17 +24,13 @@ export function useMyMutedAccountsQuery() {
     queryKey: RQKEY(),
     async queryFn({pageParam}: {pageParam: RQPageParam}) {
       return await client.call(app.bsky.graph.getMutes, {
-        limit: PAGE_SIZE,
+        limit: 30,
         cursor: pageParam,
       })
     },
     initialPageParam: undefined,
     getNextPageParam: lastPage => lastPage.cursor,
   })
-  const itemCount =
-    query.data?.pages.reduce((count, page) => count + page.mutes.length, 0) ?? 0
-  useAutoPagination(query, itemCount, PAGE_SIZE)
-  return query
 }
 
 export function* findAllProfilesInQueryData(

src/state/queries/post-liked-by.ts

@@ -6,7 +6,6 @@ import {
   useInfiniteQuery,
 } from '@tanstack/react-query'
 
-import {useAutoPagination} from '#/state/queries/util'
 import {useAppviewClient} from '#/state/session'
 import {app} from '#/lexicons'
 
@@ -19,7 +18,7 @@ export const RQKEY = (resolvedUri: string) => [RQKEY_ROOT, resolvedUri]
 
 export function useLikedByQuery(resolvedUri: string | undefined) {
   const client = useAppviewClient()
-  const query = useInfiniteQuery<
+  return useInfiniteQuery<
     app.bsky.feed.getLikes.$OutputBody,
     Error,
     InfiniteData<app.bsky.feed.getLikes.$OutputBody>,
@@ -39,10 +38,6 @@ export function useLikedByQuery(resolvedUri: string | undefined) {
     getNextPageParam: lastPage => lastPage.cursor,
     enabled: !!resolvedUri,
   })
-  const itemCount =
-    query.data?.pages.reduce((count, page) => count + page.likes.length, 0) ?? 0
-  useAutoPagination(query, itemCount, PAGE_SIZE)
-  return query
 }
 
 export function* findAllProfilesInQueryData(

src/state/queries/post-quotes.ts

@@ -13,7 +13,6 @@ import {
   didOrHandleUriMatches,
   embedViewRecordToPostView,
   getEmbeddedPost,
-  useAutoPagination,
 } from './util'
 
 const PAGE_SIZE = 30
@@ -24,7 +23,7 @@ export const RQKEY = (resolvedUri: string) => [RQKEY_ROOT, resolvedUri]
 
 export function usePostQuotesQuery(resolvedUri: string | undefined) {
   const client = useAppviewClient()
-  const query = useInfiniteQuery<
+  return useInfiniteQuery<
     app.bsky.feed.getQuotes.$OutputBody,
     Error,
     InfiniteData<app.bsky.feed.getQuotes.$OutputBody>,
@@ -70,10 +69,6 @@ export function usePostQuotesQuery(resolvedUri: string | undefined) {
       }
     },
   })
-  const itemCount =
-    query.data?.pages.reduce((count, page) => count + page.posts.length, 0) ?? 0
-  useAutoPagination(query, itemCount, PAGE_SIZE)
-  return query
 }
 
 export function* findAllProfilesInQueryData(

src/state/queries/post-reposted-by.ts

@@ -8,7 +8,6 @@ import {
 
 import {useAppviewClient} from '#/state/session'
 import {app} from '#/lexicons'
-import {useAutoPagination} from './util'
 
 const PAGE_SIZE = 30
 type RQPageParam = string | undefined
@@ -19,7 +18,7 @@ export const RQKEY = (resolvedUri: string) => [RQKEY_ROOT, resolvedUri]
 
 export function usePostRepostedByQuery(resolvedUri: string | undefined) {
   const client = useAppviewClient()
-  const query = useInfiniteQuery<
+  return useInfiniteQuery<
     app.bsky.feed.getRepostedBy.$OutputBody,
     Error,
     InfiniteData<app.bsky.feed.getRepostedBy.$OutputBody>,
@@ -39,13 +38,6 @@ export function usePostRepostedByQuery(resolvedUri: string | undefined) {
     getNextPageParam: lastPage => lastPage.cursor,
     enabled: !!resolvedUri,
   })
-  const itemCount =
-    query.data?.pages.reduce(
-      (count, page) => count + page.repostedBy.length,
-      0,
-    ) ?? 0
-  useAutoPagination(query, itemCount, PAGE_SIZE)
-  return query
 }
 
 export function* findAllProfilesInQueryData(

src/state/queries/profile-feedgens.ts

@@ -6,7 +6,6 @@ import {
   useInfiniteQuery,
 } from '@tanstack/react-query'
 
-import {useAutoPagination} from '#/state/queries/util'
 import {useAppviewClient} from '#/state/session'
 import {app} from '#/lexicons'
 import {useModerationOpts} from '../preferences/moderation-opts'
@@ -25,7 +24,7 @@ export function useProfileFeedgensQuery(
   const moderationOpts = useModerationOpts()
   const enabled = opts?.enabled !== false && Boolean(moderationOpts)
   const client = useAppviewClient()
-  const query = useInfiniteQuery<
+  return useInfiniteQuery<
     app.bsky.feed.getActorFeeds.$OutputBody,
     Error,
     InfiniteData<app.bsky.feed.getActorFeeds.$OutputBody>,
@@ -66,8 +65,4 @@ export function useProfileFeedgensQuery(
       }
     },
   })
-  const itemCount =
-    query.data?.pages.reduce((count, page) => count + page.feeds.length, 0) ?? 0
-  useAutoPagination(query, itemCount, PAGE_SIZE)
-  return query
 }

src/state/queries/profile-followers.ts

@@ -8,7 +8,6 @@ import {
 import {useAppviewClient} from '#/state/session'
 import {useAnalytics} from '#/analytics'
 import {app} from '#/lexicons'
-import {useAutoPagination} from './util'
 
 const DEFAULT_SORT = 'latest'
 const PAGE_SIZE = 30
@@ -35,7 +34,7 @@ export function useProfileFollowersQuery(
 
   const sortParam = isSortEnabled ? sort || DEFAULT_SORT : undefined
 
-  const query = useInfiniteQuery<
+  return useInfiniteQuery<
     app.bsky.graph.getFollowers.$OutputBody,
     Error,
     InfiniteData<app.bsky.graph.getFollowers.$OutputBody>,
@@ -61,13 +60,6 @@ export function useProfileFollowersQuery(
     getNextPageParam: lastPage => lastPage.cursor,
     enabled: !!did,
   })
-  const itemCount =
-    query.data?.pages.reduce(
-      (count, page) => count + page.followers.length,
-      0,
-    ) ?? 0
-  useAutoPagination(query, itemCount, PAGE_SIZE)
-  return query
 }
 
 export function* findAllProfilesInQueryData(

src/state/queries/profile-follows.ts

@@ -9,7 +9,6 @@ import {STALE} from '#/state/queries'
 import {useAppviewClient} from '#/state/session'
 import {useAnalytics} from '#/analytics'
 import {app} from '#/lexicons'
-import {useAutoPagination} from './util'
 
 const DEFAULT_SORT = 'latest'
 const PAGE_SIZE = 30
@@ -39,7 +38,7 @@ export function useProfileFollowsQuery(
 
   const sortParam = isSortEnabled ? sort || DEFAULT_SORT : undefined
 
-  const query = useInfiniteQuery<
+  return useInfiniteQuery<
     app.bsky.graph.getFollows.$OutputBody,
     Error,
     InfiniteData<app.bsky.graph.getFollows.$OutputBody>,
@@ -66,11 +65,6 @@ export function useProfileFollowsQuery(
     getNextPageParam: lastPage => lastPage.cursor,
     enabled: !!did,
   })
-  const itemCount =
-    query.data?.pages.reduce((count, page) => count + page.follows.length, 0) ??
-    0
-  useAutoPagination(query, itemCount, limit || PAGE_SIZE)
-  return query
 }
 
 export function* findAllProfilesInQueryData(

src/state/queries/profile-lists.ts

@@ -6,7 +6,6 @@ import {
   useInfiniteQuery,
 } from '@tanstack/react-query'
 
-import {useAutoPagination} from '#/state/queries/util'
 import {useAppviewClient} from '#/state/session'
 import {app} from '#/lexicons'
 import {useModerationOpts} from '../preferences/moderation-opts'
@@ -21,7 +20,7 @@ export function useProfileListsQuery(did: string, opts?: {enabled?: boolean}) {
   const moderationOpts = useModerationOpts()
   const enabled = opts?.enabled !== false && Boolean(moderationOpts)
   const client = useAppviewClient()
-  const query = useInfiniteQuery<
+  return useInfiniteQuery<
     app.bsky.graph.getLists.$OutputBody,
     Error,
     InfiniteData<app.bsky.graph.getLists.$OutputBody>,
@@ -56,8 +55,4 @@ export function useProfileListsQuery(did: string, opts?: {enabled?: boolean}) {
       }
     },
   })
-  const itemCount =
-    query.data?.pages.reduce((count, page) => count + page.lists.length, 0) ?? 0
-  useAutoPagination(query, itemCount, PAGE_SIZE)
-  return query
 }

src/state/queries/search-posts-v2.ts

@@ -21,7 +21,6 @@ import {
   didOrHandleUriMatches,
   embedViewRecordToPostView,
   getEmbeddedPost,
-  useAutoPagination,
 } from './util'
 
 const searchPostsQueryKeyRoot = 'search-posts'
@@ -62,7 +61,7 @@ export function useSearchPostsV2Query({
     result: InfiniteData<app.bsky.feed.searchPostsV2.$OutputBody>
   } | null>(null)
 
-  const result = useInfiniteQuery<
+  return useInfiniteQuery<
     app.bsky.feed.searchPostsV2.$OutputBody,
     Error,
     InfiniteData<app.bsky.feed.searchPostsV2.$OutputBody>,
@@ -176,11 +175,6 @@ export function useSearchPostsV2Query({
       [selectArgs],
     ),
   })
-  const uris = new Set(
-    result.data?.pages.flatMap(page => page.posts.map(post => post.uri)),
-  )
-  useAutoPagination(result, uris.size, 25)
-  return result
 }
 
 export function* findAllPostsInQueryData(

src/state/queries/starter-pack-search.ts

@@ -6,7 +6,6 @@ import {
 } from '@tanstack/react-query'
 
 import {STALE} from '#/state/queries'
-import {useAutoPagination} from '#/state/queries/util'
 import {useAppviewClient} from '#/state/session'
 import {app} from '#/lexicons'
 
@@ -29,7 +28,7 @@ export function useStarterPackSearch({
   limit?: number
 }) {
   const client = useAppviewClient()
-  const result = useInfiniteQuery<
+  return useInfiniteQuery<
     app.bsky.graph.searchStarterPacksV2.$OutputBody,
     Error,
     InfiniteData<app.bsky.graph.searchStarterPacksV2.$OutputBody>,
@@ -51,13 +50,6 @@ export function useStarterPackSearch({
     placeholderData: maintainData ? keepPreviousData : undefined,
     select,
   })
-  const itemCount =
-    result.data?.pages.reduce(
-      (count, page) => count + page.starterPacks.length,
-      0,
-    ) ?? 0
-  useAutoPagination(result, itemCount, limit)
-  return result
 }
 
 function select(