diff options
53 files changed, 231 insertions, 114 deletions
diff --git a/src/components/ReportDialog/SubmitView.tsx b/src/components/ReportDialog/SubmitView.tsx index 892e55489..40d655aa9 100644 --- a/src/components/ReportDialog/SubmitView.tsx +++ b/src/components/ReportDialog/SubmitView.tsx @@ -6,7 +6,7 @@ import {useLingui} from '@lingui/react' import {getLabelingServiceTitle} from '#/lib/moderation' import {ReportOption} from '#/lib/moderation/useReportOptions' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' import {CharProgress} from '#/view/com/composer/char-progress/CharProgress' import * as Toast from '#/view/com/util/Toast' import {atoms as a, native, useTheme} from '#/alf' @@ -35,6 +35,7 @@ export function SubmitView({ }) { const t = useTheme() const {_} = useLingui() + const {getAgent} = useAgent() const [details, setDetails] = React.useState<string>('') const [submitting, setSubmitting] = React.useState<boolean>(false) const [selectedServices, setSelectedServices] = React.useState<string[]>([ @@ -90,6 +91,7 @@ export function SubmitView({ selectedServices, onSubmitComplete, setError, + getAgent, ]) return ( diff --git a/src/components/hooks/useRichText.ts b/src/components/hooks/useRichText.ts index e363ae5a9..4329638ea 100644 --- a/src/components/hooks/useRichText.ts +++ b/src/components/hooks/useRichText.ts @@ -1,12 +1,13 @@ import React from 'react' import {RichText as RichTextAPI} from '@atproto/api' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' export function useRichText(text: string): [RichTextAPI, boolean] { const [prevText, setPrevText] = React.useState(text) const [rawRT, setRawRT] = React.useState(() => new RichTextAPI({text})) const [resolvedRT, setResolvedRT] = React.useState<RichTextAPI | null>(null) + const {getAgent} = useAgent() if (text !== prevText) { setPrevText(text) setRawRT(new RichTextAPI({text})) @@ -27,7 +28,7 @@ export function useRichText(text: string): [RichTextAPI, boolean] { return () => { ignore = true } - }, [text]) + }, [text, getAgent]) const isResolving = resolvedRT === null return [resolvedRT ?? rawRT, isResolving] } diff --git a/src/components/moderation/LabelsOnMeDialog.tsx b/src/components/moderation/LabelsOnMeDialog.tsx index 5cf86644c..04b4dbd53 100644 --- a/src/components/moderation/LabelsOnMeDialog.tsx +++ b/src/components/moderation/LabelsOnMeDialog.tsx @@ -7,7 +7,7 @@ import {useLingui} from '@lingui/react' import {useLabelInfo} from '#/lib/moderation/useLabelInfo' import {makeProfileLink} from '#/lib/routes/links' import {sanitizeHandle} from '#/lib/strings/handles' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' import * as Toast from '#/view/com/util/Toast' import {atoms as a, useBreakpoints, useTheme} from '#/alf' import {Button, ButtonText} from '#/components/Button' @@ -173,6 +173,7 @@ function AppealForm({ const {gtMobile} = useBreakpoints() const [details, setDetails] = React.useState('') const isAccountReport = 'did' in subject + const {getAgent} = useAgent() const onSubmit = async () => { try { diff --git a/src/screens/Deactivated.tsx b/src/screens/Deactivated.tsx index 7e87973cb..c2bac7715 100644 --- a/src/screens/Deactivated.tsx +++ b/src/screens/Deactivated.tsx @@ -1,20 +1,20 @@ import React from 'react' import {View} from 'react-native' import {useSafeAreaInsets} from 'react-native-safe-area-context' -import {useLingui} from '@lingui/react' import {msg, Trans} from '@lingui/macro' -import {useOnboardingDispatch} from '#/state/shell' -import {getAgent, isSessionDeactivated, useSessionApi} from '#/state/session' -import {logger} from '#/logger' -import {pluralize} from '#/lib/strings/helpers' +import {useLingui} from '@lingui/react' -import {atoms as a, useTheme, useBreakpoints} from '#/alf' -import {Button, ButtonIcon, ButtonText} from '#/components/Button' -import {Text, P} from '#/components/Typography' +import {pluralize} from '#/lib/strings/helpers' +import {logger} from '#/logger' import {isWeb} from '#/platform/detection' +import {isSessionDeactivated, useAgent, useSessionApi} from '#/state/session' +import {useOnboardingDispatch} from '#/state/shell' import {ScrollView} from '#/view/com/util/Views' -import {Loader} from '#/components/Loader' import {Logo} from '#/view/icons/Logo' +import {atoms as a, useBreakpoints, useTheme} from '#/alf' +import {Button, ButtonIcon, ButtonText} from '#/components/Button' +import {Loader} from '#/components/Loader' +import {P, Text} from '#/components/Typography' const COL_WIDTH = 400 @@ -25,6 +25,7 @@ export function Deactivated() { const {gtMobile} = useBreakpoints() const onboardingDispatch = useOnboardingDispatch() const {logout} = useSessionApi() + const {getAgent} = useAgent() const [isProcessing, setProcessing] = React.useState(false) const [estimatedTime, setEstimatedTime] = React.useState<string | undefined>( @@ -56,7 +57,13 @@ export function Deactivated() { } finally { setProcessing(false) } - }, [setProcessing, setEstimatedTime, setPlaceInQueue, onboardingDispatch]) + }, [ + setProcessing, + setEstimatedTime, + setPlaceInQueue, + onboardingDispatch, + getAgent, + ]) React.useEffect(() => { checkStatus() diff --git a/src/screens/Onboarding/StepFinished.tsx b/src/screens/Onboarding/StepFinished.tsx index c7e10ed3d..e7054fb1f 100644 --- a/src/screens/Onboarding/StepFinished.tsx +++ b/src/screens/Onboarding/StepFinished.tsx @@ -8,7 +8,7 @@ import {BSKY_APP_ACCOUNT_DID} from '#/lib/constants' import {logEvent} from '#/lib/statsig/statsig' import {logger} from '#/logger' import {useSetSaveFeedsMutation} from '#/state/queries/preferences' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' import {useOnboardingDispatch} from '#/state/shell' import { DescriptionText, @@ -38,6 +38,7 @@ export function StepFinished() { const onboardDispatch = useOnboardingDispatch() const [saving, setSaving] = React.useState(false) const {mutateAsync: saveFeeds} = useSetSaveFeedsMutation() + const {getAgent} = useAgent() const finishOnboarding = React.useCallback(async () => { setSaving(true) @@ -81,7 +82,7 @@ export function StepFinished() { track('OnboardingV2:StepFinished:End') track('OnboardingV2:Complete') logEvent('onboarding:finished:nextPressed', {}) - }, [state, dispatch, onboardDispatch, setSaving, saveFeeds, track]) + }, [state, dispatch, onboardDispatch, setSaving, saveFeeds, track, getAgent]) React.useEffect(() => { track('OnboardingV2:StepFinished:Start') diff --git a/src/screens/Onboarding/StepInterests/index.tsx b/src/screens/Onboarding/StepInterests/index.tsx index 6afc3c07a..df489f571 100644 --- a/src/screens/Onboarding/StepInterests/index.tsx +++ b/src/screens/Onboarding/StepInterests/index.tsx @@ -8,7 +8,7 @@ import {useAnalytics} from '#/lib/analytics/analytics' import {logEvent} from '#/lib/statsig/statsig' import {capitalize} from '#/lib/strings/capitalize' import {logger} from '#/logger' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' import {useOnboardingDispatch} from '#/state/shell' import { DescriptionText, @@ -39,6 +39,7 @@ export function StepInterests() { state.interestsStepResults.selectedInterests.map(i => i), ) const onboardDispatch = useOnboardingDispatch() + const {getAgent} = useAgent() const {isLoading, isError, error, data, refetch, isFetching} = useQuery({ queryKey: ['interests'], queryFn: async () => { diff --git a/src/screens/Signup/index.tsx b/src/screens/Signup/index.tsx index 7708599fb..6758f7fa1 100644 --- a/src/screens/Signup/index.tsx +++ b/src/screens/Signup/index.tsx @@ -9,7 +9,7 @@ import {FEEDBACK_FORM_URL} from '#/lib/constants' import {logEvent} from '#/lib/statsig/statsig' import {createFullHandle} from '#/lib/strings/handles' import {useServiceQuery} from '#/state/queries/service' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' import {LoggedOutLayout} from '#/view/com/util/layouts/LoggedOutLayout' import { initialState, @@ -35,6 +35,7 @@ export function Signup({onPressBack}: {onPressBack: () => void}) { const [state, dispatch] = React.useReducer(reducer, initialState) const submit = useSubmitSignup({state, dispatch}) const {gtMobile} = useBreakpoints() + const {getAgent} = useAgent() const { data: serviceInfo, @@ -113,6 +114,7 @@ export function Signup({onPressBack}: {onPressBack: () => void}) { state.serviceDescription?.phoneVerificationRequired, state.userDomain, submit, + getAgent, ]) const onBackPress = React.useCallback(() => { diff --git a/src/state/queries/actor-autocomplete.ts b/src/state/queries/actor-autocomplete.ts index 2d34ab53f..0b022dd49 100644 --- a/src/state/queries/actor-autocomplete.ts +++ b/src/state/queries/actor-autocomplete.ts @@ -5,7 +5,7 @@ import {useQuery, useQueryClient} from '@tanstack/react-query' import {isJustAMute} from '#/lib/moderation' import {logger} from '#/logger' import {STALE} from '#/state/queries' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' import {DEFAULT_LOGGED_OUT_PREFERENCES, useModerationOpts} from './preferences' const DEFAULT_MOD_OPTS = { @@ -18,6 +18,7 @@ export const RQKEY = (prefix: string) => [RQKEY_ROOT, prefix] export function useActorAutocompleteQuery(prefix: string) { const moderationOpts = useModerationOpts() + const {getAgent} = useAgent() prefix = prefix.toLowerCase() @@ -46,6 +47,7 @@ export type ActorAutocompleteFn = ReturnType<typeof useActorAutocompleteFn> export function useActorAutocompleteFn() { const queryClient = useQueryClient() const moderationOpts = useModerationOpts() + const {getAgent} = useAgent() return React.useCallback( async ({query, limit = 8}: {query: string; limit?: number}) => { @@ -74,7 +76,7 @@ export function useActorAutocompleteFn() { moderationOpts || DEFAULT_MOD_OPTS, ) }, - [queryClient, moderationOpts], + [queryClient, moderationOpts, getAgent], ) } diff --git a/src/state/queries/actor-search.ts b/src/state/queries/actor-search.ts index eb065b6cf..e50c68aac 100644 --- a/src/state/queries/actor-search.ts +++ b/src/state/queries/actor-search.ts @@ -2,7 +2,7 @@ import {AppBskyActorDefs} from '@atproto/api' import {QueryClient, useQuery} from '@tanstack/react-query' import {STALE} from '#/state/queries' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' const RQKEY_ROOT = 'actor-search' export const RQKEY = (query: string) => [RQKEY_ROOT, query] @@ -14,6 +14,7 @@ export function useActorSearch({ query: string enabled?: boolean }) { + const {getAgent} = useAgent() return useQuery<AppBskyActorDefs.ProfileView[]>({ staleTime: STALE.MINUTES.ONE, queryKey: RQKEY(query || ''), diff --git a/src/state/queries/app-passwords.ts b/src/state/queries/app-passwords.ts index ddfe6643d..a8f8fba0f 100644 --- a/src/state/queries/app-passwords.ts +++ b/src/state/queries/app-passwords.ts @@ -2,12 +2,13 @@ import {ComAtprotoServerCreateAppPassword} from '@atproto/api' import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query' import {STALE} from '#/state/queries' -import {getAgent} from '../session' +import {useAgent} from '../session' const RQKEY_ROOT = 'app-passwords' export const RQKEY = () => [RQKEY_ROOT] export function useAppPasswordsQuery() { + const {getAgent} = useAgent() return useQuery({ staleTime: STALE.MINUTES.FIVE, queryKey: RQKEY(), @@ -20,6 +21,7 @@ export function useAppPasswordsQuery() { export function useAppPasswordCreateMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation< ComAtprotoServerCreateAppPassword.OutputSchema, Error, @@ -42,6 +44,7 @@ export function useAppPasswordCreateMutation() { export function useAppPasswordDeleteMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation<void, Error, {name: string}>({ mutationFn: async ({name}) => { await getAgent().com.atproto.server.revokeAppPassword({ diff --git a/src/state/queries/feed.ts b/src/state/queries/feed.ts index 0d3de8969..1741d113c 100644 --- a/src/state/queries/feed.ts +++ b/src/state/queries/feed.ts @@ -17,7 +17,7 @@ import {sanitizeDisplayName} from '#/lib/strings/display-names' import {sanitizeHandle} from '#/lib/strings/handles' import {STALE} from '#/state/queries' import {usePreferencesQuery} from '#/state/queries/preferences' -import {getAgent, useSession} from '#/state/session' +import {useAgent, useSession} from '#/state/session' import {router} from '#/routes' export type FeedSourceFeedInfo = { @@ -140,6 +140,7 @@ export function getAvatarTypeFromUri(uri: string) { export function useFeedSourceInfoQuery({uri}: {uri: string}) { const type = getFeedTypeFromUri(uri) + const {getAgent} = useAgent() return useQuery({ staleTime: STALE.INFINITY, @@ -166,6 +167,7 @@ export function useFeedSourceInfoQuery({uri}: {uri: string}) { export const useGetPopularFeedsQueryKey = ['getPopularFeeds'] export function useGetPopularFeedsQuery() { + const {getAgent} = useAgent() return useInfiniteQuery< AppBskyUnspeccedGetPopularFeedGenerators.OutputSchema, Error, @@ -187,6 +189,7 @@ export function useGetPopularFeedsQuery() { } export function useSearchPopularFeedsMutation() { + const {getAgent} = useAgent() return useMutation({ mutationFn: async (query: string) => { const res = await getAgent().app.bsky.unspecced.getPopularFeedGenerators({ @@ -238,6 +241,7 @@ const pinnedFeedInfosQueryKeyRoot = 'pinnedFeedsInfos' export function usePinnedFeedsInfos() { const {hasSession} = useSession() + const {getAgent} = useAgent() const {data: preferences, isLoading: isLoadingPrefs} = usePreferencesQuery() const pinnedUris = preferences?.feeds?.pinned ?? [] diff --git a/src/state/queries/handle.ts b/src/state/queries/handle.ts index ddeb35ce7..1ab275fcf 100644 --- a/src/state/queries/handle.ts +++ b/src/state/queries/handle.ts @@ -2,7 +2,7 @@ import React from 'react' import {useMutation, useQueryClient} from '@tanstack/react-query' import {STALE} from '#/state/queries' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' const handleQueryKeyRoot = 'handle' const fetchHandleQueryKey = (handleOrDid: string) => [ @@ -14,6 +14,7 @@ const fetchDidQueryKey = (handleOrDid: string) => [didQueryKeyRoot, handleOrDid] export function useFetchHandle() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return React.useCallback( async (handleOrDid: string) => { @@ -27,12 +28,13 @@ export function useFetchHandle() { } return handleOrDid }, - [queryClient], + [queryClient, getAgent], ) } export function useUpdateHandleMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation({ mutationFn: async ({handle}: {handle: string}) => { @@ -48,6 +50,7 @@ export function useUpdateHandleMutation() { export function useFetchDid() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return React.useCallback( async (handleOrDid: string) => { @@ -64,6 +67,6 @@ export function useFetchDid() { }, }) }, - [queryClient], + [queryClient, getAgent], ) } diff --git a/src/state/queries/invites.ts b/src/state/queries/invites.ts index d5d6ecf97..f9cf25c69 100644 --- a/src/state/queries/invites.ts +++ b/src/state/queries/invites.ts @@ -3,7 +3,7 @@ import {useQuery} from '@tanstack/react-query' import {cleanError} from '#/lib/strings/errors' import {STALE} from '#/state/queries' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' function isInviteAvailable(invite: ComAtprotoServerDefs.InviteCode): boolean { return invite.available - invite.uses.length > 0 && !invite.disabled @@ -16,6 +16,7 @@ export type InviteCodesQueryResponse = Exclude< undefined > export function useInviteCodesQuery() { + const {getAgent} = useAgent() return useQuery({ staleTime: STALE.MINUTES.FIVE, queryKey: [inviteCodesQueryKeyRoot], diff --git a/src/state/queries/labeler.ts b/src/state/queries/labeler.ts index 78301eb0d..359291636 100644 --- a/src/state/queries/labeler.ts +++ b/src/state/queries/labeler.ts @@ -5,7 +5,7 @@ import {z} from 'zod' import {labelersDetailedInfoQueryKeyRoot} from '#/lib/react-query' import {STALE} from '#/state/queries' import {preferencesQueryKey} from '#/state/queries/preferences' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' const labelerInfoQueryKeyRoot = 'labeler-info' export const labelerInfoQueryKey = (did: string) => [ @@ -31,6 +31,7 @@ export function useLabelerInfoQuery({ did?: string enabled?: boolean }) { + const {getAgent} = useAgent() return useQuery({ enabled: !!did && enabled !== false, queryKey: labelerInfoQueryKey(did as string), @@ -45,6 +46,7 @@ export function useLabelerInfoQuery({ } export function useLabelersInfoQuery({dids}: {dids: string[]}) { + const {getAgent} = useAgent() return useQuery({ enabled: !!dids.length, queryKey: labelersInfoQueryKey(dids), @@ -56,6 +58,7 @@ export function useLabelersInfoQuery({dids}: {dids: string[]}) { } export function useLabelersDetailedInfoQuery({dids}: {dids: string[]}) { + const {getAgent} = useAgent() return useQuery({ enabled: !!dids.length, queryKey: labelersDetailedInfoQueryKey(dids), @@ -73,6 +76,7 @@ export function useLabelersDetailedInfoQuery({dids}: {dids: string[]}) { export function useLabelerSubscriptionMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation({ async mutationFn({did, subscribe}: {did: string; subscribe: boolean}) { diff --git a/src/state/queries/like.ts b/src/state/queries/like.ts index 94857eb91..75e93951a 100644 --- a/src/state/queries/like.ts +++ b/src/state/queries/like.ts @@ -1,8 +1,9 @@ import {useMutation} from '@tanstack/react-query' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' export function useLikeMutation() { + const {getAgent} = useAgent() return useMutation({ mutationFn: async ({uri, cid}: {uri: string; cid: string}) => { const res = await getAgent().like(uri, cid) @@ -12,6 +13,7 @@ export function useLikeMutation() { } export function useUnlikeMutation() { + const {getAgent} = useAgent() return useMutation({ mutationFn: async ({uri}: {uri: string}) => { await getAgent().deleteLike(uri) diff --git a/src/state/queries/list-members.ts b/src/state/queries/list-members.ts index 87a409b88..6f87d53c0 100644 --- a/src/state/queries/list-members.ts +++ b/src/state/queries/list-members.ts @@ -7,7 +7,7 @@ import { } from '@tanstack/react-query' import {STALE} from '#/state/queries' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' const PAGE_SIZE = 30 type RQPageParam = string | undefined @@ -16,6 +16,7 @@ const RQKEY_ROOT = 'list-members' export const RQKEY = (uri: string) => [RQKEY_ROOT, uri] export function useListMembersQuery(uri: string) { + const {getAgent} = useAgent() return useInfiniteQuery< AppBskyGraphGetList.OutputSchema, Error, diff --git a/src/state/queries/list-memberships.ts b/src/state/queries/list-memberships.ts index d5ddd5a70..46e6bdfc2 100644 --- a/src/state/queries/list-memberships.ts +++ b/src/state/queries/list-memberships.ts @@ -19,7 +19,7 @@ import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query' import {STALE} from '#/state/queries' import {RQKEY as LIST_MEMBERS_RQKEY} from '#/state/queries/list-members' -import {getAgent, useSession} from '#/state/session' +import {useAgent, useSession} from '#/state/session' // sanity limit is SANITY_PAGE_LIMIT*PAGE_SIZE total records const SANITY_PAGE_LIMIT = 1000 @@ -40,6 +40,7 @@ export interface ListMembersip { */ export function useDangerousListMembershipsQuery() { const {currentAccount} = useSession() + const {getAgent} = useAgent() return useQuery<ListMembersip[]>({ staleTime: STALE.MINUTES.FIVE, queryKey: RQKEY(), @@ -91,6 +92,7 @@ export function getMembership( export function useListMembershipAddMutation() { const {currentAccount} = useSession() + const {getAgent} = useAgent() const queryClient = useQueryClient() return useMutation< {uri: string; cid: string}, @@ -149,6 +151,7 @@ export function useListMembershipAddMutation() { export function useListMembershipRemoveMutation() { const {currentAccount} = useSession() + const {getAgent} = useAgent() const queryClient = useQueryClient() return useMutation< void, diff --git a/src/state/queries/list.ts b/src/state/queries/list.ts index 1edf2606c..dd2e21fb6 100644 --- a/src/state/queries/list.ts +++ b/src/state/queries/list.ts @@ -13,7 +13,7 @@ import chunk from 'lodash.chunk' import {uploadBlob} from '#/lib/api' import {until} from '#/lib/async/until' import {STALE} from '#/state/queries' -import {getAgent, useSession} from '../session' +import {useAgent, useSession} from '../session' import {invalidate as invalidateMyLists} from './my-lists' import {RQKEY as PROFILE_LISTS_RQKEY} from './profile-lists' @@ -21,6 +21,7 @@ const RQKEY_ROOT = 'list' export const RQKEY = (uri: string) => [RQKEY_ROOT, uri] export function useListQuery(uri?: string) { + const {getAgent} = useAgent() return useQuery<AppBskyGraphDefs.ListView, Error>({ staleTime: STALE.MINUTES.ONE, queryKey: RQKEY(uri || ''), @@ -48,6 +49,7 @@ export interface ListCreateMutateParams { export function useListCreateMutation() { const {currentAccount} = useSession() const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation<{uri: string; cid: string}, Error, ListCreateMutateParams>( { async mutationFn({ @@ -114,6 +116,7 @@ export interface ListMetadataMutateParams { } export function useListMetadataMutation() { const {currentAccount} = useSession() + const {getAgent} = useAgent() const queryClient = useQueryClient() return useMutation< {uri: string; cid: string}, @@ -181,6 +184,7 @@ export function useListMetadataMutation() { export function useListDeleteMutation() { const {currentAccount} = useSession() + const {getAgent} = useAgent() const queryClient = useQueryClient() return useMutation<void, Error, {uri: string}>({ mutationFn: async ({uri}) => { @@ -249,6 +253,7 @@ export function useListDeleteMutation() { export function useListMuteMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation<void, Error, {uri: string; mute: boolean}>({ mutationFn: async ({uri, mute}) => { if (mute) { @@ -275,6 +280,7 @@ export function useListMuteMutation() { export function useListBlockMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation<void, Error, {uri: string; block: boolean}>({ mutationFn: async ({uri, block}) => { if (block) { diff --git a/src/state/queries/my-blocked-accounts.ts b/src/state/queries/my-blocked-accounts.ts index 36b9ac580..73e289056 100644 --- a/src/state/queries/my-blocked-accounts.ts +++ b/src/state/queries/my-blocked-accounts.ts @@ -6,13 +6,14 @@ import { useInfiniteQuery, } from '@tanstack/react-query' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' const RQKEY_ROOT = 'my-blocked-accounts' export const RQKEY = () => [RQKEY_ROOT] type RQPageParam = string | undefined export function useMyBlockedAccountsQuery() { + const {getAgent} = useAgent() return useInfiniteQuery< AppBskyGraphGetBlocks.OutputSchema, Error, diff --git a/src/state/queries/my-lists.ts b/src/state/queries/my-lists.ts index 284b757c6..7fce8b68e 100644 --- a/src/state/queries/my-lists.ts +++ b/src/state/queries/my-lists.ts @@ -3,7 +3,7 @@ import {QueryClient, useQuery} from '@tanstack/react-query' import {accumulate} from '#/lib/async/accumulate' import {STALE} from '#/state/queries' -import {getAgent, useSession} from '#/state/session' +import {useAgent, useSession} from '#/state/session' export type MyListsFilter = | 'all' @@ -16,6 +16,7 @@ export const RQKEY = (filter: MyListsFilter) => [RQKEY_ROOT, filter] export function useMyListsQuery(filter: MyListsFilter) { const {currentAccount} = useSession() + const {getAgent} = useAgent() return useQuery<AppBskyGraphDefs.ListView[]>({ staleTime: STALE.MINUTES.ONE, queryKey: RQKEY(filter), diff --git a/src/state/queries/my-muted-accounts.ts b/src/state/queries/my-muted-accounts.ts index 9e90044bf..6eded3f83 100644 --- a/src/state/queries/my-muted-accounts.ts +++ b/src/state/queries/my-muted-accounts.ts @@ -6,13 +6,14 @@ import { useInfiniteQuery, } from '@tanstack/react-query' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' const RQKEY_ROOT = 'my-muted-accounts' export const RQKEY = () => [RQKEY_ROOT] type RQPageParam = string | undefined export function useMyMutedAccountsQuery() { + const {getAgent} = useAgent() return useInfiniteQuery< AppBskyGraphGetMutes.OutputSchema, Error, diff --git a/src/state/queries/notifications/feed.ts b/src/state/queries/notifications/feed.ts index 6f5dd6b19..1f2199901 100644 --- a/src/state/queries/notifications/feed.ts +++ b/src/state/queries/notifications/feed.ts @@ -27,7 +27,7 @@ import { } from '@tanstack/react-query' import {useMutedThreads} from '#/state/muted-threads' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' import {STALE} from '..' import {useModerationOpts} from '../preferences' import {embedViewRecordToPostView, getEmbeddedPost} from '../util' @@ -47,6 +47,7 @@ export function RQKEY() { } export function useNotificationFeedQuery(opts?: {enabled?: boolean}) { + const {getAgent} = useAgent() const queryClient = useQueryClient() const moderationOpts = useModerationOpts() const threadMutes = useMutedThreads() diff --git a/src/state/queries/notifications/unread.tsx b/src/state/queries/notifications/unread.tsx index 445a167c3..1c569e2a0 100644 --- a/src/state/queries/notifications/unread.tsx +++ b/src/state/queries/notifications/unread.tsx @@ -12,7 +12,7 @@ import BroadcastChannel from '#/lib/broadcast' import {logger} from '#/logger' import {isNative} from '#/platform/detection' import {useMutedThreads} from '#/state/muted-threads' -import {getAgent, useSession} from '#/state/session' +import {useAgent, useSession} from '#/state/session' import {useModerationOpts} from '../preferences' import {truncateAndInvalidate} from '../util' import {RQKEY as RQKEY_NOTIFS} from './feed' @@ -46,6 +46,7 @@ const apiContext = React.createContext<ApiContext>({ export function Provider({children}: React.PropsWithChildren<{}>) { const {hasSession} = useSession() + const {getAgent} = useAgent() const queryClient = useQueryClient() const moderationOpts = useModerationOpts() const threadMutes = useMutedThreads() @@ -197,7 +198,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) { } }, } - }, [setNumUnread, queryClient, moderationOpts, threadMutes]) + }, [setNumUnread, queryClient, moderationOpts, threadMutes, getAgent]) checkUnreadRef.current = api.checkUnread return ( diff --git a/src/state/queries/post-feed.ts b/src/state/queries/post-feed.ts index 2d5c0d4b4..42d7dbb9e 100644 --- a/src/state/queries/post-feed.ts +++ b/src/state/queries/post-feed.ts @@ -4,6 +4,7 @@ import { AppBskyFeedDefs, AppBskyFeedPost, AtUri, + BskyAgent, ModerationDecision, } from '@atproto/api' import { @@ -19,7 +20,7 @@ import {moderatePost_wrapped as moderatePost} from '#/lib/moderatePost_wrapped' import {logger} from '#/logger' import {STALE} from '#/state/queries' import {DEFAULT_LOGGED_OUT_PREFERENCES} from '#/state/queries/preferences/const' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' import {AuthorFeedAPI} from 'lib/api/feed/author' import {CustomFeedAPI} from 'lib/api/feed/custom' import {FollowingFeedAPI} from 'lib/api/feed/following' @@ -104,6 +105,7 @@ export function usePostFeedQuery( const queryClient = useQueryClient() const feedTuners = useFeedTuners(feedDesc) const moderationOpts = useModerationOpts() + const {getAgent} = useAgent() const enabled = opts?.enabled !== false && Boolean(moderationOpts) const lastRun = useRef<{ data: InfiniteData<FeedPageUnselected> @@ -142,6 +144,7 @@ export function usePostFeedQuery( feedDesc, feedParams: params || {}, feedTuners, + getAgent, }), cursor: undefined, } @@ -372,10 +375,12 @@ function createApi({ feedDesc, feedParams, feedTuners, + getAgent, }: { feedDesc: FeedDescriptor feedParams: FeedParams feedTuners: FeedTunerFn[] + getAgent: () => BskyAgent }) { if (feedDesc === 'home') { if (feedParams.mergeFeedEnabled) { diff --git a/src/state/queries/post-liked-by.ts b/src/state/queries/post-liked-by.ts index 6fa341b77..fdf694860 100644 --- a/src/state/queries/post-liked-by.ts +++ b/src/state/queries/post-liked-by.ts @@ -6,7 +6,7 @@ import { useInfiniteQuery, } from '@tanstack/react-query' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' const PAGE_SIZE = 30 type RQPageParam = string | undefined @@ -16,6 +16,7 @@ const RQKEY_ROOT = 'liked-by' export const RQKEY = (resolvedUri: string) => [RQKEY_ROOT, resolvedUri] export function useLikedByQuery(resolvedUri: string | undefined) { + const {getAgent} = useAgent() return useInfiniteQuery< AppBskyFeedGetLikes.OutputSchema, Error, diff --git a/src/state/queries/post-reposted-by.ts b/src/state/queries/post-reposted-by.ts index f8cfff0d2..13643e98d 100644 --- a/src/state/queries/post-reposted-by.ts +++ b/src/state/queries/post-reposted-by.ts @@ -6,7 +6,7 @@ import { useInfiniteQuery, } from '@tanstack/react-query' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' const PAGE_SIZE = 30 type RQPageParam = string | undefined @@ -16,6 +16,7 @@ const RQKEY_ROOT = 'post-reposted-by' export const RQKEY = (resolvedUri: string) => [RQKEY_ROOT, resolvedUri] export function usePostRepostedByQuery(resolvedUri: string | undefined) { + const {getAgent} = useAgent() return useInfiniteQuery< AppBskyFeedGetRepostedBy.OutputSchema, Error, diff --git a/src/state/queries/post-thread.ts b/src/state/queries/post-thread.ts index 521fc4751..46c7445ba 100644 --- a/src/state/queries/post-thread.ts +++ b/src/state/queries/post-thread.ts @@ -7,7 +7,7 @@ import { import {QueryClient, useQuery, useQueryClient} from '@tanstack/react-query' import {UsePreferencesQueryResponse} from '#/state/queries/preferences/types' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' import {findAllPostsInQueryData as findAllPostsInSearchQueryData} from 'state/queries/search-posts' import {findAllPostsInQueryData as findAllPostsInNotifsQueryData} from './notifications/feed' import {findAllPostsInQueryData as findAllPostsInFeedQueryData} from './post-feed' @@ -66,6 +66,7 @@ export type ThreadNode = export function usePostThreadQuery(uri: string | undefined) { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useQuery<ThreadNode, Error>({ gcTime: 0, queryKey: RQKEY(uri || ''), diff --git a/src/state/queries/post.ts b/src/state/queries/post.ts index 77497f6ba..d52c65713 100644 --- a/src/state/queries/post.ts +++ b/src/state/queries/post.ts @@ -7,13 +7,14 @@ import {useToggleMutationQueue} from '#/lib/hooks/useToggleMutationQueue' import {logEvent, LogEvents, toClout} from '#/lib/statsig/statsig' import {updatePostShadow} from '#/state/cache/post-shadow' import {Shadow} from '#/state/cache/types' -import {getAgent, useSession} from '#/state/session' +import {useAgent, useSession} from '#/state/session' import {findProfileQueryData} from './profile' const RQKEY_ROOT = 'post' export const RQKEY = (postUri: string) => [RQKEY_ROOT, postUri] export function usePostQuery(uri: string | undefined) { + const {getAgent} = useAgent() return useQuery<AppBskyFeedDefs.PostView>({ queryKey: RQKEY(uri || ''), async queryFn() { @@ -30,6 +31,7 @@ export function usePostQuery(uri: string | undefined) { export function useGetPost() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useCallback( async ({uri}: {uri: string}) => { return queryClient.fetchQuery({ @@ -56,7 +58,7 @@ export function useGetPost() { }, }) }, - [queryClient], + [queryClient, getAgent], ) } @@ -125,6 +127,7 @@ function usePostLikeMutation( const {currentAccount} = useSession() const queryClient = useQueryClient() const postAuthor = post.author + const {getAgent} = useAgent() return useMutation< {uri: string}, // responds with the uri of the like Error, @@ -162,6 +165,7 @@ function usePostLikeMutation( function usePostUnlikeMutation( logContext: LogEvents['post:unlike']['logContext'], ) { + const {getAgent} = useAgent() return useMutation<void, Error, {postUri: string; likeUri: string}>({ mutationFn: ({likeUri}) => { logEvent('post:unlike', {logContext}) @@ -234,6 +238,7 @@ export function usePostRepostMutationQueue( function usePostRepostMutation( logContext: LogEvents['post:repost']['logContext'], ) { + const {getAgent} = useAgent() return useMutation< {uri: string}, // responds with the uri of the repost Error, @@ -252,6 +257,7 @@ function usePostRepostMutation( function usePostUnrepostMutation( logContext: LogEvents['post:unrepost']['logContext'], ) { + const {getAgent} = useAgent() return useMutation<void, Error, {postUri: string; repostUri: string}>({ mutationFn: ({repostUri}) => { logEvent('post:unrepost', {logContext}) @@ -265,6 +271,7 @@ function usePostUnrepostMutation( export function usePostDeleteMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation<void, Error, {uri: string}>({ mutationFn: async ({uri}) => { await getAgent().deletePost(uri) diff --git a/src/state/queries/preferences/index.ts b/src/state/queries/preferences/index.ts index 85e3f9a25..06e47391f 100644 --- a/src/state/queries/preferences/index.ts +++ b/src/state/queries/preferences/index.ts @@ -22,7 +22,7 @@ import { ThreadViewPreferences, UsePreferencesQueryResponse, } from '#/state/queries/preferences/types' -import {getAgent, useSession} from '#/state/session' +import {useAgent, useSession} from '#/state/session' import {saveLabelers} from '#/state/session/agent-config' export * from '#/state/queries/preferences/const' @@ -33,6 +33,7 @@ const preferencesQueryKeyRoot = 'getPreferences' export const preferencesQueryKey = [preferencesQueryKeyRoot] export function usePreferencesQuery() { + const {getAgent} = useAgent() return useQuery({ staleTime: STALE.SECONDS.FIFTEEN, structuralSharing: true, @@ -118,6 +119,7 @@ export function useModerationOpts() { export function useClearPreferencesMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation({ mutationFn: async () => { @@ -131,6 +133,7 @@ export function useClearPreferencesMutation() { } export function usePreferencesSetContentLabelMutation() { + const {getAgent} = useAgent() const queryClient = useQueryClient() return useMutation< @@ -150,6 +153,7 @@ export function usePreferencesSetContentLabelMutation() { export function useSetContentLabelMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation({ mutationFn: async ({ @@ -172,6 +176,7 @@ export function useSetContentLabelMutation() { export function usePreferencesSetAdultContentMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation<void, unknown, {enabled: boolean}>({ mutationFn: async ({enabled}) => { @@ -186,6 +191,7 @@ export function usePreferencesSetAdultContentMutation() { export function usePreferencesSetBirthDateMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation<void, unknown, {birthDate: Date}>({ mutationFn: async ({birthDate}: {birthDate: Date}) => { @@ -200,6 +206,7 @@ export function usePreferencesSetBirthDateMutation() { export function useSetFeedViewPreferencesMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation<void, unknown, Partial<BskyFeedViewPreference>>({ mutationFn: async prefs => { @@ -214,6 +221,7 @@ export function useSetFeedViewPreferencesMutation() { export function useSetThreadViewPreferencesMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation<void, unknown, Partial<ThreadViewPreferences>>({ mutationFn: async prefs => { @@ -228,6 +236,7 @@ export function useSetThreadViewPreferencesMutation() { export function useSetSaveFeedsMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation< void, @@ -246,6 +255,7 @@ export function useSetSaveFeedsMutation() { export function useSaveFeedMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation<void, unknown, {uri: string}>({ mutationFn: async ({uri}) => { @@ -261,6 +271,7 @@ export function useSaveFeedMutation() { export function useRemoveFeedMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation<void, unknown, {uri: string}>({ mutationFn: async ({uri}) => { @@ -276,6 +287,7 @@ export function useRemoveFeedMutation() { export function usePinFeedMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation<void, unknown, {uri: string}>({ mutationFn: async ({uri}) => { @@ -291,6 +303,7 @@ export function usePinFeedMutation() { export function useUnpinFeedMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation<void, unknown, {uri: string}>({ mutationFn: async ({uri}) => { @@ -306,6 +319,7 @@ export function useUnpinFeedMutation() { export function useUpsertMutedWordsMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation({ mutationFn: async (mutedWords: AppBskyActorDefs.MutedWord[]) => { @@ -320,6 +334,7 @@ export function useUpsertMutedWordsMutation() { export function useUpdateMutedWordMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation({ mutationFn: async (mutedWord: AppBskyActorDefs.MutedWord) => { @@ -334,6 +349,7 @@ export function useUpdateMutedWordMutation() { export function useRemoveMutedWordMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation({ mutationFn: async (mutedWord: AppBskyActorDefs.MutedWord) => { diff --git a/src/state/queries/profile-feedgens.ts b/src/state/queries/profile-feedgens.ts index c690be197..27f2d5aaa 100644 --- a/src/state/queries/profile-feedgens.ts +++ b/src/state/queries/profile-feedgens.ts @@ -1,7 +1,7 @@ import {AppBskyFeedGetActorFeeds} from '@atproto/api' import {InfiniteData, QueryKey, useInfiniteQuery} from '@tanstack/react-query' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' const PAGE_SIZE = 30 type RQPageParam = string | undefined @@ -15,6 +15,7 @@ export function useProfileFeedgensQuery( opts?: {enabled?: boolean}, ) { const enabled = opts?.enabled !== false + const {getAgent} = useAgent() return useInfiniteQuery< AppBskyFeedGetActorFeeds.OutputSchema, Error, diff --git a/src/state/queries/profile-followers.ts b/src/state/queries/profile-followers.ts index d7dfe25c6..d0cbccaf5 100644 --- a/src/state/queries/profile-followers.ts +++ b/src/state/queries/profile-followers.ts @@ -6,7 +6,7 @@ import { useInfiniteQuery, } from '@tanstack/react-query' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' const PAGE_SIZE = 30 type RQPageParam = string | undefined @@ -15,6 +15,7 @@ const RQKEY_ROOT = 'profile-followers' export const RQKEY = (did: string) => [RQKEY_ROOT, did] export function useProfileFollowersQuery(did: string | undefined) { + const {getAgent} = useAgent() return useInfiniteQuery< AppBskyGraphGetFollowers.OutputSchema, Error, diff --git a/src/state/queries/profile-follows.ts b/src/state/queries/profile-follows.ts index 3abac2f10..23c0dce3e 100644 --- a/src/state/queries/profile-follows.ts +++ b/src/state/queries/profile-follows.ts @@ -7,7 +7,7 @@ import { } from '@tanstack/react-query' import {STALE} from '#/state/queries' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' const PAGE_SIZE = 30 type RQPageParam = string | undefined @@ -17,6 +17,7 @@ const RQKEY_ROOT = 'profile-follows' export const RQKEY = (did: string) => [RQKEY_ROOT, did] export function useProfileFollowsQuery(did: string | undefined) { + const {getAgent} = useAgent() return useInfiniteQuery< AppBskyGraphGetFollows.OutputSchema, Error, diff --git a/src/state/queries/profile-lists.ts b/src/state/queries/profile-lists.ts index 9cc395e43..543961d63 100644 --- a/src/state/queries/profile-lists.ts +++ b/src/state/queries/profile-lists.ts @@ -1,7 +1,7 @@ import {AppBskyGraphGetLists} from '@atproto/api' import {InfiniteData, QueryKey, useInfiniteQuery} from '@tanstack/react-query' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' const PAGE_SIZE = 30 type RQPageParam = string | undefined @@ -11,6 +11,7 @@ export const RQKEY = (did: string) => [RQKEY_ROOT, did] export function useProfileListsQuery(did: string, opts?: {enabled?: boolean}) { const enabled = opts?.enabled !== false + const {getAgent} = useAgent() return useInfiniteQuery< AppBskyGraphGetLists.OutputSchema, Error, diff --git a/src/state/queries/profile.ts b/src/state/queries/profile.ts index 0d5d5e5bd..6c801426e 100644 --- a/src/state/queries/profile.ts +++ b/src/state/queries/profile.ts @@ -26,7 +26,7 @@ import {Shadow} from '#/state/cache/types' import {STALE} from '#/state/queries' import {resetProfilePostsQueries} from '#/state/queries/post-feed' import {updateProfileShadow} from '../cache/profile-shadow' -import {getAgent, useSession} from '../session' +import {useAgent, useSession} from '../session' import {RQKEY as RQKEY_MY_BLOCKED} from './my-blocked-accounts' import {RQKEY as RQKEY_MY_MUTED} from './my-muted-accounts' import {ThreadNode} from './post-thread' @@ -54,6 +54,7 @@ export function useProfileQuery({ staleTime?: number }) { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useQuery<AppBskyActorDefs.ProfileViewDetailed>({ // WARNING // this staleTime is load-bearing @@ -78,6 +79,7 @@ export function useProfileQuery({ } export function useProfilesQuery({handles}: {handles: string[]}) { + const {getAgent} = useAgent() return useQuery({ staleTime: STALE.MINUTES.FIVE, queryKey: profilesQueryKey(handles), @@ -89,6 +91,7 @@ export function useProfilesQuery({handles}: {handles: string[]}) { } export function usePrefetchProfileQuery() { + const {getAgent} = useAgent() const queryClient = useQueryClient() const prefetchProfileQuery = useCallback( async (did: string) => { @@ -100,7 +103,7 @@ export function usePrefetchProfileQuery() { }, }) }, - [queryClient], + [queryClient, getAgent], ) return prefetchProfileQuery } @@ -116,6 +119,7 @@ interface ProfileUpdateParams { } export function useProfileUpdateMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation<void, Error, ProfileUpdateParams>({ mutationFn: async ({ profile, @@ -257,6 +261,7 @@ function useProfileFollowMutation( profile: Shadow<AppBskyActorDefs.ProfileViewDetailed>, ) { const {currentAccount} = useSession() + const {getAgent} = useAgent() const queryClient = useQueryClient() return useMutation<{uri: string; cid: string}, Error, {did: string}>({ mutationFn: async ({did}) => { @@ -283,6 +288,7 @@ function useProfileFollowMutation( function useProfileUnfollowMutation( logContext: LogEvents['profile:unfollow']['logContext'], ) { + const {getAgent} = useAgent() return useMutation<void, Error, {did: string; followUri: string}>({ mutationFn: async ({followUri}) => { logEvent('profile:unfollow', {logContext}) @@ -343,6 +349,7 @@ export function useProfileMuteMutationQueue( function useProfileMuteMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation<void, Error, {did: string}>({ mutationFn: async ({did}) => { await getAgent().mute(did) @@ -355,6 +362,7 @@ function useProfileMuteMutation() { function useProfileUnmuteMutation() { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useMutation<void, Error, {did: string}>({ mutationFn: async ({did}) => { await getAgent().unmute(did) @@ -421,6 +429,7 @@ export function useProfileBlockMutationQueue( function useProfileBlockMutation() { const {currentAccount} = useSession() + const {getAgent} = useAgent() const queryClient = useQueryClient() return useMutation<{uri: string; cid: string}, Error, {did: string}>({ mutationFn: async ({did}) => { @@ -441,6 +450,7 @@ function useProfileBlockMutation() { function useProfileUnblockMutation() { const {currentAccount} = useSession() + const {getAgent} = useAgent() const queryClient = useQueryClient() return useMutation<void, Error, {did: string; blockUri: string}>({ mutationFn: async ({blockUri}) => { diff --git a/src/state/queries/resolve-uri.ts b/src/state/queries/resolve-uri.ts index 18005cccf..b1980f07d 100644 --- a/src/state/queries/resolve-uri.ts +++ b/src/state/queries/resolve-uri.ts @@ -2,7 +2,7 @@ import {AppBskyActorDefs, AtUri} from '@atproto/api' import {useQuery, useQueryClient, UseQueryResult} from '@tanstack/react-query' import {STALE} from '#/state/queries' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' import {profileBasicQueryKey as RQKEY_PROFILE_BASIC} from './profile' const RQKEY_ROOT = 'resolved-did' @@ -24,6 +24,7 @@ export function useResolveUriQuery(uri: string | undefined): UriUseQueryResult { export function useResolveDidQuery(didOrHandle: string | undefined) { const queryClient = useQueryClient() + const {getAgent} = useAgent() return useQuery<string, Error>({ staleTime: STALE.HOURS.ONE, diff --git a/src/state/queries/search-posts.ts b/src/state/queries/search-posts.ts index 1106f7461..b0720af3c 100644 --- a/src/state/queries/search-posts.ts +++ b/src/state/queries/search-posts.ts @@ -6,7 +6,7 @@ import { useInfiniteQuery, } from '@tanstack/react-query' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' import {embedViewRecordToPostView, getEmbeddedPost} from './util' const searchPostsQueryKeyRoot = 'search-posts' @@ -25,6 +25,7 @@ export function useSearchPostsQuery({ sort?: 'top' | 'latest' enabled?: boolean }) { + const {getAgent} = useAgent() return useInfiniteQuery< AppBskyFeedSearchPosts.OutputSchema, Error, diff --git a/src/state/queries/suggested-feeds.ts b/src/state/queries/suggested-feeds.ts index 3be0c0b89..c7751448e 100644 --- a/src/state/queries/suggested-feeds.ts +++ b/src/state/queries/suggested-feeds.ts @@ -2,12 +2,13 @@ import {AppBskyFeedGetSuggestedFeeds} from '@atproto/api' import {InfiniteData, QueryKey, useInfiniteQuery} from '@tanstack/react-query' import {STALE} from '#/state/queries' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' const suggestedFeedsQueryKeyRoot = 'suggestedFeeds' export const suggestedFeedsQueryKey = [suggestedFeedsQueryKeyRoot] export function useSuggestedFeedsQuery() { + const {getAgent} = useAgent() return useInfiniteQuery< AppBskyFeedGetSuggestedFeeds.OutputSchema, Error, diff --git a/src/state/queries/suggested-follows.ts b/src/state/queries/suggested-follows.ts index 2573927b2..936912ab3 100644 --- a/src/state/queries/suggested-follows.ts +++ b/src/state/queries/suggested-follows.ts @@ -14,7 +14,7 @@ import { import {STALE} from '#/state/queries' import {useModerationOpts} from '#/state/queries/preferences' -import {getAgent, useSession} from '#/state/session' +import {useAgent, useSession} from '#/state/session' const suggestedFollowsQueryKeyRoot = 'suggested-follows' const suggestedFollowsQueryKey = [suggestedFollowsQueryKeyRoot] @@ -27,6 +27,7 @@ const suggestedFollowsByActorQueryKey = (did: string) => [ export function useSuggestedFollowsQuery() { const {currentAccount} = useSession() + const {getAgent} = useAgent() const moderationOpts = useModerationOpts() return useInfiniteQuery< @@ -77,6 +78,7 @@ export function useSuggestedFollowsQuery() { } export function useSuggestedFollowsByActorQuery({did}: {did: string}) { + const {getAgent} = useAgent() return useQuery<AppBskyGraphGetSuggestedFollowsByActor.OutputSchema, Error>({ queryKey: suggestedFollowsByActorQueryKey(did), queryFn: async () => { diff --git a/src/state/session/index.tsx b/src/state/session/index.tsx index adf6ccf6d..e45aa031f 100644 --- a/src/state/session/index.tsx +++ b/src/state/session/index.tsx @@ -23,16 +23,14 @@ import {readLabelers} from './agent-config' let __globalAgent: BskyAgent = PUBLIC_BSKY_AGENT -/** - * NOTE - * Never hold on to the object returned by this function. - * Call `getAgent()` at the time of invocation to ensure - * that you never have a stale agent. - */ -export function getAgent() { +function __getAgent() { return __globalAgent } +export function useAgent() { + return React.useMemo(() => ({getAgent: __getAgent}), []) +} + export type SessionAccount = persisted.PersistedAccount export type SessionState = { diff --git a/src/view/com/composer/Composer.tsx b/src/view/com/composer/Composer.tsx index 59d6cfb9c..0ac4ac56e 100644 --- a/src/view/com/composer/Composer.tsx +++ b/src/view/com/composer/Composer.tsx @@ -32,7 +32,7 @@ import { import {useProfileQuery} from '#/state/queries/profile' import {Gif} from '#/state/queries/tenor' import {ThreadgateSetting} from '#/state/queries/threadgate' -import {getAgent, useSession} from '#/state/session' +import {useAgent, useSession} from '#/state/session' import {useComposerControls} from '#/state/shell/composer' import {useAnalytics} from 'lib/analytics/analytics' import * as apilib from 'lib/api/index' @@ -83,6 +83,7 @@ export const ComposePost = observer(function ComposePost({ imageUris: initImageUris, }: Props) { const {currentAccount} = useSession() + const {getAgent} = useAgent() const {data: currentProfile} = useProfileQuery({did: currentAccount!.did}) const {isModalActive} = useModals() const {closeComposer} = useComposerControls() diff --git a/src/view/com/composer/useExternalLinkFetch.e2e.ts b/src/view/com/composer/useExternalLinkFetch.e2e.ts index ccf619db3..65ecb866e 100644 --- a/src/view/com/composer/useExternalLinkFetch.e2e.ts +++ b/src/view/com/composer/useExternalLinkFetch.e2e.ts @@ -1,12 +1,14 @@ -import {useState, useEffect} from 'react' +import {useEffect, useState} from 'react' + +import {useAgent} from '#/state/session' import * as apilib from 'lib/api/index' import {getLinkMeta} from 'lib/link-meta/link-meta' import {ComposerOpts} from 'state/shell/composer' -import {getAgent} from '#/state/session' export function useExternalLinkFetch({}: { setQuote: (opts: ComposerOpts['quote']) => void }) { + const {getAgent} = useAgent() const [extLink, setExtLink] = useState<apilib.ExternalEmbedDraft | undefined>( undefined, ) @@ -39,7 +41,7 @@ export function useExternalLinkFetch({}: { }) } return cleanup - }, [extLink]) + }, [extLink, getAgent]) return {extLink, setExtLink} } diff --git a/src/view/com/composer/useExternalLinkFetch.ts b/src/view/com/composer/useExternalLinkFetch.ts index 54773d565..d51dec42b 100644 --- a/src/view/com/composer/useExternalLinkFetch.ts +++ b/src/view/com/composer/useExternalLinkFetch.ts @@ -1,24 +1,25 @@ -import {useState, useEffect} from 'react' -import {ImageModel} from 'state/models/media/image' +import {useEffect, useState} from 'react' + +import {logger} from '#/logger' +import {useFetchDid} from '#/state/queries/handle' +import {useGetPost} from '#/state/queries/post' +import {useAgent} from '#/state/session' import * as apilib from 'lib/api/index' -import {getLinkMeta} from 'lib/link-meta/link-meta' +import {POST_IMG_MAX} from 'lib/constants' import { - getPostAsQuote, getFeedAsEmbed, getListAsEmbed, + getPostAsQuote, } from 'lib/link-meta/bsky' +import {getLinkMeta} from 'lib/link-meta/link-meta' import {downloadAndResize} from 'lib/media/manip' import { - isBskyPostUrl, isBskyCustomFeedUrl, isBskyListUrl, + isBskyPostUrl, } from 'lib/strings/url-helpers' +import {ImageModel} from 'state/models/media/image' import {ComposerOpts} from 'state/shell/composer' -import {POST_IMG_MAX} from 'lib/constants' -import {logger} from '#/logger' -import {getAgent} from '#/state/session' -import {useGetPost} from '#/state/queries/post' -import {useFetchDid} from '#/state/queries/handle' export function useExternalLinkFetch({ setQuote, @@ -30,6 +31,7 @@ export function useExternalLinkFetch({ ) const getPost = useGetPost() const fetchDid = useFetchDid() + const {getAgent} = useAgent() useEffect(() => { let aborted = false @@ -135,7 +137,7 @@ export function useExternalLinkFetch({ }) } return cleanup - }, [extLink, setQuote, getPost, fetchDid]) + }, [extLink, setQuote, getPost, fetchDid, getAgent]) return {extLink, setExtLink} } diff --git a/src/view/com/modals/ChangeEmail.tsx b/src/view/com/modals/ChangeEmail.tsx index c5672bc81..b3b91f72d 100644 --- a/src/view/com/modals/ChangeEmail.tsx +++ b/src/view/com/modals/ChangeEmail.tsx @@ -1,19 +1,20 @@ import React, {useState} from 'react' import {ActivityIndicator, SafeAreaView, StyleSheet, View} from 'react-native' -import {ScrollView, TextInput} from './util' -import {Text} from '../util/text/Text' -import {Button} from '../util/forms/Button' -import {ErrorMessage} from '../util/error/ErrorMessage' -import * as Toast from '../util/Toast' -import {s, colors} from 'lib/styles' +import {msg, Trans} from '@lingui/macro' +import {useLingui} from '@lingui/react' + +import {useModalControls} from '#/state/modals' +import {useAgent, useSession, useSessionApi} from '#/state/session' import {usePalette} from 'lib/hooks/usePalette' -import {isWeb} from 'platform/detection' import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries' import {cleanError} from 'lib/strings/errors' -import {Trans, msg} from '@lingui/macro' -import {useLingui} from '@lingui/react' -import {useModalControls} from '#/state/modals' -import {useSession, useSessionApi, getAgent} from '#/state/session' +import {colors, s} from 'lib/styles' +import {isWeb} from 'platform/detection' +import {ErrorMessage} from '../util/error/ErrorMessage' +import {Button} from '../util/forms/Button' +import {Text} from '../util/text/Text' +import * as Toast from '../util/Toast' +import {ScrollView, TextInput} from './util' enum Stages { InputEmail, @@ -26,6 +27,7 @@ export const snapPoints = ['90%'] export function Component() { const pal = usePalette('default') const {currentAccount} = useSession() + const {getAgent} = useAgent() const {updateCurrentAccount} = useSessionApi() const {_} = useLingui() const [stage, setStage] = useState<Stages>(Stages.InputEmail) diff --git a/src/view/com/modals/ChangeHandle.tsx b/src/view/com/modals/ChangeHandle.tsx index 125da44be..ae43d1e32 100644 --- a/src/view/com/modals/ChangeHandle.tsx +++ b/src/view/com/modals/ChangeHandle.tsx @@ -16,8 +16,8 @@ import {useModalControls} from '#/state/modals' import {useFetchDid, useUpdateHandleMutation} from '#/state/queries/handle' import {useServiceQuery} from '#/state/queries/service' import { - getAgent, SessionAccount, + useAgent, useSession, useSessionApi, } from '#/state/session' @@ -40,6 +40,7 @@ export type Props = {onChanged: () => void} export function Component(props: Props) { const {currentAccount} = useSession() + const {getAgent} = useAgent() const { isLoading, data: serviceInfo, diff --git a/src/view/com/modals/ChangePassword.tsx b/src/view/com/modals/ChangePassword.tsx index 4badc88aa..3ce7306b9 100644 --- a/src/view/com/modals/ChangePassword.tsx +++ b/src/view/com/modals/ChangePassword.tsx @@ -6,24 +6,25 @@ import { TouchableOpacity, View, } from 'react-native' -import {ScrollView} from './util' import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' -import {TextInput} from './util' -import {Text} from '../util/text/Text' -import {Button} from '../util/forms/Button' -import {ErrorMessage} from '../util/error/ErrorMessage' -import {s, colors} from 'lib/styles' +import {msg, Trans} from '@lingui/macro' +import {useLingui} from '@lingui/react' +import * as EmailValidator from 'email-validator' + +import {logger} from '#/logger' +import {useModalControls} from '#/state/modals' +import {useAgent, useSession} from '#/state/session' import {usePalette} from 'lib/hooks/usePalette' -import {isAndroid, isWeb} from 'platform/detection' import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries' import {cleanError, isNetworkError} from 'lib/strings/errors' import {checkAndFormatResetCode} from 'lib/strings/password' -import {Trans, msg} from '@lingui/macro' -import {useLingui} from '@lingui/react' -import {useModalControls} from '#/state/modals' -import {useSession, getAgent} from '#/state/session' -import * as EmailValidator from 'email-validator' -import {logger} from '#/logger' +import {colors, s} from 'lib/styles' +import {isAndroid, isWeb} from 'platform/detection' +import {ErrorMessage} from '../util/error/ErrorMessage' +import {Button} from '../util/forms/Button' +import {Text} from '../util/text/Text' +import {ScrollView} from './util' +import {TextInput} from './util' enum Stages { RequestCode, @@ -36,6 +37,7 @@ export const snapPoints = isAndroid ? ['90%'] : ['45%'] export function Component() { const pal = usePalette('default') const {currentAccount} = useSession() + const {getAgent} = useAgent() const {_} = useLingui() const [stage, setStage] = useState<Stages>(Stages.RequestCode) const [isProcessing, setIsProcessing] = useState<boolean>(false) diff --git a/src/view/com/modals/CreateOrEditList.tsx b/src/view/com/modals/CreateOrEditList.tsx index f5f4f56db..2dff636af 100644 --- a/src/view/com/modals/CreateOrEditList.tsx +++ b/src/view/com/modals/CreateOrEditList.tsx @@ -25,7 +25,7 @@ import { useListCreateMutation, useListMetadataMutation, } from '#/state/queries/list' -import {getAgent} from '#/state/session' +import {useAgent} from '#/state/session' import {useAnalytics} from 'lib/analytics/analytics' import {usePalette} from 'lib/hooks/usePalette' import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries' @@ -62,6 +62,7 @@ export function Component({ const {_} = useLingui() const listCreateMutation = useListCreateMutation() const listMetadataMutation = useListMetadataMutation() + const {getAgent} = useAgent() const activePurpose = useMemo(() => { if (list?.purpose) { @@ -228,6 +229,7 @@ export function Component({ listMetadataMutation, listCreateMutation, _, + getAgent, ]) return ( diff --git a/src/view/com/modals/DeleteAccount.tsx b/src/view/com/modals/DeleteAccount.tsx index 4c4fb20f1..5e68daef9 100644 --- a/src/view/com/modals/DeleteAccount.tsx +++ b/src/view/com/modals/DeleteAccount.tsx @@ -11,7 +11,7 @@ import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useModalControls} from '#/state/modals' -import {getAgent, useSession, useSessionApi} from '#/state/session' +import {useAgent, useSession, useSessionApi} from '#/state/session' import {usePalette} from 'lib/hooks/usePalette' import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries' import {cleanError} from 'lib/strings/errors' @@ -30,6 +30,7 @@ export function Component({}: {}) { const pal = usePalette('default') const theme = useTheme() const {currentAccount} = useSession() + const {getAgent} = useAgent() const {clearCurrentAccount, removeAccount} = useSessionApi() const {_} = useLingui() const {closeModal} = useModalControls() diff --git a/src/view/com/modals/VerifyEmail.tsx b/src/view/com/modals/VerifyEmail.tsx index d25a9d30b..d6a3006cc 100644 --- a/src/view/com/modals/VerifyEmail.tsx +++ b/src/view/com/modals/VerifyEmail.tsx @@ -13,7 +13,7 @@ import {useLingui} from '@lingui/react' import {logger} from '#/logger' import {useModalControls} from '#/state/modals' -import {getAgent, useSession, useSessionApi} from '#/state/session' +import {useAgent, useSession, useSessionApi} from '#/state/session' import {usePalette} from 'lib/hooks/usePalette' import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries' import {cleanError} from 'lib/strings/errors' @@ -41,6 +41,7 @@ export function Component({ onSuccess?: () => void }) { const pal = usePalette('default') + const {getAgent} = useAgent() const {currentAccount} = useSession() const {updateCurrentAccount} = useSessionApi() const {_} = useLingui() diff --git a/src/view/screens/Profile.tsx b/src/view/screens/Profile.tsx index 1571ddb78..eb9979823 100644 --- a/src/view/screens/Profile.tsx +++ b/src/view/screens/Profile.tsx @@ -19,7 +19,7 @@ import {resetProfilePostsQueries} from '#/state/queries/post-feed' import {useModerationOpts} from '#/state/queries/preferences' import {useProfileQuery} from '#/state/queries/profile' import {useResolveDidQuery} from '#/state/queries/resolve-uri' -import {getAgent, useSession} from '#/state/session' +import {useAgent, useSession} from '#/state/session' import {useSetDrawerSwipeDisabled, useSetMinimalShellMode} from '#/state/shell' import {useComposerControls} from '#/state/shell/composer' import {useAnalytics} from 'lib/analytics/analytics' @@ -472,6 +472,7 @@ function ProfileScreenLoaded({ } function useRichText(text: string): [RichTextAPI, boolean] { + const {getAgent} = useAgent() const [prevText, setPrevText] = React.useState(text) const [rawRT, setRawRT] = React.useState(() => new RichTextAPI({text})) const [resolvedRT, setResolvedRT] = React.useState<RichTextAPI | null>(null) @@ -495,7 +496,7 @@ function useRichText(text: string): [RichTextAPI, boolean] { return () => { ignore = true } - }, [text]) + }, [text, getAgent]) const isResolving = resolvedRT === null return [resolvedRT ?? rawRT, isResolving] } diff --git a/src/view/screens/Settings/DisableEmail2FADialog.tsx b/src/view/screens/Settings/DisableEmail2FADialog.tsx index b1704b309..83b133f65 100644 --- a/src/view/screens/Settings/DisableEmail2FADialog.tsx +++ b/src/view/screens/Settings/DisableEmail2FADialog.tsx @@ -5,7 +5,7 @@ import {useLingui} from '@lingui/react' import {cleanError} from '#/lib/strings/errors' import {isNative} from '#/platform/detection' -import {getAgent, useSession, useSessionApi} from '#/state/session' +import {useAgent, useSession, useSessionApi} from '#/state/session' import {ErrorMessage} from '#/view/com/util/error/ErrorMessage' import * as Toast from '#/view/com/util/Toast' import {atoms as a, useBreakpoints, useTheme} from '#/alf' @@ -31,6 +31,7 @@ export function DisableEmail2FADialog({ const {gtMobile} = useBreakpoints() const {currentAccount} = useSession() const {updateCurrentAccount} = useSessionApi() + const {getAgent} = useAgent() const [stage, setStage] = useState<Stages>(Stages.Email) const [confirmationCode, setConfirmationCode] = useState<string>('') diff --git a/src/view/screens/Settings/Email2FAToggle.tsx b/src/view/screens/Settings/Email2FAToggle.tsx index 93f1b2042..87a56ba5e 100644 --- a/src/view/screens/Settings/Email2FAToggle.tsx +++ b/src/view/screens/Settings/Email2FAToggle.tsx @@ -3,7 +3,7 @@ import {msg} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useModalControls} from '#/state/modals' -import {getAgent, useSession, useSessionApi} from '#/state/session' +import {useAgent, useSession, useSessionApi} from '#/state/session' import {ToggleButton} from 'view/com/util/forms/ToggleButton' import {useDialogControl} from '#/components/Dialog' import {DisableEmail2FADialog} from './DisableEmail2FADialog' @@ -14,6 +14,7 @@ export function Email2FAToggle() { const {updateCurrentAccount} = useSessionApi() const {openModal} = useModalControls() const disableDialogCtrl = useDialogControl() + const {getAgent} = useAgent() const enableEmailAuthFactor = React.useCallback(async () => { if (currentAccount?.email) { @@ -25,7 +26,7 @@ export function Email2FAToggle() { emailAuthFactor: true, }) } - }, [currentAccount, updateCurrentAccount]) + }, [currentAccount, updateCurrentAccount, getAgent]) const onToggle = React.useCallback(() => { if (!currentAccount) { diff --git a/src/view/screens/Settings/ExportCarDialog.tsx b/src/view/screens/Settings/ExportCarDialog.tsx index e901fb090..1b8d430b2 100644 --- a/src/view/screens/Settings/ExportCarDialog.tsx +++ b/src/view/screens/Settings/ExportCarDialog.tsx @@ -3,7 +3,7 @@ import {View} from 'react-native' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' -import {getAgent, useSession} from '#/state/session' +import {useAgent, useSession} from '#/state/session' import {atoms as a, useBreakpoints, useTheme} from '#/alf' import {Button, ButtonText} from '#/components/Button' import * as Dialog from '#/components/Dialog' @@ -19,6 +19,7 @@ export function ExportCarDialog({ const t = useTheme() const {gtMobile} = useBreakpoints() const {currentAccount} = useSession() + const {getAgent} = useAgent() const downloadUrl = React.useMemo(() => { const agent = getAgent() @@ -30,7 +31,7 @@ export function ExportCarDialog({ url.pathname = '/xrpc/com.atproto.sync.getRepo' url.searchParams.set('did', agent.session.did) return url.toString() - }, [currentAccount]) + }, [currentAccount, getAgent]) return ( <Dialog.Outer control={control}> diff --git a/src/view/shell/index.tsx b/src/view/shell/index.tsx index c94b69e06..f13a8d7df 100644 --- a/src/view/shell/index.tsx +++ b/src/view/shell/index.tsx @@ -13,7 +13,7 @@ import * as NavigationBar from 'expo-navigation-bar' import {StatusBar} from 'expo-status-bar' import {useNavigationState} from '@react-navigation/native' -import {getAgent, useSession} from '#/state/session' +import {useAgent, useSession} from '#/state/session' import { useIsDrawerOpen, useIsDrawerSwipeDisabled, @@ -57,6 +57,7 @@ function ShellInner() { ) const canGoBack = useNavigationState(state => !isStateAtTabRoot(state)) const {hasSession, currentAccount} = useSession() + const {getAgent} = useAgent() const closeAnyActiveElement = useCloseAnyActiveElement() const {importantForAccessibility} = useDialogStateContext() // start undefined @@ -85,7 +86,7 @@ function ShellInner() { ) return unsub } - }, [currentAccount]) + }, [currentAccount, getAgent]) return ( <> |