Add details to UA

src/api/general.ts

@@ -1,6 +1,6 @@
 import axios from 'axios'
-import Constants from 'expo-constants'
 import handleError, { ctx } from './handleError'
+import { userAgent } from './helpers'
 
 export type Params = {
   method: 'get' | 'post' | 'put' | 'delete'
@@ -44,8 +44,8 @@ const apiGeneral = async <T = unknown>({
         body && body instanceof FormData
           ? 'multipart/form-data'
           : 'application/json',
-      'User-Agent': `tooot/${Constants.expoConfig?.version}`,
       Accept: '*/*',
+      ...userAgent,
       ...headers
     },
     ...(body && { data: body })

src/api/helpers/index.ts

@@ -0,0 +1,6 @@
+import Constants from "expo-constants"
+import { Platform } from "react-native"
+
+const userAgent = { 'User-Agent': `tooot/${Constants.expoConfig?.version} ${Platform.OS}/${Platform.Version}` }
+
+export { userAgent }

src/api/instance.ts

@@ -1,8 +1,8 @@
 import { RootState } from '@root/store'
 import axios, { AxiosRequestConfig } from 'axios'
-import Constants from 'expo-constants'
 import li from 'li'
 import handleError, { ctx } from './handleError'
+import { userAgent } from './helpers'
 
 export type Params = {
   method: 'get' | 'post' | 'put' | 'delete' | 'patch'
@@ -53,13 +53,13 @@ const apiInstance = async <T = unknown>({
 
   console.log(
     ctx.bgGreen.bold(' API instance ') +
-      ' ' +
+    ' ' +
-      domain +
+    domain +
-      ' ' +
+    ' ' +
-      method +
+    method +
-      ctx.green(' -> ') +
+    ctx.green(' -> ') +
-      `/${url}` +
+    `/${url}` +
-      (params ? ctx.green(' -> ') : ''),
+    (params ? ctx.green(' -> ') : ''),
     params ? params : ''
   )
 
@@ -74,8 +74,8 @@ const apiInstance = async <T = unknown>({
         body && body instanceof FormData
           ? 'multipart/form-data'
           : 'application/json',
-      'User-Agent': `tooot/${Constants.expoConfig?.version}`,
       Accept: '*/*',
+      ...userAgent,
       ...headers,
       ...(token && {
         Authorization: `Bearer ${token}`

src/api/tooot.ts

@@ -1,8 +1,8 @@
 import * as Sentry from '@sentry/react-native'
 import { mapEnvironment } from '@utils/checkEnvironment'
 import axios from 'axios'
-import Constants from 'expo-constants'
 import handleError, { ctx } from './handleError'
+import { userAgent } from './helpers'
 
 export type Params = {
   method: 'get' | 'post' | 'put' | 'delete'
@@ -50,13 +50,11 @@ const apiTooot = async <T = unknown>({
         body && body instanceof FormData
           ? 'multipart/form-data'
           : 'application/json',
-      'User-Agent': `tooot/${Constants.expoConfig?.version}`,
       Accept: '*/*',
+      ...userAgent,
       ...headers
     },
-    ...(body && { data: body }),
+    ...(body && { data: body })
-    validateStatus: status =>
-      url.includes('translate') ? status < 500 : status === 200
   })
     .then(response => {
       return Promise.resolve({