From 218a72cc1c36da9b7930406d7ffbba10a500096c Mon Sep 17 00:00:00 2001
From: luna <luna@wvvw.me>
Date: Mon, 6 Jan 2025 22:48:19 +1030
Subject: [PATCH] fix: embed content ordering

---
 .../PostEmbed/app-bsky-embed-record-view.tsx  | 71 +++++++++----------
 1 file changed, 33 insertions(+), 38 deletions(-)

diff --git a/src/components/PostEmbed/app-bsky-embed-record-view.tsx b/src/components/PostEmbed/app-bsky-embed-record-view.tsx
index 2bd32b8..25a65be 100644
--- a/src/components/PostEmbed/app-bsky-embed-record-view.tsx
+++ b/src/components/PostEmbed/app-bsky-embed-record-view.tsx
@@ -26,38 +26,44 @@ export const AppBskyEmbedRecordView = ({ embed }: { embed: BSkyPostEmbed }) => {
     );
   }
 
-  if (embed.record.$type === 'app.bsky.embed.record#viewRecord' && embed.record.embeds && embed.record.embeds.length >= 1) {
-    return <PostEmbed embed={embed.record.embeds?.[0]} />;
-  }
-
   return (
     <div className="p-4 rounded-lg shadow border border-neutral-200 dark:border-neutral-800">
       {embed.record.$type === 'app.bsky.embed.record#viewRecord' && (
-        <div className="flex items-center space-x-3 mb-2">
-          <Avatar handle={author.handle} avatar={author.avatar} />
-          <div>
-            <div className="font-medium text-gray-900 dark:text-gray-100">
-              <Link to="/profile/$handle" params={{ handle: author.handle }}>
-                {author.displayName || author.handle}
-              </Link>
-            </div>
-            <div className="text-gray-500 dark:text-gray-400 text-sm">
-              <Link to="/profile/$handle" params={{ handle: author.handle }}>
-                <Handle handle={author.handle} />
-              </Link>
-              {' · '}
-              <Link
-                to="/profile/$handle/post/$postId"
-                params={{
-                  handle: author.handle,
-                  postId: embed.record.uri.split('/').pop()!,
-                }}
-              >
-                <TimeAgo date={embed.record.indexedAt} />
-              </Link>
+        <>
+          <div className="flex items-center space-x-3 mb-2">
+            <Avatar handle={author.handle} avatar={author.avatar} />
+            <div>
+              <div className="font-medium text-gray-900 dark:text-gray-100">
+                <Link to="/profile/$handle" params={{ handle: author.handle }}>
+                  {author.displayName || author.handle}
+                </Link>
+              </div>
+              <div className="text-gray-500 dark:text-gray-400 text-sm">
+                <Link to="/profile/$handle" params={{ handle: author.handle }}>
+                  <Handle handle={author.handle} />
+                </Link>
+                {' · '}
+                <Link
+                  to="/profile/$handle/post/$postId"
+                  params={{
+                    handle: author.handle,
+                    postId: embed.record.uri.split('/').pop()!,
+                  }}
+                >
+                  <TimeAgo date={embed.record.indexedAt} />
+                </Link>
+              </div>
             </div>
           </div>
-        </div>
+          <p className="text-gray-800 dark:text-gray-200">
+            {embed.record.facets ? (
+              <FacetedText text={embed.record.value.text} facets={embed.record.facets} key={embed.record.uri} />
+            ) : (
+              <FormattedText text={embed.record.value.text} key={embed.record.uri} />
+            )}
+          </p>
+          <PostEmbed embed={embed.record.embeds?.[0]} />
+        </>
       )}
       {embed.record.$type === 'app.bsky.graph.defs#starterPackViewBasic' && (
         <div className="text-gray-800 dark:text-gray-200">
@@ -106,17 +112,6 @@ export const AppBskyEmbedRecordView = ({ embed }: { embed: BSkyPostEmbed }) => {
           </div>
         </div>
       )}
-      {embed.record.$type !== 'app.bsky.graph.defs#starterPackViewBasic' &&
-        embed.record.$type !== 'app.bsky.feed.defs#generatorView' &&
-        embed.record.$type !== 'app.bsky.graph.defs#listView' && (
-          <p className="text-gray-800 dark:text-gray-200">
-            {embed.record.facets ? (
-              <FacetedText text={embed.record.value.text} facets={embed.record.facets} key={embed.record.uri} />
-            ) : (
-              <FormattedText text={embed.record.value.text} key={embed.record.uri} />
-            )}
-          </p>
-        )}
     </div>
   );
 };