Merge branch 'main' of https://github.com/bluesky-social/social-app

src/components/dialogs/GifSelect.tsx

···
             a.flex_1,
             a.mb_sm,
             a.rounded_sm,
-            a.aspect_card,
+            a.aspect_square,
             {opacity: pressed ? 0.8 : 1},
             t.atoms.bg_contrast_25,
           ]}

src/state/cache/post-shadow.ts

···
 import EventEmitter from 'eventemitter3'
 
 import {batchedUpdates} from '#/lib/batchedUpdates'
+import {findAllPostsInQueryData as findAllPostsInBookmarksQueryData} from '#/state/queries/bookmarks/useBookmarksQuery'
 import {findAllPostsInQueryData as findAllPostsInExploreFeedPreviewsQueryData} from '#/state/queries/explore-feed-previews'
 import {findAllPostsInQueryData as findAllPostsInNotifsQueryData} from '#/state/queries/notifications/feed'
 import {findAllPostsInQueryData as findAllPostsInFeedQueryData} from '#/state/queries/post-feed'
···
     queryClient,
     uri,
   )) {
+    yield post
+  }
+  for (let post of findAllPostsInBookmarksQueryData(queryClient, uri)) {
     yield post
   }
 }

src/state/queries/bookmarks/useBookmarksQuery.ts

···
 import {
   type $Typed,
   type AppBskyBookmarkGetBookmarks,
-  type AppBskyFeedDefs,
+  AppBskyFeedDefs,
+  AtUri,
 } from '@atproto/api'
 import {
   type InfiniteData,
···
   useInfiniteQuery,
 } from '@tanstack/react-query'
 
+import {
+  didOrHandleUriMatches,
+  embedViewRecordToPostView,
+  getEmbeddedPost,
+} from '#/state/queries/util'
 import {useAgent} from '#/state/session'
+import * as bsky from '#/types/bsky'
 
 export const bookmarksQueryKeyRoot = 'bookmarks'
 export const createBookmarksQueryKey = () => [bookmarksQueryKeyRoot]
···
     },
   )
 }
+
+export function* findAllPostsInQueryData(
+  queryClient: QueryClient,
+  uri: string,
+): Generator<AppBskyFeedDefs.PostView, undefined> {
+  const queryDatas = queryClient.getQueriesData<
+    InfiniteData<AppBskyBookmarkGetBookmarks.OutputSchema>
+  >({
+    queryKey: [bookmarksQueryKeyRoot],
+  })
+  const atUri = new AtUri(uri)
+
+  for (const [_queryKey, queryData] of queryDatas) {
+    if (!queryData?.pages) {
+      continue
+    }
+    for (const page of queryData?.pages) {
+      for (const bookmark of page.bookmarks) {
+        if (
+          !bsky.dangerousIsType<AppBskyFeedDefs.PostView>(
+            bookmark.item,
+            AppBskyFeedDefs.isPostView,
+          )
+        )
+          continue
+
+        if (didOrHandleUriMatches(atUri, bookmark.item)) {
+          yield bookmark.item
+        }
+
+        const quotedPost = getEmbeddedPost(bookmark.item.embed)
+        if (quotedPost && didOrHandleUriMatches(atUri, quotedPost)) {
+          yield embedViewRecordToPostView(quotedPost)
+        }
+      }
+    }
+  }
+}