137 files changed, 658 insertions, 2154 deletions

diff --git a/shared/core-utils/utils/array.ts b/shared/core-utils/common/array.ts
index 9e326a5aa..9e326a5aa 100644
--- a/shared/core-utils/utils/array.ts
+++ b/shared/core-utils/common/array.ts
diff --git a/shared/core-utils/common/env.ts b/shared/core-utils/common/env.ts
new file mode 100644
index 000000000..38c96b152
--- /dev/null
+++ b/shared/core-utils/common/env.ts
@@ -0,0 +1,30 @@
+function parallelTests () {
+  return process.env.MOCHA_PARALLEL === 'true'
+}
+
+function isGithubCI () {
+  return !!process.env.GITHUB_WORKSPACE
+}
+
+function areHttpImportTestsDisabled () {
+  const disabled = process.env.DISABLE_HTTP_IMPORT_TESTS === 'true'
+
+  if (disabled) console.log('DISABLE_HTTP_IMPORT_TESTS env set to "true" so import tests are disabled')
+
+  return disabled
+}
+
+function areObjectStorageTestsDisabled () {
+  const disabled = process.env.ENABLE_OBJECT_STORAGE_TESTS !== 'true'
+
+  if (disabled) console.log('ENABLE_OBJECT_STORAGE_TESTS env is not set to "true" so object storage tests are disabled')
+
+  return disabled
+}
+
+export {
+  parallelTests,
+  isGithubCI,
+  areHttpImportTestsDisabled,
+  areObjectStorageTestsDisabled
+}
diff --git a/shared/core-utils/common/index.ts b/shared/core-utils/common/index.ts
index 0908ff981..720977ead 100644
--- a/shared/core-utils/common/index.ts
+++ b/shared/core-utils/common/index.ts
@@ -1,6 +1,11 @@
+export * from './array'
+export * from './random'
 export * from './date'
-export * from './miscs'
+export * from './env'
+export * from './object'
+export * from './path'
 export * from './regexp'
+export * from './time'
 export * from './promises'
-export * from './types'
 export * from './url'
