X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Frequests.ts;h=495e83558703ecfd4c2e51ce8550a21452eaa15c;hb=daa0226b0a2ae1d19b342c2b7a54267d2fd8d30e;hp=a9869e987cdff4aa85d8174312416de456e1ab37;hpb=ca3d5912e16b39697bdeeda35d10b44ed8f711aa;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts index a9869e987..495e83558 100644 --- a/server/helpers/requests.ts +++ b/server/helpers/requests.ts @@ -1,11 +1,8 @@ import { createWriteStream, remove } from 'fs-extra' import got, { CancelableRequest, NormalizedOptions, Options as GotOptions, RequestError, Response } from 'got' import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent' -import { join } from 'path' -import { CONFIG } from '../initializers/config' import { ACTIVITY_PUB, BINARY_CONTENT_TYPES, PEERTUBE_VERSION, REQUEST_TIMEOUTS, WEBSERVER } from '../initializers/constants' import { pipelinePromise } from './core-utils' -import { processImage } from './image-utils' import { logger, loggerTagsFactory } from './logger' import { getProxy, isProxyEnabled } from './proxy' @@ -147,21 +144,6 @@ async function doRequestAndSaveToFile ( } } -async function downloadImage (url: string, destDir: string, destName: string, size: { width: number, height: number }) { - const tmpPath = join(CONFIG.STORAGE.TMP_DIR, 'pending-' + destName) - await doRequestAndSaveToFile(url, tmpPath) - - const destPath = join(destDir, destName) - - try { - await processImage(tmpPath, destPath, size) - } catch (err) { - await remove(tmpPath) - - throw err - } -} - function getAgent () { if (!isProxyEnabled()) return {} @@ -211,7 +193,6 @@ export { doJSONRequest, doRequestAndSaveToFile, isBinaryResponse, - downloadImage, getAgent, findLatestRedirection, peertubeGot