4 files changed, 85 insertions, 3 deletions
diff --git a/src/state/cache/post-shadow.ts b/src/state/cache/post-shadow.ts
index e02d4f1ea..55913e48d 100644
--- a/src/state/cache/post-shadow.ts
+++ b/src/state/cache/post-shadow.ts
@@ -6,6 +6,7 @@ import {Shadow, castAsShadow} from './types'
 import {findAllPostsInQueryData as findAllPostsInNotifsQueryData} from '../queries/notifications/feed'
 import {findAllPostsInQueryData as findAllPostsInFeedQueryData} from '../queries/post-feed'
 import {findAllPostsInQueryData as findAllPostsInThreadQueryData} from '../queries/post-thread'
+import {findAllPostsInQueryData as findAllPostsInSearchQueryData} from '../queries/search-posts'
 import {queryClient} from 'lib/react-query'
 export type {Shadow} from './types'
 
@@ -98,4 +99,7 @@ function* findPostsInCache(
       yield node.post
     }
   }
+  for (let post of findAllPostsInSearchQueryData(queryClient, uri)) {
+    yield post
+  }
 }
diff --git a/src/state/cache/profile-shadow.ts b/src/state/cache/profile-shadow.ts
index f85e1ad8d..79a1f228e 100644
--- a/src/state/cache/profile-shadow.ts
+++ b/src/state/cache/profile-shadow.ts
@@ -11,6 +11,7 @@ import {findAllProfilesInQueryData as findAllProfilesInProfileQueryData} from '.
 import {findAllProfilesInQueryData as findAllProfilesInProfileFollowersQueryData} from '../queries/profile-followers'
 import {findAllProfilesInQueryData as findAllProfilesInProfileFollowsQueryData} from '../queries/profile-follows'
 import {findAllProfilesInQueryData as findAllProfilesInSuggestedFollowsQueryData} from '../queries/suggested-follows'
+import {findAllProfilesInQueryData as findAllProfilesInActorSearchQueryData} from '../queries/actor-search'
 import {Shadow, castAsShadow} from './types'
 import {queryClient} from 'lib/react-query'
 export type {Shadow} from './types'
@@ -98,4 +99,5 @@ function* findProfilesInCache(did: string): Generator<ProfileView, void> {
   yield* findAllProfilesInProfileFollowersQueryData(queryClient, did)
   yield* findAllProfilesInProfileFollowsQueryData(queryClient, did)
   yield* findAllProfilesInSuggestedFollowsQueryData(queryClient, did)
+  yield* findAllProfilesInActorSearchQueryData(queryClient, did)
 }
diff --git a/src/state/queries/actor-search.ts b/src/state/queries/actor-search.ts
new file mode 100644
index 000000000..f72511548
--- /dev/null
+++ b/src/state/queries/actor-search.ts
@@ -0,0 +1,42 @@
+import {AppBskyActorDefs} from '@atproto/api'
+import {QueryClient, useQuery} from '@tanstack/react-query'
+
+import {getAgent} from '#/state/session'
+import {STALE} from '#/state/queries'
+
+export const RQKEY = (prefix: string) => ['actor-search', prefix]
+
+export function useActorSearch(prefix: string) {
+  return useQuery<AppBskyActorDefs.ProfileView[]>({
+    staleTime: STALE.MINUTES.ONE,
+    queryKey: RQKEY(prefix || ''),
+    async queryFn() {
+      const res = await getAgent().searchActors({
+        term: prefix,
+      })
+      return res.data.actors
+    },
+    enabled: !!prefix,
+  })
+}
+
+export function* findAllProfilesInQueryData(
+  queryClient: QueryClient,
+  did: string,
+) {
+  const queryDatas = queryClient.getQueriesData<AppBskyActorDefs.ProfileView[]>(
+    {
+      queryKey: ['actor-search'],
+    },
+  )
+  for (const [_queryKey, queryData] of queryDatas) {
+    if (!queryData) {
+      continue
+    }
+    for (const actor of queryData) {
+      if (actor.did === did) {
+        yield actor
+      }
+    }
+  }
+}
diff --git a/src/state/queries/search-posts.ts b/src/state/queries/search-posts.ts
index 03f3ba339..e0b317ca9 100644
--- a/src/state/queries/search-posts.ts
+++ b/src/state/queries/search-posts.ts
@@ -1,7 +1,13 @@
-import {AppBskyFeedSearchPosts} from '@atproto/api'
-import {useInfiniteQuery, InfiniteData, QueryKey} from '@tanstack/react-query'
+import {AppBskyFeedDefs, AppBskyFeedSearchPosts} from '@atproto/api'
+import {
+  useInfiniteQuery,
+  InfiniteData,
+  QueryKey,
+  QueryClient,
+} from '@tanstack/react-query'
 
 import {getAgent} from '#/state/session'
+import {embedViewRecordToPostView, getEmbeddedPost} from './util'
 
 const searchPostsQueryKey = ({query}: {query: string}) => [
   'search-posts',
@@ -17,10 +23,11 @@ export function useSearchPostsQuery({query}: {query: string}) {
     string | undefined
   >({
     queryKey: searchPostsQueryKey({query}),
-    queryFn: async () => {
+    queryFn: async ({pageParam}) => {
       const res = await getAgent().app.bsky.feed.searchPosts({
         q: query,
         limit: 25,
+        cursor: pageParam,
       })
       return res.data
     },
@@ -28,3 +35,30 @@ export function useSearchPostsQuery({query}: {query: string}) {
     getNextPageParam: lastPage => lastPage.cursor,
   })
 }
+
+export function* findAllPostsInQueryData(
+  queryClient: QueryClient,
+  uri: string,
+): Generator<AppBskyFeedDefs.PostView, undefined> {
+  const queryDatas = queryClient.getQueriesData<
+    InfiniteData<AppBskyFeedSearchPosts.OutputSchema>
+  >({
+    queryKey: ['search-posts'],
+  })
+  for (const [_queryKey, queryData] of queryDatas) {
+    if (!queryData?.pages) {
+      continue
+    }
+    for (const page of queryData?.pages) {
+      for (const post of page.posts) {
+        if (post.uri === uri) {
+          yield post
+        }
+        const quotedPost = getEmbeddedPost(post.embed)
+        if (quotedPost?.uri === uri) {
+          yield embedViewRecordToPostView(quotedPost)
+        }
+      }
+    }
+  }
+}