Few fixes

This commit is contained in:
Eric Bailey
2024-08-06 18:59:26 -05:00
parent 413e87f4c5
commit 12a0164464
3 changed files with 27 additions and 6 deletions
+2 -2
View File
@@ -58,13 +58,13 @@ export function createEmbed({
detached: boolean detached: boolean
}) { }) {
if (AppBskyEmbedRecord.isView(post.embed)) { if (AppBskyEmbedRecord.isView(post.embed)) {
if (detached) return createEmbedViewRemovedRecord({uri: post.uri}) if (detached) return createEmbedViewRemovedRecord({uri: embeddedPost.uri})
return createEmbedRecordView({post: embeddedPost}) return createEmbedRecordView({post: embeddedPost})
} else if (AppBskyEmbedRecordWithMedia.isView(post.embed)) { } else if (AppBskyEmbedRecordWithMedia.isView(post.embed)) {
if (detached) if (detached)
return { return {
...post.embed, ...post.embed,
record: createEmbedViewRemovedRecord({uri: post.uri}), record: createEmbedViewRemovedRecord({uri: embeddedPost.uri}),
} }
return createEmbedRecordWithmediaView({post, embeddedPost}) return createEmbedRecordWithmediaView({post, embeddedPost})
} }
+16 -4
View File
@@ -153,6 +153,7 @@ let PostDropdownBtn = ({
}, [post, currentAccount]) }, [post, currentAccount])
const rootUri = record.reply?.root?.uri || postUri const rootUri = record.reply?.root?.uri || postUri
const isReply = Boolean(record.reply)
const [isThreadMuted, muteThread, unmuteThread] = useThreadMuteMutationQueue( const [isThreadMuted, muteThread, unmuteThread] = useThreadMuteMutationQueue(
post, post,
rootUri, rootUri,
@@ -468,7 +469,7 @@ let PostDropdownBtn = ({
</Menu.Item> </Menu.Item>
)} )}
{!isAuthor && !isPostHidden && rootPostUri && ( {!isAuthor && !isPostHidden && rootPostUri && isReply && (
<Menu.Item <Menu.Item
testID="postDropdownHideBtn" testID="postDropdownHideBtn"
label={ label={
@@ -489,10 +490,21 @@ let PostDropdownBtn = ({
{quoteEmbed && quoteEmbed.isOwnedByViewer && ( {quoteEmbed && quoteEmbed.isOwnedByViewer && (
<Menu.Item <Menu.Item
testID="postDropdownHideBtn" testID="postDropdownHideBtn"
label={_(msg`Detach quote`)} label={
quoteEmbed.isDetached
? _(msg`Re-attach quote`)
: _(msg`Detach quote`)
}
onPress={onToggleQuotePostAttachment}> onPress={onToggleQuotePostAttachment}>
<Menu.ItemText>{_(msg`Detach quote`)}</Menu.ItemText> <Menu.ItemText>
<Menu.ItemIcon icon={EyeSlash} position="right" /> {quoteEmbed.isDetached
? _(msg`Re-attach quote`)
: _(msg`Detach quote`)}
</Menu.ItemText>
<Menu.ItemIcon
icon={quoteEmbed.isDetached ? EyeSlash : EyeSlash}
position="right"
/>
</Menu.Item> </Menu.Item>
)} )}
</Menu.Group> </Menu.Group>
@@ -84,6 +84,15 @@ export function MaybeQuoteEmbed({
</Text> </Text>
</View> </View>
) )
} else if (AppBskyEmbedRecord.isViewRemoved(embed.record)) {
return (
<View style={[styles.errorContainer, pal.borderDark]}>
<InfoCircleIcon size={18} style={pal.text} />
<Text type="lg" style={pal.text}>
<Trans>Removed by author</Trans>
</Text>
</View>
)
} }
return null return null
} }