From cdc18f125d397bd9ae37e10d8f2a7b5b52bbe31a Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Fri, 27 Jun 2025 12:19:47 +0300
Subject: [PATCH] use feedcard for feed post embeds

---
 src/components/Post/Embed/FeedEmbed.tsx | 32 +++++++++++++------------
 src/components/Post/Embed/ListEmbed.tsx |  4 ++--
 src/view/com/feeds/FeedSourceCard.tsx   |  8 +++----
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/components/Post/Embed/FeedEmbed.tsx b/src/components/Post/Embed/FeedEmbed.tsx
index f8fc169d4b..a56bf0a11c 100644
--- a/src/components/Post/Embed/FeedEmbed.tsx
+++ b/src/components/Post/Embed/FeedEmbed.tsx
@@ -1,9 +1,9 @@
-import React from 'react'
+import {useMemo} from 'react'
 import {moderateFeedGenerator} from '@atproto/api'
 
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
-import {FeedSourceCard} from '#/view/com/feeds/FeedSourceCard'
 import {atoms as a, useTheme} from '#/alf'
+import * as FeedCard from '#/components/FeedCard'
 import {ContentHider} from '#/components/moderation/ContentHider'
 import {type EmbedType} from '#/types/bsky/post'
 import {type CommonProps} from './types'
@@ -15,18 +15,20 @@ export function FeedEmbed({
 }) {
   const t = useTheme()
   return (
-    <FeedSourceCard
-      feedUri={embed.view.uri}
-      feedData={embed.view}
-      style={[
-        t.atoms.bg,
-        t.atoms.border_contrast_low,
-        a.p_md,
-        a.rounded_sm,
-        a.border,
-      ]}
-      showLikes
-    />
+    <FeedCard.Link
+      view={embed.view}
+      style={[a.border, t.atoms.border_contrast_medium, a.p_md, a.rounded_sm]}>
+      <FeedCard.Outer>
+        <FeedCard.Header>
+          <FeedCard.Avatar src={embed.view.avatar} />
+          <FeedCard.TitleAndByline
+            title={embed.view.displayName}
+            creator={embed.view.creator}
+          />
+        </FeedCard.Header>
+        <FeedCard.Likes count={embed.view.likeCount || 0} />
+      </FeedCard.Outer>
+    </FeedCard.Link>
   )
 }
 
@@ -36,7 +38,7 @@ export function ModeratedFeedEmbed({
   embed: EmbedType<'feed'>
 }) {
   const moderationOpts = useModerationOpts()
-  const moderation = React.useMemo(() => {
+  const moderation = useMemo(() => {
     return moderationOpts
       ? moderateFeedGenerator(embed.view, moderationOpts)
       : undefined
diff --git a/src/components/Post/Embed/ListEmbed.tsx b/src/components/Post/Embed/ListEmbed.tsx
index ef392e18c4..c1450bdcf9 100644
--- a/src/components/Post/Embed/ListEmbed.tsx
+++ b/src/components/Post/Embed/ListEmbed.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import {useMemo} from 'react'
 import {moderateUserList} from '@atproto/api'
 
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
@@ -28,7 +28,7 @@ export function ModeratedListEmbed({
   embed: EmbedType<'list'>
 }) {
   const moderationOpts = useModerationOpts()
-  const moderation = React.useMemo(() => {
+  const moderation = useMemo(() => {
     return moderationOpts
       ? moderateUserList(embed.view, moderationOpts)
       : undefined
diff --git a/src/view/com/feeds/FeedSourceCard.tsx b/src/view/com/feeds/FeedSourceCard.tsx
index 6ea02230ed..bc9e44f224 100644
--- a/src/view/com/feeds/FeedSourceCard.tsx
+++ b/src/view/com/feeds/FeedSourceCard.tsx
@@ -152,15 +152,15 @@ export function FeedSourceCardLoaded({
         <View style={[a.mr_md]}>
           <UserAvatar type="algo" size={36} avatar={feed.avatar} />
         </View>
-        <View style={[a.flex_1, a.gap_xs]}>
+        <View style={[a.flex_1]}>
           <Text
             emoji
-            style={[a.text_md, a.font_bold, a.leading_tight]}
+            style={[a.text_sm, a.font_bold, a.leading_snug]}
             numberOfLines={1}>
             {feed.displayName}
           </Text>
           <Text
-            style={[a.text_sm, t.atoms.text_contrast_medium, a.leading_tight]}
+            style={[a.text_sm, t.atoms.text_contrast_medium, a.leading_snug]}
             numberOfLines={1}>
             {feed.type === 'feed' ? (
               <Trans>Feed by {sanitizeHandle(feed.creatorHandle, '@')}</Trans>
@@ -185,7 +185,7 @@ export function FeedSourceCardLoaded({
             a.text_sm,
             a.font_bold,
             t.atoms.text_contrast_medium,
-            a.leading_tight,
+            a.leading_snug,
           ]}>
           <Trans>
             Liked by{' '}