From 6b2ef589ed8ef5d253f6213e1bb275cbe135f2b4 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 15 Jan 2018 11:10:46 +0100 Subject: Prepare production workflow --- server/helpers/requests.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'server') diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts index e8d77b15b..eb8a12868 100644 --- a/server/helpers/requests.ts +++ b/server/helpers/requests.ts @@ -1,8 +1,7 @@ -import * as Promise from 'bluebird' +import * as Bluebird from 'bluebird' import { createWriteStream } from 'fs' import * as request from 'request' import { ACTIVITY_PUB } from '../initializers' -import Bluebird = require('bluebird') function doRequest ( requestOptions: request.CoreOptions & request.UriOptions & { activityPub?: boolean } @@ -12,13 +11,13 @@ function doRequest ( requestOptions.headers['accept'] = ACTIVITY_PUB.ACCEPT_HEADER } - return new Promise<{ response: request.RequestResponse, body: any }>((res, rej) => { + 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((res, rej) => { + return new Bluebird((res, rej) => { request(requestOptions) .on('response', response => res(response as request.RequestResponse)) .on('error', err => rej(err)) -- cgit v1.2.3