diff options
author | dan <dan.abramov@gmail.com> | 2023-11-30 21:35:58 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-30 13:35:58 -0800 |
commit | 46b63accb8e73997f2a1bee24cfda220d29e048b (patch) | |
tree | 748de65b464e98d8241cc6fd8d11a9c17d9ec05c /src/state/queries | |
parent | 143fc80951d3a0620c0a5e55f46229f2fc743758 (diff) | |
download | voidsky-46b63accb8e73997f2a1bee24cfda220d29e048b.tar.zst |
Rewrite the shadow logic to look inside the cache (#2045)
* Reset * Associate shadows with the cache * Use colocated helpers * Fix types * Reorder for clarity * More types * Copy paste logic for profile * Hook up profile query * Hook up suggested follows * Hook up other profile things * Fix shape * Pass setShadow into the effect deps * Include reply posts in the shadow cache search --------- Co-authored-by: Paul Frazee <pfrazee@gmail.com>
Diffstat (limited to 'src/state/queries')
-rw-r--r-- | src/state/queries/list-members.ts | 40 | ||||
-rw-r--r-- | src/state/queries/my-blocked-accounts.ts | 32 | ||||
-rw-r--r-- | src/state/queries/my-muted-accounts.ts | 32 | ||||
-rw-r--r-- | src/state/queries/notifications/feed.ts | 16 | ||||
-rw-r--r-- | src/state/queries/post-feed.ts | 30 | ||||
-rw-r--r-- | src/state/queries/post-liked-by.ts | 32 | ||||
-rw-r--r-- | src/state/queries/post-reposted-by.ts | 32 | ||||
-rw-r--r-- | src/state/queries/post-thread.ts | 42 | ||||
-rw-r--r-- | src/state/queries/profile-followers.ts | 32 | ||||
-rw-r--r-- | src/state/queries/profile-follows.ts | 32 | ||||
-rw-r--r-- | src/state/queries/profile.ts | 25 | ||||
-rw-r--r-- | src/state/queries/suggested-follows.ts | 55 |
12 files changed, 353 insertions, 47 deletions
diff --git a/src/state/queries/list-members.ts b/src/state/queries/list-members.ts index 7aa91b1dc..d84089c90 100644 --- a/src/state/queries/list-members.ts +++ b/src/state/queries/list-members.ts @@ -1,5 +1,10 @@ -import {AppBskyGraphGetList} from '@atproto/api' -import {useInfiniteQuery, InfiniteData, QueryKey} from '@tanstack/react-query' +import {AppBskyActorDefs, AppBskyGraphGetList} from '@atproto/api' +import { + useInfiniteQuery, + InfiniteData, + QueryClient, + QueryKey, +} from '@tanstack/react-query' import {getAgent} from '#/state/session' import {STALE} from '#/state/queries' @@ -31,3 +36,34 @@ export function useListMembersQuery(uri: string) { getNextPageParam: lastPage => lastPage.cursor, }) } + +export function* findAllProfilesInQueryData( + queryClient: QueryClient, + did: string, +): Generator<AppBskyActorDefs.ProfileView, void> { + const queryDatas = queryClient.getQueriesData< + InfiniteData<AppBskyGraphGetList.OutputSchema> + >({ + queryKey: ['list-members'], + }) + for (const [_queryKey, queryData] of queryDatas) { + if (!queryData) { + continue + } + for (const [_queryKey, queryData] of queryDatas) { + if (!queryData?.pages) { + continue + } + for (const page of queryData?.pages) { + if (page.list.creator.did === did) { + yield page.list.creator + } + for (const item of page.items) { + if (item.subject.did === did) { + yield item.subject + } + } + } + } + } +} diff --git a/src/state/queries/my-blocked-accounts.ts b/src/state/queries/my-blocked-accounts.ts index 2c099c63d..badaaec34 100644 --- a/src/state/queries/my-blocked-accounts.ts +++ b/src/state/queries/my-blocked-accounts.ts @@ -1,5 +1,10 @@ -import {AppBskyGraphGetBlocks} from '@atproto/api' -import {useInfiniteQuery, InfiniteData, QueryKey} from '@tanstack/react-query' +import {AppBskyActorDefs, AppBskyGraphGetBlocks} from '@atproto/api' +import { + useInfiniteQuery, + InfiniteData, + QueryClient, + QueryKey, +} from '@tanstack/react-query' import {getAgent} from '#/state/session' @@ -26,3 +31,26 @@ export function useMyBlockedAccountsQuery() { getNextPageParam: lastPage => lastPage.cursor, }) } + +export function* findAllProfilesInQueryData( + queryClient: QueryClient, + did: string, +): Generator<AppBskyActorDefs.ProfileView, void> { + const queryDatas = queryClient.getQueriesData< + InfiniteData<AppBskyGraphGetBlocks.OutputSchema> + >({ + queryKey: ['my-blocked-accounts'], + }) + for (const [_queryKey, queryData] of queryDatas) { + if (!queryData?.pages) { + continue + } + for (const page of queryData?.pages) { + for (const block of page.blocks) { + if (block.did === did) { + yield block + } + } + } + } +} diff --git a/src/state/queries/my-muted-accounts.ts b/src/state/queries/my-muted-accounts.ts index a175931b5..8929e04d3 100644 --- a/src/state/queries/my-muted-accounts.ts +++ b/src/state/queries/my-muted-accounts.ts @@ -1,5 +1,10 @@ -import {AppBskyGraphGetMutes} from '@atproto/api' -import {useInfiniteQuery, InfiniteData, QueryKey} from '@tanstack/react-query' +import {AppBskyActorDefs, AppBskyGraphGetMutes} from '@atproto/api' +import { + useInfiniteQuery, + InfiniteData, + QueryClient, + QueryKey, +} from '@tanstack/react-query' import {getAgent} from '#/state/session' @@ -26,3 +31,26 @@ export function useMyMutedAccountsQuery() { getNextPageParam: lastPage => lastPage.cursor, }) } + +export function* findAllProfilesInQueryData( + queryClient: QueryClient, + did: string, +): Generator<AppBskyActorDefs.ProfileView, void> { + const queryDatas = queryClient.getQueriesData< + InfiniteData<AppBskyGraphGetMutes.OutputSchema> + >({ + queryKey: ['my-muted-accounts'], + }) + for (const [_queryKey, queryData] of queryDatas) { + if (!queryData?.pages) { + continue + } + for (const page of queryData?.pages) { + for (const mute of page.mutes) { + if (mute.did === did) { + yield mute + } + } + } + } +} diff --git a/src/state/queries/notifications/feed.ts b/src/state/queries/notifications/feed.ts index 5c519d045..0fd9a2fef 100644 --- a/src/state/queries/notifications/feed.ts +++ b/src/state/queries/notifications/feed.ts @@ -86,6 +86,19 @@ export function findPostInQueryData( queryClient: QueryClient, uri: string, ): AppBskyFeedDefs.PostView | undefined { + const generator = findAllPostsInQueryData(queryClient, uri) + const result = generator.next() + if (result.done) { + return undefined + } else { + return result.value + } +} + +export function* findAllPostsInQueryData( + queryClient: QueryClient, + uri: string, +): Generator<AppBskyFeedDefs.PostView, void> { const queryDatas = queryClient.getQueriesData<InfiniteData<FeedPage>>({ queryKey: ['notification-feed'], }) @@ -96,10 +109,9 @@ export function findPostInQueryData( for (const page of queryData?.pages) { for (const item of page.items) { if (item.subject?.uri === uri) { - return item.subject + yield item.subject } } } } - return undefined } diff --git a/src/state/queries/post-feed.ts b/src/state/queries/post-feed.ts index d87beb779..209f1f544 100644 --- a/src/state/queries/post-feed.ts +++ b/src/state/queries/post-feed.ts @@ -232,7 +232,20 @@ function createApi( export function findPostInQueryData( queryClient: QueryClient, uri: string, -): AppBskyFeedDefs.FeedViewPost | undefined { +): AppBskyFeedDefs.PostView | undefined { + const generator = findAllPostsInQueryData(queryClient, uri) + const result = generator.next() + if (result.done) { + return undefined + } else { + return result.value + } +} + +export function* findAllPostsInQueryData( + queryClient: QueryClient, + uri: string, +): Generator<AppBskyFeedDefs.PostView, void> { const queryDatas = queryClient.getQueriesData< InfiniteData<FeedPageUnselected> >({ @@ -245,12 +258,23 @@ export function findPostInQueryData( for (const page of queryData?.pages) { for (const item of page.feed) { if (item.post.uri === uri) { - return item + yield item.post + } + if ( + AppBskyFeedDefs.isPostView(item.reply?.parent) && + item.reply?.parent?.uri === uri + ) { + yield item.reply.parent + } + if ( + AppBskyFeedDefs.isPostView(item.reply?.root) && + item.reply?.root?.uri === uri + ) { + yield item.reply.root } } } } - return undefined } function assertSomePostsPassModeration(feed: AppBskyFeedDefs.FeedViewPost[]) { diff --git a/src/state/queries/post-liked-by.ts b/src/state/queries/post-liked-by.ts index 528b3be70..2cde07f28 100644 --- a/src/state/queries/post-liked-by.ts +++ b/src/state/queries/post-liked-by.ts @@ -1,5 +1,10 @@ -import {AppBskyFeedGetLikes} from '@atproto/api' -import {useInfiniteQuery, InfiniteData, QueryKey} from '@tanstack/react-query' +import {AppBskyActorDefs, AppBskyFeedGetLikes} from '@atproto/api' +import { + useInfiniteQuery, + InfiniteData, + QueryClient, + QueryKey, +} from '@tanstack/react-query' import {getAgent} from '#/state/session' @@ -31,3 +36,26 @@ export function usePostLikedByQuery(resolvedUri: string | undefined) { enabled: !!resolvedUri, }) } + +export function* findAllProfilesInQueryData( + queryClient: QueryClient, + did: string, +): Generator<AppBskyActorDefs.ProfileView, void> { + const queryDatas = queryClient.getQueriesData< + InfiniteData<AppBskyFeedGetLikes.OutputSchema> + >({ + queryKey: ['post-liked-by'], + }) + for (const [_queryKey, queryData] of queryDatas) { + if (!queryData?.pages) { + continue + } + for (const page of queryData?.pages) { + for (const like of page.likes) { + if (like.actor.did === did) { + yield like.actor + } + } + } + } +} diff --git a/src/state/queries/post-reposted-by.ts b/src/state/queries/post-reposted-by.ts index f9a80056f..db5fa6514 100644 --- a/src/state/queries/post-reposted-by.ts +++ b/src/state/queries/post-reposted-by.ts @@ -1,5 +1,10 @@ -import {AppBskyFeedGetRepostedBy} from '@atproto/api' -import {useInfiniteQuery, InfiniteData, QueryKey} from '@tanstack/react-query' +import {AppBskyActorDefs, AppBskyFeedGetRepostedBy} from '@atproto/api' +import { + useInfiniteQuery, + InfiniteData, + QueryClient, + QueryKey, +} from '@tanstack/react-query' import {getAgent} from '#/state/session' @@ -31,3 +36,26 @@ export function usePostRepostedByQuery(resolvedUri: string | undefined) { enabled: !!resolvedUri, }) } + +export function* findAllProfilesInQueryData( + queryClient: QueryClient, + did: string, +): Generator<AppBskyActorDefs.ProfileView, void> { + const queryDatas = queryClient.getQueriesData< + InfiniteData<AppBskyFeedGetRepostedBy.OutputSchema> + >({ + queryKey: ['post-reposted-by'], + }) + for (const [_queryKey, queryData] of queryDatas) { + if (!queryData?.pages) { + continue + } + for (const page of queryData?.pages) { + for (const repostedBy of page.repostedBy) { + if (repostedBy.did === did) { + yield repostedBy + } + } + } + } +} diff --git a/src/state/queries/post-thread.ts b/src/state/queries/post-thread.ts index d40af1fe2..cde45723a 100644 --- a/src/state/queries/post-thread.ts +++ b/src/state/queries/post-thread.ts @@ -88,7 +88,7 @@ export function usePostThreadQuery(uri: string | undefined) { { const item = findPostInFeedQueryData(queryClient, uri) if (item) { - return feedViewPostToPlaceholderThread(item) + return postViewToPlaceholderThread(item) } } { @@ -213,6 +213,19 @@ function findPostInQueryData( queryClient: QueryClient, uri: string, ): ThreadNode | undefined { + const generator = findAllPostsInQueryData(queryClient, uri) + const result = generator.next() + if (result.done) { + return undefined + } else { + return result.value + } +} + +export function* findAllPostsInQueryData( + queryClient: QueryClient, + uri: string, +): Generator<ThreadNode, void> { const queryDatas = queryClient.getQueriesData<ThreadNode>({ queryKey: ['post-thread'], }) @@ -222,11 +235,10 @@ function findPostInQueryData( } for (const item of traverseThread(queryData)) { if (item.uri === uri) { - return item + yield item } } } - return undefined } function* traverseThread(node: ThreadNode): Generator<ThreadNode, void> { @@ -270,30 +282,6 @@ function threadNodeToPlaceholderThread( } } -function feedViewPostToPlaceholderThread( - item: AppBskyFeedDefs.FeedViewPost, -): ThreadNode { - return { - type: 'post', - _reactKey: item.post.uri, - uri: item.post.uri, - post: item.post, - record: item.post.record as AppBskyFeedPost.Record, // validated in post-feed - parent: undefined, - replies: undefined, - viewer: item.post.viewer, - ctx: { - depth: 0, - isHighlightedPost: true, - hasMore: false, - showChildReplyLine: false, - showParentReplyLine: false, - isParentLoading: !!(item.post.record as AppBskyFeedPost.Record).reply, - isChildLoading: !!item.post.replyCount, - }, - } -} - function postViewToPlaceholderThread( post: AppBskyFeedDefs.PostView, ): ThreadNode { diff --git a/src/state/queries/profile-followers.ts b/src/state/queries/profile-followers.ts index b2008851d..fdefc8253 100644 --- a/src/state/queries/profile-followers.ts +++ b/src/state/queries/profile-followers.ts @@ -1,5 +1,10 @@ -import {AppBskyGraphGetFollowers} from '@atproto/api' -import {useInfiniteQuery, InfiniteData, QueryKey} from '@tanstack/react-query' +import {AppBskyActorDefs, AppBskyGraphGetFollowers} from '@atproto/api' +import { + useInfiniteQuery, + InfiniteData, + QueryClient, + QueryKey, +} from '@tanstack/react-query' import {getAgent} from '#/state/session' @@ -30,3 +35,26 @@ export function useProfileFollowersQuery(did: string | undefined) { enabled: !!did, }) } + +export function* findAllProfilesInQueryData( + queryClient: QueryClient, + did: string, +): Generator<AppBskyActorDefs.ProfileView, void> { + const queryDatas = queryClient.getQueriesData< + InfiniteData<AppBskyGraphGetFollowers.OutputSchema> + >({ + queryKey: ['profile-followers'], + }) + for (const [_queryKey, queryData] of queryDatas) { + if (!queryData?.pages) { + continue + } + for (const page of queryData?.pages) { + for (const follower of page.followers) { + if (follower.did === did) { + yield follower + } + } + } + } +} diff --git a/src/state/queries/profile-follows.ts b/src/state/queries/profile-follows.ts index 8af1fba07..428c8aebd 100644 --- a/src/state/queries/profile-follows.ts +++ b/src/state/queries/profile-follows.ts @@ -1,5 +1,10 @@ -import {AppBskyGraphGetFollows} from '@atproto/api' -import {useInfiniteQuery, InfiniteData, QueryKey} from '@tanstack/react-query' +import {AppBskyActorDefs, AppBskyGraphGetFollows} from '@atproto/api' +import { + useInfiniteQuery, + InfiniteData, + QueryClient, + QueryKey, +} from '@tanstack/react-query' import {getAgent} from '#/state/session' import {STALE} from '#/state/queries' @@ -33,3 +38,26 @@ export function useProfileFollowsQuery(did: string | undefined) { enabled: !!did, }) } + +export function* findAllProfilesInQueryData( + queryClient: QueryClient, + did: string, +): Generator<AppBskyActorDefs.ProfileView, void> { + const queryDatas = queryClient.getQueriesData< + InfiniteData<AppBskyGraphGetFollows.OutputSchema> + >({ + queryKey: ['profile-follows'], + }) + for (const [_queryKey, queryData] of queryDatas) { + if (!queryData?.pages) { + continue + } + for (const page of queryData?.pages) { + for (const follow of page.follows) { + if (follow.did === did) { + yield follow + } + } + } + } +} diff --git a/src/state/queries/profile.ts b/src/state/queries/profile.ts index 62e8f39c0..9435d7ad5 100644 --- a/src/state/queries/profile.ts +++ b/src/state/queries/profile.ts @@ -5,7 +5,12 @@ import { AppBskyActorProfile, AppBskyActorGetProfile, } from '@atproto/api' -import {useQuery, useQueryClient, useMutation} from '@tanstack/react-query' +import { + useQuery, + useQueryClient, + useMutation, + QueryClient, +} from '@tanstack/react-query' import {Image as RNImage} from 'react-native-image-crop-picker' import {useSession, getAgent} from '../session' import {updateProfileShadow} from '../cache/profile-shadow' @@ -477,3 +482,21 @@ async function whenAppViewReady( () => getAgent().app.bsky.actor.getProfile({actor}), ) } + +export function* findAllProfilesInQueryData( + queryClient: QueryClient, + did: string, +): Generator<AppBskyActorDefs.ProfileViewDetailed, void> { + const queryDatas = + queryClient.getQueriesData<AppBskyActorDefs.ProfileViewDetailed>({ + queryKey: ['profile'], + }) + for (const [_queryKey, queryData] of queryDatas) { + if (!queryData) { + continue + } + if (queryData.did === did) { + yield queryData + } + } +} diff --git a/src/state/queries/suggested-follows.ts b/src/state/queries/suggested-follows.ts index eadcb590a..932226b75 100644 --- a/src/state/queries/suggested-follows.ts +++ b/src/state/queries/suggested-follows.ts @@ -1,5 +1,6 @@ import React from 'react' import { + AppBskyActorDefs, AppBskyActorGetSuggestions, AppBskyGraphGetSuggestedFollowsByActor, moderateProfile, @@ -9,6 +10,7 @@ import { useQueryClient, useQuery, InfiniteData, + QueryClient, QueryKey, } from '@tanstack/react-query' @@ -106,3 +108,56 @@ export function useGetSuggestedFollowersByActor() { [queryClient], ) } + +export function* findAllProfilesInQueryData( + queryClient: QueryClient, + did: string, +): Generator<AppBskyActorDefs.ProfileView, void> { + yield* findAllProfilesInSuggestedFollowsQueryData(queryClient, did) + yield* findAllProfilesInSuggestedFollowsByActorQueryData(queryClient, did) +} + +function* findAllProfilesInSuggestedFollowsQueryData( + queryClient: QueryClient, + did: string, +) { + const queryDatas = queryClient.getQueriesData< + InfiniteData<AppBskyActorGetSuggestions.OutputSchema> + >({ + queryKey: ['suggested-follows'], + }) + for (const [_queryKey, queryData] of queryDatas) { + if (!queryData?.pages) { + continue + } + for (const page of queryData?.pages) { + for (const actor of page.actors) { + if (actor.did === did) { + yield actor + } + } + } + } +} + +function* findAllProfilesInSuggestedFollowsByActorQueryData( + queryClient: QueryClient, + did: string, +) { + const queryDatas = + queryClient.getQueriesData<AppBskyGraphGetSuggestedFollowsByActor.OutputSchema>( + { + queryKey: ['suggested-follows-by-actor'], + }, + ) + for (const [_queryKey, queryData] of queryDatas) { + if (!queryData) { + continue + } + for (const suggestion of queryData.suggestions) { + if (suggestion.did === did) { + yield suggestion + } + } + } +} |