5 files changed, 36 insertions, 26 deletions

diff --git a/server/helpers/audit-logger.ts b/server/helpers/audit-logger.ts
index 79ef44be1..076b7f11d 100644
--- a/server/helpers/audit-logger.ts
+++ b/server/helpers/audit-logger.ts
@@ -120,7 +120,7 @@ const videoKeysToKeep = [
   'downloadEnabled'
 ]
 class VideoAuditView extends EntityAuditView {
-  constructor (private readonly video: VideoDetails) {
+  constructor (video: VideoDetails) {
     super(videoKeysToKeep, 'video', video)
   }
 }
@@ -131,7 +131,7 @@ const videoImportKeysToKeep = [
   'video-name'
 ]
 class VideoImportAuditView extends EntityAuditView {
-  constructor (private readonly videoImport: VideoImport) {
+  constructor (videoImport: VideoImport) {
     super(videoImportKeysToKeep, 'video-import', videoImport)
   }
 }
@@ -150,7 +150,7 @@ const commentKeysToKeep = [
   'account-name'
 ]
 class CommentAuditView extends EntityAuditView {
-  constructor (private readonly comment: VideoComment) {
+  constructor (comment: VideoComment) {
     super(commentKeysToKeep, 'comment', comment)
   }
 }
@@ -179,7 +179,7 @@ const userKeysToKeep = [
   'videoChannels'
 ]
 class UserAuditView extends EntityAuditView {
-  constructor (private readonly user: User) {
+  constructor (user: User) {
     super(userKeysToKeep, 'user', user)
   }
 }
@@ -205,7 +205,7 @@ const channelKeysToKeep = [
   'ownerAccount-displayedName'
 ]
 class VideoChannelAuditView extends EntityAuditView {
-  constructor (private readonly channel: VideoChannel) {
+  constructor (channel: VideoChannel) {
     super(channelKeysToKeep, 'channel', channel)
   }
 }
@@ -217,7 +217,7 @@ const abuseKeysToKeep = [
   'createdAt'
 ]
 class AbuseAuditView extends EntityAuditView {
-  constructor (private readonly abuse: AdminAbuse) {
+  constructor (abuse: AdminAbuse) {
     super(abuseKeysToKeep, 'abuse', abuse)
   }
 }
diff --git a/server/helpers/core-utils.ts b/server/helpers/core-utils.ts
index 0ec45eb2e..6ebe8e2ac 100644
--- a/server/helpers/core-utils.ts
+++ b/server/helpers/core-utils.ts
@@ -56,6 +56,7 @@ const timeTable = {
 export function parseDurationToMs (duration: number | string): number {
   if (duration === null) return null
   if (typeof duration === 'number') return duration
+  if (!isNaN(+duration)) return +duration
 
   if (typeof duration === 'string') {
     const split = duration.match(/^([\d.,]+)\s?(\w+)$/)
@@ -76,6 +77,7 @@ export function parseDurationToMs (duration: number | string): number {
 
 export function parseBytes (value: string | number): number {
   if (typeof value === 'number') return value
+  if (!isNaN(+value)) return +value
 
   const tgm = /^(\d+)\s*TB\s*(\d+)\s*GB\s*(\d+)\s*MB$/
   const tg = /^(\d+)\s*TB\s*(\d+)\s*GB$/
@@ -85,40 +87,55 @@ export function parseBytes (value: string | number): number {
   const g = /^(\d+)\s*GB$/
   const m = /^(\d+)\s*MB$/
   const b = /^(\d+)\s*B$/
-  let match
+
+  let match: RegExpMatchArray
 
   if (value.match(tgm)) {
     match = value.match(tgm)
     return parseInt(match[1], 10) * 1024 * 1024 * 1024 * 1024 +
       parseInt(match[2], 10) * 1024 * 1024 * 1024 +
       parseInt(match[3], 10) * 1024 * 1024
-  } else if (value.match(tg)) {
+  }
+
+  if (value.match(tg)) {
     match = value.match(tg)
     return parseInt(match[1], 10) * 1024 * 1024 * 1024 * 1024 +
       parseInt(match[2], 10) * 1024 * 1024 * 1024
-  } else if (value.match(tm)) {
+  }
+
+  if (value.match(tm)) {
     match = value.match(tm)
     return parseInt(match[1], 10) * 1024 * 1024 * 1024 * 1024 +
       parseInt(match[2], 10) * 1024 * 1024
-  } else if (value.match(gm)) {
+  }
+
+  if (value.match(gm)) {
     match = value.match(gm)
     return parseInt(match[1], 10) * 1024 * 1024 * 1024 +
       parseInt(match[2], 10) * 1024 * 1024
-  } else if (value.match(t)) {
+  }
+
+  if (value.match(t)) {
     match = value.match(t)
     return parseInt(match[1], 10) * 1024 * 1024 * 1024 * 1024
-  } else if (value.match(g)) {
+  }
+
+  if (value.match(g)) {
     match = value.match(g)
     return parseInt(match[1], 10) * 1024 * 1024 * 1024
-  } else if (value.match(m)) {
+  }
+
+  if (value.match(m)) {
     match = value.match(m)
     return parseInt(match[1], 10) * 1024 * 1024
-  } else if (value.match(b)) {
+  }
+
+  if (value.match(b)) {
     match = value.match(b)
     return parseInt(match[1], 10) * 1024
-  } else {
-    return parseInt(value, 10)
   }
+
+  return parseInt(value, 10)
 }
 
 // ---------------------------------------------------------------------------
diff --git a/server/helpers/image-utils.ts b/server/helpers/image-utils.ts
index 7d6451db9..ebb102a0d 100644
--- a/server/helpers/image-utils.ts
+++ b/server/helpers/image-utils.ts
@@ -114,7 +114,7 @@ async function autoResize (options: {
 }) {
   const { sourceImage, newSize, destination } = options
 
-  // Portrait mode targetting a landscape, apply some effect on the image
+  // Portrait mode targeting a landscape, apply some effect on the image
   const sourceIsPortrait = sourceImage.getWidth() < sourceImage.getHeight()
   const destIsPortraitOrSquare = newSize.width <= newSize.height
 
diff --git a/server/helpers/logger.ts b/server/helpers/logger.ts
index 5fe3646c5..4fbaf8a73 100644
--- a/server/helpers/logger.ts
+++ b/server/helpers/logger.ts
@@ -57,7 +57,7 @@ const consoleLoggerFormat = format.printf(info => {
     if (CONFIG.LOG.PRETTIFY_SQL) {
       additionalInfos += '\n' + sqlFormat(info.sql, {
         language: 'sql',
-        indent: '  '
+        tabWidth: 2
       })
     } else {
       additionalInfos += ' - ' + info.sql
diff --git a/server/helpers/upload.ts b/server/helpers/upload.ts
index c94c7ab82..3cb17edd0 100644
--- a/server/helpers/upload.ts
+++ b/server/helpers/upload.ts
@@ -1,5 +1,4 @@
 import { join } from 'path'
-import { JobQueue } from '@server/lib/job-queue'
 import { RESUMABLE_UPLOAD_DIRECTORY } from '../initializers/constants'
 
 function getResumableUploadPath (filename?: string) {
@@ -8,14 +7,8 @@ function getResumableUploadPath (filename?: string) {
   return RESUMABLE_UPLOAD_DIRECTORY
 }
 
-function scheduleDeleteResumableUploadMetaFile (filepath: string) {
-  const payload = { filepath }
-  JobQueue.Instance.createJob({ type: 'delete-resumable-upload-meta-file', payload }, { delay: 900 * 1000 }) // executed in 15 min
-}
-
 // ---------------------------------------------------------------------------
 
 export {
-  getResumableUploadPath,
-  scheduleDeleteResumableUploadMetaFile
+  getResumableUploadPath
 }