Merge pull request #184 from tooot-app/main

Final test of new push system

src/api/general.ts

@@ -59,7 +59,7 @@ const apiGeneral = async <T = unknown>({
     })
     .catch(error => {
       if (sentry) {
-        Sentry.Native.setExtras(error.response)
+        Sentry.Native.setExtras(error.response || error.request)
         Sentry.Native.captureException(error)
       }
 

src/api/tooot.ts

@@ -57,7 +57,7 @@ const apiTooot = async <T = unknown>({
     })
     .catch(error => {
       if (sentry) {
-        Sentry.Native.setExtras(error.response)
+        Sentry.Native.setExtras(error.response || error.request)
         Sentry.Native.captureException(error)
       }
 

src/utils/push/useConnect.ts

@@ -25,12 +25,8 @@ const pushUseConnect = ({ mode, t, instances, dispatch }: Params) => {
       ).data
 
       apiTooot({
-        method: 'post',
+        method: 'get',
-        service: 'push',
+        url: `push/connect/${expoToken}`,
-        url: 'connect',
-        body: {
-          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])
 }

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 { 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 res = await apiTooot<Translations>({
-    method: 'get',
+    method: 'post',
-    url: '/translate',
+    url: 'translate',
-    headers: { original },
     body: { source, target, text }
   })
   haptics('Light')

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') {

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
     })