Merge branch 'develop' into shorter-URLs-channels-accounts

1 files changed, 15 insertions, 15 deletions

diff --git a/server/helpers/express-utils.ts b/server/helpers/express-utils.ts
index c0d3f8f32..010c6961a 100644
--- a/server/helpers/express-utils.ts
+++ b/server/helpers/express-utils.ts
@@ -1,13 +1,13 @@
 import * as express from 'express'
 import * as multer from 'multer'
-import { REMOTE_SCHEME } from '../initializers/constants'
-import { logger } from './logger'
-import { deleteFileAsync, generateRandomString } from './utils'
 import { extname } from 'path'
-import { isArray } from './custom-validators/misc'
+import { HttpStatusCode } from '../../shared/core-utils/miscs/http-error-codes'
 import { CONFIG } from '../initializers/config'
+import { REMOTE_SCHEME } from '../initializers/constants'
+import { isArray } from './custom-validators/misc'
+import { logger } from './logger'
+import { deleteFileAndCatch, generateRandomString } from './utils'
 import { getExtFromMimetype } from './video'
-import { HttpStatusCode } from '../../shared/core-utils/miscs/http-error-codes'
 
 function buildNSFWFilter (res?: express.Response, paramNSFW?: string) {
   if (paramNSFW === 'true') return true
@@ -30,21 +30,21 @@ function buildNSFWFilter (res?: express.Response, paramNSFW?: string) {
   return null
 }
 
-function cleanUpReqFiles (req: { files: { [fieldname: string]: Express.Multer.File[] } | Express.Multer.File[] }) {
-  const files = req.files
-
-  if (!files) return
+function cleanUpReqFiles (
+  req: { files: { [fieldname: string]: Express.Multer.File[] } | Express.Multer.File[] }
+) {
+  const filesObject = req.files
+  if (!filesObject) return
 
-  if (isArray(files)) {
-    (files as Express.Multer.File[]).forEach(f => deleteFileAsync(f.path))
+  if (isArray(filesObject)) {
+    filesObject.forEach(f => deleteFileAndCatch(f.path))
     return
   }
 
-  for (const key of Object.keys(files)) {
-    const file = files[key]
+  for (const key of Object.keys(filesObject)) {
+    const files = filesObject[key]
 
-    if (isArray(file)) file.forEach(f => deleteFileAsync(f.path))
-    else deleteFileAsync(file.path)
+    files.forEach(f => deleteFileAndCatch(f.path))
   }
 }