diff options
Diffstat (limited to 'src/view/com')
-rw-r--r-- | src/view/com/composer/Composer.tsx | 4 | ||||
-rw-r--r-- | src/view/com/composer/useExternalLinkFetch.e2e.ts | 6 | ||||
-rw-r--r-- | src/view/com/composer/useExternalLinkFetch.ts | 10 | ||||
-rw-r--r-- | src/view/com/modals/ChangeEmail.tsx | 12 | ||||
-rw-r--r-- | src/view/com/modals/ChangeHandle.tsx | 10 | ||||
-rw-r--r-- | src/view/com/modals/ChangePassword.tsx | 3 | ||||
-rw-r--r-- | src/view/com/modals/CreateOrEditList.tsx | 6 | ||||
-rw-r--r-- | src/view/com/modals/DeleteAccount.tsx | 8 | ||||
-rw-r--r-- | src/view/com/modals/VerifyEmail.tsx | 8 |
9 files changed, 33 insertions, 34 deletions
diff --git a/src/view/com/composer/Composer.tsx b/src/view/com/composer/Composer.tsx index 7b102c823..12e57c411 100644 --- a/src/view/com/composer/Composer.tsx +++ b/src/view/com/composer/Composer.tsx @@ -90,7 +90,7 @@ export const ComposePost = observer(function ComposePost({ imageUris: initImageUris, }: Props) { const {currentAccount} = useSession() - const {getAgent} = useAgent() + const agent = useAgent() const {data: currentProfile} = useProfileQuery({did: currentAccount!.did}) const {isModalActive} = useModals() const {closeComposer} = useComposerControls() @@ -260,7 +260,7 @@ export const ComposePost = observer(function ComposePost({ let postUri try { postUri = ( - await apilib.post(getAgent(), { + await apilib.post(agent, { rawText: richtext.text, replyTo: replyTo?.uri, images: gallery.images, diff --git a/src/view/com/composer/useExternalLinkFetch.e2e.ts b/src/view/com/composer/useExternalLinkFetch.e2e.ts index 65ecb866e..257a3e8e5 100644 --- a/src/view/com/composer/useExternalLinkFetch.e2e.ts +++ b/src/view/com/composer/useExternalLinkFetch.e2e.ts @@ -8,7 +8,7 @@ import {ComposerOpts} from 'state/shell/composer' export function useExternalLinkFetch({}: { setQuote: (opts: ComposerOpts['quote']) => void }) { - const {getAgent} = useAgent() + const agent = useAgent() const [extLink, setExtLink] = useState<apilib.ExternalEmbedDraft | undefined>( undefined, ) @@ -22,7 +22,7 @@ export function useExternalLinkFetch({}: { return cleanup } if (!extLink.meta) { - getLinkMeta(getAgent(), extLink.uri).then(meta => { + getLinkMeta(agent, extLink.uri).then(meta => { if (aborted) { return } @@ -41,7 +41,7 @@ export function useExternalLinkFetch({}: { }) } return cleanup - }, [extLink, getAgent]) + }, [extLink, agent]) return {extLink, setExtLink} } diff --git a/src/view/com/composer/useExternalLinkFetch.ts b/src/view/com/composer/useExternalLinkFetch.ts index d51dec42b..2e0297a47 100644 --- a/src/view/com/composer/useExternalLinkFetch.ts +++ b/src/view/com/composer/useExternalLinkFetch.ts @@ -31,7 +31,7 @@ export function useExternalLinkFetch({ ) const getPost = useGetPost() const fetchDid = useFetchDid() - const {getAgent} = useAgent() + const agent = useAgent() useEffect(() => { let aborted = false @@ -59,7 +59,7 @@ export function useExternalLinkFetch({ }, ) } else if (isBskyCustomFeedUrl(extLink.uri)) { - getFeedAsEmbed(getAgent(), fetchDid, extLink.uri).then( + getFeedAsEmbed(agent, fetchDid, extLink.uri).then( ({embed, meta}) => { if (aborted) { return @@ -77,7 +77,7 @@ export function useExternalLinkFetch({ }, ) } else if (isBskyListUrl(extLink.uri)) { - getListAsEmbed(getAgent(), fetchDid, extLink.uri).then( + getListAsEmbed(agent, fetchDid, extLink.uri).then( ({embed, meta}) => { if (aborted) { return @@ -95,7 +95,7 @@ export function useExternalLinkFetch({ }, ) } else { - getLinkMeta(getAgent(), extLink.uri).then(meta => { + getLinkMeta(agent, extLink.uri).then(meta => { if (aborted) { return } @@ -137,7 +137,7 @@ export function useExternalLinkFetch({ }) } return cleanup - }, [extLink, setQuote, getPost, fetchDid, getAgent]) + }, [extLink, setQuote, getPost, fetchDid, agent]) return {extLink, setExtLink} } diff --git a/src/view/com/modals/ChangeEmail.tsx b/src/view/com/modals/ChangeEmail.tsx index b940b2d6d..a214627e2 100644 --- a/src/view/com/modals/ChangeEmail.tsx +++ b/src/view/com/modals/ChangeEmail.tsx @@ -27,7 +27,7 @@ export const snapPoints = ['90%'] export function Component() { const pal = usePalette('default') const {currentAccount} = useSession() - const {getAgent} = useAgent() + const agent = useAgent() const {_} = useLingui() const [stage, setStage] = useState<Stages>(Stages.InputEmail) const [email, setEmail] = useState<string>(currentAccount?.email || '') @@ -45,12 +45,12 @@ export function Component() { setError('') setIsProcessing(true) try { - const res = await getAgent().com.atproto.server.requestEmailUpdate() + const res = await agent.com.atproto.server.requestEmailUpdate() if (res.data.tokenRequired) { setStage(Stages.ConfirmCode) } else { - await getAgent().com.atproto.server.updateEmail({email: email.trim()}) - await getAgent().resumeSession(getAgent().session!) + await agent.com.atproto.server.updateEmail({email: email.trim()}) + await agent.resumeSession(agent.session!) Toast.show(_(msg`Email updated`)) setStage(Stages.Done) } @@ -75,11 +75,11 @@ export function Component() { setError('') setIsProcessing(true) try { - await getAgent().com.atproto.server.updateEmail({ + await agent.com.atproto.server.updateEmail({ email: email.trim(), token: confirmationCode.trim(), }) - await getAgent().resumeSession(getAgent().session!) + await agent.resumeSession(agent.session!) Toast.show(_(msg`Email updated`)) setStage(Stages.Done) } catch (e) { diff --git a/src/view/com/modals/ChangeHandle.tsx b/src/view/com/modals/ChangeHandle.tsx index 52eb51031..f2094ed75 100644 --- a/src/view/com/modals/ChangeHandle.tsx +++ b/src/view/com/modals/ChangeHandle.tsx @@ -35,12 +35,12 @@ export type Props = {onChanged: () => void} export function Component(props: Props) { const {currentAccount} = useSession() - const {getAgent} = useAgent() + const agent = useAgent() const { isLoading, data: serviceInfo, error: serviceInfoError, - } = useServiceQuery(getAgent().service.toString()) + } = useServiceQuery(agent.service.toString()) return isLoading || !currentAccount ? ( <View style={{padding: 18}}> @@ -71,7 +71,7 @@ export function Inner({ const {closeModal} = useModalControls() const {mutateAsync: updateHandle, isPending: isUpdateHandlePending} = useUpdateHandleMutation() - const {getAgent} = useAgent() + const agent = useAgent() const [error, setError] = useState<string>('') @@ -111,7 +111,7 @@ export function Inner({ await updateHandle({ handle: newHandle, }) - await getAgent().resumeSession(getAgent().session!) + await agent.resumeSession(agent.session!) closeModal() onChanged() } catch (err: any) { @@ -129,7 +129,7 @@ export function Inner({ closeModal, updateHandle, serviceInfo, - getAgent, + agent, ]) // rendering diff --git a/src/view/com/modals/ChangePassword.tsx b/src/view/com/modals/ChangePassword.tsx index 3ce7306b9..196715b49 100644 --- a/src/view/com/modals/ChangePassword.tsx +++ b/src/view/com/modals/ChangePassword.tsx @@ -37,7 +37,7 @@ export const snapPoints = isAndroid ? ['90%'] : ['45%'] export function Component() { const pal = usePalette('default') const {currentAccount} = useSession() - const {getAgent} = useAgent() + const agent = useAgent() const {_} = useLingui() const [stage, setStage] = useState<Stages>(Stages.RequestCode) const [isProcessing, setIsProcessing] = useState<boolean>(false) @@ -46,7 +46,6 @@ export function Component() { const [error, setError] = useState<string>('') const {isMobile} = useWebMediaQueries() const {closeModal} = useModalControls() - const agent = getAgent() const onRequestCode = async () => { if ( diff --git a/src/view/com/modals/CreateOrEditList.tsx b/src/view/com/modals/CreateOrEditList.tsx index 2dff636af..2ea34e808 100644 --- a/src/view/com/modals/CreateOrEditList.tsx +++ b/src/view/com/modals/CreateOrEditList.tsx @@ -62,7 +62,7 @@ export function Component({ const {_} = useLingui() const listCreateMutation = useListCreateMutation() const listMetadataMutation = useListMetadataMutation() - const {getAgent} = useAgent() + const agent = useAgent() const activePurpose = useMemo(() => { if (list?.purpose) { @@ -157,7 +157,7 @@ export function Component({ {cleanNewlines: true}, ) - await richText.detectFacets(getAgent()) + await richText.detectFacets(agent) richText = shortenLinks(richText) // filter out any mention facets that didn't map to a user @@ -229,7 +229,7 @@ export function Component({ listMetadataMutation, listCreateMutation, _, - getAgent, + agent, ]) return ( diff --git a/src/view/com/modals/DeleteAccount.tsx b/src/view/com/modals/DeleteAccount.tsx index cab5dc289..06f1e111a 100644 --- a/src/view/com/modals/DeleteAccount.tsx +++ b/src/view/com/modals/DeleteAccount.tsx @@ -31,7 +31,7 @@ export function Component({}: {}) { const pal = usePalette('default') const theme = useTheme() const {currentAccount} = useSession() - const {getAgent} = useAgent() + const agent = useAgent() const {removeAccount} = useSessionApi() const {_} = useLingui() const {closeModal} = useModalControls() @@ -45,7 +45,7 @@ export function Component({}: {}) { setError('') setIsProcessing(true) try { - await getAgent().com.atproto.server.requestAccountDelete() + await agent.com.atproto.server.requestAccountDelete() setIsEmailSent(true) } catch (e: any) { setError(cleanError(e)) @@ -63,7 +63,7 @@ export function Component({}: {}) { try { // inform chat service of intent to delete account - const {success} = await getAgent().api.chat.bsky.actor.deleteAccount( + const {success} = await agent.api.chat.bsky.actor.deleteAccount( undefined, { headers: DM_SERVICE_HEADERS, @@ -72,7 +72,7 @@ export function Component({}: {}) { if (!success) { throw new Error('Failed to inform chat service of account deletion') } - await getAgent().com.atproto.server.deleteAccount({ + await agent.com.atproto.server.deleteAccount({ did: currentAccount.did, password, token, diff --git a/src/view/com/modals/VerifyEmail.tsx b/src/view/com/modals/VerifyEmail.tsx index 3fdde330d..7c1146a01 100644 --- a/src/view/com/modals/VerifyEmail.tsx +++ b/src/view/com/modals/VerifyEmail.tsx @@ -41,7 +41,7 @@ export function Component({ onSuccess?: () => void }) { const pal = usePalette('default') - const {getAgent} = useAgent() + const agent = useAgent() const {currentAccount} = useSession() const {_} = useLingui() const [stage, setStage] = useState<Stages>( @@ -64,7 +64,7 @@ export function Component({ setError('') setIsProcessing(true) try { - await getAgent().com.atproto.server.requestEmailConfirmation() + await agent.com.atproto.server.requestEmailConfirmation() setStage(Stages.ConfirmCode) } catch (e) { setError(cleanError(String(e))) @@ -77,11 +77,11 @@ export function Component({ setError('') setIsProcessing(true) try { - await getAgent().com.atproto.server.confirmEmail({ + await agent.com.atproto.server.confirmEmail({ email: (currentAccount?.email || '').trim(), token: confirmationCode.trim(), }) - await getAgent().resumeSession(getAgent().session!) + await agent.resumeSession(agent.session!) Toast.show(_(msg`Email verified`)) closeModal() onSuccess?.() |