From d2ce0aafe81eea2d4259abe3a3b92018f98e6786 Mon Sep 17 00:00:00 2001 From: Zhiyuan Zheng Date: Wed, 8 Dec 2021 23:11:51 +0100 Subject: [PATCH] Fix translation error When there is body, the method has to be `post` --- src/api/general.ts | 2 +- src/api/tooot.ts | 4 ++-- src/utils/queryHooks/translate.ts | 20 +++----------------- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/src/api/general.ts b/src/api/general.ts index d2779e49..19ef755a 100644 --- a/src/api/general.ts +++ b/src/api/general.ts @@ -59,7 +59,7 @@ const apiGeneral = async ({ }) .catch(error => { if (sentry) { - Sentry.Native.setExtras(error.response) + Sentry.Native.setExtras(error.response || error.request) Sentry.Native.captureException(error) } diff --git a/src/api/tooot.ts b/src/api/tooot.ts index 79afb1a8..845b70cb 100644 --- a/src/api/tooot.ts +++ b/src/api/tooot.ts @@ -16,7 +16,7 @@ export type Params = { sentry?: boolean } -export const TOOOT_API_DOMAIN = __DEV__ ? 'testapi.tooot.app' : 'testapi.tooot.app' +export const TOOOT_API_DOMAIN = __DEV__ ? 'testapi.tooot.app' : 'api.tooot.app' const apiTooot = async ({ method, @@ -57,7 +57,7 @@ const apiTooot = async ({ }) .catch(error => { if (sentry) { - Sentry.Native.setExtras(error.response) + Sentry.Native.setExtras(error.response || error.request) Sentry.Native.captureException(error) } diff --git a/src/utils/queryHooks/translate.ts b/src/utils/queryHooks/translate.ts index 7bb8e084..64aec663 100644 --- a/src/utils/queryHooks/translate.ts +++ b/src/utils/queryHooks/translate.ts @@ -1,7 +1,6 @@ import apiTooot from '@api/tooot' import haptics from '@components/haptics' import { AxiosError } from 'axios' -import * as Crypto from 'expo-crypto' import { useQuery, UseQueryOptions } from 'react-query' type Translations = { @@ -13,7 +12,6 @@ type Translations = { export type QueryKeyTranslate = [ 'Translate', { - uri: string source: string target: string text: string[] @@ -21,23 +19,11 @@ export type QueryKeyTranslate = [ ] const queryFunction = async ({ queryKey }: { queryKey: QueryKeyTranslate }) => { - const { uri, source, target, text } = queryKey[1] - - const uriEncoded = await Crypto.digestStringAsync( - Crypto.CryptoDigestAlgorithm.SHA256, - uri.replace(/https?:\/\//, ''), - { encoding: Crypto.CryptoEncoding.HEX } - ) - const original = await Crypto.digestStringAsync( - Crypto.CryptoDigestAlgorithm.SHA256, - JSON.stringify({ source, text }), - { encoding: Crypto.CryptoEncoding.HEX } - ) + const { source, target, text } = queryKey[1] const res = await apiTooot({ - method: 'get', - url: '/translate', - headers: { original }, + method: 'post', + url: 'translate', body: { source, target, text } }) haptics('Light')