Skip to content

Commit 218a72c

Browse files
committed
fix: embed content ordering
1 parent c8e078e commit 218a72c

File tree

1 file changed

+33
-38
lines changed

1 file changed

+33
-38
lines changed

src/components/PostEmbed/app-bsky-embed-record-view.tsx

Lines changed: 33 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -26,38 +26,44 @@ export const AppBskyEmbedRecordView = ({ embed }: { embed: BSkyPostEmbed }) => {
2626
);
2727
}
2828

29-
if (embed.record.$type === 'app.bsky.embed.record#viewRecord' && embed.record.embeds && embed.record.embeds.length >= 1) {
30-
return <PostEmbed embed={embed.record.embeds?.[0]} />;
31-
}
32-
3329
return (
3430
<div className="p-4 rounded-lg shadow border border-neutral-200 dark:border-neutral-800">
3531
{embed.record.$type === 'app.bsky.embed.record#viewRecord' && (
36-
<div className="flex items-center space-x-3 mb-2">
37-
<Avatar handle={author.handle} avatar={author.avatar} />
38-
<div>
39-
<div className="font-medium text-gray-900 dark:text-gray-100">
40-
<Link to="/profile/$handle" params={{ handle: author.handle }}>
41-
{author.displayName || author.handle}
42-
</Link>
43-
</div>
44-
<div className="text-gray-500 dark:text-gray-400 text-sm">
45-
<Link to="/profile/$handle" params={{ handle: author.handle }}>
46-
<Handle handle={author.handle} />
47-
</Link>
48-
{' · '}
49-
<Link
50-
to="/profile/$handle/post/$postId"
51-
params={{
52-
handle: author.handle,
53-
postId: embed.record.uri.split('/').pop()!,
54-
}}
55-
>
56-
<TimeAgo date={embed.record.indexedAt} />
57-
</Link>
32+
<>
33+
<div className="flex items-center space-x-3 mb-2">
34+
<Avatar handle={author.handle} avatar={author.avatar} />
35+
<div>
36+
<div className="font-medium text-gray-900 dark:text-gray-100">
37+
<Link to="/profile/$handle" params={{ handle: author.handle }}>
38+
{author.displayName || author.handle}
39+
</Link>
40+
</div>
41+
<div className="text-gray-500 dark:text-gray-400 text-sm">
42+
<Link to="/profile/$handle" params={{ handle: author.handle }}>
43+
<Handle handle={author.handle} />
44+
</Link>
45+
{' · '}
46+
<Link
47+
to="/profile/$handle/post/$postId"
48+
params={{
49+
handle: author.handle,
50+
postId: embed.record.uri.split('/').pop()!,
51+
}}
52+
>
53+
<TimeAgo date={embed.record.indexedAt} />
54+
</Link>
55+
</div>
5856
</div>
5957
</div>
60-
</div>
58+
<p className="text-gray-800 dark:text-gray-200">
59+
{embed.record.facets ? (
60+
<FacetedText text={embed.record.value.text} facets={embed.record.facets} key={embed.record.uri} />
61+
) : (
62+
<FormattedText text={embed.record.value.text} key={embed.record.uri} />
63+
)}
64+
</p>
65+
<PostEmbed embed={embed.record.embeds?.[0]} />
66+
</>
6167
)}
6268
{embed.record.$type === 'app.bsky.graph.defs#starterPackViewBasic' && (
6369
<div className="text-gray-800 dark:text-gray-200">
@@ -106,17 +112,6 @@ export const AppBskyEmbedRecordView = ({ embed }: { embed: BSkyPostEmbed }) => {
106112
</div>
107113
</div>
108114
)}
109-
{embed.record.$type !== 'app.bsky.graph.defs#starterPackViewBasic' &&
110-
embed.record.$type !== 'app.bsky.feed.defs#generatorView' &&
111-
embed.record.$type !== 'app.bsky.graph.defs#listView' && (
112-
<p className="text-gray-800 dark:text-gray-200">
113-
{embed.record.facets ? (
114-
<FacetedText text={embed.record.value.text} facets={embed.record.facets} key={embed.record.uri} />
115-
) : (
116-
<FormattedText text={embed.record.value.text} key={embed.record.uri} />
117-
)}
118-
</p>
119-
)}
120115
</div>
121116
);
122117
};

0 commit comments

Comments
 (0)