diff options
| -rw-r--r-- | src/lib/strings/rich-text-helpers.ts | 29 | ||||
| -rw-r--r-- | src/view/com/post-thread/PostThreadItem.tsx | 3 | ||||
| -rw-r--r-- | src/view/com/post/Post.tsx | 7 | ||||
| -rw-r--r-- | src/view/com/posts/FeedItem.tsx | 1 | ||||
| -rw-r--r-- | src/view/com/util/forms/PostDropdownBtn.tsx | 16 | ||||
| -rw-r--r-- | src/view/com/util/post-ctrls/PostCtrls.tsx | 9 |
6 files changed, 60 insertions, 5 deletions
diff --git a/src/lib/strings/rich-text-helpers.ts b/src/lib/strings/rich-text-helpers.ts new file mode 100644 index 000000000..08971ca03 --- /dev/null +++ b/src/lib/strings/rich-text-helpers.ts @@ -0,0 +1,29 @@ +import {AppBskyRichtextFacet, RichText} from '@atproto/api' +import {linkRequiresWarning} from './url-helpers' + +export function richTextToString(rt: RichText): string { + const {text, facets} = rt + + if (!facets?.length) { + return text + } + + let result = '' + + for (const segment of rt.segments()) { + const link = segment.link + + if (link && AppBskyRichtextFacet.validateLink(link).success) { + const href = link.uri + const text = segment.text + + const requiresWarning = linkRequiresWarning(href, text) + + result += !requiresWarning ? href : `[${text}](${href})` + } else { + result += segment.text + } + } + + return result +} diff --git a/src/view/com/post-thread/PostThreadItem.tsx b/src/view/com/post-thread/PostThreadItem.tsx index bb3c7e2cc..cd218a062 100644 --- a/src/view/com/post-thread/PostThreadItem.tsx +++ b/src/view/com/post-thread/PostThreadItem.tsx @@ -336,6 +336,7 @@ let PostThreadItemLoaded = ({ postCid={post.cid} postUri={post.uri} record={record} + richText={richText} showAppealLabelItem={ post.author.did === currentAccount?.did && isModeratedPost } @@ -439,6 +440,7 @@ let PostThreadItemLoaded = ({ big post={post} record={record} + richText={richText} onPressReply={onPressReply} /> </View> @@ -587,6 +589,7 @@ let PostThreadItemLoaded = ({ <PostCtrls post={post} record={record} + richText={richText} onPressReply={onPressReply} /> </View> diff --git a/src/view/com/post/Post.tsx b/src/view/com/post/Post.tsx index 0e5a459fa..f035c32ad 100644 --- a/src/view/com/post/Post.tsx +++ b/src/view/com/post/Post.tsx @@ -213,7 +213,12 @@ function PostInner({ </ContentHider> ) : null} </ContentHider> - <PostCtrls post={post} record={record} onPressReply={onPressReply} /> + <PostCtrls + post={post} + record={record} + richText={richText} + onPressReply={onPressReply} + /> </View> </View> </Link> diff --git a/src/view/com/posts/FeedItem.tsx b/src/view/com/posts/FeedItem.tsx index f2b5605dd..8dee4ed49 100644 --- a/src/view/com/posts/FeedItem.tsx +++ b/src/view/com/posts/FeedItem.tsx @@ -304,6 +304,7 @@ let FeedItemInner = ({ <PostCtrls post={post} record={record} + richText={richText} onPressReply={onPressReply} showAppealLabelItem={ post.author.did === currentAccount?.did && isModeratedPost diff --git a/src/view/com/util/forms/PostDropdownBtn.tsx b/src/view/com/util/forms/PostDropdownBtn.tsx index 82373822e..8e31c9e63 100644 --- a/src/view/com/util/forms/PostDropdownBtn.tsx +++ b/src/view/com/util/forms/PostDropdownBtn.tsx @@ -2,7 +2,12 @@ import React, {memo} from 'react' import {Linking, StyleProp, View, ViewStyle} from 'react-native' import Clipboard from '@react-native-clipboard/clipboard' import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' -import {AppBskyActorDefs, AppBskyFeedPost, AtUri} from '@atproto/api' +import { + AppBskyActorDefs, + AppBskyFeedPost, + AtUri, + RichText as RichTextAPI, +} from '@atproto/api' import {toShareUrl} from 'lib/strings/url-helpers' import {useTheme} from 'lib/ThemeContext' import {shareUrl} from 'lib/sharing' @@ -24,6 +29,7 @@ import {msg} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useSession} from '#/state/session' import {isWeb} from '#/platform/detection' +import {richTextToString} from '#/lib/strings/rich-text-helpers' let PostDropdownBtn = ({ testID, @@ -31,6 +37,7 @@ let PostDropdownBtn = ({ postCid, postUri, record, + richText, style, showAppealLabelItem, }: { @@ -39,6 +46,7 @@ let PostDropdownBtn = ({ postCid: string postUri: string record: AppBskyFeedPost.Record + richText: RichTextAPI style?: StyleProp<ViewStyle> showAppealLabelItem?: boolean }): React.ReactNode => { @@ -96,9 +104,11 @@ let PostDropdownBtn = ({ }, [rootUri, toggleThreadMute, _]) const onCopyPostText = React.useCallback(() => { - Clipboard.setString(record?.text || '') + const str = richTextToString(richText) + + Clipboard.setString(str) Toast.show(_(msg`Copied to clipboard`)) - }, [record, _]) + }, [_, richText]) const onOpenTranslate = React.useCallback(() => { Linking.openURL(translatorUrl) diff --git a/src/view/com/util/post-ctrls/PostCtrls.tsx b/src/view/com/util/post-ctrls/PostCtrls.tsx index 575f19bfc..50ef8a875 100644 --- a/src/view/com/util/post-ctrls/PostCtrls.tsx +++ b/src/view/com/util/post-ctrls/PostCtrls.tsx @@ -6,7 +6,11 @@ import { View, ViewStyle, } from 'react-native' -import {AppBskyFeedDefs, AppBskyFeedPost} from '@atproto/api' +import { + AppBskyFeedDefs, + AppBskyFeedPost, + RichText as RichTextAPI, +} from '@atproto/api' import {Text} from '../text/Text' import {PostDropdownBtn} from '../forms/PostDropdownBtn' import {HeartIcon, HeartIconSolid, CommentBottomArrow} from 'lib/icons' @@ -33,6 +37,7 @@ let PostCtrls = ({ big, post, record, + richText, showAppealLabelItem, style, onPressReply, @@ -40,6 +45,7 @@ let PostCtrls = ({ big?: boolean post: Shadow<AppBskyFeedDefs.PostView> record: AppBskyFeedPost.Record + richText: RichTextAPI showAppealLabelItem?: boolean style?: StyleProp<ViewStyle> onPressReply: () => void @@ -212,6 +218,7 @@ let PostCtrls = ({ postCid={post.cid} postUri={post.uri} record={record} + richText={richText} showAppealLabelItem={showAppealLabelItem} style={styles.ctrlPad} /> |