Fix self mention, resolve handle

This commit is contained in:
Eric Bailey
2023-11-14 13:14:46 -06:00
parent 0a26e78dcb
commit 2cf3f4c9b7
2 changed files with 51 additions and 7 deletions
+34
View File
@@ -0,0 +1,34 @@
import React from 'react'
import {useMutation} from '@tanstack/react-query'
import {useSession} from '#/state/session'
export function useGetHandle() {
const {agent} = useSession()
return React.useCallback(
async (handleOrDid: string) => {
if (handleOrDid.startsWith('did:')) {
const res = await agent.getProfile({actor: handleOrDid})
return res.data.handle
}
return handleOrDid
},
[agent],
)
}
export function useGetHandleMutation() {
const {agent} = useSession()
return useMutation({
mutationFn: async (handleOrDid: string) => {
if (handleOrDid.startsWith('did:')) {
// TODO would be nice to do this without all the other fetched data
const res = await agent.getProfile({actor: handleOrDid})
return res.data.handle
}
return handleOrDid
},
})
}
+17 -7
View File
@@ -45,6 +45,7 @@ import {useProfileQuery} from '#/state/queries/profile'
import {useSession} from '#/state/session' import {useSession} from '#/state/session'
import {useUnreadNotifications} from '#/state/queries/notifications/unread' import {useUnreadNotifications} from '#/state/queries/notifications/unread'
import {useComposerControls} from '#/state/shell/composer' import {useComposerControls} from '#/state/shell/composer'
import {useGetHandleMutation} from '#/state/queries/handle'
const ProfileCard = observer(function ProfileCardImpl() { const ProfileCard = observer(function ProfileCardImpl() {
const {currentAccount} = useSession() const {currentAccount} = useSession()
@@ -124,6 +125,7 @@ const NavItem = observer(function NavItemImpl({
label, label,
}: NavItemProps) { }: NavItemProps) {
const pal = usePalette('default') const pal = usePalette('default')
const {currentAccount} = useSession()
const store = useStores() const store = useStores()
const {isDesktop, isTablet} = useWebMediaQueries() const {isDesktop, isTablet} = useWebMediaQueries()
const [pathName] = React.useMemo(() => router.matchPath(href), [href]) const [pathName] = React.useMemo(() => router.matchPath(href), [href])
@@ -137,7 +139,7 @@ const NavItem = observer(function NavItemImpl({
currentRouteInfo.name === 'Profile' currentRouteInfo.name === 'Profile'
? isTab(currentRouteInfo.name, pathName) && ? isTab(currentRouteInfo.name, pathName) &&
(currentRouteInfo.params as CommonNavigatorParams['Profile']).name === (currentRouteInfo.params as CommonNavigatorParams['Profile']).name ===
store.me.handle currentAccount?.handle
: isTab(currentRouteInfo.name, pathName) : isTab(currentRouteInfo.name, pathName)
const {onPress} = useLinkProps({to: href}) const {onPress} = useLinkProps({to: href})
const onPressWrapped = React.useCallback( const onPressWrapped = React.useCallback(
@@ -194,11 +196,13 @@ const NavItem = observer(function NavItemImpl({
}) })
function ComposeBtn() { function ComposeBtn() {
const store = useStores() const {currentAccount} = useSession()
const {getState} = useNavigation() const {getState} = useNavigation()
const {openComposer} = useComposerControls() const {openComposer} = useComposerControls()
const {_} = useLingui() const {_} = useLingui()
const {isTablet} = useWebMediaQueries() const {isTablet} = useWebMediaQueries()
const {mutateAsync: getHandle, isPending: isGetHandlePending} =
useGetHandleMutation()
const getProfileHandle = async () => { const getProfileHandle = async () => {
const {routes} = getState() const {routes} = getState()
@@ -210,13 +214,18 @@ function ComposeBtn() {
).name ).name
if (handle.startsWith('did:')) { if (handle.startsWith('did:')) {
const cached = await store.profiles.cache.get(handle) try {
const profile = cached ? cached.data : undefined handle = await getHandle(handle)
// if we can't resolve handle, set to undefined } catch (e) {
handle = profile?.handle || undefined handle = undefined
}
} }
if (!handle || handle === store.me.handle || handle === 'handle.invalid') if (
!handle ||
handle === currentAccount?.handle ||
handle === 'handle.invalid'
)
return undefined return undefined
return handle return handle
@@ -233,6 +242,7 @@ function ComposeBtn() {
} }
return ( return (
<TouchableOpacity <TouchableOpacity
disabled={isGetHandlePending}
style={[styles.newPostBtn]} style={[styles.newPostBtn]}
onPress={onPressCompose} onPress={onPressCompose}
accessibilityRole="button" accessibilityRole="button"