update endpoint
This commit is contained in:
@@ -2,17 +2,12 @@ import {memo, useCallback, useEffect, useMemo, useRef, useState} from 'react'
|
|||||||
import {TextInput, View, type ViewToken} from 'react-native'
|
import {TextInput, View, type ViewToken} from 'react-native'
|
||||||
import {type ModerationOpts} from '@atproto/api'
|
import {type ModerationOpts} from '@atproto/api'
|
||||||
import {Trans, useLingui} from '@lingui/react/macro'
|
import {Trans, useLingui} from '@lingui/react/macro'
|
||||||
import {useQueryClient} from '@tanstack/react-query'
|
|
||||||
|
|
||||||
import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback'
|
import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback'
|
||||||
import {popularInterests, useInterestsDisplayNames} from '#/lib/interests'
|
import {popularInterests, useInterestsDisplayNames} from '#/lib/interests'
|
||||||
import {useModerationOpts} from '#/state/preferences/moderation-opts'
|
import {useModerationOpts} from '#/state/preferences/moderation-opts'
|
||||||
import {useActorSearch} from '#/state/queries/actor-search'
|
import {useActorSearch} from '#/state/queries/actor-search'
|
||||||
import {usePreferencesQuery} from '#/state/queries/preferences'
|
import {usePreferencesQuery} from '#/state/queries/preferences'
|
||||||
import {
|
|
||||||
getAllDidsInDiscoverCache,
|
|
||||||
useGetSuggestedUsersForDiscoverQuery,
|
|
||||||
} from '#/state/queries/trending/useGetSuggestedUsersForDiscoverQuery'
|
|
||||||
import {useGetSuggestedUsersForSeeMoreQuery} from '#/state/queries/trending/useGetSuggestedUsersForSeeMoreQuery'
|
import {useGetSuggestedUsersForSeeMoreQuery} from '#/state/queries/trending/useGetSuggestedUsersForSeeMoreQuery'
|
||||||
import {useSession} from '#/state/session'
|
import {useSession} from '#/state/session'
|
||||||
import {type Follow10ProgressGuide} from '#/state/shell/progress-guide'
|
import {type Follow10ProgressGuide} from '#/state/shell/progress-guide'
|
||||||
@@ -119,7 +114,6 @@ const FOR_YOU_TAB = 'all'
|
|||||||
function DialogInner({guide}: {guide?: Follow10ProgressGuide}) {
|
function DialogInner({guide}: {guide?: Follow10ProgressGuide}) {
|
||||||
const {t: l} = useLingui()
|
const {t: l} = useLingui()
|
||||||
const ax = useAnalytics()
|
const ax = useAnalytics()
|
||||||
const queryClient = useQueryClient()
|
|
||||||
const rawInterestsDisplayNames = useInterestsDisplayNames()
|
const rawInterestsDisplayNames = useInterestsDisplayNames()
|
||||||
const {data: preferences} = usePreferencesQuery()
|
const {data: preferences} = usePreferencesQuery()
|
||||||
const personalizedInterests = preferences?.interests?.tags
|
const personalizedInterests = preferences?.interests?.tags
|
||||||
@@ -156,29 +150,13 @@ function DialogInner({guide}: {guide?: Follow10ProgressGuide}) {
|
|||||||
|
|
||||||
const isForYou = selectedInterest === FOR_YOU_TAB
|
const isForYou = selectedInterest === FOR_YOU_TAB
|
||||||
|
|
||||||
// Snapshot the DIDs already shown by the home-feed Discover interstitial at
|
|
||||||
// dialog open time. The endpoint has no cursor; we dedup client-side so the
|
|
||||||
// For You tab doesn't re-show profiles the viewer just saw. Snapshotting
|
|
||||||
// once (lazy init) prevents our own `limit: 50` fetch from excluding itself
|
|
||||||
// after it lands in the shared cache.
|
|
||||||
const [alreadyShownDids] = useState(() =>
|
|
||||||
getAllDidsInDiscoverCache(queryClient),
|
|
||||||
)
|
|
||||||
|
|
||||||
const discoverQuery = useGetSuggestedUsersForDiscoverQuery({
|
|
||||||
limit: 50,
|
|
||||||
enabled: isForYou,
|
|
||||||
})
|
|
||||||
const seeMoreQuery = useGetSuggestedUsersForSeeMoreQuery({
|
const seeMoreQuery = useGetSuggestedUsersForSeeMoreQuery({
|
||||||
category: isForYou ? undefined : selectedInterest,
|
category: isForYou ? undefined : selectedInterest,
|
||||||
limit: 50,
|
limit: 50,
|
||||||
enabled: !isForYou,
|
|
||||||
})
|
})
|
||||||
const suggestions = isForYou ? discoverQuery.data : seeMoreQuery.data
|
const suggestions = seeMoreQuery.data
|
||||||
const isFetchingSuggestions = isForYou
|
const isFetchingSuggestions = seeMoreQuery.isFetching
|
||||||
? discoverQuery.isFetching
|
const suggestionsError = seeMoreQuery.error
|
||||||
: seeMoreQuery.isFetching
|
|
||||||
const suggestionsError = isForYou ? discoverQuery.error : seeMoreQuery.error
|
|
||||||
const {
|
const {
|
||||||
data: searchResults,
|
data: searchResults,
|
||||||
isFetching: isFetchingSearchResults,
|
isFetching: isFetchingSearchResults,
|
||||||
@@ -222,10 +200,6 @@ function DialogInner({guide}: {guide?: Follow10ProgressGuide}) {
|
|||||||
if (seen.has(profile.did)) continue
|
if (seen.has(profile.did)) continue
|
||||||
if (profile.did === currentAccount?.did) continue
|
if (profile.did === currentAccount?.did) continue
|
||||||
if (profile.viewer?.following) continue
|
if (profile.viewer?.following) continue
|
||||||
// On the For You tab, skip profiles the viewer was already shown by
|
|
||||||
// the home-feed Discover interstitial.
|
|
||||||
if (isForYou && !hasSearchText && alreadyShownDids.has(profile.did))
|
|
||||||
continue
|
|
||||||
|
|
||||||
seen.add(profile.did)
|
seen.add(profile.did)
|
||||||
|
|
||||||
@@ -260,8 +234,6 @@ function DialogInner({guide}: {guide?: Follow10ProgressGuide}) {
|
|||||||
hasSearchText,
|
hasSearchText,
|
||||||
resultsKey,
|
resultsKey,
|
||||||
isSearchResultsError,
|
isSearchResultsError,
|
||||||
isForYou,
|
|
||||||
alreadyShownDids,
|
|
||||||
])
|
])
|
||||||
|
|
||||||
const isGuide = Boolean(guide)
|
const isGuide = Boolean(guide)
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ import {useAgent} from '#/state/session'
|
|||||||
|
|
||||||
export type QueryProps = {
|
export type QueryProps = {
|
||||||
limit?: number
|
limit?: number
|
||||||
enabled?: boolean
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export const getSuggestedUsersForDiscoverQueryKeyRoot =
|
export const getSuggestedUsersForDiscoverQueryKeyRoot =
|
||||||
@@ -29,7 +28,6 @@ export function useGetSuggestedUsersForDiscoverQuery(props: QueryProps = {}) {
|
|||||||
const {data: preferences} = usePreferencesQuery()
|
const {data: preferences} = usePreferencesQuery()
|
||||||
|
|
||||||
return useQuery({
|
return useQuery({
|
||||||
enabled: props.enabled ?? true,
|
|
||||||
staleTime: STALE.MINUTES.THREE,
|
staleTime: STALE.MINUTES.THREE,
|
||||||
queryKey: createGetSuggestedUsersForDiscoverQueryKey({limit: props.limit}),
|
queryKey: createGetSuggestedUsersForDiscoverQueryKey({limit: props.limit}),
|
||||||
queryFn: async () => {
|
queryFn: async () => {
|
||||||
@@ -75,33 +73,3 @@ export function* findAllProfilesInQueryData(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Collects every DID currently cached under any `getSuggestedUsersForDiscover`
|
|
||||||
* query. Used by the See More dialog's For You tab to filter out profiles the
|
|
||||||
* viewer has already been shown by the home-feed interstitial (the endpoint
|
|
||||||
* has no cursor/offset, so we dedup client-side).
|
|
||||||
*
|
|
||||||
* The query key root is shared with `getSuggestedUsersForSeeMore`, so we
|
|
||||||
* narrow by key length (Discover keys are `[root, limit]`, SeeMore keys are
|
|
||||||
* `[root, category, limit]`).
|
|
||||||
*/
|
|
||||||
export function getAllDidsInDiscoverCache(
|
|
||||||
queryClient: QueryClient,
|
|
||||||
): Set<string> {
|
|
||||||
const dids = new Set<string>()
|
|
||||||
const responses =
|
|
||||||
queryClient.getQueriesData<AppBskyUnspeccedGetSuggestedUsersForDiscover.OutputSchema>(
|
|
||||||
{
|
|
||||||
queryKey: [getSuggestedUsersForDiscoverQueryKeyRoot],
|
|
||||||
},
|
|
||||||
)
|
|
||||||
for (const [key, response] of responses) {
|
|
||||||
if (!response) continue
|
|
||||||
if (key.length !== 2) continue
|
|
||||||
for (const actor of response.actors) {
|
|
||||||
dids.add(actor.did)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return dids
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user