From e0ce715a1ded6e84c877004dae3e354c8716fb06 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 16 Jul 2019 14:52:24 +0200 Subject: Check latest plugins version --- server/helpers/requests.ts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'server/helpers') diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts index 2e30c94a1..80476d649 100644 --- a/server/helpers/requests.ts +++ b/server/helpers/requests.ts @@ -1,18 +1,22 @@ import * as Bluebird from 'bluebird' import { createWriteStream, remove } from 'fs-extra' import * as request from 'request' -import { ACTIVITY_PUB } from '../initializers/constants' +import { ACTIVITY_PUB, WEBSERVER } from '../initializers/constants' import { processImage } from './image-utils' import { join } from 'path' import { logger } from './logger' import { CONFIG } from '../initializers/config' +const packageJSON = require('../../../package.json') + function doRequest ( requestOptions: request.CoreOptions & request.UriOptions & { activityPub?: boolean }, bodyKBLimit = 1000 // 1MB ): Bluebird<{ response: request.RequestResponse, body: T }> { + if (!(requestOptions.headers)) requestOptions.headers = {} + requestOptions.headers['User-Agent'] = getUserAgent() + if (requestOptions.activityPub === true) { - if (!Array.isArray(requestOptions.headers)) requestOptions.headers = {} requestOptions.headers['accept'] = ACTIVITY_PUB.ACCEPT_HEADER } @@ -27,6 +31,9 @@ function doRequestAndSaveToFile ( destPath: string, bodyKBLimit = 10000 // 10MB ) { + if (!requestOptions.headers) requestOptions.headers = {} + requestOptions.headers['User-Agent'] = getUserAgent() + return new Bluebird((res, rej) => { const file = createWriteStream(destPath) file.on('finish', () => res()) @@ -60,6 +67,10 @@ async function downloadImage (url: string, destDir: string, destName: string, si } } +function getUserAgent () { + return `PeerTube/${packageJSON.version} (+${WEBSERVER.URL})` +} + // --------------------------------------------------------------------------- export { -- cgit v1.2.3