X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fexpress-utils.ts;h=780fd6345e850df4735f70d066c3f65616e8d926;hb=0628157fe9662fdb2b6fa658b8b53fe684c013ce;hp=c299b70f139ef590432574fe57e524c1c55715e9;hpb=c4fa01f7c45b66b112ebd08abce744b7c4041feb;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/express-utils.ts b/server/helpers/express-utils.ts index c299b70f1..780fd6345 100644 --- a/server/helpers/express-utils.ts +++ b/server/helpers/express-utils.ts @@ -1,9 +1,9 @@ -import * as express from 'express' -import * as multer from 'multer' +import express, { RequestHandler } from 'express' +import multer, { diskStorage } from 'multer' import { HttpStatusCode } from '../../shared/models/http/http-error-codes' import { CONFIG } from '../initializers/config' import { REMOTE_SCHEME } from '../initializers/constants' -import { getLowercaseExtension } from './core-utils' +import { getLowercaseExtension } from '@shared/core-utils' import { isArray } from './custom-validators/misc' import { logger } from './logger' import { deleteFileAndCatch, generateRandomString } from './utils' @@ -59,7 +59,7 @@ function getHostWithPort (host: string) { return host } -function badRequest (req: express.Request, res: express.Response) { +function badRequest (_req: express.Request, res: express.Response) { return res.type('json') .status(HttpStatusCode.BAD_REQUEST_400) .end() @@ -69,8 +69,8 @@ function createReqFiles ( fieldNames: string[], mimeTypes: { [id: string]: string | string[] }, destinations: { [fieldName: string]: string } -) { - const storage = multer.diskStorage({ +): RequestHandler { + const storage = diskStorage({ destination: (req, file, cb) => { cb(null, destinations[file.fieldname]) },