Refactor ChatListItem for mod state
This commit is contained in:
@@ -1,11 +1,16 @@
|
|||||||
import React, {useCallback} from 'react'
|
import React, {useCallback} from 'react'
|
||||||
import {Keyboard, Pressable, View} from 'react-native'
|
import {Keyboard, Pressable, View} from 'react-native'
|
||||||
import {AppBskyActorDefs, ChatBskyConvoDefs} from '@atproto/api'
|
import {
|
||||||
|
AppBskyActorDefs,
|
||||||
|
ChatBskyConvoDefs,
|
||||||
|
ModerationDecision,
|
||||||
|
} from '@atproto/api'
|
||||||
import {msg, Trans} from '@lingui/macro'
|
import {msg, Trans} from '@lingui/macro'
|
||||||
import {useLingui} from '@lingui/react'
|
import {useLingui} from '@lingui/react'
|
||||||
import {useNavigation} from '@react-navigation/native'
|
import {useNavigation} from '@react-navigation/native'
|
||||||
|
|
||||||
import {NavigationProp} from '#/lib/routes/types'
|
import {NavigationProp} from '#/lib/routes/types'
|
||||||
|
import {listUriToHref} from '#/lib/strings/url-helpers'
|
||||||
import {
|
import {
|
||||||
useConvoQuery,
|
useConvoQuery,
|
||||||
useMarkAsReadMutation,
|
useMarkAsReadMutation,
|
||||||
@@ -14,6 +19,7 @@ import {useLeaveConvo} from '#/state/queries/messages/leave-conversation'
|
|||||||
import {useMuteConvo} from '#/state/queries/messages/mute-conversation'
|
import {useMuteConvo} from '#/state/queries/messages/mute-conversation'
|
||||||
import * as Toast from '#/view/com/util/Toast'
|
import * as Toast from '#/view/com/util/Toast'
|
||||||
import {atoms as a, useTheme} from '#/alf'
|
import {atoms as a, useTheme} from '#/alf'
|
||||||
|
import * as Dialog from '#/components/Dialog'
|
||||||
import {ArrowBoxLeft_Stroke2_Corner0_Rounded as ArrowBoxLeft} from '#/components/icons/ArrowBoxLeft'
|
import {ArrowBoxLeft_Stroke2_Corner0_Rounded as ArrowBoxLeft} from '#/components/icons/ArrowBoxLeft'
|
||||||
import {DotGrid_Stroke2_Corner0_Rounded as DotsHorizontal} from '#/components/icons/DotGrid'
|
import {DotGrid_Stroke2_Corner0_Rounded as DotsHorizontal} from '#/components/icons/DotGrid'
|
||||||
import {Flag_Stroke2_Corner0_Rounded as Flag} from '#/components/icons/Flag'
|
import {Flag_Stroke2_Corner0_Rounded as Flag} from '#/components/icons/Flag'
|
||||||
@@ -22,8 +28,10 @@ import {Person_Stroke2_Corner0_Rounded as Person} from '#/components/icons/Perso
|
|||||||
import {PersonCheck_Stroke2_Corner0_Rounded as PersonCheck} from '#/components/icons/PersonCheck'
|
import {PersonCheck_Stroke2_Corner0_Rounded as PersonCheck} from '#/components/icons/PersonCheck'
|
||||||
import {PersonX_Stroke2_Corner0_Rounded as PersonX} from '#/components/icons/PersonX'
|
import {PersonX_Stroke2_Corner0_Rounded as PersonX} from '#/components/icons/PersonX'
|
||||||
import {SpeakerVolumeFull_Stroke2_Corner0_Rounded as Unmute} from '#/components/icons/Speaker'
|
import {SpeakerVolumeFull_Stroke2_Corner0_Rounded as Unmute} from '#/components/icons/Speaker'
|
||||||
|
import {InlineLinkText} from '#/components/Link'
|
||||||
import * as Menu from '#/components/Menu'
|
import * as Menu from '#/components/Menu'
|
||||||
import * as Prompt from '#/components/Prompt'
|
import * as Prompt from '#/components/Prompt'
|
||||||
|
import {Text} from '#/components/Typography'
|
||||||
import {Bubble_Stroke2_Corner2_Rounded as Bubble} from '../icons/Bubble'
|
import {Bubble_Stroke2_Corner2_Rounded as Bubble} from '../icons/Bubble'
|
||||||
|
|
||||||
let ConvoMenu = ({
|
let ConvoMenu = ({
|
||||||
@@ -34,22 +42,34 @@ let ConvoMenu = ({
|
|||||||
showMarkAsRead,
|
showMarkAsRead,
|
||||||
hideTrigger,
|
hideTrigger,
|
||||||
triggerOpacity,
|
triggerOpacity,
|
||||||
|
moderation,
|
||||||
}: {
|
}: {
|
||||||
convo: ChatBskyConvoDefs.ConvoView
|
convo: ChatBskyConvoDefs.ConvoView
|
||||||
profile: AppBskyActorDefs.ProfileViewBasic
|
profile: AppBskyActorDefs.ProfileViewBasic
|
||||||
onUpdateConvo?: (convo: ChatBskyConvoDefs.ConvoView) => void
|
|
||||||
control?: Menu.MenuControlProps
|
control?: Menu.MenuControlProps
|
||||||
currentScreen: 'list' | 'conversation'
|
currentScreen: 'list' | 'conversation'
|
||||||
showMarkAsRead?: boolean
|
showMarkAsRead?: boolean
|
||||||
hideTrigger?: boolean
|
hideTrigger?: boolean
|
||||||
triggerOpacity?: number
|
triggerOpacity?: number
|
||||||
|
moderation: ModerationDecision
|
||||||
}): React.ReactNode => {
|
}): React.ReactNode => {
|
||||||
const navigation = useNavigation<NavigationProp>()
|
const navigation = useNavigation<NavigationProp>()
|
||||||
const {_} = useLingui()
|
const {_} = useLingui()
|
||||||
const t = useTheme()
|
const t = useTheme()
|
||||||
const leaveConvoControl = Prompt.usePromptControl()
|
const leaveConvoControl = Prompt.usePromptControl()
|
||||||
const reportControl = Prompt.usePromptControl()
|
const reportControl = Prompt.usePromptControl()
|
||||||
|
const blockedByListControl = Prompt.usePromptControl()
|
||||||
const {mutate: markAsRead} = useMarkAsReadMutation()
|
const {mutate: markAsRead} = useMarkAsReadMutation()
|
||||||
|
const modui = moderation.ui('profileView')
|
||||||
|
const {listBlocks} = React.useMemo(() => {
|
||||||
|
const blocks = modui.alerts.filter(alert => alert.type === 'blocking')
|
||||||
|
const listBlocks = blocks.filter(alert => alert.source.type === 'list')
|
||||||
|
const userBlock = blocks.find(alert => alert.source.type === 'user')
|
||||||
|
return {
|
||||||
|
listBlocks,
|
||||||
|
userBlock,
|
||||||
|
}
|
||||||
|
}, [modui])
|
||||||
|
|
||||||
const {data: convo} = useConvoQuery(initialConvo)
|
const {data: convo} = useConvoQuery(initialConvo)
|
||||||
|
|
||||||
@@ -70,6 +90,13 @@ let ConvoMenu = ({
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const toggleBlock = React.useCallback(() => {
|
||||||
|
if (listBlocks.length) {
|
||||||
|
blockedByListControl.open()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}, [listBlocks, blockedByListControl])
|
||||||
|
|
||||||
const {mutate: leaveConvo} = useLeaveConvo(convo?.id, {
|
const {mutate: leaveConvo} = useLeaveConvo(convo?.id, {
|
||||||
onSuccess: () => {
|
onSuccess: () => {
|
||||||
if (currentScreen === 'conversation') {
|
if (currentScreen === 'conversation') {
|
||||||
@@ -148,10 +175,7 @@ let ConvoMenu = ({
|
|||||||
<Menu.Divider />
|
<Menu.Divider />
|
||||||
{/* TODO(samuel): implement this */}
|
{/* TODO(samuel): implement this */}
|
||||||
<Menu.Group>
|
<Menu.Group>
|
||||||
<Menu.Item
|
<Menu.Item label={_(msg`Block account`)} onPress={toggleBlock}>
|
||||||
label={_(msg`Block account`)}
|
|
||||||
onPress={() => {}}
|
|
||||||
disabled>
|
|
||||||
<Menu.ItemText>
|
<Menu.ItemText>
|
||||||
<Trans>Block account</Trans>
|
<Trans>Block account</Trans>
|
||||||
</Menu.ItemText>
|
</Menu.ItemText>
|
||||||
@@ -202,6 +226,42 @@ let ConvoMenu = ({
|
|||||||
confirmButtonCta={_(msg`I understand`)}
|
confirmButtonCta={_(msg`I understand`)}
|
||||||
onConfirm={noop}
|
onConfirm={noop}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<Prompt.Outer control={blockedByListControl} testID="blockedByListDialog">
|
||||||
|
<Prompt.TitleText>{_(msg`User blocked by list`)}</Prompt.TitleText>
|
||||||
|
|
||||||
|
<View style={[a.gap_sm, a.pb_lg]}>
|
||||||
|
<Text
|
||||||
|
selectable
|
||||||
|
style={[a.text_md, a.leading_snug, t.atoms.text_contrast_high]}>
|
||||||
|
{_(
|
||||||
|
msg`This account is blocked by one or more of your moderation lists. To unblock, please visit the lists directly and remove this user.`,
|
||||||
|
)}{' '}
|
||||||
|
</Text>
|
||||||
|
|
||||||
|
<Text style={[a.text_md, a.leading_snug, t.atoms.text_contrast_high]}>
|
||||||
|
{_(msg`Lists blocking this user:`)}{' '}
|
||||||
|
{listBlocks.map((block, i) =>
|
||||||
|
block.source.type === 'list' ? (
|
||||||
|
<React.Fragment key={block.source.list.uri}>
|
||||||
|
{i === 0 ? null : ', '}
|
||||||
|
<InlineLinkText
|
||||||
|
to={listUriToHref(block.source.list.uri)}
|
||||||
|
style={[a.text_md, a.leading_snug]}>
|
||||||
|
{block.source.list.name}
|
||||||
|
</InlineLinkText>
|
||||||
|
</React.Fragment>
|
||||||
|
) : null,
|
||||||
|
)}
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
<Prompt.Actions>
|
||||||
|
<Prompt.Cancel cta={_(msg`I understand`)} />
|
||||||
|
</Prompt.Actions>
|
||||||
|
|
||||||
|
<Dialog.Close />
|
||||||
|
</Prompt.Outer>
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,21 @@
|
|||||||
import React from 'react'
|
import React from 'react'
|
||||||
import {View} from 'react-native'
|
import {View} from 'react-native'
|
||||||
import {ChatBskyConvoDefs} from '@atproto/api'
|
import {
|
||||||
|
AppBskyActorDefs,
|
||||||
|
ChatBskyConvoDefs,
|
||||||
|
moderateProfile,
|
||||||
|
ModerationOpts,
|
||||||
|
} from '@atproto/api'
|
||||||
import {msg} from '@lingui/macro'
|
import {msg} from '@lingui/macro'
|
||||||
import {useLingui} from '@lingui/react'
|
import {useLingui} from '@lingui/react'
|
||||||
import {useNavigation} from '@react-navigation/native'
|
import {useNavigation} from '@react-navigation/native'
|
||||||
|
|
||||||
import {NavigationProp} from '#/lib/routes/types'
|
import {NavigationProp} from '#/lib/routes/types'
|
||||||
import {isNative} from '#/platform/detection'
|
import {isNative} from '#/platform/detection'
|
||||||
|
import {useProfileShadow} from '#/state/cache/profile-shadow'
|
||||||
|
import {useModerationOpts} from '#/state/preferences/moderation-opts'
|
||||||
import {useSession} from '#/state/session'
|
import {useSession} from '#/state/session'
|
||||||
|
import {sanitizeDisplayName} from 'lib/strings/display-names'
|
||||||
import {TimeElapsed} from '#/view/com/util/TimeElapsed'
|
import {TimeElapsed} from '#/view/com/util/TimeElapsed'
|
||||||
import {UserAvatar} from '#/view/com/util/UserAvatar'
|
import {UserAvatar} from '#/view/com/util/UserAvatar'
|
||||||
import {atoms as a, useBreakpoints, useTheme, web} from '#/alf'
|
import {atoms as a, useBreakpoints, useTheme, web} from '#/alf'
|
||||||
@@ -17,25 +25,53 @@ import {Bell2Off_Filled_Corner0_Rounded as BellStroke} from '#/components/icons/
|
|||||||
import {useMenuControl} from '#/components/Menu'
|
import {useMenuControl} from '#/components/Menu'
|
||||||
import {Text} from '#/components/Typography'
|
import {Text} from '#/components/Typography'
|
||||||
|
|
||||||
export function ChatListItem({
|
export function ChatListItem({convo}: {convo: ChatBskyConvoDefs.ConvoView}) {
|
||||||
|
const {currentAccount} = useSession()
|
||||||
|
const otherUser = convo.members.find(
|
||||||
|
member => member.did !== currentAccount?.did,
|
||||||
|
)
|
||||||
|
const moderationOpts = useModerationOpts()
|
||||||
|
|
||||||
|
if (!otherUser || !moderationOpts) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<ChatListItemReady
|
||||||
|
convo={convo}
|
||||||
|
profile={otherUser}
|
||||||
|
moderationOpts={moderationOpts}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function ChatListItemReady({
|
||||||
convo,
|
convo,
|
||||||
index,
|
profile: profileUnshadowed,
|
||||||
|
moderationOpts,
|
||||||
}: {
|
}: {
|
||||||
convo: ChatBskyConvoDefs.ConvoView
|
convo: ChatBskyConvoDefs.ConvoView
|
||||||
index: number
|
profile: AppBskyActorDefs.ProfileViewBasic
|
||||||
|
moderationOpts: ModerationOpts
|
||||||
}) {
|
}) {
|
||||||
const t = useTheme()
|
const t = useTheme()
|
||||||
const {_} = useLingui()
|
const {_} = useLingui()
|
||||||
const {currentAccount} = useSession()
|
const {currentAccount} = useSession()
|
||||||
const menuControl = useMenuControl()
|
const menuControl = useMenuControl()
|
||||||
const {gtMobile} = useBreakpoints()
|
const {gtMobile} = useBreakpoints()
|
||||||
const otherUser = convo.members.find(
|
const profile = useProfileShadow(profileUnshadowed)
|
||||||
member => member.did !== currentAccount?.did,
|
const moderation = React.useMemo(
|
||||||
|
() => moderateProfile(profile, moderationOpts),
|
||||||
|
[profile, moderationOpts],
|
||||||
)
|
)
|
||||||
const isDeletedAccount = otherUser?.handle === 'missing.invalid'
|
|
||||||
|
const isDeletedAccount = profile.handle === 'missing.invalid'
|
||||||
const displayName = isDeletedAccount
|
const displayName = isDeletedAccount
|
||||||
? 'Deleted Account'
|
? 'Deleted Account'
|
||||||
: otherUser?.displayName || otherUser?.handle
|
: sanitizeDisplayName(
|
||||||
|
profile.displayName || profile.handle,
|
||||||
|
moderation.ui('displayName'),
|
||||||
|
)
|
||||||
|
|
||||||
let lastMessage = _(msg`No messages yet`)
|
let lastMessage = _(msg`No messages yet`)
|
||||||
let lastMessageSentAt: string | null = null
|
let lastMessageSentAt: string | null = null
|
||||||
@@ -73,10 +109,6 @@ export function ChatListItem({
|
|||||||
})
|
})
|
||||||
}, [convo.id, navigation])
|
}, [convo.id, navigation])
|
||||||
|
|
||||||
if (!otherUser) {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View
|
<View
|
||||||
// @ts-expect-error web only
|
// @ts-expect-error web only
|
||||||
@@ -85,7 +117,7 @@ export function ChatListItem({
|
|||||||
onFocus={onFocus}
|
onFocus={onFocus}
|
||||||
onBlur={onMouseLeave}>
|
onBlur={onMouseLeave}>
|
||||||
<Button
|
<Button
|
||||||
label={otherUser.displayName || otherUser.handle}
|
label={profile.displayName || profile.handle}
|
||||||
onPress={onPress}
|
onPress={onPress}
|
||||||
style={a.flex_1}
|
style={a.flex_1}
|
||||||
onLongPress={isNative ? menuControl.open : undefined}>
|
onLongPress={isNative ? menuControl.open : undefined}>
|
||||||
@@ -98,10 +130,13 @@ export function ChatListItem({
|
|||||||
a.py_md,
|
a.py_md,
|
||||||
a.gap_md,
|
a.gap_md,
|
||||||
(hovered || pressed) && t.atoms.bg_contrast_25,
|
(hovered || pressed) && t.atoms.bg_contrast_25,
|
||||||
index === 0 && [a.border_t, a.pt_lg],
|
|
||||||
t.atoms.border_contrast_low,
|
t.atoms.border_contrast_low,
|
||||||
]}>
|
]}>
|
||||||
<UserAvatar avatar={otherUser?.avatar} size={52} />
|
<UserAvatar
|
||||||
|
avatar={profile.avatar}
|
||||||
|
size={52}
|
||||||
|
moderation={moderation.ui('avatar')}
|
||||||
|
/>
|
||||||
<View style={[a.flex_1, a.flex_row, a.align_center]}>
|
<View style={[a.flex_1, a.flex_row, a.align_center]}>
|
||||||
<View style={[a.flex_1]}>
|
<View style={[a.flex_1]}>
|
||||||
<View
|
<View
|
||||||
@@ -154,7 +189,7 @@ export function ChatListItem({
|
|||||||
<Text
|
<Text
|
||||||
numberOfLines={1}
|
numberOfLines={1}
|
||||||
style={[a.text_sm, t.atoms.text_contrast_medium, a.pb_xs]}>
|
style={[a.text_sm, t.atoms.text_contrast_medium, a.pb_xs]}>
|
||||||
@{otherUser.handle}
|
@{profile.handle}
|
||||||
</Text>
|
</Text>
|
||||||
)}
|
)}
|
||||||
<Text
|
<Text
|
||||||
@@ -196,7 +231,7 @@ export function ChatListItem({
|
|||||||
)}
|
)}
|
||||||
<ConvoMenu
|
<ConvoMenu
|
||||||
convo={convo}
|
convo={convo}
|
||||||
profile={otherUser}
|
profile={profile}
|
||||||
control={menuControl}
|
control={menuControl}
|
||||||
currentScreen="list"
|
currentScreen="list"
|
||||||
showMarkAsRead={convo.unreadCount > 0}
|
showMarkAsRead={convo.unreadCount > 0}
|
||||||
@@ -204,6 +239,7 @@ export function ChatListItem({
|
|||||||
triggerOpacity={
|
triggerOpacity={
|
||||||
!gtMobile || showActions || menuControl.isOpen ? 1 : 0
|
!gtMobile || showActions || menuControl.isOpen ? 1 : 0
|
||||||
}
|
}
|
||||||
|
moderation={moderation}
|
||||||
/>
|
/>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
|
|||||||
Reference in New Issue
Block a user