Search lists cleanup, pagninate actor search (#9009)

src/state/queries/actor-search.ts

@@ -1,25 +1,18 @@
-import {
-  type AppBskyActorDefs,
-  type AppBskyActorSearchActors,
-} from '@atproto/api'
+import {type AppBskyActorSearchActors} from '@atproto/api'
 import {
   type InfiniteData,
   keepPreviousData,
   type QueryClient,
   type QueryKey,
   useInfiniteQuery,
-  useQuery,
 } from '@tanstack/react-query'
 
 import {STALE} from '#/state/queries'
 import {useAgent} from '#/state/session'
 
-const RQKEY_ROOT = 'actor-search'
-export const RQKEY = (query: string) => [RQKEY_ROOT, query]
-
-export const RQKEY_ROOT_PAGINATED = `${RQKEY_ROOT}_paginated`
-export const RQKEY_PAGINATED = (query: string, limit?: number) => [
-  RQKEY_ROOT_PAGINATED,
+export const RQKEY_ROOT = 'actor-search'
+export const RQKEY = (query: string, limit?: number) => [
+  RQKEY_ROOT,
   query,
   limit,
 ]
@@ -27,27 +20,6 @@ export const RQKEY_PAGINATED = (query: string, limit?: number) => [
 export function useActorSearch({
   query,
   enabled,
-}: {
-  query: string
-  enabled?: boolean
-}) {
-  const agent = useAgent()
-  return useQuery<AppBskyActorDefs.ProfileView[]>({
-    staleTime: STALE.MINUTES.ONE,
-    queryKey: RQKEY(query || ''),
-    async queryFn() {
-      const res = await agent.searchActors({
-        q: query,
-      })
-      return res.data.actors
-    },
-    enabled: enabled && !!query,
-  })
-}
-
-export function useActorSearchPaginated({
-  query,
-  enabled,
   maintainData,
   limit = 25,
 }: {
@@ -65,7 +37,7 @@ export function useActorSearchPaginated({
     string | undefined
   >({
     staleTime: STALE.MINUTES.FIVE,
-    queryKey: RQKEY_PAGINATED(query, limit),
+    queryKey: RQKEY(query, limit),
     queryFn: async ({pageParam}) => {
       const res = await agent.searchActors({
         q: query,
@@ -78,35 +50,38 @@ export function useActorSearchPaginated({
     initialPageParam: undefined,
     getNextPageParam: lastPage => lastPage.cursor,
     placeholderData: maintainData ? keepPreviousData : undefined,
+    select,
   })
 }
 
+function select(data: InfiniteData<AppBskyActorSearchActors.OutputSchema>) {
+  // enforce uniqueness
+  const dids = new Set()
+
+  return {
+    ...data,
+    pages: data.pages.map(page => ({
+      actors: page.actors.filter(actor => {
+        if (dids.has(actor.did)) {
+          return false
+        }
+        dids.add(actor.did)
+        return true
+      }),
+    })),
+  }
+}
+
 export function* findAllProfilesInQueryData(
   queryClient: QueryClient,
   did: string,
 ) {
-  const queryDatas = queryClient.getQueriesData<AppBskyActorDefs.ProfileView[]>(
-    {
-      queryKey: [RQKEY_ROOT],
-    },
-  )
-  for (const [_queryKey, queryData] of queryDatas) {
-    if (!queryData) {
-      continue
-    }
-    for (const actor of queryData) {
-      if (actor.did === did) {
-        yield actor
-      }
-    }
-  }
-
-  const queryDatasPaginated = queryClient.getQueriesData<
+  const queryDatas = queryClient.getQueriesData<
     InfiniteData<AppBskyActorSearchActors.OutputSchema>
   >({
-    queryKey: [RQKEY_ROOT_PAGINATED],
+    queryKey: [RQKEY_ROOT],
   })
-  for (const [_queryKey, queryData] of queryDatasPaginated) {
+  for (const [_queryKey, queryData] of queryDatas) {
     if (!queryData) {
       continue
     }