Merge branch 'bluesky-social:main' into zh

zio/stable
Kuwa Lee 2024-06-13 03:00:02 +08:00 committed by GitHub
commit bd8f0e5a1c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 7 deletions

View File

@ -71,8 +71,11 @@ let ProfileMenu = ({
const loggedOutWarningPromptControl = Prompt.usePromptControl()
const showLoggedOutWarning = React.useMemo(() => {
return !!profile.labels?.find(label => label.val === '!no-unauthenticated')
}, [profile.labels])
return (
profile.did !== currentAccount?.did &&
!!profile.labels?.find(label => label.val === '!no-unauthenticated')
)
}, [currentAccount, profile])
const invalidateProfileQuery = React.useCallback(() => {
queryClient.invalidateQueries({

View File

@ -196,6 +196,9 @@ let PostDropdownBtn = ({
)
}, [postAuthor])
const showLoggedOutWarning =
postAuthor.did !== currentAccount?.did && hideInPWI
const onSharePost = React.useCallback(() => {
const url = toShareUrl(href)
shareUrl(url)
@ -296,7 +299,7 @@ let PostDropdownBtn = ({
testID="postDropdownShareBtn"
label={isWeb ? _(msg`Copy link to post`) : _(msg`Share`)}
onPress={() => {
if (hideInPWI) {
if (showLoggedOutWarning) {
loggedOutWarningPromptControl.open()
} else {
onSharePost()

View File

@ -27,7 +27,7 @@ import {
usePostLikeMutationQueue,
usePostRepostMutationQueue,
} from '#/state/queries/post'
import {useRequireAuth} from '#/state/session'
import {useRequireAuth, useSession} from '#/state/session'
import {useComposerControls} from '#/state/shell/composer'
import {atoms as a, useTheme} from '#/alf'
import {useDialogControl} from '#/components/Dialog'
@ -64,6 +64,7 @@ let PostCtrls = ({
const t = useTheme()
const {_} = useLingui()
const {openComposer} = useComposerControls()
const {currentAccount} = useSession()
const [queueLike, queueUnlike] = usePostLikeMutationQueue(post, logContext)
const [queueRepost, queueUnrepost] = usePostRepostMutationQueue(
post,
@ -75,10 +76,11 @@ let PostCtrls = ({
const playHaptic = useHaptics()
const shouldShowLoggedOutWarning = React.useMemo(() => {
return !!post.author.labels?.find(
label => label.val === '!no-unauthenticated',
return (
post.author.did !== currentAccount?.did &&
!!post.author.labels?.find(label => label.val === '!no-unauthenticated')
)
}, [post])
}, [currentAccount, post])
const defaultCtrlColor = React.useMemo(
() => ({