diff --git a/src/api/general.ts b/src/api/general.ts index 270286ce..24b1ef6a 100644 --- a/src/api/general.ts +++ b/src/api/general.ts @@ -1,7 +1,6 @@ import axios from 'axios' import chalk from 'chalk' import Constants from 'expo-constants' -import * as Sentry from 'sentry-expo' const ctx = new chalk.Instance({ level: 3 }) @@ -14,7 +13,6 @@ export type Params = { } headers?: { [key: string]: string } body?: FormData | Object - sentry?: boolean } const apiGeneral = async ({ @@ -23,8 +21,7 @@ const apiGeneral = async ({ url, params, headers, - body, - sentry = true + body }: Params): Promise<{ body: T }> => { console.log( ctx.bgGreen.bold(' API general ') + @@ -45,7 +42,10 @@ const apiGeneral = async ({ url, params, headers: { - 'Content-Type': 'application/json', + 'Content-Type': + body && body instanceof FormData + ? 'multipart/form-data' + : 'application/json', 'User-Agent': `tooot/${Constants.manifest?.version}`, Accept: '*/*', ...headers diff --git a/src/api/instance.ts b/src/api/instance.ts index 7a2558b7..73975956 100644 --- a/src/api/instance.ts +++ b/src/api/instance.ts @@ -3,7 +3,6 @@ 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 }) @@ -73,7 +72,10 @@ const apiInstance = async ({ url, params, headers: { - 'Content-Type': 'application/json', + 'Content-Type': + body && body instanceof FormData + ? 'multipart/form-data' + : 'application/json', 'User-Agent': `tooot/${Constants.manifest?.version}`, Accept: '*/*', ...headers, diff --git a/src/api/tooot.ts b/src/api/tooot.ts index 90a30717..6e7b9ba3 100644 --- a/src/api/tooot.ts +++ b/src/api/tooot.ts @@ -48,7 +48,10 @@ const apiTooot = async ({ url: `${url}`, params, headers: { - 'Content-Type': 'application/json', + 'Content-Type': + body && body instanceof FormData + ? 'multipart/form-data' + : 'application/json', 'User-Agent': `tooot/${Constants.manifest?.version}`, Accept: '*/*', ...headers diff --git a/yarn.lock b/yarn.lock index 7d88160e..8f67cba6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3963,9 +3963,9 @@ flow-parser@^0.121.0: integrity sha512-1gIBiWJNR0tKUNv8gZuk7l9rVX06OuLzY9AoGio7y/JT4V1IZErEMEq2TJS+PFcw/y0RshZ1J/27VfK1UQzYVg== follow-redirects@^1.14.9: - version "1.14.9" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" - integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== + version "1.15.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.0.tgz#06441868281c86d0dda4ad8bdaead2d02dca89d4" + integrity sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ== fontfaceobserver@^2.1.0: version "2.1.0"