6 files changed, 135 insertions, 130 deletions

diff --git a/scripts/danger/clean/cleaner.ts b/scripts/danger/clean/cleaner.ts
index 2d5366a91..69e8a63a0 100644
--- a/scripts/danger/clean/cleaner.ts
+++ b/scripts/danger/clean/cleaner.ts
@@ -14,7 +14,7 @@ initDatabaseModels(true)
     console.info('Tables of %s deleted.', CONFIG.DATABASE.DBNAME)
 
     const STORAGE = CONFIG.STORAGE
-    Promise.mapSeries(Object.keys(STORAGE), storage => {
+    return Promise.mapSeries(Object.keys(STORAGE), storage => {
       const storageDir = STORAGE[storage]
 
       return new Promise((res, rej) => {
@@ -28,3 +28,7 @@ initDatabaseModels(true)
     })
     .then(() => process.exit(0))
   })
+  .catch(err => {
+    console.error(err)
+    process.exit(-1)
+  })
diff --git a/scripts/generate-code-contributors.ts b/scripts/generate-code-contributors.ts
index 53813e6ab..2f76d78c2 100755
--- a/scripts/generate-code-contributors.ts
+++ b/scripts/generate-code-contributors.ts
@@ -1,10 +1,6 @@
 import { registerTSPaths } from '../server/helpers/register-ts-paths'
-
 registerTSPaths()
 
-import { doRequest } from '../server/helpers/requests'
-import { readFileSync } from 'fs-extra'
-import { uniqBy } from 'lodash'
 import { execCLI } from '@shared/extra-utils'
 
 run()
@@ -50,124 +46,124 @@ async function getGitContributors () {
 
 // Zanata is dead, don't loose the contributors name
 function getZanataContributors () {
-  return [ { 'username': 'abdhessuk', 'name': 'Abd Hessuk' }, { 'username': 'abidin24', 'name': 'abidin toumi' }, {
-    'username': 'aditoo',
-    'name': 'Lorem Ipsum'
-  }, { 'username': 'alice', 'name': 'Alice' }, { 'username': 'anastasia', 'name': 'Anastasia' }, {
-    'username': 'autom',
-    'name': 'Filip Bengtsson'
-  }, { 'username': 'balaji', 'name': 'Balaji' }, { 'username': 'bristow', 'name': 'Cédric F.' }, {
-    'username': 'butterflyoffire',
-    'name': 'ButterflyOfFire'
-  }, { 'username': 'chocobozzz', 'name': 'Chocobozzz' }, { 'username': 'claichou', 'name': 'Claire Mohin' }, {
-    'username': 'degrange',
-    'name': 'Degrange Mathieu'
-  }, { 'username': 'dibek', 'name': 'Giuseppe Di Bella' }, { 'username': 'edu', 'name': 'eduardo' }, {
-    'username': 'ehsaan',
-    'name': 'ehsaan'
-  }, { 'username': 'esoforte', 'name': 'Ondřej Kotas' }, { 'username': 'fkohrt', 'name': 'Florian Kohrt' }, {
-    'username': 'giqtaqisi',
-    'name': 'Ian Townsend'
-  }, { 'username': 'goofy', 'name': 'goofy' }, { 'username': 'gorkaazk', 'name': 'Gorka Azkarate Zubiaur' }, {
-    'username': 'gwendald',
-    'name': 'GwendalD'
-  }, { 'username': 'h3zjp', 'name': 'h3zjp' }, { 'username': 'jfblanc', 'name': 'Joan Francés Blanc' }, {
-    'username': 'jhertel',
-    'name': 'Jean Hertel'
-  }, { 'username': 'jmf', 'name': 'Jan-Michael Franz' }, { 'username': 'jorropo', 'name': 'Jorropo' }, {
-    'username': 'kairozen',
-    'name': 'Geoffrey Baudelet'
-  }, { 'username': 'kedemferre', 'name': 'Kédem Ferré' }, { 'username': 'kousha', 'name': 'Kousha Zanjani' }, {
-    'username': 'krkk',
-    'name': 'Karol Kosek'
-  }, { 'username': 'landrok', 'name': 'Landrok' }, { 'username': 'leeroyepold48', 'name': 'Leeroy Epold' }, {
-    'username': 'm4sk1n',
-    'name': 'marcin mikołajczak'
-  }, { 'username': 'matograine', 'name': 'tom ngr' }, { 'username': 'medow', 'name': 'Mahir Ahmed' }, {
-    'username': 'mhu',
-    'name': 'Max Hübner'
-  }, { 'username': 'midgard', 'name': 'Midgard' }, { 'username': 'nbrucy', 'name': 'N. B.' }, {
-    'username': 'nitai',
-    'name': 'nitai bezerra'
-  }, { 'username': 'noncommutativegeo', 'name': 'Andrea Panontin' }, { 'username': 'nopsidy', 'name': 'McFlat' }, {
-    'username': 'nvivant',
-    'name': 'Nicolas Vivant'
-  }, { 'username': 'osoitz', 'name': 'Osoitz' }, { 'username': 'outloudvi', 'name': 'Outvi V' }, {
-    'username': 'quentin',
-    'name': 'Quentí'
-  }, { 'username': 'quentind', 'name': 'Quentin Dupont' }, { 'username': 'rafaelff', 'name': 'Rafael Fontenelle' }, {
-    'username': 'rigelk',
-    'name': 'Rigel Kent'
-  }, { 'username': 's8321414', 'name': 'Jeff Huang' }, { 'username': 'sato_ss', 'name': 'Satoshi Shirosaka' }, {
-    'username': 'sercom_kc',
-    'name': 'SerCom_KC'
-  }, { 'username': 'severo', 'name': 'Sylvain Lesage' }, { 'username': 'silkevicious', 'name': 'Sylke Vicious' }, {
-    'username': 'sosha',
-    'name': 'Sosha'
-  }, { 'username': 'spla', 'name': 'spla' }, { 'username': 'strubbl', 'name': 'Sven' }, {
-    'username': 'swedneck',
-    'name': 'Tim Stahel'
-  }, { 'username': 'tagomago', 'name': 'Tagomago' }, { 'username': 'talone', 'name': 'TitiAlone' }, {
-    'username': 'thibaultmartin',
-    'name': 'Thibault Martin'
-  }, { 'username': 'tirifto', 'name': 'Tirifto' }, { 'username': 'tuxayo', 'name': 'Victor Grousset/tuxayo' }, {
-    'username': 'unextro',
-    'name': 'Ondřej Pokorný'
-  }, { 'username': 'unzarida', 'name': 'unzarida' }, { 'username': 'vincent', 'name': 'Vincent Laporte' }, {
-    'username': 'wanhua',
-    'name': 'wanhua'
-  }, { 'username': 'xinayder', 'name': 'Alexandre' }, { 'username': 'xosem', 'name': 'Xosé M.' }, {
-    'username': 'zveryok',
-    'name': 'Nikitin Stanislav'
-  }, { 'username': '6543', 'name': '6543' }, { 'username': 'aasami', 'name': 'Miroslav Ďurian' }, {
-    'username': 'alidemirtas',
-    'name': 'Ali Demirtas'
-  }, { 'username': 'alpha', 'name': 'Alpha' }, { 'username': 'ariasuni', 'name': 'Mélanie Chauvel' }, {
-    'username': 'bfonton',
-    'name': 'Baptiste Fonton'
-  }, { 'username': 'c0dr', 'name': 'c0dr lnx' }, { 'username': 'canony', 'name': 'canony' }, {
-    'username': 'cat',
-    'name': 'Cat'
-  }, { 'username': 'clerie', 'name': 'Clemens Riese' }, { 'username': 'curupira', 'name': 'Curupira' }, {
-    'username': 'dhsets',
-    'name': 'djsets'
-  }, { 'username': 'digitalkiller', 'name': 'Digital Killer' }, { 'username': 'dwsage', 'name': 'd.w. sage' }, {
-    'username': 'flauta',
-    'name': 'Andrea Primiani'
-  }, { 'username': 'frankstrater', 'name': 'Frank Sträter' }, { 'username': 'gillux', 'name': 'gillux' }, {
-    'username': 'gunchleoc',
-    'name': 'GunChleoc'
-  }, { 'username': 'jaidedtd', 'name': 'Jenga Phoenix' }, { 'username': 'joss2lyon', 'name': 'Josselin' }, {
-    'username': 'kekkotranslates',
-    'name': 'Francesco'
-  }, { 'username': 'kingu', 'name': 'Allan Nordhøy' }, { 'username': 'kittybecca', 'name': 'Rivka bat Tsvi' }, {
-    'username': 'knuxify',
-    'name': 'knuxify'
-  }, { 'username': 'lapor', 'name': 'Kristijan Tkalec' }, { 'username': 'laufor', 'name': 'Lau For' }, {
-    'username': 'lstamellos',
-    'name': 'Loukas Stamellos'
-  }, { 'username': 'lw1', 'name': 'Lukas Winkler' }, { 'username': 'mablr', 'name': 'Mablr' }, {
-    'username': 'marcinmalecki',
-    'name': 'Marcin Małecki'
-  }, { 'username': 'mayana', 'name': 'Mayana' }, { 'username': 'mikeorlov', 'name': 'Michael Orlov' }, {
-    'username': 'nin',
-    'name': 'nz'
-  }, { 'username': 'norbipeti', 'name': 'NorbiPeti' }, { 'username': 'ppnplus', 'name': 'Phongpanot Phairat' }, {
-    'username': 'predatorix',
-    'name': 'Predatorix'
-  }, { 'username': 'robin', 'name': 'Robin Lahtinen' }, { 'username': 'rond', 'name': 'rondnelly nunes' }, {
-    'username': 'secreet',
-    'name': 'Secreet'
-  }, { 'username': 'sftblw', 'name': 'sftblw' }, { 'username': 'sporiff', 'name': 'Ciarán Ainsworth' }, {
-    'username': 'tekuteku',
-    'name': 'tekuteku'
-  }, { 'username': 'thecatjustmeow', 'name': 'Nguyen Huynh Hung' }, { 'username': 'tmota', 'name': 'Tiago Mota' }, {
-    'username': 'uranix',
-    'name': 'Michal Mauser'
-  }, { 'username': 'wakutiteo', 'name': 'Markel' }, {
-    'username': 'wonderingdane',
-    'name': 'Nicolai Ireneo-Larsen'
-  }, { 'username': 'zeynepeliacik', 'name': 'Zeynep Can' } ]
+  return [ { username: 'abdhessuk', name: 'Abd Hessuk' }, { username: 'abidin24', name: 'abidin toumi' }, {
+    username: 'aditoo',
+    name: 'Lorem Ipsum'
+  }, { username: 'alice', name: 'Alice' }, { username: 'anastasia', name: 'Anastasia' }, {
+    username: 'autom',
+    name: 'Filip Bengtsson'
+  }, { username: 'balaji', name: 'Balaji' }, { username: 'bristow', name: 'Cédric F.' }, {
+    username: 'butterflyoffire',
+    name: 'ButterflyOfFire'
+  }, { username: 'chocobozzz', name: 'Chocobozzz' }, { username: 'claichou', name: 'Claire Mohin' }, {
+    username: 'degrange',
+    name: 'Degrange Mathieu'
+  }, { username: 'dibek', name: 'Giuseppe Di Bella' }, { username: 'edu', name: 'eduardo' }, {
+    username: 'ehsaan',
+    name: 'ehsaan'
+  }, { username: 'esoforte', name: 'Ondřej Kotas' }, { username: 'fkohrt', name: 'Florian Kohrt' }, {
+    username: 'giqtaqisi',
+    name: 'Ian Townsend'
+  }, { username: 'goofy', name: 'goofy' }, { username: 'gorkaazk', name: 'Gorka Azkarate Zubiaur' }, {
+    username: 'gwendald',
+    name: 'GwendalD'
+  }, { username: 'h3zjp', name: 'h3zjp' }, { username: 'jfblanc', name: 'Joan Francés Blanc' }, {
+    username: 'jhertel',
+    name: 'Jean Hertel'
+  }, { username: 'jmf', name: 'Jan-Michael Franz' }, { username: 'jorropo', name: 'Jorropo' }, {
+    username: 'kairozen',
+    name: 'Geoffrey Baudelet'
+  }, { username: 'kedemferre', name: 'Kédem Ferré' }, { username: 'kousha', name: 'Kousha Zanjani' }, {
+    username: 'krkk',
+    name: 'Karol Kosek'
+  }, { username: 'landrok', name: 'Landrok' }, { username: 'leeroyepold48', name: 'Leeroy Epold' }, {
+    username: 'm4sk1n',
+    name: 'marcin mikołajczak'
+  }, { username: 'matograine', name: 'tom ngr' }, { username: 'medow', name: 'Mahir Ahmed' }, {
+    username: 'mhu',
+    name: 'Max Hübner'
+  }, { username: 'midgard', name: 'Midgard' }, { username: 'nbrucy', name: 'N. B.' }, {
+    username: 'nitai',
+    name: 'nitai bezerra'
+  }, { username: 'noncommutativegeo', name: 'Andrea Panontin' }, { username: 'nopsidy', name: 'McFlat' }, {
+    username: 'nvivant',
+    name: 'Nicolas Vivant'
+  }, { username: 'osoitz', name: 'Osoitz' }, { username: 'outloudvi', name: 'Outvi V' }, {
+    username: 'quentin',
+    name: 'Quentí'
+  }, { username: 'quentind', name: 'Quentin Dupont' }, { username: 'rafaelff', name: 'Rafael Fontenelle' }, {
+    username: 'rigelk',
+    name: 'Rigel Kent'
+  }, { username: 's8321414', name: 'Jeff Huang' }, { username: 'sato_ss', name: 'Satoshi Shirosaka' }, {
+    username: 'sercom_kc',
+    name: 'SerCom_KC'
+  }, { username: 'severo', name: 'Sylvain Lesage' }, { username: 'silkevicious', name: 'Sylke Vicious' }, {
+    username: 'sosha',
+    name: 'Sosha'
+  }, { username: 'spla', name: 'spla' }, { username: 'strubbl', name: 'Sven' }, {
+    username: 'swedneck',
+    name: 'Tim Stahel'
+  }, { username: 'tagomago', name: 'Tagomago' }, { username: 'talone', name: 'TitiAlone' }, {
+    username: 'thibaultmartin',
+    name: 'Thibault Martin'
+  }, { username: 'tirifto', name: 'Tirifto' }, { username: 'tuxayo', name: 'Victor Grousset/tuxayo' }, {
+    username: 'unextro',
+    name: 'Ondřej Pokorný'
+  }, { username: 'unzarida', name: 'unzarida' }, { username: 'vincent', name: 'Vincent Laporte' }, {
+    username: 'wanhua',
+    name: 'wanhua'
+  }, { username: 'xinayder', name: 'Alexandre' }, { username: 'xosem', name: 'Xosé M.' }, {
+    username: 'zveryok',
+    name: 'Nikitin Stanislav'
+  }, { username: '6543', name: '6543' }, { username: 'aasami', name: 'Miroslav Ďurian' }, {
+    username: 'alidemirtas',
+    name: 'Ali Demirtas'
+  }, { username: 'alpha', name: 'Alpha' }, { username: 'ariasuni', name: 'Mélanie Chauvel' }, {
+    username: 'bfonton',
+    name: 'Baptiste Fonton'
+  }, { username: 'c0dr', name: 'c0dr lnx' }, { username: 'canony', name: 'canony' }, {
+    username: 'cat',
+    name: 'Cat'
+  }, { username: 'clerie', name: 'Clemens Riese' }, { username: 'curupira', name: 'Curupira' }, {
+    username: 'dhsets',
+    name: 'djsets'
+  }, { username: 'digitalkiller', name: 'Digital Killer' }, { username: 'dwsage', name: 'd.w. sage' }, {
+    username: 'flauta',
+    name: 'Andrea Primiani'
+  }, { username: 'frankstrater', name: 'Frank Sträter' }, { username: 'gillux', name: 'gillux' }, {
+    username: 'gunchleoc',
+    name: 'GunChleoc'
+  }, { username: 'jaidedtd', name: 'Jenga Phoenix' }, { username: 'joss2lyon', name: 'Josselin' }, {
+    username: 'kekkotranslates',
+    name: 'Francesco'
+  }, { username: 'kingu', name: 'Allan Nordhøy' }, { username: 'kittybecca', name: 'Rivka bat Tsvi' }, {
+    username: 'knuxify',
+    name: 'knuxify'
+  }, { username: 'lapor', name: 'Kristijan Tkalec' }, { username: 'laufor', name: 'Lau For' }, {
+    username: 'lstamellos',
+    name: 'Loukas Stamellos'
+  }, { username: 'lw1', name: 'Lukas Winkler' }, { username: 'mablr', name: 'Mablr' }, {
+    username: 'marcinmalecki',
+    name: 'Marcin Małecki'
+  }, { username: 'mayana', name: 'Mayana' }, { username: 'mikeorlov', name: 'Michael Orlov' }, {
+    username: 'nin',
+    name: 'nz'
+  }, { username: 'norbipeti', name: 'NorbiPeti' }, { username: 'ppnplus', name: 'Phongpanot Phairat' }, {
+    username: 'predatorix',
+    name: 'Predatorix'
+  }, { username: 'robin', name: 'Robin Lahtinen' }, { username: 'rond', name: 'rondnelly nunes' }, {
+    username: 'secreet',
+    name: 'Secreet'
+  }, { username: 'sftblw', name: 'sftblw' }, { username: 'sporiff', name: 'Ciarán Ainsworth' }, {
+    username: 'tekuteku',
+    name: 'tekuteku'
+  }, { username: 'thecatjustmeow', name: 'Nguyen Huynh Hung' }, { username: 'tmota', name: 'Tiago Mota' }, {
+    username: 'uranix',
+    name: 'Michal Mauser'
+  }, { username: 'wakutiteo', name: 'Markel' }, {
+    username: 'wonderingdane',
+    name: 'Nicolai Ireneo-Larsen'
+  }, { username: 'zeynepeliacik', name: 'Zeynep Can' } ]
 }
 
 function getContributorsBlacklist () {
diff --git a/scripts/i18n/create-custom-files.ts b/scripts/i18n/create-custom-files.ts
index d39a15974..2862b230e 100755
--- a/scripts/i18n/create-custom-files.ts
+++ b/scripts/i18n/create-custom-files.ts
@@ -50,18 +50,18 @@ values(VIDEO_CATEGORIES)
     'Sorry',
     'This video is not available because the remote instance is not responding.'
   ])
-  .forEach(v => serverKeys[v] = v)
+  .forEach(v => { serverKeys[v] = v })
 
 // More keys
 Object.assign(serverKeys, {
-  'Misc': 'Misc',
-  'Unknown': 'Unknown'
+  Misc: 'Misc',
+  Unknown: 'Unknown'
 })
 
 // ISO 639 keys
 const languageKeys: any = {}
 const languages = buildLanguages()
-Object.keys(languages).forEach(k => languageKeys[languages[k]] = languages[k])
+Object.keys(languages).forEach(k => { languageKeys[languages[k]] = languages[k] })
 
 Object.assign(serverKeys, languageKeys)
 
diff --git a/scripts/parse-log.ts b/scripts/parse-log.ts
index 26049b54d..58e052b9f 100755
--- a/scripts/parse-log.ts
+++ b/scripts/parse-log.ts
@@ -79,7 +79,7 @@ function run () {
       // Don't know why but loggerFormat does not remove splat key
       Object.assign(log, { splat: undefined })
 
-      logLevels[ log.level ](log)
+      logLevels[log.level](log)
     })
 
     stream.once('close', () => res())
@@ -90,7 +90,7 @@ function run () {
 async function getNewestFile (files: string[], basePath: string) {
   const sorted = await mtimeSortFilesDesc(files, basePath)
 
-  return (sorted.length > 0) ? sorted[ 0 ].file : ''
+  return (sorted.length > 0) ? sorted[0].file : ''
 }
 
 function toTimeFormat (time: string) {
diff --git a/scripts/prune-storage.ts b/scripts/prune-storage.ts
index 2b04e906d..1def1d792 100755
--- a/scripts/prune-storage.ts
+++ b/scripts/prune-storage.ts
@@ -161,7 +161,8 @@ async function askConfirmation () {
     }
     prompt.get(schema, function (err, result) {
       if (err) return rej(err)
-      return res(result.confirm && result.confirm.match(/y/) !== null)
+
+      return res(result.confirm?.match(/y/) !== null)
     })
   })
 }
diff --git a/scripts/reset-password.ts b/scripts/reset-password.ts
index 863537500..bf6535cea 100755
--- a/scripts/reset-password.ts
+++ b/scripts/reset-password.ts
@@ -53,3 +53,7 @@ initDatabaseModels(true)
         .finally(() => process.exit(0))
     })
   })
+  .catch(err => {
+    console.error(err)
+    process.exit(-1)
+  })