5 files changed, 21 insertions, 18 deletions

diff --git a/shared/extra-utils/instances-index/mock-instances-index.ts b/shared/extra-utils/instances-index/mock-instances-index.ts
index ea09c9f61..2604eda03 100644
--- a/shared/extra-utils/instances-index/mock-instances-index.ts
+++ b/shared/extra-utils/instances-index/mock-instances-index.ts
@@ -4,7 +4,7 @@ export class MockInstancesIndex {
   private readonly indexInstances: { host: string, createdAt: string }[] = []
 
   initialize () {
-    return new Promise(res => {
+    return new Promise<void>(res => {
       const app = express()
 
       app.use('/', (req: express.Request, res: express.Response, next: express.NextFunction) => {
diff --git a/shared/extra-utils/miscs/email.ts b/shared/extra-utils/miscs/email.ts
index 15d298a73..758b15b58 100644
--- a/shared/extra-utils/miscs/email.ts
+++ b/shared/extra-utils/miscs/email.ts
@@ -1,4 +1,5 @@
 import { ChildProcess, fork } from 'child_process'
+import { join } from 'path'
 import { randomInt } from '../../core-utils/miscs/miscs'
 import { parallelTests } from '../server/servers'
 
@@ -10,7 +11,7 @@ class MockSmtpServer {
   private emails: object[]
 
   private constructor () {
-    this.emailChildProcess = fork(`${__dirname}/email-child-process`, [])
+    this.emailChildProcess = fork(join(__dirname, 'email-child-process'), [])
 
     this.emailChildProcess.on('message', (msg: any) => {
       if (msg.email) {
@@ -27,7 +28,7 @@ class MockSmtpServer {
 
       if (this.started) {
         this.emails = emailsCollection
-        return res()
+        return res(undefined)
       }
 
       // ensure maildev isn't started until
diff --git a/shared/extra-utils/moderation/abuses.ts b/shared/extra-utils/moderation/abuses.ts
index cb6ca46ef..c0fda722f 100644
--- a/shared/extra-utils/moderation/abuses.ts
+++ b/shared/extra-utils/moderation/abuses.ts
@@ -21,19 +21,21 @@ function reportAbuse (options: {
 }) {
   const path = '/api/v1/abuses'
 
-  const video = options.videoId ? {
-    id: options.videoId,
-    startAt: options.startAt,
-    endAt: options.endAt
-  } : undefined
-
-  const comment = options.commentId ? {
-    id: options.commentId
-  } : undefined
-
-  const account = options.accountId ? {
-    id: options.accountId
-  } : undefined
+  const video = options.videoId
+    ? {
+      id: options.videoId,
+      startAt: options.startAt,
+      endAt: options.endAt
+    }
+    : undefined
+
+  const comment = options.commentId
+    ? { id: options.commentId }
+    : undefined
+
+  const account = options.accountId
+    ? { id: options.accountId }
+    : undefined
 
   const body = {
     account,
diff --git a/shared/extra-utils/plugins/mock-blocklist.ts b/shared/extra-utils/plugins/mock-blocklist.ts
index 07c8c5122..50e2289f1 100644
--- a/shared/extra-utils/plugins/mock-blocklist.ts
+++ b/shared/extra-utils/plugins/mock-blocklist.ts
@@ -14,7 +14,7 @@ export class MockBlocklist {
   private server: Server
 
   initialize () {
-    return new Promise(res => {
+    return new Promise<void>(res => {
       const app = express()
 
       app.get('/blocklist', (req: express.Request, res: express.Response) => {
diff --git a/shared/extra-utils/videos/live.ts b/shared/extra-utils/videos/live.ts
index 98f67a9bb..b0e499ce0 100644
--- a/shared/extra-utils/videos/live.ts
+++ b/shared/extra-utils/videos/live.ts
@@ -98,7 +98,7 @@ function sendRTMPStream (rtmpBaseUrl: string, streamKey: string, fixtureName = '
 }
 
 function waitFfmpegUntilError (command: ffmpeg.FfmpegCommand, successAfterMS = 10000) {
-  return new Promise((res, rej) => {
+  return new Promise<void>((res, rej) => {
     command.on('error', err => {
       return rej(err)
     })