Only use account name in routes

[github/Chocobozzz/PeerTube.git] / server / helpers / requests.ts

diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts
index 4b1deeadce1fb0772378ea9690d54bd042668343..64e3ce663b13f8668483296047577f956e171bdb 100644 (file)
--- a/server/helpers/requests.ts
+++ b/server/helpers/requests.ts
@@ -1,19 +1,29 @@
-import * as Promise from 'bluebird'
+import * as Bluebird from 'bluebird'
 import { createWriteStream } from 'fs'
 import * as request from 'request'
+import { ACTIVITY_PUB } from '../initializers'
 
-function doRequest (requestOptions: request.CoreOptions & request.UriOptions) {
-  return new Promise<{ response: request.RequestResponse, body: any }>((res, rej) => {
+function doRequest (
+  requestOptions: request.CoreOptions & request.UriOptions & { activityPub?: boolean }
+): Bluebird<{ response: request.RequestResponse, body: any }> {
+  if (requestOptions.activityPub === true) {
+    if (!Array.isArray(requestOptions.headers)) requestOptions.headers = {}
+    requestOptions.headers['accept'] = ACTIVITY_PUB.ACCEPT_HEADER
+  }
+
+  return new Bluebird<{ response: request.RequestResponse, body: any }>((res, rej) => {
     request(requestOptions, (err, response, body) => err ? rej(err) : res({ response, body }))
   })
 }
 
 function doRequestAndSaveToFile (requestOptions: request.CoreOptions & request.UriOptions, destPath: string) {
-  return new Promise<request.RequestResponse>((res, rej) => {
+  return new Bluebird<void>((res, rej) => {
+    const file = createWriteStream(destPath)
+    file.on('finish', () => res())
+
     request(requestOptions)
-      .on('response', response => res(response as request.RequestResponse))
       .on('error', err => rej(err))
-      .pipe(createWriteStream(destPath))
+      .pipe(file)
   })
 }