diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-11 14:09:23 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 14:09:23 +0100 |
| commit | b718fd22374d64534bcfe69932cf562894abed6a (patch) | |
| tree | 311d3c67e2a4d1f33ebdd1dc163527de9d33d0f7 /server/helpers/requests.ts | |
| parent | adb115f5522bea4d52456a9fc5eb4140bb064476 (diff) | |
| parent | 501e961199578129629cf0567033d13efced9904 (diff) | |
| download | PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.tar.gz PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.tar.zst PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.zip | |
Merge branch 'develop' into pr/1285
Diffstat (limited to 'server/helpers/requests.ts')
| -rw-r--r-- | server/helpers/requests.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts index 3fc776f1a..5c6dc5e19 100644 --- a/server/helpers/requests.ts +++ b/server/helpers/requests.ts | |||
| @@ -7,7 +7,7 @@ import { join } from 'path' | |||
| 7 | 7 | ||
| 8 | function doRequest <T> ( | 8 | function doRequest <T> ( |
| 9 | requestOptions: request.CoreOptions & request.UriOptions & { activityPub?: boolean } | 9 | requestOptions: request.CoreOptions & request.UriOptions & { activityPub?: boolean } |
| 10 | ): Bluebird<{ response: request.RequestResponse, body: any }> { | 10 | ): Bluebird<{ response: request.RequestResponse, body: T }> { |
| 11 | if (requestOptions.activityPub === true) { | 11 | if (requestOptions.activityPub === true) { |
| 12 | if (!Array.isArray(requestOptions.headers)) requestOptions.headers = {} | 12 | if (!Array.isArray(requestOptions.headers)) requestOptions.headers = {} |
| 13 | requestOptions.headers['accept'] = ACTIVITY_PUB.ACCEPT_HEADER | 13 | requestOptions.headers['accept'] = ACTIVITY_PUB.ACCEPT_HEADER |