Merge pull request #195 from tooot-app/main

Test v3.1

.github/workflows/build.yml

@@ -22,7 +22,7 @@ jobs:
       - name: -- Step 3 -- Use Expo action
         uses: expo/expo-github-action@v6
         with:
-          expo-version: 4.x
+          expo-version: 5.x
           username: ${{ secrets.EXPO_USERNAME }}
           token: ${{ secrets.EXPO_TOKEN }}
       - name: -- Step 4 -- Install node dependencies

fastlane/metadata/en-US/release_notes.txt

@@ -1,3 +1 @@
-Support iOS version starting from 12
-Optimize performance (hopefully)
-Using new push and translation service
+Optimize performance and fix bugs

fastlane/metadata/zh-Hans/release_notes.txt

@@ -1,3 +1 @@
-iOS支持最低版本12
-（但愿）性能有改进
-使用新的推送和翻译服务
+性能有改进及修复错误

src/api/general.ts

@@ -24,7 +24,7 @@ const apiGeneral = async <T = unknown>({
   params,
   headers,
   body,
-  sentry = false
+  sentry = true
 }: Params): Promise<{ body: T }> => {
   console.log(
     ctx.bgGreen.bold(' API general ') +
@@ -58,8 +58,12 @@ const apiGeneral = async <T = unknown>({
       })
     })
     .catch(error => {
-      if (sentry) {
-        Sentry.Native.setExtras(error.response || error.request)
+      if (sentry && Math.random() < 0.001) {
+        Sentry.Native.setExtras({
+          API: 'instance',
+          ...(error.response && { response: error.response }),
+          ...(error.request && { request: error.request })
+        })
         Sentry.Native.captureException(error)
       }
 

src/api/instance.ts

@@ -3,6 +3,7 @@ import axios, { AxiosRequestConfig } from 'axios'
 import chalk from 'chalk'
 import Constants from 'expo-constants'
 import li from 'li'
+import * as Sentry from 'sentry-expo'
 
 const ctx = new chalk.Instance({ level: 3 })
 
@@ -97,6 +98,15 @@ const apiInstance = async <T = unknown>({
       })
     })
     .catch(error => {
+      if (Math.random() < 0.001) {
+        Sentry.Native.setExtras({
+          API: 'instance',
+          ...(error.response && { response: error.response }),
+          ...(error.request && { request: error.request })
+        })
+        Sentry.Native.captureException(error)
+      }
+
       if (error.response) {
         // The request was made and the server responded with a status code
         // that falls out of the range of 2xx

src/api/tooot.ts

@@ -29,7 +29,7 @@ const apiTooot = async <T = unknown>({
   params,
   headers,
   body,
-  sentry = false
+  sentry = true
 }: Params): Promise<{ body: T }> => {
   console.log(
     ctx.bgGreen.bold(' API tooot ') +
@@ -61,8 +61,12 @@ const apiTooot = async <T = unknown>({
       })
     })
     .catch(error => {
-      if (sentry) {
-        Sentry.Native.setExtras(error.response || error.request)
+      if (sentry && Math.random() < 0.005) {
+        Sentry.Native.setExtras({
+          API: 'tooot',
+          ...(error.response && { response: error.response }),
+          ...(error.request && { request: error.request })
+        })
         Sentry.Native.captureException(error)
       }
 

src/utils/slices/instances/push/register.ts

@@ -28,8 +28,7 @@ const subscribe = async ({
   return apiTooot({
     method: 'post',
     url: `/push/subscribe/${expoToken}/${instanceUrl}/${accountId}`,
-    body: { accountFull, serverKey, auth },
-    sentry: true
+    body: { accountFull, serverKey, auth }
   })
 }
 

src/utils/slices/instances/push/unregister.ts

@@ -21,8 +21,7 @@ const pushUnregister = async (state: RootState, expoToken: string) => {
 
   await apiTooot<{ endpoint: string; publicKey: string; auth: string }>({
     method: 'delete',
-    url: `/push/unsubscribe/${expoToken}/${instance.url}/${instance.account.id}`,
-    sentry: true
+    url: `/push/unsubscribe/${expoToken}/${instance.url}/${instance.account.id}`
   })
 
   if (Platform.OS === 'android') {

src/utils/slices/instances/updatePushDecode.ts

@@ -21,20 +21,19 @@ export const updateInstancePushDecode = createAsyncThunk(
     }
 
     const expoToken = isDevelopment
-    ? 'DEVELOPMENT_TOKEN_1'
-    : (
-        await Notifications.getExpoPushTokenAsync({
-          experienceId: '@xmflsct/tooot'
-        })
-      ).data
+      ? 'DEVELOPMENT_TOKEN_1'
+      : (
+          await Notifications.getExpoPushTokenAsync({
+            experienceId: '@xmflsct/tooot'
+          })
+        ).data
 
     await apiTooot({
       method: 'put',
       url: `/push/update-decode/${expoToken}/${instance.url}/${instance.account.id}`,
       body: {
         auth: !disable ? null : instance.push.keys.auth
-      },
-      sentry: true
+      }
     })
 
     if (Platform.OS === 'android') {