+export * from './version'
diff --git a/shared/core-utils/common/object.ts b/shared/core-utils/common/object.ts
new file mode 100644
index 000000000..49d209819
--- /dev/null
+++ b/shared/core-utils/common/object.ts
@@ -0,0 +1,35 @@
+function pick <O extends object, K extends keyof O> (object: O, keys: K[]): Pick<O, K> {
+  const result: any = {}
+
+  for (const key of keys) {
+    if (Object.prototype.hasOwnProperty.call(object, key)) {
+      result[key] = object[key]
+    }
+  }
+
+  return result
+}
+
+function getKeys <O extends object, K extends keyof O> (object: O, keys: K[]): K[] {
+  return (Object.keys(object) as K[]).filter(k => keys.includes(k))
+}
+
+function sortObjectComparator (key: string, order: 'asc' | 'desc') {
+  return (a: any, b: any) => {
+    if (a[key] < b[key]) {
+      return order === 'asc' ? -1 : 1
+    }
+
+    if (a[key] > b[key]) {
+      return order === 'asc' ? 1 : -1
+    }
+
+    return 0
+  }
+}
+
+export {
+  pick,
+  getKeys,
+  sortObjectComparator
+}
diff --git a/shared/core-utils/common/path.ts b/shared/core-utils/common/path.ts
new file mode 100644
index 000000000..006505316
--- /dev/null
+++ b/shared/core-utils/common/path.ts
@@ -0,0 +1,48 @@
+import { basename, extname, isAbsolute, join, resolve } from 'path'
+
+let rootPath: string
+
+function root () {
+  if (rootPath) return rootPath
+
+  rootPath = __dirname
+
+  if (basename(rootPath) === 'tools') rootPath = resolve(rootPath, '..')
+  if (basename(rootPath) === 'scripts') rootPath = resolve(rootPath, '..')
+  if (basename(rootPath) === 'common') rootPath = resolve(rootPath, '..')
+  if (basename(rootPath) === 'core-utils') rootPath = resolve(rootPath, '..')
+  if (basename(rootPath) === 'shared') rootPath = resolve(rootPath, '..')
+  if (basename(rootPath) === 'server') rootPath = resolve(rootPath, '..')
+  if (basename(rootPath) === 'dist') rootPath = resolve(rootPath, '..')
+
+  return rootPath
+}
+
+function buildPath (path: string) {
+  if (isAbsolute(path)) return path
+
+  return join(root(), path)
+}
+
+function getLowercaseExtension (filename: string) {
+  const ext = extname(filename) || ''
+
+  return ext.toLowerCase()
+}
+
+function buildAbsoluteFixturePath (path: string, customCIPath = false) {
+  if (isAbsolute(path)) return path
+
+  if (customCIPath && process.env.GITHUB_WORKSPACE) {
+    return join(process.env.GITHUB_WORKSPACE, 'fixtures', path)
+  }
+
+  return join(root(), 'server', 'tests', 'fixtures', path)
+}
+
+export {
+  root,
+  buildPath,
+  buildAbsoluteFixturePath,
+  getLowercaseExtension
+}
diff --git a/shared/core-utils/common/random.ts b/shared/core-utils/common/random.ts
new file mode 100644
index 000000000..705735d09
--- /dev/null
+++ b/shared/core-utils/common/random.ts
@@ -0,0 +1,8 @@
+// high excluded
+function randomInt (low: number, high: number) {
+  return Math.floor(Math.random() * (high - low) + low)
+}
+
+export {
+  randomInt
+}
diff --git a/shared/core-utils/common/time.ts b/shared/core-utils/common/time.ts
new file mode 100644
index 000000000..2992609ca
--- /dev/null
+++ b/shared/core-utils/common/time.ts
@@ -0,0 +1,7 @@
+function wait (milliseconds: number) {
+  return new Promise(resolve => setTimeout(resolve, milliseconds))
+}
+
+export {
+  wait
+}
diff --git a/shared/core-utils/common/url.ts b/shared/core-utils/common/url.ts
index 9c111cbcc..8020d9b28 100644
--- a/shared/core-utils/common/url.ts
+++ b/shared/core-utils/common/url.ts
@@ -50,6 +50,7 @@ function decorateVideoLink (options: {
   warningTitle?: boolean
   controls?: boolean
   peertubeLink?: boolean
+  p2p?: boolean
 }) {
   const { url } = options
 
@@ -74,6 +75,7 @@ function decorateVideoLink (options: {
   if (options.warningTitle === false) params.set('warningTitle', '0')
   if (options.controls === false) params.set('controls', '0')
   if (options.peertubeLink === false) params.set('peertubeLink', '0')
+  if (options.p2p !== undefined) params.set('p2p', options.p2p ? '1' : '0')
 
   return buildUrl(url, params)
 }
diff --git a/shared/core-utils/common/miscs.ts b/shared/core-utils/common/version.ts
index bc65dc338..8a64f8c4d 100644
--- a/shared/core-utils/common/miscs.ts
+++ b/shared/core-utils/common/version.ts
@@ -1,8 +1,3 @@
-// high excluded
-function randomInt (low: number, high: number) {
-  return Math.floor(Math.random() * (high - low) + low)
-}
-
 // Thanks https://stackoverflow.com/a/16187766
 function compareSemVer (a: string, b: string) {
   const regExStrip0 = /(\.0+)+$/
@@ -20,22 +15,6 @@ function compareSemVer (a: string, b: string) {
   return segmentsA.length - segmentsB.length
 }
 
-function sortObjectComparator (key: string, order: 'asc' | 'desc') {
-  return (a: any, b: any) => {
-    if (a[key] < b[key]) {
-      return order === 'asc' ? -1 : 1
-    }
-
-    if (a[key] > b[key]) {
-      return order === 'asc' ? 1 : -1
-    }
-
-    return 0
-  }
-}
-
 export {
-  randomInt,
-  compareSemVer,
-  sortObjectComparator
+  compareSemVer
 }
diff --git a/shared/core-utils/i18n/i18n.ts b/shared/core-utils/i18n/i18n.ts
index f27de20f1..ae6af8192 100644
--- a/shared/core-utils/i18n/i18n.ts
+++ b/shared/core-utils/i18n/i18n.ts
@@ -28,6 +28,8 @@ export const I18N_LOCALES = {
   'ru-RU': 'русский',
   'sq': 'Shqip',
   'sv-SE': 'Svenska',
+  'nn': 'norsk nynorsk',
+  'nb-NO': 'norsk bokmål',
   'th-TH': 'ไทย',
   'vi-VN': 'Tiếng Việt',
   'zh-Hans-CN': '简体中文（中国）',
@@ -52,6 +54,7 @@ const I18N_LOCALE_ALIAS = {
   'nl': 'nl-NL',
   'pl': 'pl-PL',
   'pt': 'pt-BR',
+  'nb': 'nb-NO',
   'ru': 'ru-RU',
   'sv': 'sv-SE',
   'th': 'th-TH',
diff --git a/shared/core-utils/index.ts b/shared/core-utils/index.ts
index e0a6a8087..8daaa2d04 100644
--- a/shared/core-utils/index.ts
+++ b/shared/core-utils/index.ts
@@ -4,5 +4,4 @@ export * from './i18n'
 export * from './plugins'
 export * from './renderer'
 export * from './users'
-export * from './utils'
 export * from './videos'
diff --git a/shared/core-utils/users/user-role.ts b/shared/core-utils/users/user-role.ts
index 81cba1dad..cc757d779 100644
--- a/shared/core-utils/users/user-role.ts
+++ b/shared/core-utils/users/user-role.ts
@@ -14,8 +14,8 @@ const userRoleRights: { [ id in UserRole ]: UserRight[] } = {
   [UserRole.MODERATOR]: [
     UserRight.MANAGE_VIDEO_BLACKLIST,
     UserRight.MANAGE_ABUSES,
+    UserRight.MANAGE_ANY_VIDEO_CHANNEL,
     UserRight.REMOVE_ANY_VIDEO,
-    UserRight.REMOVE_ANY_VIDEO_CHANNEL,
     UserRight.REMOVE_ANY_VIDEO_PLAYLIST,
     UserRight.REMOVE_ANY_VIDEO_COMMENT,
     UserRight.UPDATE_ANY_VIDEO,
diff --git a/shared/core-utils/utils/index.ts b/shared/core-utils/utils/index.ts
deleted file mode 100644
index 8d16365a8..000000000
--- a/shared/core-utils/utils/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './array'
-export * from './object'
diff --git a/shared/core-utils/utils/object.ts b/shared/core-utils/utils/object.ts
deleted file mode 100644
index 9a8a98f9b..000000000
--- a/shared/core-utils/utils/object.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-function pick <O extends object, K extends keyof O> (object: O, keys: K[]): Pick<O, K> {
-  const result: any = {}
-
-  for (const key of keys) {
-    if (Object.prototype.hasOwnProperty.call(object, key)) {
-      result[key] = object[key]
-    }
-  }
-
-  return result
-}
-
-export {
-  pick
-}
diff --git a/shared/core-utils/videos/bitrate.ts b/shared/core-utils/videos/bitrate.ts
index c1891188f..30d22df09 100644
--- a/shared/core-utils/videos/bitrate.ts
+++ b/shared/core-utils/videos/bitrate.ts
@@ -1,4 +1,4 @@
-import { VideoResolution } from "@shared/models"
+import { VideoResolution } from '@shared/models'
 
 type BitPerPixel = { [ id in VideoResolution ]: number }
 
diff --git a/shared/extra-utils/crypto.ts b/shared/extra-utils/crypto.ts
new file mode 100644
index 000000000..1a583f1a0
--- /dev/null
+++ b/shared/extra-utils/crypto.ts
@@ -0,0 +1,20 @@
+import { BinaryToTextEncoding, createHash } from 'crypto'
+
+function sha256 (str: string | Buffer, encoding: BinaryToTextEncoding = 'hex') {
+  return createHash('sha256').update(str).digest(encoding)
+}
+
+function sha1 (str: string | Buffer, encoding: BinaryToTextEncoding = 'hex') {
+  return createHash('sha1').update(str).digest(encoding)
+}
+
+// high excluded
+function randomInt (low: number, high: number) {
+  return Math.floor(Math.random() * (high - low) + low)
+}
+
+export {
+  randomInt,
+  sha256,
+  sha1
+}
diff --git a/shared/extra-utils/ffprobe.ts b/shared/extra-utils/ffprobe.ts
new file mode 100644
index 000000000..53a3aa001
--- /dev/null
+++ b/shared/extra-utils/ffprobe.ts
@@ -0,0 +1,187 @@
+import { ffprobe, FfprobeData } from 'fluent-ffmpeg'
+import { VideoFileMetadata } from '@shared/models/videos'
+
+/**
+ *
+ * Helpers to run ffprobe and extract data from the JSON output
+ *
+ */
+
+function ffprobePromise (path: string) {
+  return new Promise<FfprobeData>((res, rej) => {
+    ffprobe(path, (err, data) => {
+      if (err) return rej(err)
+
+      return res(data)
+    })
+  })
+}
+
+async function isAudioFile (path: string, existingProbe?: FfprobeData) {
+  const videoStream = await getVideoStreamFromFile(path, existingProbe)
+
+  return !videoStream
+}
+
+async function getAudioStream (videoPath: string, existingProbe?: FfprobeData) {
+  // without position, ffprobe considers the last input only
+  // we make it consider the first input only
+  // if you pass a file path to pos, then ffprobe acts on that file directly
+  const data = existingProbe || await ffprobePromise(videoPath)
+
+  if (Array.isArray(data.streams)) {
+    const audioStream = data.streams.find(stream => stream['codec_type'] === 'audio')
+
+    if (audioStream) {
+      return {
+        absolutePath: data.format.filename,
+        audioStream,
+        bitrate: parseInt(audioStream['bit_rate'] + '', 10)
+      }
+    }
+  }
+
+  return { absolutePath: data.format.filename }
+}
+
+function getMaxAudioBitrate (type: 'aac' | 'mp3' | string, bitrate: number) {
+  const maxKBitrate = 384
+  const kToBits = (kbits: number) => kbits * 1000
+
+  // If we did not manage to get the bitrate, use an average value
+  if (!bitrate) return 256
+
+  if (type === 'aac') {
+    switch (true) {
+      case bitrate > kToBits(maxKBitrate):
+        return maxKBitrate
+
+      default:
+        return -1 // we interpret it as a signal to copy the audio stream as is
+    }
+  }
+
+  /*
+    a 192kbit/sec mp3 doesn't hold as much information as a 192kbit/sec aac.
+    That's why, when using aac, we can go to lower kbit/sec. The equivalences
+    made here are not made to be accurate, especially with good mp3 encoders.
+    */
+  switch (true) {
+    case bitrate <= kToBits(192):
+      return 128
+
+    case bitrate <= kToBits(384):
+      return 256
+
+    default:
+      return maxKBitrate
+  }
+}
+
+async function getVideoStreamSize (path: string, existingProbe?: FfprobeData): Promise<{ width: number, height: number }> {
+  const videoStream = await getVideoStreamFromFile(path, existingProbe)
+
+  return videoStream === null
+    ? { width: 0, height: 0 }
+    : { width: videoStream.width, height: videoStream.height }
+}
+
+async function getVideoFileResolution (path: string, existingProbe?: FfprobeData) {
+  const size = await getVideoStreamSize(path, existingProbe)
+
+  return {
+    width: size.width,
+    height: size.height,
+    ratio: Math.max(size.height, size.width) / Math.min(size.height, size.width),
+    resolution: Math.min(size.height, size.width),
+    isPortraitMode: size.height > size.width
+  }
+}
+
+async function getVideoFileFPS (path: string, existingProbe?: FfprobeData) {
+  const videoStream = await getVideoStreamFromFile(path, existingProbe)
+  if (videoStream === null) return 0
+
+  for (const key of [ 'avg_frame_rate', 'r_frame_rate' ]) {
+    const valuesText: string = videoStream[key]
+    if (!valuesText) continue
+
+    const [ frames, seconds ] = valuesText.split('/')
+    if (!frames || !seconds) continue
+
+    const result = parseInt(frames, 10) / parseInt(seconds, 10)
+    if (result > 0) return Math.round(result)
+  }
+
+  return 0
+}
+
+async function getMetadataFromFile (path: string, existingProbe?: FfprobeData) {
+  const metadata = existingProbe || await ffprobePromise(path)
+
+  return new VideoFileMetadata(metadata)
+}
+
+async function getVideoFileBitrate (path: string, existingProbe?: FfprobeData): Promise<number> {
+  const metadata = await getMetadataFromFile(path, existingProbe)
+
+  let bitrate = metadata.format.bit_rate as number
+  if (bitrate && !isNaN(bitrate)) return bitrate
+
+  const videoStream = await getVideoStreamFromFile(path, existingProbe)
+  if (!videoStream) return undefined
+
+  bitrate = videoStream?.bit_rate
+  if (bitrate && !isNaN(bitrate)) return bitrate
+
+  return undefined
+}
+
+async function getDurationFromVideoFile (path: string, existingProbe?: FfprobeData) {
+  const metadata = await getMetadataFromFile(path, existingProbe)
+
+  return Math.round(metadata.format.duration)
+}
+
+async function getVideoStreamFromFile (path: string, existingProbe?: FfprobeData) {
+  const metadata = await getMetadataFromFile(path, existingProbe)
+
+  return metadata.streams.find(s => s.codec_type === 'video') || null
+}
+
+async function canDoQuickAudioTranscode (path: string, probe?: FfprobeData): Promise<boolean> {
+  const parsedAudio = await getAudioStream(path, probe)
+
+  if (!parsedAudio.audioStream) return true
+
+  if (parsedAudio.audioStream['codec_name'] !== 'aac') return false
+
+  const audioBitrate = parsedAudio.bitrate
+  if (!audioBitrate) return false
+
+  const maxAudioBitrate = getMaxAudioBitrate('aac', audioBitrate)
+  if (maxAudioBitrate !== -1 && audioBitrate > maxAudioBitrate) return false
+
+  const channelLayout = parsedAudio.audioStream['channel_layout']
+  // Causes playback issues with Chrome
+  if (!channelLayout || channelLayout === 'unknown') return false
+
+  return true
+}
+
+// ---------------------------------------------------------------------------
+
+export {
+  getVideoStreamSize,
+  getVideoFileResolution,
+  getMetadataFromFile,
+  getMaxAudioBitrate,
+  getVideoStreamFromFile,
+  getDurationFromVideoFile,
+  getAudioStream,
+  getVideoFileFPS,
+  isAudioFile,
+  ffprobePromise,
+  getVideoFileBitrate,
+  canDoQuickAudioTranscode
+}
diff --git a/shared/extra-utils/file.ts b/shared/extra-utils/file.ts
new file mode 100644
index 000000000..8060ab520
--- /dev/null
+++ b/shared/extra-utils/file.ts
@@ -0,0 +1,11 @@
+import { stat } from 'fs-extra'
+
+async function getFileSize (path: string) {
+  const stats = await stat(path)
+
+  return stats.size
+}
+
+export {
+  getFileSize
+}
diff --git a/shared/extra-utils/index.ts b/shared/extra-utils/index.ts
index 4b3636d06..e2e161a7b 100644
--- a/shared/extra-utils/index.ts
+++ b/shared/extra-utils/index.ts
@@ -1,15 +1,4 @@
-export * from './bulk'
-export * from './cli'
-export * from './custom-pages'
-export * from './feeds'
-export * from './logs'
-export * from './miscs'
-export * from './mock-servers'
-export * from './moderation'
-export * from './overviews'
-export * from './requests'
-export * from './search'
-export * from './server'
-export * from './socket'
-export * from './users'
-export * from './videos'
+export * from './crypto'
+export * from './ffprobe'
+export * from './file'
+export * from './uuid'
diff --git a/shared/extra-utils/miscs/checks.ts b/shared/extra-utils/miscs/checks.ts
deleted file mode 100644
index b1be214b1..000000000
--- a/shared/extra-utils/miscs/checks.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/no-floating-promises */
-
-import { expect } from 'chai'
-import { pathExists, readFile } from 'fs-extra'
-import { join } from 'path'
-import { root } from '@server/helpers/core-utils'
-import { HttpStatusCode } from '@shared/models'
-import { makeGetRequest } from '../requests'
-import { PeerTubeServer } from '../server'
-
-// Default interval -> 5 minutes
-function dateIsValid (dateString: string, interval = 300000) {
-  const dateToCheck = new Date(dateString)
-  const now = new Date()
-
-  return Math.abs(now.getTime() - dateToCheck.getTime()) <= interval
-}
-
-function expectStartWith (str: string, start: string) {
-  expect(str.startsWith(start), `${str} does not start with ${start}`).to.be.true
-}
-
-async function expectLogDoesNotContain (server: PeerTubeServer, str: string) {
-  const content = await server.servers.getLogContent()
-
-  expect(content.toString()).to.not.contain(str)
-}
-
-async function testImage (url: string, imageName: string, imagePath: string, extension = '.jpg') {
-  const res = await makeGetRequest({
-    url,
-    path: imagePath,
-    expectedStatus: HttpStatusCode.OK_200
-  })
-
-  const body = res.body
-
-  const data = await readFile(join(root(), 'server', 'tests', 'fixtures', imageName + extension))
-  const minLength = body.length - ((30 * body.length) / 100)
-  const maxLength = body.length + ((30 * body.length) / 100)
-
-  expect(data.length).to.be.above(minLength, 'the generated image is way smaller than the recorded fixture')
-  expect(data.length).to.be.below(maxLength, 'the generated image is way larger than the recorded fixture')
-}
-
-async function testFileExistsOrNot (server: PeerTubeServer, directory: string, filePath: string, exist: boolean) {
-  const base = server.servers.buildDirectory(directory)
-
-  expect(await pathExists(join(base, filePath))).to.equal(exist)
-}
-
-export {
-  dateIsValid,
-  testImage,
-  expectLogDoesNotContain,
-  testFileExistsOrNot,
-  expectStartWith
-}
diff --git a/shared/extra-utils/miscs/generate.ts b/shared/extra-utils/miscs/generate.ts
deleted file mode 100644
index 3b29c0ad4..000000000
--- a/shared/extra-utils/miscs/generate.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import { expect } from 'chai'
-import ffmpeg from 'fluent-ffmpeg'
-import { ensureDir, pathExists } from 'fs-extra'
-import { dirname } from 'path'
-import { getVideoFileBitrate, getVideoFileFPS, getVideoFileResolution } from '@server/helpers/ffprobe-utils'
-import { getMaxBitrate } from '@shared/core-utils'
-import { buildAbsoluteFixturePath } from './tests'
-
-async function ensureHasTooBigBitrate (fixturePath: string) {
-  const bitrate = await getVideoFileBitrate(fixturePath)
-  const dataResolution = await getVideoFileResolution(fixturePath)
-  const fps = await getVideoFileFPS(fixturePath)
-
-  const maxBitrate = getMaxBitrate({ ...dataResolution, fps })
-  expect(bitrate).to.be.above(maxBitrate)
-}
-
-async function generateHighBitrateVideo () {
-  const tempFixturePath = buildAbsoluteFixturePath('video_high_bitrate_1080p.mp4', true)
-
-  await ensureDir(dirname(tempFixturePath))
-
-  const exists = await pathExists(tempFixturePath)
-  if (!exists) {
-    console.log('Generating high bitrate video.')
-
-    // Generate a random, high bitrate video on the fly, so we don't have to include
-    // a large file in the repo. The video needs to have a certain minimum length so
-    // that FFmpeg properly applies bitrate limits.
-    // https://stackoverflow.com/a/15795112
-    return new Promise<string>((res, rej) => {
-      ffmpeg()
-        .outputOptions([ '-f rawvideo', '-video_size 1920x1080', '-i /dev/urandom' ])
-        .outputOptions([ '-ac 2', '-f s16le', '-i /dev/urandom', '-t 10' ])
-        .outputOptions([ '-maxrate 10M', '-bufsize 10M' ])
-        .output(tempFixturePath)
-        .on('error', rej)
-        .on('end', () => res(tempFixturePath))
-        .run()
-    })
-  }
-
-  await ensureHasTooBigBitrate(tempFixturePath)
-
-  return tempFixturePath
-}
-
-async function generateVideoWithFramerate (fps = 60) {
-  const tempFixturePath = buildAbsoluteFixturePath(`video_${fps}fps.mp4`, true)
-
-  await ensureDir(dirname(tempFixturePath))
-
-  const exists = await pathExists(tempFixturePath)
-  if (!exists) {
-    console.log('Generating video with framerate %d.', fps)
-
-    return new Promise<string>((res, rej) => {
-      ffmpeg()
-        .outputOptions([ '-f rawvideo', '-video_size 1280x720', '-i /dev/urandom' ])
-        .outputOptions([ '-ac 2', '-f s16le', '-i /dev/urandom', '-t 10' ])
-        .outputOptions([ `-r ${fps}` ])
-        .output(tempFixturePath)
-        .on('error', rej)
-        .on('end', () => res(tempFixturePath))
-        .run()
-    })
-  }
-
-  return tempFixturePath
-}
-
-export {
-  generateHighBitrateVideo,
-  generateVideoWithFramerate
-}
diff --git a/shared/extra-utils/miscs/index.ts b/shared/extra-utils/miscs/index.ts
deleted file mode 100644
index 4474661de..000000000
--- a/shared/extra-utils/miscs/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './checks'
-export * from './generate'
-export * from './sql-command'
-export * from './tests'
-export * from './webtorrent'
diff --git a/shared/extra-utils/miscs/tests.ts b/shared/extra-utils/miscs/tests.ts
deleted file mode 100644
index 658fe5fd3..000000000
--- a/shared/extra-utils/miscs/tests.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import { stat } from 'fs-extra'
-import { basename, isAbsolute, join, resolve } from 'path'
-
-const FIXTURE_URLS = {
-  peertube_long: 'https://peertube2.cpy.re/videos/watch/122d093a-1ede-43bd-bd34-59d2931ffc5e',
-  peertube_short: 'https://peertube2.cpy.re/w/3fbif9S3WmtTP8gGsC5HBd',
-
-  youtube: 'https://www.youtube.com/watch?v=msX3jv1XdvM',
-
-  /**
-   * The video is used to check format-selection correctness wrt. HDR,
-   * which brings its own set of oddities outside of a MediaSource.
-   *
-   * The video needs to have the following format_ids:
-   * (which you can check by using `youtube-dl <url> -F`):
-   * - (webm vp9)
-   * - (mp4 avc1)
-   * - (webm vp9.2 HDR)
-   */
-  youtubeHDR: 'https://www.youtube.com/watch?v=RQgnBB9z_N4',
-
-  // eslint-disable-next-line max-len
-  magnet: 'magnet:?xs=https%3A%2F%2Fpeertube2.cpy.re%2Flazy-static%2Ftorrents%2Fb209ca00-c8bb-4b2b-b421-1ede169f3dbc-720.torrent&xt=urn:btih:0f498834733e8057ed5c6f2ee2b4efd8d84a76ee&dn=super+peertube2+video&tr=https%3A%2F%2Fpeertube2.cpy.re%2Ftracker%2Fannounce&tr=wss%3A%2F%2Fpeertube2.cpy.re%3A443%2Ftracker%2Fsocket&ws=https%3A%2F%2Fpeertube2.cpy.re%2Fstatic%2Fwebseed%2Fb209ca00-c8bb-4b2b-b421-1ede169f3dbc-720.mp4',
-
-  badVideo: 'https://download.cpy.re/peertube/bad_video.mp4',
-  goodVideo: 'https://download.cpy.re/peertube/good_video.mp4',
-  goodVideo720: 'https://download.cpy.re/peertube/good_video_720.mp4',
-
-  file4K: 'https://download.cpy.re/peertube/4k_file.txt'
-}
-
-function parallelTests () {
-  return process.env.MOCHA_PARALLEL === 'true'
-}
-
-function isGithubCI () {
-  return !!process.env.GITHUB_WORKSPACE
-}
-
-function areHttpImportTestsDisabled () {
-  const disabled = process.env.DISABLE_HTTP_IMPORT_TESTS === 'true'
-
-  if (disabled) console.log('DISABLE_HTTP_IMPORT_TESTS env set to "true" so import tests are disabled')
-
-  return disabled
-}
-
-function areObjectStorageTestsDisabled () {
-  const disabled = process.env.ENABLE_OBJECT_STORAGE_TESTS !== 'true'
-
-  if (disabled) console.log('ENABLE_OBJECT_STORAGE_TESTS env is not set to "true" so object storage tests are disabled')
-
-  return disabled
-}
-
-function buildAbsoluteFixturePath (path: string, customCIPath = false) {
-  if (isAbsolute(path)) return path
-
-  if (customCIPath && process.env.GITHUB_WORKSPACE) {
-    return join(process.env.GITHUB_WORKSPACE, 'fixtures', path)
-  }
-
-  return join(root(), 'server', 'tests', 'fixtures', path)
-}
-
-function root () {
-  // We are in /miscs
-  let root = join(__dirname, '..', '..', '..')
-
-  if (basename(root) === 'dist') root = resolve(root, '..')
-
-  return root
-}
-
-function wait (milliseconds: number) {
-  return new Promise(resolve => setTimeout(resolve, milliseconds))
-}
-
-async function getFileSize (path: string) {
-  const stats = await stat(path)
-
-  return stats.size
-}
-
-function buildRequestStub (): any {
-  return { }
-}
-
-export {
-  FIXTURE_URLS,
-
-  parallelTests,
-  isGithubCI,
-  areHttpImportTestsDisabled,
-  buildAbsoluteFixturePath,
-  getFileSize,
-  buildRequestStub,
-  areObjectStorageTestsDisabled,
-  wait,
-  root
-}
diff --git a/shared/extra-utils/mock-servers/index.ts b/shared/extra-utils/mock-servers/index.ts
deleted file mode 100644
index 93c00c788..000000000
--- a/shared/extra-utils/mock-servers/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './mock-email'
-export * from './mock-instances-index'
-export * from './mock-joinpeertube-versions'
-export * from './mock-plugin-blocklist'
-export * from './mock-object-storage'
diff --git a/shared/extra-utils/mock-servers/mock-429.ts b/shared/extra-utils/mock-servers/mock-429.ts
deleted file mode 100644
index 9e0d1281a..000000000
--- a/shared/extra-utils/mock-servers/mock-429.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import express from 'express'
-import { Server } from 'http'
-import { getPort, randomListen, terminateServer } from './utils'
-
-export class Mock429 {
-  private server: Server
-  private responseSent = false
-
-  async initialize () {
-    const app = express()
-
-    app.get('/', (req: express.Request, res: express.Response, next: express.NextFunction) => {
-
-      if (!this.responseSent) {
-        this.responseSent = true
-
-        // Retry after 5 seconds
-        res.header('retry-after', '2')
-        return res.sendStatus(429)
-      }
-
-      return res.sendStatus(200)
-    })
-
-    this.server = await randomListen(app)
-
-    return getPort(this.server)
-  }
-
-  terminate () {
-    return terminateServer(this.server)
-  }
-}
diff --git a/shared/extra-utils/mock-servers/mock-email.ts b/shared/extra-utils/mock-servers/mock-email.ts
deleted file mode 100644
index f646c1621..000000000
--- a/shared/extra-utils/mock-servers/mock-email.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { ChildProcess } from 'child_process'
-import MailDev from '@peertube/maildev'
-import { randomInt } from '@shared/core-utils'
-import { parallelTests } from '../miscs'
-
-class MockSmtpServer {
-
-  private static instance: MockSmtpServer
-  private started = false
-  private emailChildProcess: ChildProcess
-  private emails: object[]
-
-  private constructor () { }
-
-  collectEmails (emailsCollection: object[]) {
-    return new Promise<number>((res, rej) => {
-      const port = parallelTests() ? randomInt(1000, 2000) : 1025
-      this.emails = emailsCollection
-
-      if (this.started) {
-        return res(undefined)
-      }
-
-      const maildev = new MailDev({
-        ip: '127.0.0.1',
-        smtp: port,
-        disableWeb: true,
-        silent: true
-      })
-
-      maildev.on('new', email => {
-        this.emails.push(email)
-      })
-
-      maildev.listen(err => {
-        if (err) return rej(err)
-
-        this.started = true
-
-        return res(port)
-      })
-    })
-  }
-
-  kill () {
-    if (!this.emailChildProcess) return
-
-    process.kill(this.emailChildProcess.pid)
-
-    this.emailChildProcess = null
-    MockSmtpServer.instance = null
-  }
-
-  static get Instance () {
-    return this.instance || (this.instance = new this())
-  }
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  MockSmtpServer
-}
diff --git a/shared/extra-utils/mock-servers/mock-instances-index.ts b/shared/extra-utils/mock-servers/mock-instances-index.ts
deleted file mode 100644
index 92b12d6f3..000000000
--- a/shared/extra-utils/mock-servers/mock-instances-index.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import express from 'express'
-import { Server } from 'http'
-import { getPort, randomListen, terminateServer } from './utils'
-
-export class MockInstancesIndex {
-  private server: Server
-
-  private readonly indexInstances: { host: string, createdAt: string }[] = []
-
-  async initialize () {
-    const app = express()
-
-    app.use('/', (req: express.Request, res: express.Response, next: express.NextFunction) => {
-      if (process.env.DEBUG) console.log('Receiving request on mocked server %s.', req.url)
-
-      return next()
-    })
-
-    app.get('/api/v1/instances/hosts', (req: express.Request, res: express.Response) => {
-      const since = req.query.since
-
-      const filtered = this.indexInstances.filter(i => {
-        if (!since) return true
-
-        return i.createdAt > since
-      })
-
-      return res.json({
-        total: filtered.length,
-        data: filtered
-      })
-    })
-
-    this.server = await randomListen(app)
-
-    return getPort(this.server)
-  }
-
-  addInstance (host: string) {
-    this.indexInstances.push({ host, createdAt: new Date().toISOString() })
-  }
-
-  terminate () {
-    return terminateServer(this.server)
-  }
-}
diff --git a/shared/extra-utils/mock-servers/mock-joinpeertube-versions.ts b/shared/extra-utils/mock-servers/mock-joinpeertube-versions.ts
deleted file mode 100644
index e7906ea56..000000000
--- a/shared/extra-utils/mock-servers/mock-joinpeertube-versions.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import express from 'express'
-import { Server } from 'http'
-import { getPort, randomListen } from './utils'
-
-export class MockJoinPeerTubeVersions {
-  private server: Server
-  private latestVersion: string
-
-  async initialize () {
-    const app = express()
-
-    app.use('/', (req: express.Request, res: express.Response, next: express.NextFunction) => {
-      if (process.env.DEBUG) console.log('Receiving request on mocked server %s.', req.url)
-
-      return next()
-    })
-
-    app.get('/versions.json', (req: express.Request, res: express.Response) => {
-      return res.json({
-        peertube: {
-          latestVersion: this.latestVersion
-        }
-      })
-    })
-
-    this.server = await randomListen(app)
-
-    return getPort(this.server)
-  }
-
-  setLatestVersion (latestVersion: string) {
-    this.latestVersion = latestVersion
-  }
-}
diff --git a/shared/extra-utils/mock-servers/mock-object-storage.ts b/shared/extra-utils/mock-servers/mock-object-storage.ts
deleted file mode 100644
index d135c2631..000000000
--- a/shared/extra-utils/mock-servers/mock-object-storage.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import express from 'express'
-import got, { RequestError } from 'got'
-import { Server } from 'http'
-import { pipeline } from 'stream'
-import { ObjectStorageCommand } from '../server'
-import { getPort, randomListen, terminateServer } from './utils'
-
-export class MockObjectStorage {
-  private server: Server
-
-  async initialize () {
-    const app = express()
-
-    app.get('/:bucketName/:path(*)', (req: express.Request, res: express.Response, next: express.NextFunction) => {
-      const url = `http://${req.params.bucketName}.${ObjectStorageCommand.getEndpointHost()}/${req.params.path}`
-
-      if (process.env.DEBUG) {
-        console.log('Receiving request on mocked server %s.', req.url)
-        console.log('Proxifying request to %s', url)
-      }
-
-      return pipeline(
-        got.stream(url, { throwHttpErrors: false }),
-        res,
-        (err: RequestError) => {
-          if (!err) return
-
-          console.error('Pipeline failed.', err)
-        }
-      )
-    })
-
-    this.server = await randomListen(app)
-
-    return getPort(this.server)
-  }
-
-  terminate () {
-    return terminateServer(this.server)
-  }
-}
diff --git a/shared/extra-utils/mock-servers/mock-plugin-blocklist.ts b/shared/extra-utils/mock-servers/mock-plugin-blocklist.ts
deleted file mode 100644
index f8a271cba..000000000
--- a/shared/extra-utils/mock-servers/mock-plugin-blocklist.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import express, { Request, Response } from 'express'
-import { Server } from 'http'
-import { getPort, randomListen, terminateServer } from './utils'
-
-type BlocklistResponse = {
-  data: {
-    value: string
-    action?: 'add' | 'remove'
-    updatedAt?: string
-  }[]
-}
-
-export class MockBlocklist {
-  private body: BlocklistResponse
-  private server: Server
-
-  async initialize () {
-    const app = express()
-
-    app.get('/blocklist', (req: Request, res: Response) => {
-      return res.json(this.body)
-    })
-
-    this.server = await randomListen(app)
-
-    return getPort(this.server)
-  }
-
-  replace (body: BlocklistResponse) {
-    this.body = body
-  }
-
-  terminate () {
-    return terminateServer(this.server)
-  }
-}
diff --git a/shared/extra-utils/mock-servers/mock-proxy.ts b/shared/extra-utils/mock-servers/mock-proxy.ts
deleted file mode 100644
index 75ac79055..000000000
--- a/shared/extra-utils/mock-servers/mock-proxy.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-
-import { createServer, Server } from 'http'
-import proxy from 'proxy'
-import { getPort, terminateServer } from './utils'
-
-class MockProxy {
-  private server: Server
-
-  initialize () {
-    return new Promise<number>(res => {
-      this.server = proxy(createServer())
-      this.server.listen(0, () => res(getPort(this.server)))
-    })
-  }
-
-  terminate () {
-    return terminateServer(this.server)
-  }
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  MockProxy
-}
diff --git a/shared/extra-utils/mock-servers/utils.ts b/shared/extra-utils/mock-servers/utils.ts
deleted file mode 100644
index 235642439..000000000
--- a/shared/extra-utils/mock-servers/utils.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Express } from 'express'
-import { Server } from 'http'
-import { AddressInfo } from 'net'
-
-function randomListen (app: Express) {
-  return new Promise<Server>(res => {
-    const server = app.listen(0, () => res(server))
-  })
-}
-
-function getPort (server: Server) {
-  const address = server.address() as AddressInfo
-
-  return address.port
-}
-
-function terminateServer (server: Server) {
-  if (!server) return Promise.resolve()
-
-  return new Promise<void>((res, rej) => {
-    server.close(err => {
-      if (err) return rej(err)
-
-      return res()
-    })
-  })
-}
-
-export {
-  randomListen,
-  getPort,
-  terminateServer
-}
diff --git a/shared/extra-utils/requests/activitypub.ts b/shared/extra-utils/requests/activitypub.ts
deleted file mode 100644
index 4ae878384..000000000
--- a/shared/extra-utils/requests/activitypub.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { activityPubContextify } from '../../../server/helpers/activitypub'
-import { doRequest } from '../../../server/helpers/requests'
-import { HTTP_SIGNATURE } from '../../../server/initializers/constants'
-import { buildGlobalHeaders } from '../../../server/lib/job-queue/handlers/utils/activitypub-http-utils'
-
-function makePOSTAPRequest (url: string, body: any, httpSignature: any, headers: any) {
-  const options = {
-    method: 'POST' as 'POST',
-    json: body,
-    httpSignature,
-    headers
-  }
-
-  return doRequest(url, options)
-}
-
-async function makeFollowRequest (to: { url: string }, by: { url: string, privateKey }) {
-  const follow = {
-    type: 'Follow',
-    id: by.url + '/' + new Date().getTime(),
-    actor: by.url,
-    object: to.url
-  }
-
-  const body = activityPubContextify(follow)
-
-  const httpSignature = {
-    algorithm: HTTP_SIGNATURE.ALGORITHM,
-    authorizationHeaderName: HTTP_SIGNATURE.HEADER_NAME,
-    keyId: by.url,
-    key: by.privateKey,
-    headers: HTTP_SIGNATURE.HEADERS_TO_SIGN
-  }
-  const headers = buildGlobalHeaders(body)
-
-  return makePOSTAPRequest(to.url + '/inbox', body, httpSignature, headers)
-}
-
-export {
-  makePOSTAPRequest,
-  makeFollowRequest
-}
diff --git a/shared/extra-utils/requests/check-api-params.ts b/shared/extra-utils/requests/check-api-params.ts
deleted file mode 100644
index 26ba1e913..000000000
--- a/shared/extra-utils/requests/check-api-params.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { HttpStatusCode } from '@shared/models'
-import { makeGetRequest } from './requests'
-
-function checkBadStartPagination (url: string, path: string, token?: string, query = {}) {
-  return makeGetRequest({
-    url,
-    path,
-    token,
-    query: { ...query, start: 'hello' },
-    expectedStatus: HttpStatusCode.BAD_REQUEST_400
-  })
-}
-
-async function checkBadCountPagination (url: string, path: string, token?: string, query = {}) {
-  await makeGetRequest({
-    url,
-    path,
-    token,
-    query: { ...query, count: 'hello' },
-    expectedStatus: HttpStatusCode.BAD_REQUEST_400
-  })
-
-  await makeGetRequest({
-    url,
-    path,
-    token,
-    query: { ...query, count: 2000 },
-    expectedStatus: HttpStatusCode.BAD_REQUEST_400
-  })
-}
-
-function checkBadSortPagination (url: string, path: string, token?: string, query = {}) {
-  return makeGetRequest({
-    url,
-    path,
-    token,
-    query: { ...query, sort: 'hello' },
-    expectedStatus: HttpStatusCode.BAD_REQUEST_400
-  })
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  checkBadStartPagination,
-  checkBadCountPagination,
-  checkBadSortPagination
-}
diff --git a/shared/extra-utils/requests/index.ts b/shared/extra-utils/requests/index.ts
deleted file mode 100644
index 501163f92..000000000
--- a/shared/extra-utils/requests/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// Don't include activitypub that import stuff from server
-export * from './check-api-params'
-export * from './requests'
diff --git a/shared/extra-utils/server/directories.ts b/shared/extra-utils/server/directories.ts
deleted file mode 100644
index b6465cbf4..000000000
--- a/shared/extra-utils/server/directories.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-
-import { expect } from 'chai'
-import { pathExists, readdir } from 'fs-extra'
-import { join } from 'path'
-import { root } from '@server/helpers/core-utils'
-import { PeerTubeServer } from './server'
-
-async function checkTmpIsEmpty (server: PeerTubeServer) {
-  await checkDirectoryIsEmpty(server, 'tmp', [ 'plugins-global.css', 'hls', 'resumable-uploads' ])
-
-  if (await pathExists(join('test' + server.internalServerNumber, 'tmp', 'hls'))) {
-    await checkDirectoryIsEmpty(server, 'tmp/hls')
-  }
-}
-
-async function checkDirectoryIsEmpty (server: PeerTubeServer, directory: string, exceptions: string[] = []) {
-  const testDirectory = 'test' + server.internalServerNumber
-
-  const directoryPath = join(root(), testDirectory, directory)
-
-  const directoryExists = await pathExists(directoryPath)
-  expect(directoryExists).to.be.true
-
-  const files = await readdir(directoryPath)
-  const filtered = files.filter(f => exceptions.includes(f) === false)
-
-  expect(filtered).to.have.lengthOf(0)
-}
-
-export {
-  checkTmpIsEmpty,
-  checkDirectoryIsEmpty
-}
diff --git a/shared/extra-utils/server/plugins.ts b/shared/extra-utils/server/plugins.ts
deleted file mode 100644
index 0f5fabd5a..000000000
--- a/shared/extra-utils/server/plugins.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-
-import { expect } from 'chai'
-import { PeerTubeServer } from '../server/server'
-
-async function testHelloWorldRegisteredSettings (server: PeerTubeServer) {
-  const body = await server.plugins.getRegisteredSettings({ npmName: 'peertube-plugin-hello-world' })
-
-  const registeredSettings = body.registeredSettings
-  expect(registeredSettings).to.have.length.at.least(1)
-
-  const adminNameSettings = registeredSettings.find(s => s.name === 'admin-name')
-  expect(adminNameSettings).to.not.be.undefined
-}
-
-export {
-  testHelloWorldRegisteredSettings
-}
diff --git a/shared/extra-utils/server/tracker.ts b/shared/extra-utils/server/tracker.ts
deleted file mode 100644
index f04e8f8a1..000000000
--- a/shared/extra-utils/server/tracker.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { expect } from 'chai'
-import { sha1 } from '@server/helpers/core-utils'
-import { makeGetRequest } from '../requests'
-
-async function hlsInfohashExist (serverUrl: string, masterPlaylistUrl: string, fileNumber: number) {
-  const path = '/tracker/announce'
-
-  const infohash = sha1(`2${masterPlaylistUrl}+V${fileNumber}`)
-
-  // From bittorrent-tracker
-  const infohashBinary = escape(Buffer.from(infohash, 'hex').toString('binary')).replace(/[@*/+]/g, function (char) {
-    return '%' + char.charCodeAt(0).toString(16).toUpperCase()
-  })
-
-  const res = await makeGetRequest({
-    url: serverUrl,
-    path,
-    rawQuery: `peer_id=-WW0105-NkvYO/egUAr4&info_hash=${infohashBinary}&port=42100`,
-    expectedStatus: 200
-  })
-
-  expect(res.text).to.not.contain('failure')
-}
-
-export {
-  hlsInfohashExist
-}
diff --git a/shared/extra-utils/users/actors.ts b/shared/extra-utils/users/actors.ts
deleted file mode 100644
index cfcc7d0a7..000000000
--- a/shared/extra-utils/users/actors.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-
-import { expect } from 'chai'
-import { pathExists, readdir } from 'fs-extra'
-import { join } from 'path'
-import { root } from '@server/helpers/core-utils'
-import { Account, VideoChannel } from '@shared/models'
-import { PeerTubeServer } from '../server'
-
-async function expectChannelsFollows (options: {
-  server: PeerTubeServer
-  handle: string
-  followers: number
-  following: number
-}) {
-  const { server } = options
-  const { data } = await server.channels.list()
-
-  return expectActorFollow({ ...options, data })
-}
-
-async function expectAccountFollows (options: {
-  server: PeerTubeServer
-  handle: string
-  followers: number
-  following: number
-}) {
-  const { server } = options
-  const { data } = await server.accounts.list()
-
-  return expectActorFollow({ ...options, data })
-}
-
-async function checkActorFilesWereRemoved (filename: string, serverNumber: number) {
-  const testDirectory = 'test' + serverNumber
-
-  for (const directory of [ 'avatars' ]) {
-    const directoryPath = join(root(), testDirectory, directory)
-
-    const directoryExists = await pathExists(directoryPath)
-    expect(directoryExists).to.be.true
-
-    const files = await readdir(directoryPath)
-    for (const file of files) {
-      expect(file).to.not.contain(filename)
-    }
-  }
-}
-
-export {
-  expectAccountFollows,
-  expectChannelsFollows,
-  checkActorFilesWereRemoved
-}
-
-// ---------------------------------------------------------------------------
-
-function expectActorFollow (options: {
-  server: PeerTubeServer
-  data: (Account | VideoChannel)[]
-  handle: string
-  followers: number
-  following: number
-}) {
-  const { server, data, handle, followers, following } = options
-
-  const actor = data.find(a => a.name + '@' + a.host === handle)
-  const message = `${handle} on ${server.url}`
-
-  expect(actor, message).to.exist
-  expect(actor.followersCount).to.equal(followers, message)
-  expect(actor.followingCount).to.equal(following, message)
-}
diff --git a/shared/extra-utils/users/notifications.ts b/shared/extra-utils/users/notifications.ts
deleted file mode 100644
index 07ccb0f8d..000000000
--- a/shared/extra-utils/users/notifications.ts
+++ /dev/null
@@ -1,795 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-
-import { expect } from 'chai'
-import { inspect } from 'util'
-import { AbuseState, PluginType } from '@shared/models'
-import { UserNotification, UserNotificationSetting, UserNotificationSettingValue, UserNotificationType } from '../../models/users'
-import { MockSmtpServer } from '../mock-servers/mock-email'
-import { PeerTubeServer } from '../server'
-import { doubleFollow } from '../server/follows'
-import { createMultipleServers } from '../server/servers'
-import { setAccessTokensToServers } from './login'
-
-type CheckerBaseParams = {
-  server: PeerTubeServer
-  emails: any[]
-  socketNotifications: UserNotification[]
-  token: string
-  check?: { web: boolean, mail: boolean }
-}
-
-type CheckerType = 'presence' | 'absence'
-
-function getAllNotificationsSettings (): UserNotificationSetting {
-  return {
-    newVideoFromSubscription: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
-    newCommentOnMyVideo: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
-    abuseAsModerator: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
-    videoAutoBlacklistAsModerator: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
-    blacklistOnMyVideo: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
-    myVideoImportFinished: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
-    myVideoPublished: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
-    commentMention: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
-    newFollow: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
-    newUserRegistration: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
-    newInstanceFollower: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
-    abuseNewMessage: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
-    abuseStateChange: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
-    autoInstanceFollowing: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
-    newPeerTubeVersion: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
-    newPluginVersion: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL
-  }
-}
-
-async function checkNewVideoFromSubscription (options: CheckerBaseParams & {
-  videoName: string
-  shortUUID: string
-  checkType: CheckerType
-}) {
-  const { videoName, shortUUID } = options
-  const notificationType = UserNotificationType.NEW_VIDEO_FROM_SUBSCRIPTION
-
-  function notificationChecker (notification: UserNotification, checkType: CheckerType) {
-    if (checkType === 'presence') {
-      expect(notification).to.not.be.undefined
-      expect(notification.type).to.equal(notificationType)
-
-      checkVideo(notification.video, videoName, shortUUID)
-      checkActor(notification.video.channel)
-    } else {
-      expect(notification).to.satisfy((n: UserNotification) => {
-        return n === undefined || n.type !== UserNotificationType.NEW_VIDEO_FROM_SUBSCRIPTION || n.video.name !== videoName
-      })
-    }
-  }
-
-  function emailNotificationFinder (email: object) {
-    const text = email['text']
-    return text.indexOf(shortUUID) !== -1 && text.indexOf('Your subscription') !== -1
-  }
-
-  await checkNotification({ ...options, notificationChecker, emailNotificationFinder })
-}
-
-async function checkVideoIsPublished (options: CheckerBaseParams & {
-  videoName: string
-  shortUUID: string
-  checkType: CheckerType
-}) {
-  const { videoName, shortUUID } = options
-  const notificationType = UserNotificationType.MY_VIDEO_PUBLISHED
-
-  function notificationChecker (notification: UserNotification, checkType: CheckerType) {
-    if (checkType === 'presence') {
-      expect(notification).to.not.be.undefined
-      expect(notification.type).to.equal(notificationType)
-
-      checkVideo(notification.video, videoName, shortUUID)
-      checkActor(notification.video.channel)
-    } else {
-      expect(notification.video).to.satisfy(v => v === undefined || v.name !== videoName)
-    }
-  }
-
-  function emailNotificationFinder (email: object) {
-    const text: string = email['text']
-    return text.includes(shortUUID) && text.includes('Your video')
-  }
-
-  await checkNotification({ ...options, notificationChecker, emailNotificationFinder })
-}
-
-async function checkMyVideoImportIsFinished (options: CheckerBaseParams & {
-  videoName: string
-  shortUUID: string
-  url: string
-  success: boolean
-  checkType: CheckerType
-}) {
-  const { videoName, shortUUID, url, success } = options
-
-  const notificationType = success ? UserNotificationType.MY_VIDEO_IMPORT_SUCCESS : UserNotificationType.MY_VIDEO_IMPORT_ERROR
-
-  function notificationChecker (notification: UserNotification, checkType: CheckerType) {
-    if (checkType === 'presence') {
-      expect(notification).to.not.be.undefined
-      expect(notification.type).to.equal(notificationType)
-
-      expect(notification.videoImport.targetUrl).to.equal(url)
-
-      if (success) checkVideo(notification.videoImport.video, videoName, shortUUID)
-    } else {
-      expect(notification.videoImport).to.satisfy(i => i === undefined || i.targetUrl !== url)
-    }
-  }
-
-  function emailNotificationFinder (email: object) {
-    const text: string = email['text']
-    const toFind = success ? ' finished' : ' error'
-
-    return text.includes(url) && text.includes(toFind)
-  }
-
-  await checkNotification({ ...options, notificationChecker, emailNotificationFinder })
-}
-
-async function checkUserRegistered (options: CheckerBaseParams & {
-  username: string
-  checkType: CheckerType
-}) {
-  const { username } = options
-  const notificationType = UserNotificationType.NEW_USER_REGISTRATION
-
-  function notificationChecker (notification: UserNotification, checkType: CheckerType) {
-    if (checkType === 'presence') {
-      expect(notification).to.not.be.undefined
-      expect(notification.type).to.equal(notificationType)
-
-      checkActor(notification.account)
-      expect(notification.account.name).to.equal(username)
-    } else {
-      expect(notification).to.satisfy(n => n.type !== notificationType || n.account.name !== username)
-    }
-  }
-
-  function emailNotificationFinder (email: object) {
-    const text: string = email['text']
-
-    return text.includes(' registered.') && text.includes(username)
-  }
-
-  await checkNotification({ ...options, notificationChecker, emailNotificationFinder })
-}
-
-async function checkNewActorFollow (options: CheckerBaseParams & {
-  followType: 'channel' | 'account'
-  followerName: string
-  followerDisplayName: string
-  followingDisplayName: string
-  checkType: CheckerType
-}) {
-  const { followType, followerName, followerDisplayName, followingDisplayName } = options
-  const notificationType = UserNotificationType.NEW_FOLLOW
-
-  function notificationChecker (notification: UserNotification, checkType: CheckerType) {
-    if (checkType === 'presence') {
-      expect(notification).to.not.be.undefined
-      expect(notification.type).to.equal(notificationType)
-
-      checkActor(notification.actorFollow.follower)
-      expect(notification.actorFollow.follower.displayName).to.equal(followerDisplayName)
-      expect(notification.actorFollow.follower.name).to.equal(followerName)
-      expect(notification.actorFollow.follower.host).to.not.be.undefined
-
-      const following = notification.actorFollow.following
-      expect(following.displayName).to.equal(followingDisplayName)
-      expect(following.type).to.equal(followType)
-    } else {
-      expect(notification).to.satisfy(n => {
-        return n.type !== notificationType ||
-          (n.actorFollow.follower.name !== followerName && n.actorFollow.following !== followingDisplayName)
-      })
-    }
-  }
-
-  function emailNotificationFinder (email: object) {
-    const text: string = email['text']
-
-    return text.includes(followType) && text.includes(followingDisplayName) && text.includes(followerDisplayName)
-  }
-
-  await checkNotification({ ...options, notificationChecker, emailNotificationFinder })
-}
-
-async function checkNewInstanceFollower (options: CheckerBaseParams & {
-  followerHost: string
-  checkType: CheckerType
-}) {
-  const { followerHost } = options
-  const notificationType = UserNotificationType.NEW_INSTANCE_FOLLOWER
-
-  function notificationChecker (notification: UserNotification, checkType: CheckerType) {
-    if (checkType === 'presence') {
-      expect(notification).to.not.be.undefined
-      expect(notification.type).to.equal(notificationType)
-
-      checkActor(notification.actorFollow.follower)
-      expect(notification.actorFollow.follower.name).to.equal('peertube')
-      expect(notification.actorFollow.follower.host).to.equal(followerHost)
-
-      expect(notification.actorFollow.following.name).to.equal('peertube')
-    } else {
-      expect(notification).to.satisfy(n => {
-        return n.type !== notificationType || n.actorFollow.follower.host !== followerHost
-      })
-    }
-  }
-
-  function emailNotificationFinder (email: object) {
-    const text: string = email['text']
-
-    return text.includes('instance has a new follower') && text.includes(followerHost)
-  }
-
-  await checkNotification({ ...options, notificationChecker, emailNotificationFinder })
-}
-
-async function checkAutoInstanceFollowing (options: CheckerBaseParams & {
-  followerHost: string
-  followingHost: string
-  checkType: CheckerType
-}) {
-  const { followerHost, followingHost } = options
-  const notificationType = UserNotificationType.AUTO_INSTANCE_FOLLOWING
-
-  function notificationChecker (notification: UserNotification, checkType: CheckerType) {
-    if (checkType === 'presence') {
-      expect(notification).to.not.be.undefined
-      expect(notification.type).to.equal(notificationType)
-
-      const following = notification.actorFollow.following
-      checkActor(following)
-      expect(following.name).to.equal('peertube')
-      expect(following.host).to.equal(followingHost)
-
-      expect(notification.actorFollow.follower.name).to.equal('peertube')
-      expect(notification.actorFollow.follower.host).to.equal(followerHost)
-    } else {
-      expect(notification).to.satisfy(n => {
-        return n.type !== notificationType || n.actorFollow.following.host !== followingHost
-      })
-    }
-  }
-
-  function emailNotificationFinder (email: object) {
-    const text: string = email['text']
-
-    return text.includes(' automatically followed a new instance') && text.includes(followingHost)
-  }
-
-  await checkNotification({ ...options, notificationChecker, emailNotificationFinder })
-}
-
-async function checkCommentMention (options: CheckerBaseParams & {
-  shortUUID: string
-  commentId: number
-  threadId: number
-  byAccountDisplayName: string
-  checkType: CheckerType
-}) {
-  const { shortUUID, commentId, threadId, byAccountDisplayName } = options
-  const notificationType = UserNotificationType.COMMENT_MENTION
-
-  function notificationChecker (notification: UserNotification, checkType: CheckerType) {
-    if (checkType === 'presence') {
-      expect(notification).to.not.be.undefined
-      expect(notification.type).to.equal(notificationType)
-
-      checkComment(notification.comment, commentId, threadId)
-      checkActor(notification.comment.account)
-      expect(notification.comment.account.displayName).to.equal(byAccountDisplayName)
-
-      checkVideo(notification.comment.video, undefined, shortUUID)
-    } else {
-      expect(notification).to.satisfy(n => n.type !== notificationType || n.comment.id !== commentId)
-    }
-  }
-
-  function emailNotificationFinder (email: object) {
-    const text: string = email['text']
-
-    return text.includes(' mentioned ') && text.includes(shortUUID) && text.includes(byAccountDisplayName)
-  }
-
-  await checkNotification({ ...options, notificationChecker, emailNotificationFinder })
-}
-
-let lastEmailCount = 0
-
-async function checkNewCommentOnMyVideo (options: CheckerBaseParams & {
-  shortUUID: string
-  commentId: number
-  threadId: number
-  checkType: CheckerType
-}) {
-  const { server, shortUUID, commentId, threadId, checkType, emails } = options
-  const notificationType = UserNotificationType.NEW_COMMENT_ON_MY_VIDEO
-
-  function notificationChecker (notification: UserNotification, checkType: CheckerType) {
-    if (checkType === 'presence') {
-      expect(notification).to.not.be.undefined
-      expect(notification.type).to.equal(notificationType)
-
-      checkComment(notification.comment, commentId, threadId)
-      checkActor(notification.comment.account)
-      checkVideo(notification.comment.video, undefined, shortUUID)
-    } else {
-      expect(notification).to.satisfy((n: UserNotification) => {
-        return n === undefined || n.comment === undefined || n.comment.id !== commentId
-      })
-    }
-  }
-
-  const commentUrl = `http://localhost:${server.port}/w/${shortUUID};threadId=${threadId}`
-
-  function emailNotificationFinder (email: object) {
-    return email['text'].indexOf(commentUrl) !== -1
-  }
-
-  await checkNotification({ ...options, notificationChecker, emailNotificationFinder })
-
-  if (checkType === 'presence') {
-    // We cannot detect email duplicates, so check we received another email
-    expect(emails).to.have.length.above(lastEmailCount)
-    lastEmailCount = emails.length
-  }
-}
-
-async function checkNewVideoAbuseForModerators (options: CheckerBaseParams & {
-  shortUUID: string
-  videoName: string
-  checkType: CheckerType
-}) {
-  const { shortUUID, videoName } = options
-  const notificationType = UserNotificationType.NEW_ABUSE_FOR_MODERATORS
-
-  function notificationChecker (notification: UserNotification, checkType: CheckerType) {
-    if (checkType === 'presence') {
-      expect(notification).to.not.be.undefined
-      expect(notification.type).to.equal(notificationType)
-
-      expect(notification.abuse.id).to.be.a('number')
-      checkVideo(notification.abuse.video, videoName, shortUUID)
-    } else {
-      expect(notification).to.satisfy((n: UserNotification) => {
-        return n === undefined || n.abuse === undefined || n.abuse.video.shortUUID !== shortUUID
-      })
-    }
-  }
-
-  function emailNotificationFinder (email: object) {
-    const text = email['text']
-    return text.indexOf(shortUUID) !== -1 && text.indexOf('abuse') !== -1
-  }
-
-  await checkNotification({ ...options, notificationChecker, emailNotificationFinder })
-}
-
-async function checkNewAbuseMessage (options: CheckerBaseParams & {
-  abuseId: number
-  message: string
-  toEmail: string
-  checkType: CheckerType
-}) {
-  const { abuseId, message, toEmail } = options
-  const notificationType = UserNotificationType.ABUSE_NEW_MESSAGE
-
-  function notificationChecker (notification: UserNotification, checkType: CheckerType) {
-    if (checkType === 'presence') {
-      expect(notification).to.not.be.undefined
-      expect(notification.type).to.equal(notificationType)
-
-      expect(notification.abuse.id).to.equal(abuseId)
-    } else {
-      expect(notification).to.satisfy((n: UserNotification) => {
-        return n === undefined || n.type !== notificationType || n.abuse === undefined || n.abuse.id !== abuseId
-      })
-    }
-  }
-
-  function emailNotificationFinder (email: object) {
-    const text = email['text']
-    const to = email['to'].filter(t => t.address === toEmail)
-
-    return text.indexOf(message) !== -1 && to.length !== 0
-  }
-
-  await checkNotification({ ...options, notificationChecker, emailNotificationFinder })
-}
-
-async function checkAbuseStateChange (options: CheckerBaseParams & {
-  abuseId: number
-  state: AbuseState
-  checkType: CheckerType
-}) {
-  const { abuseId, state } = options
-  const notificationType = UserNotificationType.ABUSE_STATE_CHANGE
-
-  function notificationChecker (notification: UserNotification, checkType: CheckerType) {
-    if (checkType === 'presence') {
-      expect(notification).to.not.be.undefined
-      expect(notification.type).to.equal(notificationType)
-
-      expect(notification.abuse.id).to.equal(abuseId)
-      expect(notification.abuse.state).to.equal(state)
-    } else {
-      expect(notification).to.satisfy((n: UserNotification) => {
-        return n === undefined || n.abuse === undefined || n.abuse.id !== abuseId
-      })
-    }
-  }
-
-  function emailNotificationFinder (email: object) {
-    const text = email['text']
-
-    const contains = state === AbuseState.ACCEPTED
-      ? ' accepted'
-      : ' rejected'
-
-    return text.indexOf(contains) !== -1
-  }
-
-  await checkNotification({ ...options, notificationChecker, emailNotificationFinder })
-}
-
-async function checkNewCommentAbuseForModerators (options: CheckerBaseParams & {
-  shortUUID: string
-  videoName: string
-  checkType: CheckerType
-}) {
-  const { shortUUID, videoName } = options
-  const notificationType = UserNotificationType.NEW_ABUSE_FOR_MODERATORS
-
-  function notificationChecker (notification: UserNotification, checkType: CheckerType) {
-    if (checkType === 'presence') {
-      expect(notification).to.not.be.undefined
-      expect(notification.type).to.equal(notificationType)
-
-      expect(notification.abuse.id).to.be.a('number')
-      checkVideo(notification.abuse.comment.video, videoName, shortUUID)
-    } else {
-      expect(notification).to.satisfy((n: UserNotification) => {
-        return n === undefined || n.abuse === undefined || n.abuse.comment.video.shortUUID !== shortUUID
-      })
-    }
-  }
-
-  function emailNotificationFinder (email: object) {
-    const text = email['text']
-    return text.indexOf(shortUUID) !== -1 && text.indexOf('abuse') !== -1
-  }
-
-  await checkNotification({ ...options, notificationChecker, emailNotificationFinder })
-}
-
-async function checkNewAccountAbuseForModerators (options: CheckerBaseParams & {
-  displayName: string
-  checkType: CheckerType
-}) {
-  const { displayName } = options
-  const notificationType = UserNotificationType.NEW_ABUSE_FOR_MODERATORS
-
-  function notificationChecker (notification: UserNotification, checkType: CheckerType) {
-    if (checkType === 'presence') {
-      expect(notification).to.not.be.undefined
-      expect(notification.type).to.equal(notificationType)
-
-      expect(notification.abuse.id).to.be.a('number')
-      expect(notification.abuse.account.displayName).to.equal(displayName)
-    } else {
-      expect(notification).to.satisfy((n: UserNotification) => {
-        return n === undefined || n.abuse === undefined || n.abuse.account.displayName !== displayName
-      })
-    }
-  }
-
-  function emailNotificationFinder (email: object) {
-    const text = email['text']
-    return text.indexOf(displayName) !== -1 && text.indexOf('abuse') !== -1
-  }
-
-  await checkNotification({ ...options, notificationChecker, emailNotificationFinder })
-}
-
-async function checkVideoAutoBlacklistForModerators (options: CheckerBaseParams & {
-  shortUUID: string
-  videoName: string
-  checkType: CheckerType
-}) {
-  const { shortUUID, videoName } = options
-  const notificationType = UserNotificationType.VIDEO_AUTO_BLACKLIST_FOR_MODERATORS
-
-  function notificationChecker (notification: UserNotification, checkType: CheckerType) {
-    if (checkType === 'presence') {
-      expect(notification).to.not.be.undefined
-      expect(notification.type).to.equal(notificationType)
-
-      expect(notification.videoBlacklist.video.id).to.be.a('number')
-      checkVideo(notification.videoBlacklist.video, videoName, shortUUID)
-    } else {
-      expect(notification).to.satisfy((n: UserNotification) => {
-        return n === undefined || n.video === undefined || n.video.shortUUID !== shortUUID
-      })
-    }
-  }
-
-  function emailNotificationFinder (email: object) {
-    const text = email['text']
-    return text.indexOf(shortUUID) !== -1 && email['text'].indexOf('video-auto-blacklist/list') !== -1
-  }
-
-  await checkNotification({ ...options, notificationChecker, emailNotificationFinder })
-}
-
-async function checkNewBlacklistOnMyVideo (options: CheckerBaseParams & {
-  shortUUID: string
-  videoName: string
-  blacklistType: 'blacklist' | 'unblacklist'
-}) {
-  const { videoName, shortUUID, blacklistType } = options
-  const notificationType = blacklistType === 'blacklist'
-    ? UserNotificationType.BLACKLIST_ON_MY_VIDEO
-    : UserNotificationType.UNBLACKLIST_ON_MY_VIDEO
-
-  function notificationChecker (notification: UserNotification) {
-    expect(notification).to.not.be.undefined
-    expect(notification.type).to.equal(notificationType)
-
-    const video = blacklistType === 'blacklist' ? notification.videoBlacklist.video : notification.video
-
-    checkVideo(video, videoName, shortUUID)
-  }
-
-  function emailNotificationFinder (email: object) {
-    const text = email['text']
-    const blacklistText = blacklistType === 'blacklist'
-      ? 'blacklisted'
-      : 'unblacklisted'
-
-    return text.includes(shortUUID) && text.includes(blacklistText)
-  }
-
-  await checkNotification({ ...options, notificationChecker, emailNotificationFinder, checkType: 'presence' })
-}
-
-async function checkNewPeerTubeVersion (options: CheckerBaseParams & {
-  latestVersion: string
-  checkType: CheckerType
-}) {
-  const { latestVersion } = options
-  const notificationType = UserNotificationType.NEW_PEERTUBE_VERSION
-
-  function notificationChecker (notification: UserNotification, checkType: CheckerType) {
-    if (checkType === 'presence') {
-      expect(notification).to.not.be.undefined
-      expect(notification.type).to.equal(notificationType)
-
-      expect(notification.peertube).to.exist
-      expect(notification.peertube.latestVersion).to.equal(latestVersion)
-    } else {
-      expect(notification).to.satisfy((n: UserNotification) => {
-        return n === undefined || n.peertube === undefined || n.peertube.latestVersion !== latestVersion
-      })
-    }
-  }
-
-  function emailNotificationFinder (email: object) {
-    const text = email['text']
-
-    return text.includes(latestVersion)
-  }
-
-  await checkNotification({ ...options, notificationChecker, emailNotificationFinder })
-}
-
-async function checkNewPluginVersion (options: CheckerBaseParams & {
-  pluginType: PluginType
-  pluginName: string
-  checkType: CheckerType
-}) {
-  const { pluginName, pluginType } = options
-  const notificationType = UserNotificationType.NEW_PLUGIN_VERSION
-
-  function notificationChecker (notification: UserNotification, checkType: CheckerType) {
-    if (checkType === 'presence') {
-      expect(notification).to.not.be.undefined
-      expect(notification.type).to.equal(notificationType)
-
-      expect(notification.plugin.name).to.equal(pluginName)
-      expect(notification.plugin.type).to.equal(pluginType)
-    } else {
-      expect(notification).to.satisfy((n: UserNotification) => {
-        return n === undefined || n.plugin === undefined || n.plugin.name !== pluginName
-      })
-    }
-  }
-
-  function emailNotificationFinder (email: object) {
-    const text = email['text']
-
-    return text.includes(pluginName)
-  }
-
-  await checkNotification({ ...options, notificationChecker, emailNotificationFinder })
-}
-
-async function prepareNotificationsTest (serversCount = 3, overrideConfigArg: any = {}) {
-  const userNotifications: UserNotification[] = []
-  const adminNotifications: UserNotification[] = []
-  const adminNotificationsServer2: UserNotification[] = []
-  const emails: object[] = []
-
-  const port = await MockSmtpServer.Instance.collectEmails(emails)
-
-  const overrideConfig = {
-    smtp: {
-      hostname: 'localhost',
-      port
-    },
-    signup: {
-      limit: 20
-    }
-  }
-  const servers = await createMultipleServers(serversCount, Object.assign(overrideConfig, overrideConfigArg))
-
-  await setAccessTokensToServers(servers)
-
-  if (serversCount > 1) {
-    await doubleFollow(servers[0], servers[1])
-  }
-
-  const user = { username: 'user_1', password: 'super password' }
-  await servers[0].users.create({ ...user, videoQuota: 10 * 1000 * 1000 })
-  const userAccessToken = await servers[0].login.getAccessToken(user)
-
-  await servers[0].notifications.updateMySettings({ token: userAccessToken, settings: getAllNotificationsSettings() })
-  await servers[0].notifications.updateMySettings({ settings: getAllNotificationsSettings() })
-
-  if (serversCount > 1) {
-    await servers[1].notifications.updateMySettings({ settings: getAllNotificationsSettings() })
-  }
-
-  {
-    const socket = servers[0].socketIO.getUserNotificationSocket({ token: userAccessToken })
-    socket.on('new-notification', n => userNotifications.push(n))
-  }
-  {
-    const socket = servers[0].socketIO.getUserNotificationSocket()
-    socket.on('new-notification', n => adminNotifications.push(n))
-  }
-
-  if (serversCount > 1) {
-    const socket = servers[1].socketIO.getUserNotificationSocket()
-    socket.on('new-notification', n => adminNotificationsServer2.push(n))
-  }
-
-  const { videoChannels } = await servers[0].users.getMyInfo()
-  const channelId = videoChannels[0].id
-
-  return {
-    userNotifications,
-    adminNotifications,
-    adminNotificationsServer2,
-    userAccessToken,
-    emails,
-    servers,
-    channelId
-  }
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  getAllNotificationsSettings,
-
-  CheckerBaseParams,
-  CheckerType,
-  checkMyVideoImportIsFinished,
-  checkUserRegistered,
-  checkAutoInstanceFollowing,
-  checkVideoIsPublished,
-  checkNewVideoFromSubscription,
-  checkNewActorFollow,
-  checkNewCommentOnMyVideo,
-  checkNewBlacklistOnMyVideo,
-  checkCommentMention,
-  checkNewVideoAbuseForModerators,
-  checkVideoAutoBlacklistForModerators,
-  checkNewAbuseMessage,
-  checkAbuseStateChange,
-  checkNewInstanceFollower,
-  prepareNotificationsTest,
-  checkNewCommentAbuseForModerators,
-  checkNewAccountAbuseForModerators,
-  checkNewPeerTubeVersion,
-  checkNewPluginVersion
-}
-
-// ---------------------------------------------------------------------------
-
-async function checkNotification (options: CheckerBaseParams & {
-  notificationChecker: (notification: UserNotification, checkType: CheckerType) => void
-  emailNotificationFinder: (email: object) => boolean
-  checkType: CheckerType
-}) {
-  const { server, token, checkType, notificationChecker, emailNotificationFinder, socketNotifications, emails } = options
-
-  const check = options.check || { web: true, mail: true }
-
-  if (check.web) {
-    const notification = await server.notifications.getLatest({ token: token })
-
-    if (notification || checkType !== 'absence') {
-      notificationChecker(notification, checkType)
-    }
-
-    const socketNotification = socketNotifications.find(n => {
-      try {
-        notificationChecker(n, 'presence')
-        return true
-      } catch {
-        return false
-      }
-    })
-
-    if (checkType === 'presence') {
-      const obj = inspect(socketNotifications, { depth: 5 })
-      expect(socketNotification, 'The socket notification is absent when it should be present. ' + obj).to.not.be.undefined
-    } else {
-      const obj = inspect(socketNotification, { depth: 5 })
-      expect(socketNotification, 'The socket notification is present when it should not be present. ' + obj).to.be.undefined
-    }
-  }
-
-  if (check.mail) {
-    // Last email
-    const email = emails
-                      .slice()
-                      .reverse()
-                      .find(e => emailNotificationFinder(e))
-
-    if (checkType === 'presence') {
-      const texts = emails.map(e => e.text)
-      expect(email, 'The email is absent when is should be present. ' + inspect(texts)).to.not.be.undefined
-    } else {
-      expect(email, 'The email is present when is should not be present. ' + inspect(email)).to.be.undefined
-    }
-  }
-}
-
-function checkVideo (video: any, videoName?: string, shortUUID?: string) {
-  if (videoName) {
-    expect(video.name).to.be.a('string')
-    expect(video.name).to.not.be.empty
-    expect(video.name).to.equal(videoName)
-  }
-
-  if (shortUUID) {
-    expect(video.shortUUID).to.be.a('string')
-    expect(video.shortUUID).to.not.be.empty
-    expect(video.shortUUID).to.equal(shortUUID)
-  }
-
-  expect(video.id).to.be.a('number')
-}
-
-function checkActor (actor: any) {
-  expect(actor.displayName).to.be.a('string')
-  expect(actor.displayName).to.not.be.empty
-  expect(actor.host).to.not.be.undefined
-}
-
-function checkComment (comment: any, commentId: number, threadId: number) {
-  expect(comment.id).to.equal(commentId)
-  expect(comment.threadId).to.equal(threadId)
-}
diff --git a/shared/extra-utils/uuid.ts b/shared/extra-utils/uuid.ts
new file mode 100644
index 000000000..f3c80e046
--- /dev/null
+++ b/shared/extra-utils/uuid.ts
@@ -0,0 +1,32 @@
+import short, { uuid } from 'short-uuid'
+
+const translator = short()
+
+function buildUUID () {
+  return uuid()
+}
+
+function uuidToShort (uuid: string) {
+  if (!uuid) return uuid
+
+  return translator.fromUUID(uuid)
+}
+
+function shortToUUID (shortUUID: string) {
+  if (!shortUUID) return shortUUID
+
+  return translator.toUUID(shortUUID)
+}
+
+function isShortUUID (value: string) {
+  if (!value) return false
+
+  return value.length === translator.maxLength
+}
+
+export {
+  buildUUID,
+  uuidToShort,
+  shortToUUID,
+  isShortUUID
+}
diff --git a/shared/extra-utils/videos/captions.ts b/shared/extra-utils/videos/captions.ts
deleted file mode 100644
index 35e722408..000000000
--- a/shared/extra-utils/videos/captions.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { expect } from 'chai'
-import request from 'supertest'
-import { HttpStatusCode } from '@shared/models'
-
-async function testCaptionFile (url: string, captionPath: string, toTest: RegExp | string) {
-  const res = await request(url)
-    .get(captionPath)
-    .expect(HttpStatusCode.OK_200)
-
-  if (toTest instanceof RegExp) {
-    expect(res.text).to.match(toTest)
-  } else {
-    expect(res.text).to.contain(toTest)
-  }
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  testCaptionFile
-}
diff --git a/shared/extra-utils/videos/playlists.ts b/shared/extra-utils/videos/playlists.ts
deleted file mode 100644
index 3dde52bb9..000000000
--- a/shared/extra-utils/videos/playlists.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { expect } from 'chai'
-import { readdir } from 'fs-extra'
-import { join } from 'path'
-import { root } from '../miscs'
-
-async function checkPlaylistFilesWereRemoved (
-  playlistUUID: string,
-  internalServerNumber: number,
-  directories = [ 'thumbnails' ]
-) {
-  const testDirectory = 'test' + internalServerNumber
-
-  for (const directory of directories) {
-    const directoryPath = join(root(), testDirectory, directory)
-
-    const files = await readdir(directoryPath)
-    for (const file of files) {
-      expect(file).to.not.contain(playlistUUID)
-    }
-  }
-}
-
-export {
-  checkPlaylistFilesWereRemoved
-}
diff --git a/shared/extra-utils/videos/streaming-playlists.ts b/shared/extra-utils/videos/streaming-playlists.ts
deleted file mode 100644
index 6671e3fa6..000000000
--- a/shared/extra-utils/videos/streaming-playlists.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { expect } from 'chai'
-import { basename } from 'path'
-import { sha256 } from '@server/helpers/core-utils'
-import { removeFragmentedMP4Ext } from '@shared/core-utils'
-import { HttpStatusCode, VideoStreamingPlaylist } from '@shared/models'
-import { PeerTubeServer } from '../server'
-
-async function checkSegmentHash (options: {
-  server: PeerTubeServer
-  baseUrlPlaylist: string
-  baseUrlSegment: string
-  resolution: number
-  hlsPlaylist: VideoStreamingPlaylist
-}) {
-  const { server, baseUrlPlaylist, baseUrlSegment, resolution, hlsPlaylist } = options
-  const command = server.streamingPlaylists
-
-  const file = hlsPlaylist.files.find(f => f.resolution.id === resolution)
-  const videoName = basename(file.fileUrl)
-
-  const playlist = await command.get({ url: `${baseUrlPlaylist}/${removeFragmentedMP4Ext(videoName)}.m3u8` })
-
-  const matches = /#EXT-X-BYTERANGE:(\d+)@(\d+)/.exec(playlist)
-
-  const length = parseInt(matches[1], 10)
-  const offset = parseInt(matches[2], 10)
-  const range = `${offset}-${offset + length - 1}`
-
-  const segmentBody = await command.getSegment({
-    url: `${baseUrlSegment}/${videoName}`,
-    expectedStatus: HttpStatusCode.PARTIAL_CONTENT_206,
-    range: `bytes=${range}`
-  })
-
-  const shaBody = await command.getSegmentSha256({ url: hlsPlaylist.segmentsSha256Url })
-  expect(sha256(segmentBody)).to.equal(shaBody[videoName][range])
-}
-
-async function checkLiveSegmentHash (options: {
-  server: PeerTubeServer
-  baseUrlSegment: string
-  videoUUID: string
-  segmentName: string
-  hlsPlaylist: VideoStreamingPlaylist
-}) {
-  const { server, baseUrlSegment, videoUUID, segmentName, hlsPlaylist } = options
-  const command = server.streamingPlaylists
-
-  const segmentBody = await command.getSegment({ url: `${baseUrlSegment}/${videoUUID}/${segmentName}` })
-  const shaBody = await command.getSegmentSha256({ url: hlsPlaylist.segmentsSha256Url })
-
-  expect(sha256(segmentBody)).to.equal(shaBody[segmentName])
-}
-
-async function checkResolutionsInMasterPlaylist (options: {
-  server: PeerTubeServer
-  playlistUrl: string
-  resolutions: number[]
-}) {
-  const { server, playlistUrl, resolutions } = options
-
-  const masterPlaylist = await server.streamingPlaylists.get({ url: playlistUrl })
-
-  for (const resolution of resolutions) {
-    const reg = new RegExp(
-      '#EXT-X-STREAM-INF:BANDWIDTH=\\d+,RESOLUTION=\\d+x' + resolution + ',(FRAME-RATE=\\d+,)?CODECS="avc1.64001f,mp4a.40.2"'
-    )
-
-    expect(masterPlaylist).to.match(reg)
-  }
-}
-
-export {
-  checkSegmentHash,
-  checkLiveSegmentHash,
-  checkResolutionsInMasterPlaylist
-}
diff --git a/shared/extra-utils/videos/videos.ts b/shared/extra-utils/videos/videos.ts
deleted file mode 100644
index 4d2784dde..000000000
--- a/shared/extra-utils/videos/videos.ts
+++ /dev/null
@@ -1,253 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/no-floating-promises */
-
-import { expect } from 'chai'
-import { pathExists, readdir } from 'fs-extra'
-import { basename, join } from 'path'
-import { getLowercaseExtension } from '@server/helpers/core-utils'
-import { uuidRegex } from '@shared/core-utils'
-import { HttpStatusCode, VideoCaption, VideoDetails } from '@shared/models'
-import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../server/initializers/constants'
-import { dateIsValid, testImage, webtorrentAdd } from '../miscs'
-import { makeRawRequest } from '../requests/requests'
-import { waitJobs } from '../server'
-import { PeerTubeServer } from '../server/server'
-import { VideoEdit } from './videos-command'
-
-async function checkVideoFilesWereRemoved (options: {
-  server: PeerTubeServer
-  video: VideoDetails
-  captions?: VideoCaption[]
-  onlyVideoFiles?: boolean // default false
-}) {
-  const { video, server, captions = [], onlyVideoFiles = false } = options
-
-  const webtorrentFiles = video.files || []
-  const hlsFiles = video.streamingPlaylists[0]?.files || []
-
-  const thumbnailName = basename(video.thumbnailPath)
-  const previewName = basename(video.previewPath)
-
-  const torrentNames = webtorrentFiles.concat(hlsFiles).map(f => basename(f.torrentUrl))
-
-  const captionNames = captions.map(c => basename(c.captionPath))
-
-  const webtorrentFilenames = webtorrentFiles.map(f => basename(f.fileUrl))
-  const hlsFilenames = hlsFiles.map(f => basename(f.fileUrl))
-
-  let directories: { [ directory: string ]: string[] } = {
-    videos: webtorrentFilenames,
-    redundancy: webtorrentFilenames,
-    [join('playlists', 'hls')]: hlsFilenames,
-    [join('redundancy', 'hls')]: hlsFilenames
-  }
-
-  if (onlyVideoFiles !== true) {
-    directories = {
-      ...directories,
-
-      thumbnails: [ thumbnailName ],
-      previews: [ previewName ],
-      torrents: torrentNames,
-      captions: captionNames
-    }
-  }
-
-  for (const directory of Object.keys(directories)) {
-    const directoryPath = server.servers.buildDirectory(directory)
-
-    const directoryExists = await pathExists(directoryPath)
-    if (directoryExists === false) continue
-
-    const existingFiles = await readdir(directoryPath)
-    for (const existingFile of existingFiles) {
-      for (const shouldNotExist of directories[directory]) {
-        expect(existingFile, `File ${existingFile} should not exist in ${directoryPath}`).to.not.contain(shouldNotExist)
-      }
-    }
-  }
-}
-
-async function saveVideoInServers (servers: PeerTubeServer[], uuid: string) {
-  for (const server of servers) {
-    server.store.videoDetails = await server.videos.get({ id: uuid })
-  }
-}
-
-function checkUploadVideoParam (
-  server: PeerTubeServer,
-  token: string,
-  attributes: Partial<VideoEdit>,
-  expectedStatus = HttpStatusCode.OK_200,
-  mode: 'legacy' | 'resumable' = 'legacy'
-) {
-  return mode === 'legacy'
-    ? server.videos.buildLegacyUpload({ token, attributes, expectedStatus })
-    : server.videos.buildResumeUpload({ token, attributes, expectedStatus })
-}
-
-async function completeVideoCheck (
-  server: PeerTubeServer,
-  video: any,
-  attributes: {
-    name: string
-    category: number
-    licence: number
-    language: string
-    nsfw: boolean
-    commentsEnabled: boolean
-    downloadEnabled: boolean
-    description: string
-    publishedAt?: string
-    support: string
-    originallyPublishedAt?: string
-    account: {
-      name: string
-      host: string
-    }
-    isLocal: boolean
-    tags: string[]
-    privacy: number
-    likes?: number
-    dislikes?: number
-    duration: number
-    channel: {
-      displayName: string
-      name: string
-      description: string
-      isLocal: boolean
-    }
-    fixture: string
-    files: {
-      resolution: number
-      size: number
-    }[]
-    thumbnailfile?: string
-    previewfile?: string
-  }
-) {
-  if (!attributes.likes) attributes.likes = 0
-  if (!attributes.dislikes) attributes.dislikes = 0
-
-  const host = new URL(server.url).host
-  const originHost = attributes.account.host
-
-  expect(video.name).to.equal(attributes.name)
-  expect(video.category.id).to.equal(attributes.category)
-  expect(video.category.label).to.equal(attributes.category !== null ? VIDEO_CATEGORIES[attributes.category] : 'Misc')
-  expect(video.licence.id).to.equal(attributes.licence)
-  expect(video.licence.label).to.equal(attributes.licence !== null ? VIDEO_LICENCES[attributes.licence] : 'Unknown')
-  expect(video.language.id).to.equal(attributes.language)
-  expect(video.language.label).to.equal(attributes.language !== null ? VIDEO_LANGUAGES[attributes.language] : 'Unknown')
-  expect(video.privacy.id).to.deep.equal(attributes.privacy)
-  expect(video.privacy.label).to.deep.equal(VIDEO_PRIVACIES[attributes.privacy])
-  expect(video.nsfw).to.equal(attributes.nsfw)
-  expect(video.description).to.equal(attributes.description)
-  expect(video.account.id).to.be.a('number')
-  expect(video.account.host).to.equal(attributes.account.host)
-  expect(video.account.name).to.equal(attributes.account.name)
-  expect(video.channel.displayName).to.equal(attributes.channel.displayName)
-  expect(video.channel.name).to.equal(attributes.channel.name)
-  expect(video.likes).to.equal(attributes.likes)
-  expect(video.dislikes).to.equal(attributes.dislikes)
-  expect(video.isLocal).to.equal(attributes.isLocal)
-  expect(video.duration).to.equal(attributes.duration)
-  expect(video.url).to.contain(originHost)
-  expect(dateIsValid(video.createdAt)).to.be.true
-  expect(dateIsValid(video.publishedAt)).to.be.true
-  expect(dateIsValid(video.updatedAt)).to.be.true
-
-  if (attributes.publishedAt) {
-    expect(video.publishedAt).to.equal(attributes.publishedAt)
-  }
-
-  if (attributes.originallyPublishedAt) {
-    expect(video.originallyPublishedAt).to.equal(attributes.originallyPublishedAt)
-  } else {
-    expect(video.originallyPublishedAt).to.be.null
-  }
-
-  const videoDetails = await server.videos.get({ id: video.uuid })
-
-  expect(videoDetails.files).to.have.lengthOf(attributes.files.length)
-  expect(videoDetails.tags).to.deep.equal(attributes.tags)
-  expect(videoDetails.account.name).to.equal(attributes.account.name)
-  expect(videoDetails.account.host).to.equal(attributes.account.host)
-  expect(video.channel.displayName).to.equal(attributes.channel.displayName)
-  expect(video.channel.name).to.equal(attributes.channel.name)
-  expect(videoDetails.channel.host).to.equal(attributes.account.host)
-  expect(videoDetails.channel.isLocal).to.equal(attributes.channel.isLocal)
-  expect(dateIsValid(videoDetails.channel.createdAt.toString())).to.be.true
-  expect(dateIsValid(videoDetails.channel.updatedAt.toString())).to.be.true
-  expect(videoDetails.commentsEnabled).to.equal(attributes.commentsEnabled)
-  expect(videoDetails.downloadEnabled).to.equal(attributes.downloadEnabled)
-
-  for (const attributeFile of attributes.files) {
-    const file = videoDetails.files.find(f => f.resolution.id === attributeFile.resolution)
-    expect(file).not.to.be.undefined
-
-    let extension = getLowercaseExtension(attributes.fixture)
-    // Transcoding enabled: extension will always be .mp4
-    if (attributes.files.length > 1) extension = '.mp4'
-
-    expect(file.magnetUri).to.have.lengthOf.above(2)
-
-    expect(file.torrentDownloadUrl).to.match(new RegExp(`http://${host}/download/torrents/${uuidRegex}-${file.resolution.id}.torrent`))
-    expect(file.torrentUrl).to.match(new RegExp(`http://${host}/lazy-static/torrents/${uuidRegex}-${file.resolution.id}.torrent`))
-
-    expect(file.fileUrl).to.match(new RegExp(`http://${originHost}/static/webseed/${uuidRegex}-${file.resolution.id}${extension}`))
-    expect(file.fileDownloadUrl).to.match(new RegExp(`http://${originHost}/download/videos/${uuidRegex}-${file.resolution.id}${extension}`))
-
-    await Promise.all([
-      makeRawRequest(file.torrentUrl, 200),
-      makeRawRequest(file.torrentDownloadUrl, 200),
-      makeRawRequest(file.metadataUrl, 200)
-    ])
-
-    expect(file.resolution.id).to.equal(attributeFile.resolution)
-    expect(file.resolution.label).to.equal(attributeFile.resolution + 'p')
-
-    const minSize = attributeFile.size - ((10 * attributeFile.size) / 100)
-    const maxSize = attributeFile.size + ((10 * attributeFile.size) / 100)
-    expect(
-      file.size,
-      'File size for resolution ' + file.resolution.label + ' outside confidence interval (' + minSize + '> size <' + maxSize + ')'
-    ).to.be.above(minSize).and.below(maxSize)
-
-    const torrent = await webtorrentAdd(file.magnetUri, true)
-    expect(torrent.files).to.be.an('array')
-    expect(torrent.files.length).to.equal(1)
-    expect(torrent.files[0].path).to.exist.and.to.not.equal('')
-  }
-
-  expect(videoDetails.thumbnailPath).to.exist
-  await testImage(server.url, attributes.thumbnailfile || attributes.fixture, videoDetails.thumbnailPath)
-
-  if (attributes.previewfile) {
-    expect(videoDetails.previewPath).to.exist
-    await testImage(server.url, attributes.previewfile, videoDetails.previewPath)
-  }
-}
-
-// serverNumber starts from 1
-async function uploadRandomVideoOnServers (
-  servers: PeerTubeServer[],
-  serverNumber: number,
-  additionalParams?: VideoEdit & { prefixName?: string }
-) {
-  const server = servers.find(s => s.serverNumber === serverNumber)
-  const res = await server.videos.randomUpload({ wait: false, additionalParams })
-
-  await waitJobs(servers)
-
-  return res
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  checkUploadVideoParam,
-  completeVideoCheck,
-  uploadRandomVideoOnServers,
-  checkVideoFilesWereRemoved,
-  saveVideoInServers
-}
diff --git a/shared/index.ts b/shared/index.ts
deleted file mode 100644
index ad200c539..000000000
--- a/shared/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './models'
diff --git a/shared/models/http/http-error-codes.ts b/shared/models/http/http-error-codes.ts
index b2fbdfc5a..5ebff1cb5 100644
--- a/shared/models/http/http-error-codes.ts
+++ b/shared/models/http/http-error-codes.ts
@@ -4,7 +4,7 @@
  *
  * WebDAV and other codes useless with regards to PeerTube are not listed.
  */
-export enum HttpStatusCode {
+export const enum HttpStatusCode {
 
   /**
    * Official Documentation @ https://tools.ietf.org/html/rfc7231#section-6.2.1
diff --git a/shared/models/http/http-methods.ts b/shared/models/http/http-methods.ts
index 1cfa458b9..3f4adafe2 100644
--- a/shared/models/http/http-methods.ts
+++ b/shared/models/http/http-methods.ts
@@ -1,5 +1,5 @@
 /** HTTP request method to indicate the desired action to be performed for a given resource. */
-export enum HttpMethod {
+export const enum HttpMethod {
   /** The CONNECT method establishes a tunnel to the server identified by the target resource. */
   CONNECT = 'CONNECT',
   /** The DELETE method deletes the specified resource. */
diff --git a/shared/models/moderation/block-status.model.ts b/shared/models/moderation/block-status.model.ts
new file mode 100644
index 000000000..597312757
--- /dev/null
+++ b/shared/models/moderation/block-status.model.ts
@@ -0,0 +1,15 @@
+export interface BlockStatus {
+  accounts: {
+    [ handle: string ]: {
+      blockedByServer: boolean
+      blockedByUser?: boolean
+    }
+  }
+
+  hosts: {
+    [ host: string ]: {
+      blockedByServer: boolean
+      blockedByUser?: boolean
+    }
+  }
+}
diff --git a/shared/models/moderation/index.ts b/shared/models/moderation/index.ts
index 8b6042e97..f8e6d351c 100644
--- a/shared/models/moderation/index.ts
+++ b/shared/models/moderation/index.ts
@@ -1,3 +1,4 @@
 export * from './abuse'
+export * from './block-status.model'
 export * from './account-block.model'
 export * from './server-block.model'
diff --git a/shared/models/plugins/client/index.ts b/shared/models/plugins/client/index.ts
index c500185c9..f3e3fcbcf 100644
--- a/shared/models/plugins/client/index.ts
+++ b/shared/models/plugins/client/index.ts
@@ -4,4 +4,5 @@ export * from './plugin-element-placeholder.type'
 export * from './plugin-selector-id.type'
 export * from './register-client-form-field.model'
 export * from './register-client-hook.model'
+export * from './register-client-route.model'
 export * from './register-client-settings-script.model'
diff --git a/shared/models/plugins/client/plugin-selector-id.type.ts b/shared/models/plugins/client/plugin-selector-id.type.ts
index b74dffbef..8d23314b5 100644
--- a/shared/models/plugins/client/plugin-selector-id.type.ts
+++ b/shared/models/plugins/client/plugin-selector-id.type.ts
@@ -1 +1,10 @@
-export type PluginSelectorId = 'login-form'
+export type PluginSelectorId =
+  'login-form' |
+  'menu-user-dropdown-language-item' |
+  'about-instance-features' |
+  'about-instance-statistics' |
+  'about-instance-moderation' |
+  'about-menu-instance' |
+  'about-menu-peertube' |
+  'about-menu-network' |
+  'about-instance-other-information'
diff --git a/shared/models/plugins/client/register-client-form-field.model.ts b/shared/models/plugins/client/register-client-form-field.model.ts
index 2df071337..153c4a6ea 100644
--- a/shared/models/plugins/client/register-client-form-field.model.ts
+++ b/shared/models/plugins/client/register-client-form-field.model.ts
@@ -16,8 +16,15 @@ export type RegisterClientFormFieldOptions = {
 
   // Not supported by plugin setting registration, use registerSettingsScript instead
   hidden?: (options: any) => boolean
+
+  // Return undefined | null if there is no error or return a string with the detailed error
+  // Not supported by plugin setting registration
+  error?: (options: any) => Promise<{ error: boolean, text?: string }>
 }
 
 export interface RegisterClientVideoFieldOptions {
   type: 'update' | 'upload' | 'import-url' | 'import-torrent' | 'go-live'
+
+  // Default to 'plugin-settings'
+  tab?: 'main' | 'plugin-settings'
 }
diff --git a/shared/models/plugins/client/register-client-route.model.ts b/shared/models/plugins/client/register-client-route.model.ts
new file mode 100644
index 000000000..271b67834
--- /dev/null
+++ b/shared/models/plugins/client/register-client-route.model.ts
@@ -0,0 +1,7 @@
+export interface RegisterClientRouteOptions {
+  route: string
+
+  onMount (options: {
+    rootEl: HTMLElement
+  }): void
+}
diff --git a/shared/models/plugins/client/register-client-settings-script.model.ts b/shared/models/plugins/client/register-client-settings-script.model.ts
index 481ceef96..117ca4739 100644
--- a/shared/models/plugins/client/register-client-settings-script.model.ts
+++ b/shared/models/plugins/client/register-client-settings-script.model.ts
@@ -1,6 +1,6 @@
 import { RegisterServerSettingOptions } from '../server'
 
-export interface RegisterClientSettingsScript {
+export interface RegisterClientSettingsScriptOptions {
   isSettingHidden (options: {
     setting: RegisterServerSettingOptions
     formValues: { [name: string]: any }
diff --git a/shared/models/plugins/plugin-index/peertube-plugin-index.model.ts b/shared/models/plugins/plugin-index/peertube-plugin-index.model.ts
index e91c8b4dc..36dfef943 100644
--- a/shared/models/plugins/plugin-index/peertube-plugin-index.model.ts
+++ b/shared/models/plugins/plugin-index/peertube-plugin-index.model.ts
@@ -9,6 +9,8 @@ export interface PeerTubePluginIndex {
 
   latestVersion: string
 
+  official: boolean
+
   name?: string
   installed?: boolean
 }
diff --git a/shared/models/plugins/plugin-package-json.model.ts b/shared/models/plugins/plugin-package-json.model.ts
index b2f92af80..7ce968ff2 100644
--- a/shared/models/plugins/plugin-package-json.model.ts
+++ b/shared/models/plugins/plugin-package-json.model.ts
@@ -1,15 +1,15 @@
 import { PluginClientScope } from './client/plugin-client-scope.type'
 
-export type PluginTranslationPaths = {
+export type PluginTranslationPathsJSON = {
   [ locale: string ]: string
 }
 
-export type ClientScript = {
+export type ClientScriptJSON = {
   script: string
   scopes: PluginClientScope[]
 }
 
-export type PluginPackageJson = {
+export type PluginPackageJSON = {
   name: string
   version: string
   description: string
@@ -23,7 +23,7 @@ export type PluginPackageJson = {
   staticDirs: { [ name: string ]: string }
   css: string[]
 
-  clientScripts: ClientScript[]
+  clientScripts: ClientScriptJSON[]
 
-  translations: PluginTranslationPaths
+  translations: PluginTranslationPathsJSON
 }
diff --git a/shared/models/plugins/plugin.type.ts b/shared/models/plugins/plugin.type.ts
index b6766821a..016219ceb 100644
--- a/shared/models/plugins/plugin.type.ts
+++ b/shared/models/plugins/plugin.type.ts
@@ -1,4 +1,4 @@
-export enum PluginType {
+export const enum PluginType {
   PLUGIN = 1,
   THEME = 2
 }
diff --git a/shared/models/plugins/server/api/install-plugin.model.ts b/shared/models/plugins/server/api/install-plugin.model.ts
index 5a268ebe1..a1d009a00 100644
--- a/shared/models/plugins/server/api/install-plugin.model.ts
+++ b/shared/models/plugins/server/api/install-plugin.model.ts
@@ -1,4 +1,5 @@
 export interface InstallOrUpdatePlugin {
   npmName?: string
+  pluginVersion?: string
   path?: string
 }
diff --git a/shared/models/plugins/server/server-hook.model.ts b/shared/models/plugins/server/server-hook.model.ts
index 3ab910197..bd2b27da5 100644
--- a/shared/models/plugins/server/server-hook.model.ts
+++ b/shared/models/plugins/server/server-hook.model.ts
@@ -53,6 +53,12 @@ export const serverFilterHookObject = {
   'filter:api.video-thread.create.accept.result': true,
   'filter:api.video-comment-reply.create.accept.result': true,
 
+  // Filter attributes when creating video object
+  'filter:api.video.upload.video-attribute.result': true,
+  'filter:api.video.import-url.video-attribute.result': true,
+  'filter:api.video.import-torrent.video-attribute.result': true,
+  'filter:api.video.live.video-attribute.result': true,
+
   // Filter params/result used to list threads of a specific video
   // (used by the video watch page)
   'filter:api.video-threads.list.params': true,
@@ -63,6 +69,9 @@ export const serverFilterHookObject = {
   'filter:api.video-thread-comments.list.params': true,
   'filter:api.video-thread-comments.list.result': true,
 
+  // Filter get stats result
+  'filter:api.server.stats.get.result': true,
+
   // Filter result used to check if we need to auto blacklist a video
   // (fired when a local or remote video is created or updated)
   'filter:video.auto-blacklist.result': true,
@@ -106,6 +115,11 @@ export const serverActionHookObject = {
   // Fired when a comment (thread or reply) is deleted
   'action:api.video-comment.deleted': true,
 
+  // Fired when a caption is created
+  'action:api.video-caption.created': true,
+  // Fired when a caption is deleted
+  'action:api.video-caption.deleted': true,
+
   // Fired when a user is blocked (banned)
   'action:api.user.blocked': true,
   // Fired when a user is unblocked (unbanned)
diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts
index 3ed932494..52d3d9588 100644
--- a/shared/models/server/custom-config.model.ts
+++ b/shared/models/server/custom-config.model.ts
@@ -52,6 +52,20 @@ export interface CustomConfig {
     }
   }
 
+  client: {
+    videos: {
+      miniature: {
+        preferAuthorDisplayName: boolean
+      }
+    }
+
+    menu: {
+      login: {
+        redirectOnSingleExternalAuth: boolean
+      }
+    }
+  }
+
   cache: {
     previews: {
       size: number
diff --git a/shared/models/server/job.model.ts b/shared/models/server/job.model.ts
index ecc960da5..8a69d11fa 100644
--- a/shared/models/server/job.model.ts
+++ b/shared/models/server/job.model.ts
@@ -103,18 +103,23 @@ interface BaseTranscodingPayload {
 
 export interface HLSTranscodingPayload extends BaseTranscodingPayload {
   type: 'new-resolution-to-hls'
-  isPortraitMode?: boolean
   resolution: VideoResolution
   copyCodecs: boolean
 
+  hasAudio: boolean
+  isPortraitMode?: boolean
+
   autoDeleteWebTorrentIfNeeded: boolean
   isMaxQuality: boolean
 }
 
 export interface NewResolutionTranscodingPayload extends BaseTranscodingPayload {
   type: 'new-resolution-to-webtorrent'
-  isPortraitMode?: boolean
   resolution: VideoResolution
+
+  hasAudio: boolean
+
+  isPortraitMode?: boolean
 }
 
 export interface MergeAudioTranscodingPayload extends BaseTranscodingPayload {
diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts
index e75eefd47..32be96b9d 100644
--- a/shared/models/server/server-config.model.ts
+++ b/shared/models/server/server-config.model.ts
@@ -1,12 +1,14 @@
-import { ClientScript } from '../plugins/plugin-package-json.model'
+import { VideoPrivacy } from '../videos/video-privacy.enum'
+import { ClientScriptJSON } from '../plugins/plugin-package-json.model'
 import { NSFWPolicyType } from '../videos/nsfw-policy.type'
 import { BroadcastMessageLevel } from './broadcast-message-level.type'
 
 export interface ServerConfigPlugin {
   name: string
+  npmName: string
   version: string
   description: string
-  clientScripts: { [name: string]: ClientScript }
+  clientScripts: { [name: string]: ClientScriptJSON }
 }
 
 export interface ServerConfigTheme extends ServerConfigPlugin {
@@ -39,6 +41,31 @@ export interface ServerConfig {
         preferAuthorDisplayName: boolean
       }
     }
+
+    menu: {
+      login: {
+        redirectOnSingleExternalAuth: boolean
+      }
+    }
+  }
+
+  defaults: {
+    publish: {
+      downloadEnabled: boolean
+      commentsEnabled: boolean
+      privacy: VideoPrivacy
+      licence: number
+    }
+
+    p2p: {
+      webapp: {
+        enabled: boolean
+      }
+
+      embed: {
+        enabled: boolean
+      }
+    }
   }
 
   webadmin: {
diff --git a/shared/models/users/index.ts b/shared/models/users/index.ts
index b61a8cd40..a24ffee96 100644
--- a/shared/models/users/index.ts
+++ b/shared/models/users/index.ts
@@ -8,6 +8,7 @@ export * from './user-refresh-token.model'
 export * from './user-register.model'
 export * from './user-right.enum'
 export * from './user-role'
+export * from './user-scoped-token'
 export * from './user-update-me.model'
 export * from './user-update.model'
 export * from './user-video-quota.model'
diff --git a/shared/models/users/user-right.enum.ts b/shared/models/users/user-right.enum.ts
index 6415ca6f2..668535f4e 100644
--- a/shared/models/users/user-right.enum.ts
+++ b/shared/models/users/user-right.enum.ts
@@ -22,9 +22,9 @@ export const enum UserRight {
   MANAGE_SERVERS_BLOCKLIST,
 
   MANAGE_VIDEO_BLACKLIST,
+  MANAGE_ANY_VIDEO_CHANNEL,
 
   REMOVE_ANY_VIDEO,
-  REMOVE_ANY_VIDEO_CHANNEL,
   REMOVE_ANY_VIDEO_PLAYLIST,
   REMOVE_ANY_VIDEO_COMMENT,
 
diff --git a/shared/models/users/user-role.ts b/shared/models/users/user-role.ts
index 94413abca..687a2aa0d 100644
--- a/shared/models/users/user-role.ts
+++ b/shared/models/users/user-role.ts
@@ -1,5 +1,5 @@
 // Keep the order
-export enum UserRole {
+export const enum UserRole {
   ADMINISTRATOR = 0,
   MODERATOR = 1,
   USER = 2
diff --git a/shared/models/users/user-update-me.model.ts b/shared/models/users/user-update-me.model.ts
index 6d7df38fb..e664e44b5 100644
--- a/shared/models/users/user-update-me.model.ts
+++ b/shared/models/users/user-update-me.model.ts
@@ -5,7 +5,10 @@ export interface UserUpdateMe {
   description?: string
   nsfwPolicy?: NSFWPolicyType
 
+  // FIXME: deprecated in favour of p2pEnabled in 4.1
   webTorrentEnabled?: boolean
+  p2pEnabled?: boolean
+
   autoPlayVideo?: boolean
   autoPlayNextVideo?: boolean
   autoPlayNextVideoPlaylist?: boolean
diff --git a/shared/models/users/user.model.ts b/shared/models/users/user.model.ts
index 78870c556..63c5c8a92 100644
--- a/shared/models/users/user.model.ts
+++ b/shared/models/users/user.model.ts
@@ -20,7 +20,11 @@ export interface User {
   autoPlayVideo: boolean
   autoPlayNextVideo: boolean
   autoPlayNextVideoPlaylist: boolean
+
+  // @deprecated in favour of p2pEnabled
   webTorrentEnabled: boolean
+  p2pEnabled: boolean
+
   videosHistoryEnabled: boolean
   videoLanguages: string[]
 
diff --git a/shared/models/videos/video-state.enum.ts b/shared/models/videos/video-state.enum.ts
index 6112b6e16..09268d2ff 100644
--- a/shared/models/videos/video-state.enum.ts
+++ b/shared/models/videos/video-state.enum.ts
@@ -5,5 +5,6 @@ export const enum VideoState {
   WAITING_FOR_LIVE = 4,
   LIVE_ENDED = 5,
   TO_MOVE_TO_EXTERNAL_STORAGE = 6,
-  TRANSCODING_FAILED = 7
+  TRANSCODING_FAILED = 7,
+  TO_MOVE_TO_EXTERNAL_STORAGE_FAILED = 8
 }
diff --git a/shared/extra-utils/bulk/bulk-command.ts b/shared/server-commands/bulk/bulk-command.ts
index b5c5673ce..b5c5673ce 100644
--- a/shared/extra-utils/bulk/bulk-command.ts
+++ b/shared/server-commands/bulk/bulk-command.ts
diff --git a/shared/extra-utils/bulk/index.ts b/shared/server-commands/bulk/index.ts
index 391597243..391597243 100644
--- a/shared/extra-utils/bulk/index.ts
+++ b/shared/server-commands/bulk/index.ts
diff --git a/shared/extra-utils/cli/cli-command.ts b/shared/server-commands/cli/cli-command.ts
index ab9738174..ab9738174 100644
--- a/shared/extra-utils/cli/cli-command.ts
+++ b/shared/server-commands/cli/cli-command.ts
diff --git a/shared/extra-utils/cli/index.ts b/shared/server-commands/cli/index.ts
index 91b5abfbe..91b5abfbe 100644
--- a/shared/extra-utils/cli/index.ts
+++ b/shared/server-commands/cli/index.ts
diff --git a/shared/extra-utils/custom-pages/custom-pages-command.ts b/shared/server-commands/custom-pages/custom-pages-command.ts
index cd869a8de..cd869a8de 100644
--- a/shared/extra-utils/custom-pages/custom-pages-command.ts
+++ b/shared/server-commands/custom-pages/custom-pages-command.ts
diff --git a/shared/extra-utils/custom-pages/index.ts b/shared/server-commands/custom-pages/index.ts
index 58aed04f2..58aed04f2 100644
--- a/shared/extra-utils/custom-pages/index.ts
+++ b/shared/server-commands/custom-pages/index.ts
diff --git a/shared/extra-utils/feeds/feeds-command.ts b/shared/server-commands/feeds/feeds-command.ts
index 3c95f9536..3c95f9536 100644
--- a/shared/extra-utils/feeds/feeds-command.ts
+++ b/shared/server-commands/feeds/feeds-command.ts
diff --git a/shared/extra-utils/feeds/index.ts b/shared/server-commands/feeds/index.ts
index 662a22b6f..662a22b6f 100644
--- a/shared/extra-utils/feeds/index.ts
+++ b/shared/server-commands/feeds/index.ts
diff --git a/shared/server-commands/index.ts b/shared/server-commands/index.ts
new file mode 100644
index 000000000..c24ebb2df
--- /dev/null
+++ b/shared/server-commands/index.ts
@@ -0,0 +1,14 @@
+export * from './bulk'
+export * from './cli'
+export * from './custom-pages'
+export * from './feeds'
+export * from './logs'
+export * from './miscs'
+export * from './moderation'
+export * from './overviews'
+export * from './requests'
+export * from './search'
+export * from './server'
+export * from './socket'
+export * from './users'
+export * from './videos'
diff --git a/shared/extra-utils/logs/index.ts b/shared/server-commands/logs/index.ts
index 69452d7f0..69452d7f0 100644
--- a/shared/extra-utils/logs/index.ts
+++ b/shared/server-commands/logs/index.ts
diff --git a/shared/extra-utils/logs/logs-command.ts b/shared/server-commands/logs/logs-command.ts
index 7b5c66c0c..8f63383ea 100644
--- a/shared/extra-utils/logs/logs-command.ts
+++ b/shared/server-commands/logs/logs-command.ts
@@ -1,5 +1,4 @@
-import { HttpStatusCode } from '@shared/models'
-import { LogLevel } from '../../models/server/log-level.type'
+import { HttpStatusCode, LogLevel } from '@shared/models'
 import { AbstractCommand, OverrideCommandOptions } from '../shared'
 
 export class LogsCommand extends AbstractCommand {
diff --git a/shared/server-commands/miscs/index.ts b/shared/server-commands/miscs/index.ts
new file mode 100644
index 000000000..a1d14e998
--- /dev/null
+++ b/shared/server-commands/miscs/index.ts
@@ -0,0 +1,2 @@
+export * from './sql-command'
+export * from './webtorrent'
diff --git a/shared/extra-utils/miscs/sql-command.ts b/shared/server-commands/miscs/sql-command.ts
index bedb3349b..09a99f834 100644
--- a/shared/extra-utils/miscs/sql-command.ts
+++ b/shared/server-commands/miscs/sql-command.ts
@@ -1,5 +1,5 @@
 import { QueryTypes, Sequelize } from 'sequelize'
-import { AbstractCommand } from '../shared/abstract-command'
+import { AbstractCommand } from '../shared'
 
 export class SQLCommand extends AbstractCommand {
   private sequelize: Sequelize
diff --git a/shared/extra-utils/miscs/webtorrent.ts b/shared/server-commands/miscs/webtorrent.ts
index 0683f8893..0683f8893 100644
--- a/shared/extra-utils/miscs/webtorrent.ts
+++ b/shared/server-commands/miscs/webtorrent.ts
diff --git a/shared/extra-utils/moderation/abuses-command.ts b/shared/server-commands/moderation/abuses-command.ts
index 0db32ba46..0db32ba46 100644
--- a/shared/extra-utils/moderation/abuses-command.ts
+++ b/shared/server-commands/moderation/abuses-command.ts
diff --git a/shared/extra-utils/moderation/index.ts b/shared/server-commands/moderation/index.ts
index b37643956..b37643956 100644
--- a/shared/extra-utils/moderation/index.ts
+++ b/shared/server-commands/moderation/index.ts
diff --git a/shared/extra-utils/overviews/index.ts b/shared/server-commands/overviews/index.ts
index e19551907..e19551907 100644
--- a/shared/extra-utils/overviews/index.ts
+++ b/shared/server-commands/overviews/index.ts
diff --git a/shared/extra-utils/overviews/overviews-command.ts b/shared/server-commands/overviews/overviews-command.ts
index 06b4892d2..06b4892d2 100644
--- a/shared/extra-utils/overviews/overviews-command.ts
+++ b/shared/server-commands/overviews/overviews-command.ts
diff --git a/shared/server-commands/requests/index.ts b/shared/server-commands/requests/index.ts
new file mode 100644
index 000000000..802982301
--- /dev/null
+++ b/shared/server-commands/requests/index.ts
@@ -0,0 +1 @@
+export * from './requests'
diff --git a/shared/extra-utils/requests/requests.ts b/shared/server-commands/requests/requests.ts
index b6b9024ed..95e4fe6b1 100644
--- a/shared/extra-utils/requests/requests.ts
+++ b/shared/server-commands/requests/requests.ts
@@ -3,8 +3,8 @@
 import { decode } from 'querystring'
 import request from 'supertest'
 import { URL } from 'url'
+import { buildAbsoluteFixturePath } from '@shared/core-utils'
 import { HttpStatusCode } from '@shared/models'
-import { buildAbsoluteFixturePath } from '../miscs/tests'
 
 export type CommonRequestParams = {
   url: string
diff --git a/shared/extra-utils/search/index.ts b/shared/server-commands/search/index.ts
index 48dbe8ae9..48dbe8ae9 100644
--- a/shared/extra-utils/search/index.ts
+++ b/shared/server-commands/search/index.ts
diff --git a/shared/extra-utils/search/search-command.ts b/shared/server-commands/search/search-command.ts
index 0fbbcd6ef..0fbbcd6ef 100644
--- a/shared/extra-utils/search/search-command.ts
+++ b/shared/server-commands/search/search-command.ts
diff --git a/shared/extra-utils/server/config-command.ts b/shared/server-commands/server/config-command.ts
index 7a768b4df..797231b1d 100644
--- a/shared/extra-utils/server/config-command.ts
+++ b/shared/server-commands/server/config-command.ts
@@ -1,8 +1,7 @@
 import { merge } from 'lodash'
-import { DeepPartial } from '@shared/core-utils'
-import { About, HttpStatusCode, ServerConfig } from '@shared/models'
-import { CustomConfig } from '../../models/server/custom-config.model'
-import { AbstractCommand, OverrideCommandOptions } from '../shared'
+import { About, CustomConfig, HttpStatusCode, ServerConfig } from '@shared/models'
+import { DeepPartial } from '@shared/typescript-utils'
+import { AbstractCommand, OverrideCommandOptions } from '../shared/abstract-command'
 
 export class ConfigCommand extends AbstractCommand {
 
@@ -194,6 +193,18 @@ export class ConfigCommand extends AbstractCommand {
           whitelisted: true
         }
       },
+      client: {
+        videos: {
+          miniature: {
+            preferAuthorDisplayName: false
+          }
+        },
+        menu: {
+          login: {
+            redirectOnSingleExternalAuth: false
+          }
+        }
+      },
       cache: {
         previews: {
           size: 2
diff --git a/shared/extra-utils/server/contact-form-command.ts b/shared/server-commands/server/contact-form-command.ts
index 0e8fd6d84..0e8fd6d84 100644
--- a/shared/extra-utils/server/contact-form-command.ts
+++ b/shared/server-commands/server/contact-form-command.ts
diff --git a/shared/extra-utils/server/debug-command.ts b/shared/server-commands/server/debug-command.ts
index 3c5a785bb..3c5a785bb 100644
--- a/shared/extra-utils/server/debug-command.ts
+++ b/shared/server-commands/server/debug-command.ts
diff --git a/shared/extra-utils/server/follows-command.ts b/shared/server-commands/server/follows-command.ts
index 01ef6f179..01ef6f179 100644
--- a/shared/extra-utils/server/follows-command.ts
+++ b/shared/server-commands/server/follows-command.ts
diff --git a/shared/extra-utils/server/follows.ts b/shared/server-commands/server/follows.ts
index 698238f29..698238f29 100644
--- a/shared/extra-utils/server/follows.ts
+++ b/shared/server-commands/server/follows.ts
diff --git a/shared/extra-utils/server/index.ts b/shared/server-commands/server/index.ts
index 76a2099da..0a4b21fc4 100644
--- a/shared/extra-utils/server/index.ts
+++ b/shared/server-commands/server/index.ts
@@ -1,17 +1,14 @@
 export * from './config-command'
 export * from './contact-form-command'
 export * from './debug-command'
-export * from './directories'
 export * from './follows-command'
 export * from './follows'
 export * from './jobs'
 export * from './jobs-command'
 export * from './object-storage-command'
 export * from './plugins-command'
-export * from './plugins'
 export * from './redundancy-command'
 export * from './server'
 export * from './servers-command'
 export * from './servers'
 export * from './stats-command'
-export * from './tracker'
diff --git a/shared/extra-utils/server/jobs-command.ts b/shared/server-commands/server/jobs-command.ts
index 6636e7e4d..ac62157d1 100644
--- a/shared/extra-utils/server/jobs-command.ts
+++ b/shared/server-commands/server/jobs-command.ts
@@ -1,6 +1,5 @@
 import { pick } from '@shared/core-utils'
-import { HttpStatusCode } from '@shared/models'
-import { Job, JobState, JobType, ResultList } from '../../models'
+import { HttpStatusCode, Job, JobState, JobType, ResultList } from '@shared/models'
 import { AbstractCommand, OverrideCommandOptions } from '../shared'
 
 export class JobsCommand extends AbstractCommand {
diff --git a/shared/extra-utils/server/jobs.ts b/shared/server-commands/server/jobs.ts
index 34fefd444..fc65a873b 100644
--- a/shared/extra-utils/server/jobs.ts
+++ b/shared/server-commands/server/jobs.ts
@@ -1,7 +1,7 @@
 
 import { expect } from 'chai'
+import { wait } from '@shared/core-utils'
 import { JobState, JobType } from '../../models'
-import { wait } from '../miscs'
 import { PeerTubeServer } from './server'
 
 async function waitJobs (serversArg: PeerTubeServer[] | PeerTubeServer, skipDelayed = false) {
diff --git a/shared/extra-utils/server/object-storage-command.ts b/shared/server-commands/server/object-storage-command.ts
index b4de8f4cb..b4de8f4cb 100644
--- a/shared/extra-utils/server/object-storage-command.ts
+++ b/shared/server-commands/server/object-storage-command.ts
diff --git a/shared/extra-utils/server/plugins-command.ts b/shared/server-commands/server/plugins-command.ts
index b944475a2..bb1277a7c 100644
--- a/shared/extra-utils/server/plugins-command.ts
+++ b/shared/server-commands/server/plugins-command.ts
@@ -2,13 +2,13 @@
 
 import { readJSON, writeJSON } from 'fs-extra'
 import { join } from 'path'
-import { root } from '@server/helpers/core-utils'
+import { root } from '@shared/core-utils'
 import {
   HttpStatusCode,
   PeerTubePlugin,
   PeerTubePluginIndex,
   PeertubePluginIndexList,
-  PluginPackageJson,
+  PluginPackageJSON,
   PluginTranslation,
   PluginType,
   PublicServerSetting,
@@ -158,15 +158,16 @@ export class PluginsCommand extends AbstractCommand {
   install (options: OverrideCommandOptions & {
     path?: string
     npmName?: string
+    pluginVersion?: string
   }) {
-    const { npmName, path } = options
+    const { npmName, path, pluginVersion } = options
     const apiPath = '/api/v1/plugins/install'
 
     return this.postBodyRequest({
       ...options,
 
       path: apiPath,
-      fields: { npmName, path },
+      fields: { npmName, path, pluginVersion },
       implicitToken: true,
       defaultExpectedStatus: HttpStatusCode.OK_200
     })
@@ -244,7 +245,7 @@ export class PluginsCommand extends AbstractCommand {
     return writeJSON(path, json)
   }
 
-  getPackageJSON (npmName: string): Promise<PluginPackageJson> {
+  getPackageJSON (npmName: string): Promise<PluginPackageJSON> {
     const path = this.getPackageJSONPath(npmName)
 
     return readJSON(path)
diff --git a/shared/extra-utils/server/redundancy-command.ts b/shared/server-commands/server/redundancy-command.ts
index e7a8b3c29..e7a8b3c29 100644
--- a/shared/extra-utils/server/redundancy-command.ts
+++ b/shared/server-commands/server/redundancy-command.ts
diff --git a/shared/extra-utils/server/server.ts b/shared/server-commands/server/server.ts
index 31224ebe9..da89fd876 100644
--- a/shared/extra-utils/server/server.ts
+++ b/shared/server-commands/server/server.ts
@@ -1,15 +1,14 @@
 import { ChildProcess, fork } from 'child_process'
 import { copy } from 'fs-extra'
 import { join } from 'path'
-import { root } from '@server/helpers/core-utils'
-import { randomInt } from '@shared/core-utils'
-import { Video, VideoChannel, VideoCreateResult, VideoDetails } from '../../models/videos'
+import { parallelTests, randomInt, root } from '@shared/core-utils'
+import { Video, VideoChannel, VideoCreateResult, VideoDetails } from '@shared/models'
 import { BulkCommand } from '../bulk'
 import { CLICommand } from '../cli'
 import { CustomPagesCommand } from '../custom-pages'
 import { FeedCommand } from '../feeds'
 import { LogsCommand } from '../logs'
-import { parallelTests, SQLCommand } from '../miscs'
+import { SQLCommand } from '../miscs'
 import { AbusesCommand } from '../moderation'
 import { OverviewsCommand } from '../overviews'
 import { SearchCommand } from '../search'
@@ -34,11 +33,11 @@ import { ContactFormCommand } from './contact-form-command'
 import { DebugCommand } from './debug-command'
 import { FollowsCommand } from './follows-command'
 import { JobsCommand } from './jobs-command'
+import { ObjectStorageCommand } from './object-storage-command'
 import { PluginsCommand } from './plugins-command'
 import { RedundancyCommand } from './redundancy-command'
 import { ServersCommand } from './servers-command'
 import { StatsCommand } from './stats-command'
-import { ObjectStorageCommand } from './object-storage-command'
 
 export type RunServerOptions = {
   hideLogs?: boolean
@@ -211,19 +210,26 @@ export class PeerTubeServer {
       Object.assign(env, options.env)
     }
 
+    const execArgv = options.nodeArgs || []
+    // FIXME: too slow :/
+    // execArgv.push('--enable-source-maps')
+
     const forkOptions = {
       silent: true,
       env,
       detached: true,
-      execArgv: options.nodeArgs || []
+      execArgv
     }
 
+    const peertubeArgs = options.peertubeArgs || []
+
     return new Promise<void>((res, rej) => {
       const self = this
+      let aggregatedLogs = ''
 
-      this.app = fork(join(root(), 'dist', 'server.js'), options.peertubeArgs || [], forkOptions)
+      this.app = fork(join(root(), 'dist', 'server.js'), peertubeArgs, forkOptions)
 
-      const onPeerTubeExit = () => rej(new Error('Process exited'))
+      const onPeerTubeExit = () => rej(new Error('Process exited:\n' + aggregatedLogs))
       const onParentExit = () => {
         if (!this.app || !this.app.pid) return
 
@@ -238,10 +244,13 @@ export class PeerTubeServer {
       this.app.stdout.on('data', function onStdout (data) {
         let dontContinue = false
 
+        const log: string = data.toString()
+        aggregatedLogs += log
+
         // Capture things if we want to
         for (const key of Object.keys(regexps)) {
           const regexp = regexps[key]
-          const matches = data.toString().match(regexp)
+          const matches = log.match(regexp)
           if (matches !== null) {
             if (key === 'client_id') self.store.client.id = matches[1]
             else if (key === 'client_secret') self.store.client.secret = matches[1]
@@ -252,7 +261,7 @@ export class PeerTubeServer {
 
         // Check if all required sentences are here
         for (const key of Object.keys(serverRunString)) {
-          if (data.toString().indexOf(key) !== -1) serverRunString[key] = true
+          if (log.includes(key)) serverRunString[key] = true
           if (serverRunString[key] === false) dontContinue = true
         }
 
@@ -260,7 +269,7 @@ export class PeerTubeServer {
         if (dontContinue === true) return
 
         if (options.hideLogs === false) {
-          console.log(data.toString())
+          console.log(log)
         } else {
           process.removeListener('exit', onParentExit)
           self.app.stdout.removeListener('data', onStdout)
diff --git a/shared/extra-utils/server/servers-command.ts b/shared/server-commands/server/servers-command.ts
index 776d2123c..c5d8d18dc 100644
--- a/shared/extra-utils/server/servers-command.ts
+++ b/shared/server-commands/server/servers-command.ts
@@ -1,9 +1,9 @@
 import { exec } from 'child_process'
 import { copy, ensureDir, readFile, remove } from 'fs-extra'
 import { basename, join } from 'path'
-import { root } from '@server/helpers/core-utils'
+import { isGithubCI, root, wait } from '@shared/core-utils'
+import { getFileSize } from '@shared/extra-utils'
 import { HttpStatusCode } from '@shared/models'
-import { getFileSize, isGithubCI, wait } from '../miscs'
 import { AbstractCommand, OverrideCommandOptions } from '../shared'
 
 export class ServersCommand extends AbstractCommand {
diff --git a/shared/extra-utils/server/servers.ts b/shared/server-commands/server/servers.ts
index 21ab9405b..0faee3a8d 100644
--- a/shared/extra-utils/server/servers.ts
+++ b/shared/server-commands/server/servers.ts
@@ -1,5 +1,5 @@
 import { ensureDir } from 'fs-extra'
-import { isGithubCI } from '../miscs'
+import { isGithubCI } from '@shared/core-utils'
 import { PeerTubeServer, RunServerOptions } from './server'
 
 async function createSingleServer (serverNumber: number, configOverride?: Object, options: RunServerOptions = {}) {
diff --git a/shared/extra-utils/server/stats-command.ts b/shared/server-commands/server/stats-command.ts
index 64a452306..64a452306 100644
--- a/shared/extra-utils/server/stats-command.ts
+++ b/shared/server-commands/server/stats-command.ts
diff --git a/shared/extra-utils/shared/abstract-command.ts b/shared/server-commands/shared/abstract-command.ts
index a57c857fc..1b53a5330 100644
--- a/shared/extra-utils/shared/abstract-command.ts
+++ b/shared/server-commands/shared/abstract-command.ts
@@ -1,5 +1,5 @@
 import { isAbsolute, join } from 'path'
-import { root } from '../miscs/tests'
+import { root } from '@shared/core-utils'
 import {
   makeDeleteRequest,
   makeGetRequest,
diff --git a/shared/extra-utils/shared/index.ts b/shared/server-commands/shared/index.ts
index e807ab4f7..e807ab4f7 100644
--- a/shared/extra-utils/shared/index.ts
+++ b/shared/server-commands/shared/index.ts
diff --git a/shared/extra-utils/socket/index.ts b/shared/server-commands/socket/index.ts
index 594329b2f..594329b2f 100644
--- a/shared/extra-utils/socket/index.ts
+++ b/shared/server-commands/socket/index.ts
diff --git a/shared/extra-utils/socket/socket-io-command.ts b/shared/server-commands/socket/socket-io-command.ts
index c277ead28..c277ead28 100644
--- a/shared/extra-utils/socket/socket-io-command.ts
+++ b/shared/server-commands/socket/socket-io-command.ts
diff --git a/shared/extra-utils/users/accounts-command.ts b/shared/server-commands/users/accounts-command.ts
index 98d9d5927..5844b330b 100644
--- a/shared/extra-utils/users/accounts-command.ts
+++ b/shared/server-commands/users/accounts-command.ts
@@ -1,6 +1,4 @@
-import { HttpStatusCode, ResultList } from '@shared/models'
-import { Account, ActorFollow } from '../../models/actors'
-import { AccountVideoRate, VideoRateType } from '../../models/videos'
+import { Account, AccountVideoRate, ActorFollow, HttpStatusCode, ResultList, VideoRateType } from '@shared/models'
 import { AbstractCommand, OverrideCommandOptions } from '../shared'
 
 export class AccountsCommand extends AbstractCommand {
diff --git a/shared/extra-utils/users/blocklist-command.ts b/shared/server-commands/users/blocklist-command.ts
index 14491a1ae..2e7ed074d 100644
--- a/shared/extra-utils/users/blocklist-command.ts
+++ b/shared/server-commands/users/blocklist-command.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import { AccountBlock, HttpStatusCode, ResultList, ServerBlock } from '@shared/models'
+import { AccountBlock, BlockStatus, HttpStatusCode, ResultList, ServerBlock } from '@shared/models'
 import { AbstractCommand, OverrideCommandOptions } from '../shared'
 
 type ListBlocklistOptions = OverrideCommandOptions & {
@@ -37,6 +37,29 @@ export class BlocklistCommand extends AbstractCommand {
 
   // ---------------------------------------------------------------------------
 
+  getStatus (options: OverrideCommandOptions & {
+    accounts?: string[]
+    hosts?: string[]
+  }) {
+    const { accounts, hosts } = options
+
+    const path = '/api/v1/blocklist/status'
+
+    return this.getRequestBody<BlockStatus>({
+      ...options,
+
+      path,
+      query: {
+        accounts,
+        hosts
+      },
+      implicitToken: false,
+      defaultExpectedStatus: HttpStatusCode.OK_200
+    })
+  }
+
+  // ---------------------------------------------------------------------------
+
   addToMyBlocklist (options: OverrideCommandOptions & {
     account?: string
     server?: string
diff --git a/shared/extra-utils/users/index.ts b/shared/server-commands/users/index.ts
index 460a06f70..c2bc5c44f 100644
--- a/shared/extra-utils/users/index.ts
+++ b/shared/server-commands/users/index.ts
@@ -1,9 +1,7 @@
 export * from './accounts-command'
-export * from './actors'
 export * from './blocklist-command'
 export * from './login'
 export * from './login-command'
-export * from './notifications'
 export * from './notifications-command'
 export * from './subscriptions-command'
 export * from './users-command'
diff --git a/shared/extra-utils/users/login-command.ts b/shared/server-commands/users/login-command.ts
index 143f72a59..143f72a59 100644
--- a/shared/extra-utils/users/login-command.ts
+++ b/shared/server-commands/users/login-command.ts
diff --git a/shared/extra-utils/users/login.ts b/shared/server-commands/users/login.ts
index f1df027d3..f1df027d3 100644
--- a/shared/extra-utils/users/login.ts
+++ b/shared/server-commands/users/login.ts
diff --git a/shared/extra-utils/users/notifications-command.ts b/shared/server-commands/users/notifications-command.ts
index 692420b8b..6bd815daa 100644
--- a/shared/extra-utils/users/notifications-command.ts
+++ b/shared/server-commands/users/notifications-command.ts
@@ -1,5 +1,4 @@
-import { HttpStatusCode, ResultList } from '@shared/models'
-import { UserNotification, UserNotificationSetting } from '../../models/users'
+import { HttpStatusCode, ResultList, UserNotification, UserNotificationSetting } from '@shared/models'
 import { AbstractCommand, OverrideCommandOptions } from '../shared'
 
 export class NotificationsCommand extends AbstractCommand {
diff --git a/shared/extra-utils/users/subscriptions-command.ts b/shared/server-commands/users/subscriptions-command.ts
index edc60e612..edc60e612 100644
--- a/shared/extra-utils/users/subscriptions-command.ts
+++ b/shared/server-commands/users/subscriptions-command.ts
diff --git a/shared/extra-utils/users/users-command.ts b/shared/server-commands/users/users-command.ts
index 2a10e4fc8..b5ae9008e 100644
--- a/shared/extra-utils/users/users-command.ts
+++ b/shared/server-commands/users/users-command.ts
@@ -4,6 +4,7 @@ import {
   HttpStatusCode,
   MyUser,
   ResultList,
+  ScopedToken,
   User,
   UserAdminFlag,
   UserCreateResult,
@@ -13,7 +14,6 @@ import {
   UserVideoQuota,
   UserVideoRate
 } from '@shared/models'
-import { ScopedToken } from '@shared/models/users/user-scoped-token'
 import { unwrapBody } from '../requests'
 import { AbstractCommand, OverrideCommandOptions } from '../shared'
 
@@ -202,7 +202,8 @@ export class UsersCommand extends AbstractCommand {
     return {
       token,
       userId: user.id,
-      userChannelId: me.videoChannels[0].id
+      userChannelId: me.videoChannels[0].id,
+      userChannelName: me.videoChannels[0].name
     }
   }
 
diff --git a/shared/extra-utils/videos/blacklist-command.ts b/shared/server-commands/videos/blacklist-command.ts
index 3a2ef89ba..47e23ebc8 100644
--- a/shared/extra-utils/videos/blacklist-command.ts
+++ b/shared/server-commands/videos/blacklist-command.ts
@@ -1,6 +1,5 @@
 
-import { HttpStatusCode, ResultList } from '@shared/models'
-import { VideoBlacklist, VideoBlacklistType } from '../../models/videos'
+import { HttpStatusCode, ResultList, VideoBlacklist, VideoBlacklistType } from '@shared/models'
 import { AbstractCommand, OverrideCommandOptions } from '../shared'
 
 export class BlacklistCommand extends AbstractCommand {
diff --git a/shared/extra-utils/videos/captions-command.ts b/shared/server-commands/videos/captions-command.ts
index a65ea99e3..62bf9c5e6 100644
--- a/shared/extra-utils/videos/captions-command.ts
+++ b/shared/server-commands/videos/captions-command.ts
@@ -1,5 +1,5 @@
+import { buildAbsoluteFixturePath } from '@shared/core-utils'
 import { HttpStatusCode, ResultList, VideoCaption } from '@shared/models'
-import { buildAbsoluteFixturePath } from '../miscs'
 import { AbstractCommand, OverrideCommandOptions } from '../shared'
 
 export class CaptionsCommand extends AbstractCommand {
diff --git a/shared/extra-utils/videos/change-ownership-command.ts b/shared/server-commands/videos/change-ownership-command.ts
index ad4c726ef..ad4c726ef 100644
--- a/shared/extra-utils/videos/change-ownership-command.ts
+++ b/shared/server-commands/videos/change-ownership-command.ts
diff --git a/shared/extra-utils/videos/channels-command.ts b/shared/server-commands/videos/channels-command.ts
index e406e570b..8ab124658 100644
--- a/shared/extra-utils/videos/channels-command.ts
+++ b/shared/server-commands/videos/channels-command.ts
@@ -1,7 +1,13 @@
 import { pick } from '@shared/core-utils'
-import { ActorFollow, HttpStatusCode, ResultList, VideoChannel, VideoChannelCreateResult } from '@shared/models'
-import { VideoChannelCreate } from '../../models/videos/channel/video-channel-create.model'
-import { VideoChannelUpdate } from '../../models/videos/channel/video-channel-update.model'
+import {
+  ActorFollow,
+  HttpStatusCode,
+  ResultList,
+  VideoChannel,
+  VideoChannelCreate,
+  VideoChannelCreateResult,
+  VideoChannelUpdate
+} from '@shared/models'
 import { unwrapBody } from '../requests'
 import { AbstractCommand, OverrideCommandOptions } from '../shared'
 
diff --git a/shared/extra-utils/videos/channels.ts b/shared/server-commands/videos/channels.ts
index 756c47453..756c47453 100644
--- a/shared/extra-utils/videos/channels.ts
+++ b/shared/server-commands/videos/channels.ts
diff --git a/shared/extra-utils/videos/comments-command.ts b/shared/server-commands/videos/comments-command.ts
index f0d163a07..f0d163a07 100644
--- a/shared/extra-utils/videos/comments-command.ts
+++ b/shared/server-commands/videos/comments-command.ts
diff --git a/shared/extra-utils/videos/history-command.ts b/shared/server-commands/videos/history-command.ts
index 13b7150c1..13b7150c1 100644
--- a/shared/extra-utils/videos/history-command.ts
+++ b/shared/server-commands/videos/history-command.ts
diff --git a/shared/extra-utils/videos/imports-command.ts b/shared/server-commands/videos/imports-command.ts
index e4944694d..e4944694d 100644
--- a/shared/extra-utils/videos/imports-command.ts
+++ b/shared/server-commands/videos/imports-command.ts
diff --git a/shared/extra-utils/videos/index.ts b/shared/server-commands/videos/index.ts
index 26e663f46..68a188b21 100644
--- a/shared/extra-utils/videos/index.ts
+++ b/shared/server-commands/videos/index.ts
@@ -1,6 +1,5 @@
 export * from './blacklist-command'
 export * from './captions-command'
-export * from './captions'
 export * from './change-ownership-command'
 export * from './channels'
 export * from './channels-command'
@@ -10,10 +9,7 @@ export * from './imports-command'
 export * from './live-command'
 export * from './live'
 export * from './playlists-command'
-export * from './playlists'
 export * from './services-command'
 export * from './streaming-playlists-command'
-export * from './streaming-playlists'
 export * from './comments-command'
 export * from './videos-command'
-export * from './videos'
diff --git a/shared/extra-utils/videos/live-command.ts b/shared/server-commands/videos/live-command.ts
index 74f5d3089..f7816eca0 100644
--- a/shared/extra-utils/videos/live-command.ts
+++ b/shared/server-commands/videos/live-command.ts
@@ -3,8 +3,8 @@
 import { readdir } from 'fs-extra'
 import { omit } from 'lodash'
 import { join } from 'path'
+import { wait } from '@shared/core-utils'
 import { HttpStatusCode, LiveVideo, LiveVideoCreate, LiveVideoUpdate, VideoCreateResult, VideoDetails, VideoState } from '@shared/models'
-import { wait } from '../miscs'
 import { unwrapBody } from '../requests'
 import { AbstractCommand, OverrideCommandOptions } from '../shared'
 import { sendRTMPStream, testFfmpegStreamError } from './live'
diff --git a/shared/extra-utils/videos/live.ts b/shared/server-commands/videos/live.ts
index d3665bc90..7a7faa911 100644
--- a/shared/extra-utils/videos/live.ts
+++ b/shared/server-commands/videos/live.ts
@@ -1,10 +1,5 @@
-/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-
-import { expect } from 'chai'
 import ffmpeg, { FfmpegCommand } from 'fluent-ffmpeg'
-import { pathExists, readdir } from 'fs-extra'
-import { join } from 'path'
-import { buildAbsoluteFixturePath, wait } from '../miscs'
+import { buildAbsoluteFixturePath, wait } from '@shared/core-utils'
 import { PeerTubeServer } from '../server/server'
 
 function sendRTMPStream (options: {
@@ -95,43 +90,11 @@ async function waitUntilLiveSavedOnAllServers (servers: PeerTubeServer[], videoI
   }
 }
 
-async function checkLiveCleanupAfterSave (server: PeerTubeServer, videoUUID: string, resolutions: number[] = []) {
-  const basePath = server.servers.buildDirectory('streaming-playlists')
-  const hlsPath = join(basePath, 'hls', videoUUID)
-
-  if (resolutions.length === 0) {
-    const result = await pathExists(hlsPath)
-    expect(result).to.be.false
-
-    return
-  }
-
-  const files = await readdir(hlsPath)
-
-  // fragmented file and playlist per resolution + master playlist + segments sha256 json file
-  expect(files).to.have.lengthOf(resolutions.length * 2 + 2)
-
-  for (const resolution of resolutions) {
-    const fragmentedFile = files.find(f => f.endsWith(`-${resolution}-fragmented.mp4`))
-    expect(fragmentedFile).to.exist
-
-    const playlistFile = files.find(f => f.endsWith(`${resolution}.m3u8`))
-    expect(playlistFile).to.exist
-  }
-
-  const masterPlaylistFile = files.find(f => f.endsWith('-master.m3u8'))
-  expect(masterPlaylistFile).to.exist
-
-  const shaFile = files.find(f => f.endsWith('-segments-sha256.json'))
-  expect(shaFile).to.exist
-}
-
 export {
   sendRTMPStream,
   waitFfmpegUntilError,
   testFfmpegStreamError,
   stopFfmpeg,
   waitUntilLivePublishedOnAllServers,
-  waitUntilLiveSavedOnAllServers,
-  checkLiveCleanupAfterSave
+  waitUntilLiveSavedOnAllServers
 }
diff --git a/shared/extra-utils/videos/playlists-command.ts b/shared/server-commands/videos/playlists-command.ts
index ce23900d3..ce23900d3 100644
--- a/shared/extra-utils/videos/playlists-command.ts
+++ b/shared/server-commands/videos/playlists-command.ts
diff --git a/shared/extra-utils/videos/services-command.ts b/shared/server-commands/videos/services-command.ts
index 06760df42..06760df42 100644
--- a/shared/extra-utils/videos/services-command.ts
+++ b/shared/server-commands/videos/services-command.ts
diff --git a/shared/extra-utils/videos/streaming-playlists-command.ts b/shared/server-commands/videos/streaming-playlists-command.ts
index 5d40d35cb..5d40d35cb 100644
--- a/shared/extra-utils/videos/streaming-playlists-command.ts
+++ b/shared/server-commands/videos/streaming-playlists-command.ts
diff --git a/shared/extra-utils/videos/videos-command.ts b/shared/server-commands/videos/videos-command.ts
index 7ec9c3647..21753ddc4 100644
--- a/shared/extra-utils/videos/videos-command.ts
+++ b/shared/server-commands/videos/videos-command.ts
@@ -5,9 +5,8 @@ import { createReadStream, stat } from 'fs-extra'
 import got, { Response as GotResponse } from 'got'
 import { omit } from 'lodash'
 import validator from 'validator'
-import { buildUUID } from '@server/helpers/uuid'
-import { loadLanguages } from '@server/initializers/constants'
-import { pick } from '@shared/core-utils'
+import { buildAbsoluteFixturePath, pick, wait } from '@shared/core-utils'
+import { buildUUID } from '@shared/extra-utils'
 import {
   HttpStatusCode,
   ResultList,
@@ -21,9 +20,8 @@ import {
   VideosCommonQuery,
   VideoTranscodingCreate
 } from '@shared/models'
-import { buildAbsoluteFixturePath, wait } from '../miscs'
 import { unwrapBody } from '../requests'
-import { PeerTubeServer, waitJobs } from '../server'
+import { waitJobs } from '../server'
 import { AbstractCommand, OverrideCommandOptions } from '../shared'
 
 export type VideoEdit = Partial<Omit<VideoCreate, 'thumbnailfile' | 'previewfile'>> & {
@@ -33,13 +31,6 @@ export type VideoEdit = Partial<Omit<VideoCreate, 'thumbnailfile' | 'previewfile
 }
 
 export class VideosCommand extends AbstractCommand {
-
-  constructor (server: PeerTubeServer) {
-    super(server)
-
-    loadLanguages()
-  }
-
   getCategories (options: OverrideCommandOptions = {}) {
     const path = '/api/v1/videos/categories'
 
diff --git a/shared/tsconfig.json b/shared/tsconfig.json
new file mode 100644
index 000000000..95892077b
--- /dev/null
+++ b/shared/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "../dist/shared"
+  }
+}
diff --git a/shared/tsconfig.types.json b/shared/tsconfig.types.json
new file mode 100644
index 000000000..6acfc05e1
--- /dev/null
+++ b/shared/tsconfig.types.json
@@ -0,0 +1,12 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../packages/types/dist/shared",
+    "stripInternal": true,
+    "removeComments": false,
+    "emitDeclarationOnly": true
+  },
+  "exclude": [
+    "server-commands/"
+  ]
+}
diff --git a/shared/typescript-utils/index.ts b/shared/typescript-utils/index.ts
new file mode 100644
index 000000000..c9f6f047d
--- /dev/null
+++ b/shared/typescript-utils/index.ts
@@ -0,0 +1 @@
+export * from './types'
diff --git a/shared/core-utils/common/types.ts b/shared/typescript-utils/types.ts
index bd2a97b98..bd2a97b98 100644
--- a/shared/core-utils/common/types.ts
+++ b/shared/typescript-utils/types.ts