diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-02-22 18:06:25 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2023-02-22 18:06:25 +0900 |
| commit | 76583510419a7a21dfc3c43c9a6e29de791da0fa (patch) | |
| tree | 07c05b0e5331256140becb55dc85928b6618e272 /packages/backend/src/core/HttpRequestService.ts | |
| parent | Merge branch 'develop' (diff) | |
| parent | 13.7.0 (diff) | |
| download | misskey-76583510419a7a21dfc3c43c9a6e29de791da0fa.tar.gz misskey-76583510419a7a21dfc3c43c9a6e29de791da0fa.tar.bz2 misskey-76583510419a7a21dfc3c43c9a6e29de791da0fa.zip | |
Merge branch 'develop'
Diffstat (limited to 'packages/backend/src/core/HttpRequestService.ts')
| -rw-r--r-- | packages/backend/src/core/HttpRequestService.ts | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packages/backend/src/core/HttpRequestService.ts b/packages/backend/src/core/HttpRequestService.ts index e32026b04f..375aa846cb 100644 --- a/packages/backend/src/core/HttpRequestService.ts +++ b/packages/backend/src/core/HttpRequestService.ts @@ -99,7 +99,6 @@ export class HttpRequestService { const res = await this.send(url, { method: 'GET', headers: Object.assign({ - 'User-Agent': this.config.userAgent, Accept: accept, }, headers ?? {}), timeout: 5000, @@ -114,7 +113,6 @@ export class HttpRequestService { const res = await this.send(url, { method: 'GET', headers: Object.assign({ - 'User-Agent': this.config.userAgent, Accept: accept, }, headers ?? {}), timeout: 5000, @@ -144,7 +142,10 @@ export class HttpRequestService { const res = await fetch(url, { method: args.method ?? 'GET', - headers: args.headers, + headers: { + 'User-Agent': this.config.userAgent, + ...(args.headers ?? {}) + }, body: args.body, size: args.size ?? 10 * 1024 * 1024, agent: (url) => this.getAgentByUrl(url), |