Skip to content

Commit

Permalink
Fix self mention, resolve handle (#1903)
Browse files Browse the repository at this point in the history
* Fix self mention, resolve handle

* Use queryClient

* Fix type

* Remove staleTime
  • Loading branch information
estrattonbailey authored Nov 14, 2023
1 parent 8e4a3ad commit ab6e3f2
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 8 deletions.
25 changes: 25 additions & 0 deletions src/state/queries/handle.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import React from 'react'
import {useQueryClient} from '@tanstack/react-query'

import {useSession} from '#/state/session'

const fetchHandleQueryKey = (handleOrDid: string) => ['handle', handleOrDid]

export function useFetchHandle() {
const {agent} = useSession()
const queryClient = useQueryClient()

return React.useCallback(
async (handleOrDid: string) => {
if (handleOrDid.startsWith('did:')) {
const res = await queryClient.fetchQuery({
queryKey: fetchHandleQueryKey(handleOrDid),
queryFn: () => agent.getProfile({actor: handleOrDid}),
})
return res.data.handle
}
return handleOrDid
},
[agent, queryClient],
)
}
29 changes: 21 additions & 8 deletions src/view/shell/desktop/LeftNav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import {useProfileQuery} from '#/state/queries/profile'
import {useSession} from '#/state/session'
import {useUnreadNotifications} from '#/state/queries/notifications/unread'
import {useComposerControls} from '#/state/shell/composer'
import {useFetchHandle} from '#/state/queries/handle'

const ProfileCard = observer(function ProfileCardImpl() {
const {currentAccount} = useSession()
Expand Down Expand Up @@ -124,6 +125,7 @@ const NavItem = observer(function NavItemImpl({
label,
}: NavItemProps) {
const pal = usePalette('default')
const {currentAccount} = useSession()
const store = useStores()
const {isDesktop, isTablet} = useWebMediaQueries()
const [pathName] = React.useMemo(() => router.matchPath(href), [href])
Expand All @@ -137,7 +139,7 @@ const NavItem = observer(function NavItemImpl({
currentRouteInfo.name === 'Profile'
? isTab(currentRouteInfo.name, pathName) &&
(currentRouteInfo.params as CommonNavigatorParams['Profile']).name ===
store.me.handle
currentAccount?.handle
: isTab(currentRouteInfo.name, pathName)
const {onPress} = useLinkProps({to: href})
const onPressWrapped = React.useCallback(
Expand Down Expand Up @@ -194,11 +196,13 @@ const NavItem = observer(function NavItemImpl({
})

function ComposeBtn() {
const store = useStores()
const {currentAccount} = useSession()
const {getState} = useNavigation()
const {openComposer} = useComposerControls()
const {_} = useLingui()
const {isTablet} = useWebMediaQueries()
const [isFetchingHandle, setIsFetchingHandle] = React.useState(false)
const fetchHandle = useFetchHandle()

const getProfileHandle = async () => {
const {routes} = getState()
Expand All @@ -210,13 +214,21 @@ function ComposeBtn() {
).name

if (handle.startsWith('did:')) {
const cached = await store.profiles.cache.get(handle)
const profile = cached ? cached.data : undefined
// if we can't resolve handle, set to undefined
handle = profile?.handle || undefined
try {
setIsFetchingHandle(true)
handle = await fetchHandle(handle)
} catch (e) {
handle = undefined
} finally {
setIsFetchingHandle(false)
}
}

if (!handle || handle === store.me.handle || handle === 'handle.invalid')
if (
!handle ||
handle === currentAccount?.handle ||
handle === 'handle.invalid'
)
return undefined

return handle
Expand All @@ -233,6 +245,7 @@ function ComposeBtn() {
}
return (
<TouchableOpacity
disabled={isFetchingHandle}
style={[styles.newPostBtn]}
onPress={onPressCompose}
accessibilityRole="button"
Expand Down Expand Up @@ -372,7 +385,7 @@ export const DesktopLeftNav = observer(function DesktopLeftNav() {
label="Moderation"
/>
<NavItem
href={makeProfileLink(currentAccount)}
href={currentAccount ? makeProfileLink(currentAccount) : '/'}
icon={
<UserIcon
strokeWidth={1.75}
Expand Down

0 comments on commit ab6e3f2

Please sign in to comment.