diff options
Diffstat (limited to 'src/view')
| -rw-r--r-- | src/view/com/posts/FeedItem.tsx | 21 | ||||
| -rw-r--r-- | src/view/com/util/forms/PostDropdownBtn.tsx | 62 |
2 files changed, 70 insertions, 13 deletions
diff --git a/src/view/com/posts/FeedItem.tsx b/src/view/com/posts/FeedItem.tsx index fb9cdb065..28b8f4ceb 100644 --- a/src/view/com/posts/FeedItem.tsx +++ b/src/view/com/posts/FeedItem.tsx @@ -38,7 +38,8 @@ import {PostMeta} from '#/view/com/util/PostMeta' import {Text} from '#/view/com/util/text/Text' import {PreviewableUserAvatar} from '#/view/com/util/UserAvatar' import {atoms as a} from '#/alf' -import {Repost_Stroke2_Corner2_Rounded as Repost} from '#/components/icons/Repost' +import {Pin_Stroke2_Corner0_Rounded as PinIcon} from '#/components/icons/Pin' +import {Repost_Stroke2_Corner2_Rounded as RepostIcon} from '#/components/icons/Repost' import {ContentHider} from '#/components/moderation/ContentHider' import {LabelsOnMyPost} from '#/components/moderation/LabelsOnMe' import {PostAlerts} from '#/components/moderation/PostAlerts' @@ -52,6 +53,7 @@ interface FeedItemProps { record: AppBskyFeedPost.Record reason: | AppBskyFeedDefs.ReasonRepost + | AppBskyFeedDefs.ReasonPin | ReasonFeedSource | {[k: string]: unknown; $type: string} | undefined @@ -295,7 +297,7 @@ let FeedItemInner = ({ ) } onBeforePress={onOpenReposter}> - <Repost + <RepostIcon style={{color: pal.colors.textLight, marginRight: 3}} width={14} height={14} @@ -337,6 +339,21 @@ let FeedItemInner = ({ )} </Text> </Link> + ) : AppBskyFeedDefs.isReasonPin(reason) ? ( + <View style={styles.includeReason}> + <PinIcon + style={{color: pal.colors.textLight, marginRight: 3}} + width={14} + height={14} + /> + <Text + type="sm-bold" + style={pal.textLight} + lineHeight={1.2} + numberOfLines={1}> + <Trans>Pinned</Trans> + </Text> + </View> ) : null} </View> </View> diff --git a/src/view/com/util/forms/PostDropdownBtn.tsx b/src/view/com/util/forms/PostDropdownBtn.tsx index 03b6dd233..fe6efc02f 100644 --- a/src/view/com/util/forms/PostDropdownBtn.tsx +++ b/src/view/com/util/forms/PostDropdownBtn.tsx @@ -1,4 +1,4 @@ -import React, {memo} from 'react' +import React, {memo, useCallback} from 'react' import { Platform, Pressable, @@ -18,9 +18,13 @@ import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useNavigation} from '@react-navigation/native' +import {getCurrentRoute} from '#/lib/routes/helpers' import {makeProfileLink} from '#/lib/routes/links' import {CommonNavigatorParams, NavigationProp} from '#/lib/routes/types' +import {shareUrl} from '#/lib/sharing' import {richTextToString} from '#/lib/strings/rich-text-helpers' +import {toShareUrl} from '#/lib/strings/url-helpers' +import {useTheme} from '#/lib/ThemeContext' import {getTranslatorLink} from '#/locale/helpers' import {logger} from '#/logger' import {isWeb} from '#/platform/detection' @@ -29,6 +33,7 @@ import {useFeedFeedbackContext} from '#/state/feed-feedback' import {useLanguagePrefs} from '#/state/preferences' import {useHiddenPosts, useHiddenPostsApi} from '#/state/preferences' import {useOpenLink} from '#/state/preferences/in-app-browser' +import {usePinnedPostMutation} from '#/state/queries/pinned-post' import { usePostDeleteMutation, useThreadMuteMutationQueue, @@ -38,10 +43,6 @@ import {getMaybeDetachedQuoteEmbed} from '#/state/queries/postgate/util' import {useToggleReplyVisibilityMutation} from '#/state/queries/threadgate' import {useSession} from '#/state/session' import {useMergedThreadgateHiddenReplies} from '#/state/threadgate-hidden-replies' -import {getCurrentRoute} from 'lib/routes/helpers' -import {shareUrl} from 'lib/sharing' -import {toShareUrl} from 'lib/strings/url-helpers' -import {useTheme} from 'lib/ThemeContext' import {atoms as a, useBreakpoints, useTheme as useAlf} from '#/alf' import {useDialogControl} from '#/components/Dialog' import {useGlobalDialogsControlContext} from '#/components/dialogs/Context' @@ -65,6 +66,7 @@ import {EyeSlash_Stroke2_Corner0_Rounded as EyeSlash} from '#/components/icons/E import {Filter_Stroke2_Corner0_Rounded as Filter} from '#/components/icons/Filter' import {Mute_Stroke2_Corner0_Rounded as Mute} from '#/components/icons/Mute' import {PaperPlane_Stroke2_Corner0_Rounded as Send} from '#/components/icons/PaperPlane' +import {Pin_Stroke2_Corner0_Rounded as PinIcon} from '#/components/icons/Pin' import {SettingsGear2_Stroke2_Corner0_Rounded as Gear} from '#/components/icons/SettingsGear2' import {SpeakerVolumeFull_Stroke2_Corner0_Rounded as Unmute} from '#/components/icons/Speaker' import {Trash_Stroke2_Corner0_Rounded as Trash} from '#/components/icons/Trash' @@ -106,7 +108,9 @@ let PostDropdownBtn = ({ const {_} = useLingui() const defaultCtrlColor = theme.palette.default.postCtrl const langPrefs = useLanguagePrefs() - const postDeleteMutation = usePostDeleteMutation() + const {mutateAsync: deletePostMutate} = usePostDeleteMutation() + const {mutateAsync: pinPostMutate, isPending: isPinPending} = + usePinnedPostMutation() const hiddenPosts = useHiddenPosts() const {hidePost} = useHiddenPostsApi() const feedFeedback = useFeedFeedbackContext() @@ -149,8 +153,9 @@ let PostDropdownBtn = ({ threadgateRecord, }) const isReplyHiddenByThreadgate = threadgateHiddenReplies.has(postUri) + const isPinned = post.viewer?.pinned - const {mutateAsync: toggleQuoteDetachment, isPending} = + const {mutateAsync: toggleQuoteDetachment, isPending: isDetachPending} = useToggleQuoteDetachmentMutation() const prefetchPostInteractionSettings = usePrefetchPostInteractionSettings({ @@ -169,7 +174,7 @@ let PostDropdownBtn = ({ ) const onDeletePost = React.useCallback(() => { - postDeleteMutation.mutateAsync({uri: postUri}).then( + deletePostMutate({uri: postUri}).then( () => { Toast.show(_(msg`Post deleted`)) @@ -197,7 +202,7 @@ let PostDropdownBtn = ({ }, [ navigation, postUri, - postDeleteMutation, + deletePostMutate, postAuthor, currentAccount, isAuthor, @@ -344,6 +349,14 @@ let PostDropdownBtn = ({ toggleReplyVisibility, ]) + const onPressPin = useCallback(() => { + pinPostMutate({ + postUri, + postCid, + action: isPinned ? 'unpin' : 'pin', + }) + }, [isPinned, pinPostMutate, postCid, postUri]) + return ( <EventStopper onKeyDown={false}> <Menu.Root> @@ -372,6 +385,33 @@ let PostDropdownBtn = ({ </Menu.Trigger> <Menu.Outer> + {isAuthor && ( + <> + <Menu.Group> + <Menu.Item + testID="pinPostBtn" + label={ + isPinned + ? _(msg`Unpin from profile`) + : _(msg`Pin to your profile`) + } + disabled={isPinPending} + onPress={onPressPin}> + <Menu.ItemText> + {isPinned + ? _(msg`Unpin from profile`) + : _(msg`Pin to your profile`)} + </Menu.ItemText> + <Menu.ItemIcon + icon={isPinPending ? Loader : PinIcon} + position="right" + /> + </Menu.Item> + </Menu.Group> + <Menu.Divider /> + </> + )} + <Menu.Group> {(!hideInPWI || hasSession) && ( <> @@ -536,7 +576,7 @@ let PostDropdownBtn = ({ {canDetachQuote && ( <Menu.Item - disabled={isPending} + disabled={isDetachPending} testID="postDropdownHideBtn" label={ quoteEmbed.isDetached @@ -555,7 +595,7 @@ let PostDropdownBtn = ({ </Menu.ItemText> <Menu.ItemIcon icon={ - isPending + isDetachPending ? Loader : quoteEmbed.isDetached ? Eye |