Skip to content

Commit

Permalink
Add ability to block account from post dropdown menu (#6091)
Browse files Browse the repository at this point in the history
Co-authored-by: Hailey <[email protected]>
Co-authored-by: Hailey <[email protected]>
  • Loading branch information
3 people authored Nov 22, 2024
1 parent 247bc10 commit ced6787
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/state/queries/profile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ function useProfileUnmuteMutation() {
}

export function useProfileBlockMutationQueue(
profile: Shadow<AppBskyActorDefs.ProfileViewDetailed>,
profile: Shadow<AppBskyActorDefs.ProfileViewBasic>,
) {
const queryClient = useQueryClient()
const did = profile.did
Expand Down
56 changes: 48 additions & 8 deletions src/view/com/util/forms/PostDropdownBtnMenuItems.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import {getTranslatorLink} from '#/locale/helpers'
import {logger} from '#/logger'
import {isWeb} from '#/platform/detection'
import {Shadow} from '#/state/cache/post-shadow'
import {useProfileShadow} from '#/state/cache/profile-shadow'
import {useFeedFeedbackContext} from '#/state/feed-feedback'
import {useLanguagePrefs} from '#/state/preferences'
import {useHiddenPosts, useHiddenPostsApi} from '#/state/preferences'
Expand All @@ -39,6 +40,7 @@ import {
} from '#/state/queries/post'
import {useToggleQuoteDetachmentMutation} from '#/state/queries/postgate'
import {getMaybeDetachedQuoteEmbed} from '#/state/queries/postgate/util'
import {useProfileBlockMutationQueue} from '#/state/queries/profile'
import {useToggleReplyVisibilityMutation} from '#/state/queries/threadgate'
import {useSession} from '#/state/session'
import {useMergedThreadgateHiddenReplies} from '#/state/threadgate-hidden-replies'
Expand All @@ -64,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 {PersonX_Stroke2_Corner0_Rounded as PersonX} from '#/components/icons/Person'
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'
Expand Down Expand Up @@ -107,6 +110,7 @@ let PostDropdownMenuItems = ({
const openLink = useOpenLink()
const navigation = useNavigation<NavigationProp>()
const {mutedWordsDialogControl} = useGlobalDialogsControlContext()
const blockPromptControl = useDialogControl()
const reportDialogControl = useReportDialogControl()
const deletePromptControl = useDialogControl()
const hidePromptControl = useDialogControl()
Expand All @@ -121,7 +125,7 @@ let PostDropdownMenuItems = ({

const postUri = post.uri
const postCid = post.cid
const postAuthor = post.author
const postAuthor = useProfileShadow(post.author)
const quoteEmbed = React.useMemo(() => {
if (!currentAccount || !post.embed) return
return getMaybeDetachedQuoteEmbed({
Expand All @@ -148,6 +152,8 @@ let PostDropdownMenuItems = ({
const {mutateAsync: toggleQuoteDetachment, isPending: isDetachPending} =
useToggleQuoteDetachmentMutation()

const [queueBlock] = useProfileBlockMutationQueue(postAuthor)

const prefetchPostInteractionSettings = usePrefetchPostInteractionSettings({
postUri: post.uri,
rootPostUri: rootUri,
Expand Down Expand Up @@ -348,6 +354,18 @@ let PostDropdownMenuItems = ({
})
}, [isPinned, pinPostMutate, postCid, postUri])

const onBlockAuthor = useCallback(async () => {
try {
await queueBlock()
Toast.show(_(msg`Account blocked`))
} catch (e: any) {
if (e?.name !== 'AbortError') {
logger.error('Failed to block account', {message: e})
Toast.show(_(msg`There was an issue! ${e.toString()}`), 'xmark')
}
}
}, [_, queueBlock])

return (
<>
<Menu.Outer>
Expand Down Expand Up @@ -578,13 +596,24 @@ let PostDropdownMenuItems = ({
<Menu.Divider />
<Menu.Group>
{!isAuthor && (
<Menu.Item
testID="postDropdownReportBtn"
label={_(msg`Report post`)}
onPress={() => reportDialogControl.open()}>
<Menu.ItemText>{_(msg`Report post`)}</Menu.ItemText>
<Menu.ItemIcon icon={Warning} position="right" />
</Menu.Item>
<>
{!postAuthor.viewer?.blocking && (
<Menu.Item
testID="postDropdownBlockBtn"
label={_(msg`Block account`)}
onPress={() => blockPromptControl.open()}>
<Menu.ItemText>{_(msg`Block account`)}</Menu.ItemText>
<Menu.ItemIcon icon={PersonX} position="right" />
</Menu.Item>
)}
<Menu.Item
testID="postDropdownReportBtn"
label={_(msg`Report post`)}
onPress={() => reportDialogControl.open()}>
<Menu.ItemText>{_(msg`Report post`)}</Menu.ItemText>
<Menu.ItemIcon icon={Warning} position="right" />
</Menu.Item>
</>
)}

{isAuthor && (
Expand Down Expand Up @@ -704,6 +733,17 @@ let PostDropdownMenuItems = ({
onConfirm={onToggleReplyVisibility}
confirmButtonCta={_(msg`Yes, hide`)}
/>

<Prompt.Basic
control={blockPromptControl}
title={_(msg`Block Account?`)}
description={_(
msg`Blocked accounts cannot reply in your threads, mention you, or otherwise interact with you.`,
)}
onConfirm={onBlockAuthor}
confirmButtonCta={_(msg`Block`)}
confirmButtonColor="negative"
/>
</>
)
}
Expand Down

0 comments on commit ced6787

Please sign in to comment.