Use new endpoints for suggested users (#10185)

src/screens/Search/Explore.tsx

@@ -28,7 +28,10 @@ import {
   createGetSuggestedFeedsQueryKey,
   useGetSuggestedFeedsQuery,
 } from '#/state/queries/trending/useGetSuggestedFeedsQuery'
-import {getSuggestedUsersQueryKeyRoot} from '#/state/queries/trending/useGetSuggestedUsersQuery'
+import {
+  getSuggestedUsersForExploreQueryKeyRoot,
+  useGetSuggestedUsersForExploreQuery,
+} from '#/state/queries/trending/useGetSuggestedUsersForExploreQuery'
 import {createGetTrendsQueryKey} from '#/state/queries/trending/useGetTrendsQuery'
 import {
   createSuggestedStarterPacksQueryKey,
@@ -48,7 +51,6 @@ import {ExploreInterestsCard} from '#/screens/Search/modules/ExploreInterestsCar
 import {ExploreRecommendations} from '#/screens/Search/modules/ExploreRecommendations'
 import {ExploreTrendingTopics} from '#/screens/Search/modules/ExploreTrendingTopics'
 import {ExploreTrendingVideos} from '#/screens/Search/modules/ExploreTrendingVideos'
-import {useSuggestedUsers} from '#/screens/Search/util/useSuggestedUsers'
 import {atoms as a, native, platform, useTheme} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {Button} from '#/components/Button'
@@ -242,9 +244,8 @@ export function Explore({
     isLoading: suggestedUsersIsLoading,
     error: suggestedUsersError,
     isRefetching: suggestedUsersIsRefetching,
-  } = useSuggestedUsers({
+  } = useGetSuggestedUsersForExploreQuery({
     category: selectedInterest || (useFullExperience ? null : interests[0]),
-    search: !useFullExperience,
   })
   /* End special language handling */
 
@@ -316,7 +317,7 @@ export function Explore({
         queryKey: createSuggestedStarterPacksQueryKey(),
       }),
       qc.resetQueries({
-        queryKey: [getSuggestedUsersQueryKeyRoot],
+        queryKey: [getSuggestedUsersForExploreQueryKeyRoot],
       }),
       qc.resetQueries({
         queryKey: [useActorSearchQueryKeyRoot],

src/screens/Search/util/useSuggestedUsers.ts

@@ -1,59 +0,0 @@
-import {useMemo} from 'react'
-
-import {useInterestsDisplayNames} from '#/lib/interests'
-import {useActorSearch} from '#/state/queries/actor-search'
-import {useGetSuggestedUsersQuery} from '#/state/queries/trending/useGetSuggestedUsersQuery'
-
-/**
- * Conditional hook, used in case a user is a non-english speaker, in which
- * case we fall back to searching for users instead of our more curated set.
- */
-export function useSuggestedUsers({
-  category = null,
-  search = false,
-}: {
-  category?: string | null
-  /**
-   * If true, we'll search for users using the translated value of `category`,
-   * based on the user's app language setting
-   */
-  search?: boolean
-}) {
-  const interestsDisplayNames = useInterestsDisplayNames()
-  const curated = useGetSuggestedUsersQuery({
-    enabled: !search,
-    category,
-  })
-  const searched = useActorSearch({
-    enabled: !!search,
-    // use user's app language translation for this value
-    query: category ? interestsDisplayNames[category] : '',
-    limit: 10,
-  })
-
-  return useMemo(() => {
-    if (search) {
-      return {
-        // we're not paginating right now
-        data: searched?.data
-          ? {
-              actors: searched.data.pages.flatMap(p => p.actors) ?? [],
-              recId: undefined,
-            }
-          : undefined,
-        isLoading: searched.isLoading,
-        error: searched.error,
-        isRefetching: searched.isRefetching,
-        refetch: searched.refetch,
-      }
-    } else {
-      return {
-        data: curated.data,
-        isLoading: curated.isLoading,
-        error: curated.error,
-        isRefetching: curated.isRefetching,
-        refetch: curated.refetch,
-      }
-    }
-  }, [curated, searched, search])
-}

src/screens/Settings/InterestsSettings.tsx

@@ -19,7 +19,9 @@ import {
 } from '#/state/queries/preferences'
 import {type UsePreferencesQueryResponse} from '#/state/queries/preferences/types'
 import {createGetSuggestedFeedsQueryKey} from '#/state/queries/trending/useGetSuggestedFeedsQuery'
-import {createGetSuggestedUsersQueryKey} from '#/state/queries/trending/useGetSuggestedUsersQuery'
+import {createGetSuggestedUsersForDiscoverQueryKey} from '#/state/queries/trending/useGetSuggestedUsersForDiscoverQuery'
+import {createGetSuggestedUsersForExploreQueryKey} from '#/state/queries/trending/useGetSuggestedUsersForExploreQuery'
+import {createGetSuggestedUsersForSeeMoreQueryKey} from '#/state/queries/trending/useGetSuggestedUsersForSeeMoreQuery'
 import {createSuggestedStarterPacksQueryKey} from '#/state/queries/useSuggestedStarterPacksQuery'
 import {useAgent} from '#/state/session'
 import {atoms as a, useGutters, useTheme} from '#/alf'
@@ -120,7 +122,15 @@ function Inner({
         await Promise.all([
           qc.resetQueries({queryKey: createSuggestedStarterPacksQueryKey()}),
           qc.resetQueries({queryKey: createGetSuggestedFeedsQueryKey()}),
-          qc.resetQueries({queryKey: createGetSuggestedUsersQueryKey({})}),
+          qc.resetQueries({
+            queryKey: createGetSuggestedUsersForDiscoverQueryKey({}),
+          }),
+          qc.resetQueries({
+            queryKey: createGetSuggestedUsersForExploreQueryKey({}),
+          }),
+          qc.resetQueries({
+            queryKey: createGetSuggestedUsersForSeeMoreQueryKey({}),
+          }),
         ])
 
         Toast.show(