Simplify some props

src/components/Post/Embed/ImageEmbed.tsx

@@ -46,11 +46,10 @@ export function ImageEmbed({
   const layout: 'single' | 'grid' | 'carousel' =
     images.length === 1 ? 'single' : useExpandedLayout ? 'carousel' : 'grid'
 
-  const postContext =
+  const postContext = rest.post
-    rest.uri && rest.authorDid
     ? {
-          uri: rest.uri,
+        uri: rest.post.uri,
-          authorDid: rest.authorDid,
+        authorDid: rest.post.author.did,
         feedDescriptor: rest.feedDescriptor,
       }
     : undefined

src/components/Post/Embed/index.tsx

@@ -347,8 +347,7 @@ export function QuoteEmbed({
           }
           // The photo embed belongs to the quoted post, so attribute its
           // analytics to the quoted post rather than the parent.
-          uri={quote.uri}
+          post={quote}
-          authorDid={quote.author.did}
         />
       )}
     </>

src/components/Post/Embed/types.ts

@@ -15,11 +15,12 @@ export type CommonProps = {
   viewContext?: PostEmbedViewContext
   isWithinQuote?: boolean
   allowNestedQuotes?: boolean
-  // Post context for analytics on photo embed events (post:photoEmbed:*).
+  /**
-  // When the embed has no owning post (e.g. previews), leave these undefined
+   * The post that contains this embed. Used for analytics on photo embed
-  // and no events will be emitted.
+   * events (post:photoEmbed:*). When the embed has no owning post (e.g.
-  uri?: string
+   * composer previews), leave this undefined and no events will be emitted.
-  authorDid?: string
+   */
+  post?: AppBskyFeedDefs.PostView
   feedDescriptor?: string
 }
 

src/screens/PostThread/components/ThreadItemAnchor.tsx

@@ -414,8 +414,7 @@ const ThreadItemAnchorInner = memo(function ThreadItemAnchorInner({
                     moderation={moderation}
                     viewContext={PostEmbedViewContext.ThreadHighlighted}
                     onOpen={onOpenEmbed}
-                    uri={post.uri}
+                    post={post}
-                    authorDid={post.author.did}
                   />
                 </View>
               )}

src/screens/PostThread/components/ThreadItemPost.tsx

@@ -349,8 +349,7 @@ const ThreadItemPostInner = memo(function ThreadItemPostInner({
                     embed={post.embed}
                     moderation={moderation}
                     viewContext={PostEmbedViewContext.Feed}
-                    uri={post.uri}
+                    post={post}
-                    authorDid={post.author.did}
                   />
                 </View>
               )}

src/screens/PostThread/components/ThreadItemTreePost.tsx

@@ -371,8 +371,7 @@ const ThreadItemTreePostInner = memo(function ThreadItemTreePostInner({
                         embed={post.embed}
                         moderation={moderation}
                         viewContext={PostEmbedViewContext.Feed}
-                        uri={post.uri}
+                        post={post}
-                        authorDid={post.author.did}
                       />
                     </View>
                   )}

src/view/com/post/Post.tsx

@@ -255,8 +255,7 @@ function PostInner({
                     embed={post.embed}
                     moderation={moderation}
                     viewContext={PostEmbedViewContext.Feed}
-                    uri={post.uri}
+                    post={post}
-                    authorDid={post.author.did}
                   />
                 </View>
               ) : null}

src/view/com/posts/PostFeedItem.tsx

@@ -531,8 +531,7 @@ let PostContent = ({
             moderation={moderation}
             onOpen={onOpenEmbed}
             viewContext={PostEmbedViewContext.Feed}
-            uri={post.uri}
+            post={post}
-            authorDid={post.author.did}
             feedDescriptor={feedDescriptor}
           />
         </View>