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..2e26f241 100644 --- a/src/api/tooot.ts +++ b/src/api/tooot.ts @@ -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/push/useConnect.ts b/src/utils/push/useConnect.ts index 77f3ad6b..e0ef63fb 100644 --- a/src/utils/push/useConnect.ts +++ b/src/utils/push/useConnect.ts @@ -25,12 +25,8 @@ const pushUseConnect = ({ mode, t, instances, dispatch }: Params) => { ).data apiTooot({ - method: 'post', - service: 'push', - url: 'connect', - body: { - expoToken - }, + method: 'get', + url: `push/connect/${expoToken}`, sentry: true }).catch(error => { if (error.status == 410) { @@ -76,7 +72,7 @@ const pushUseConnect = ({ mode, t, instances, dispatch }: Params) => { const pushEnabled = instances.filter(instance => instance.push.global.value) if (pushEnabled.length) { - // connect() + connect() } }, [instances]) } 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') diff --git a/src/utils/slices/instances/push/register.ts b/src/utils/slices/instances/push/register.ts index 38f1cefd..c91a9279 100644 --- a/src/utils/slices/instances/push/register.ts +++ b/src/utils/slices/instances/push/register.ts @@ -77,7 +77,7 @@ const pushRegister = async ( accountId, accountFull, serverKey: res.body.server_key, - auth + auth: instancePush.decode.value === false ? null : auth }) if (Platform.OS === 'android') { diff --git a/src/utils/slices/instances/updatePushDecode.ts b/src/utils/slices/instances/updatePushDecode.ts index 172ca3d4..5ef848ed 100644 --- a/src/utils/slices/instances/updatePushDecode.ts +++ b/src/utils/slices/instances/updatePushDecode.ts @@ -29,7 +29,7 @@ export const updateInstancePushDecode = createAsyncThunk( method: 'put', url: `/push/update-decode/${expoToken}/${instance.url}/${instance.account.id}`, body: { - auth: disable ? null : instance.push.keys.auth + auth: !disable ? null : instance.push.keys.auth }, sentry: true })