93 files changed, 1479 insertions, 376 deletions
diff --git a/shared/core-utils/logs/logs.ts b/shared/core-utils/logs/logs.ts
new file mode 100644
index 000000000..d0996cf55
--- /dev/null
+++ b/shared/core-utils/logs/logs.ts
@@ -0,0 +1,25 @@
+import { stat } from 'fs-extra'
+async function mtimeSortFilesDesc (files: string[], basePath: string) {
+  const promises = []
+  const out: { file: string, mtime: number }[] = []
+  for (const file of files) {
+    const p = stat(basePath + '/' + file)
+      .then(stats => {
+        if (stats.isFile()) out.push({ file, mtime: stats.mtime.getTime() })
+      })
+    promises.push(p)
+  }
+  await Promise.all(promises)
+  out.sort((a, b) => b.mtime - a.mtime)
+  return out
+}
+export {
+  mtimeSortFilesDesc
+}
diff --git a/shared/core-utils/miscs/miscs.ts b/shared/core-utils/miscs/miscs.ts
new file mode 100644
index 000000000..c668e44c1
--- /dev/null
+++ b/shared/core-utils/miscs/miscs.ts
@@ -0,0 +1,7 @@
+function randomInt (low: number, high: number) {
+  return Math.floor(Math.random() * (high - low) + low)
+}
+export {
+  randomInt
+}
diff --git a/shared/utils/cli/cli.ts b/shared/extra-utils/cli/cli.ts
index 54d05e9c6..54d05e9c6 100644
--- a/shared/utils/cli/cli.ts
+++ b/shared/extra-utils/cli/cli.ts
diff --git a/shared/utils/feeds/feeds.ts b/shared/extra-utils/feeds/feeds.ts
index af6df2b20..af6df2b20 100644
--- a/shared/utils/feeds/feeds.ts
+++ b/shared/extra-utils/feeds/feeds.ts
diff --git a/shared/utils/index.ts b/shared/extra-utils/index.ts
index e08bbfd2a..9d0bbaa38 100644
--- a/shared/utils/index.ts
+++ b/shared/extra-utils/index.ts
@@ -8,15 +8,18 @@ export * from './miscs/miscs'
 export * from './miscs/stubs'
 export * from './miscs/sql'
 export * from './server/follows'
-export * from './requests/activitypub'
 export * from './requests/requests'
 export * from './requests/check-api-params'
 export * from './server/servers'
 export * from './videos/services'
+export * from './videos/video-playlists'
 export * from './users/users'
+export * from './users/accounts'
 export * from './videos/video-abuses'
 export * from './videos/video-blacklist'
 export * from './videos/video-channels'
+export * from './videos/video-comments'
+export * from './videos/video-streaming-playlists'
 export * from './videos/videos'
 export * from './videos/video-change-ownership'
 export * from './feeds/feeds'
diff --git a/shared/extra-utils/logs/logs.ts b/shared/extra-utils/logs/logs.ts
new file mode 100644
index 000000000..cbb1afb93
--- /dev/null
+++ b/shared/extra-utils/logs/logs.ts
@@ -0,0 +1,18 @@
+import { makeGetRequest } from '../requests/requests'
+import { LogLevel } from '../../models/server/log-level.type'
+function getLogs (url: string, accessToken: string, startDate: Date, endDate?: Date, level?: LogLevel) {
+  const path = '/api/v1/server/logs'
+  return makeGetRequest({
+    url,
+    path,
+    token: accessToken,
+    query: { startDate, endDate, level },
+    statusCodeExpected: 200
+  })
+}
+export {
+  getLogs
+}
diff --git a/shared/utils/miscs/email-child-process.js b/shared/extra-utils/miscs/email-child-process.js
index 40ae37d70..088a5a08c 100644
--- a/shared/utils/miscs/email-child-process.js
+++ b/shared/extra-utils/miscs/email-child-process.js
@@ -6,7 +6,7 @@ process.on('message', (msg) => {
  if (msg.start) {
    const maildev = new MailDev({
      ip: '127.0.0.1',
-      smtp: 1025,
+      smtp: msg.port,
      disableWeb: true,
      silent: true
    })
diff --git a/shared/utils/miscs/email.ts b/shared/extra-utils/miscs/email.ts
index f9f1bd95b..b2a1093da 100644
--- a/shared/utils/miscs/email.ts
+++ b/shared/extra-utils/miscs/email.ts
@@ -1,4 +1,6 @@
-import { fork, ChildProcess } from 'child_process'
+import { ChildProcess, fork } from 'child_process'
+import { randomInt } from '../../core-utils/miscs/miscs'
+import { parallelTests } from '../server/servers'
 class MockSmtpServer {
@@ -20,7 +22,9 @@ class MockSmtpServer {
  }
  collectEmails (emailsCollection: object[]) {
-    return new Promise((res, rej) => {
+    return new Promise<number>((res, rej) => {
+      const port = parallelTests() ? randomInt(1000, 2000) : 1025
      if (this.started) {
        this.emails = emailsCollection
        return res()
@@ -28,7 +32,7 @@ class MockSmtpServer {
      // ensure maildev isn't started until
      // unexpected exit can be reported to test runner
-      this.emailChildProcess.send({ start: true })
+      this.emailChildProcess.send({ start: true, port })
      this.emailChildProcess.on('exit', () => {
        return rej(new Error('maildev exited unexpectedly, confirm port not in use'))
      })
@@ -38,7 +42,7 @@ class MockSmtpServer {
        }
        this.started = true
        this.emails = emailsCollection
-        return res()
+        return res(port)
      })
    })
  }
diff --git a/shared/utils/miscs/miscs.ts b/shared/extra-utils/miscs/miscs.ts
index 91a93b631..d1ffb7be4 100644
--- a/shared/utils/miscs/miscs.ts
+++ b/shared/extra-utils/miscs/miscs.ts
@@ -33,7 +33,7 @@ function webtorrentAdd (torrent: string, refreshWebTorrent = false) {
 }
 function root () {
-  // We are in /shared/utils/miscs
+  // We are in /miscs
  return join(__dirname, '..', '..', '..')
 }
diff --git a/shared/extra-utils/miscs/sql.ts b/shared/extra-utils/miscs/sql.ts
new file mode 100644
index 000000000..3cfae5c23
--- /dev/null
+++ b/shared/extra-utils/miscs/sql.ts
@@ -0,0 +1,80 @@
+import { QueryTypes, Sequelize } from 'sequelize'
+let sequelizes: { [ id: number ]: Sequelize } = {}
+function getSequelize (serverNumber: number) {
+  if (sequelizes[serverNumber]) return sequelizes[serverNumber]
+  const dbname = 'peertube_test' + serverNumber
+  const username = 'peertube'
+  const password = 'peertube'
+  const host = 'localhost'
+  const port = 5432
+  const seq = new Sequelize(dbname, username, password, {
+    dialect: 'postgres',
+    host,
+    port,
+    logging: false
+  })
+  sequelizes[serverNumber] = seq
+  return seq
+}
+function setActorField (serverNumber: number, to: string, field: string, value: string) {
+  const seq = getSequelize(serverNumber)
+  const options = { type: QueryTypes.UPDATE }
+  return seq.query(`UPDATE actor SET "${field}" = '${value}' WHERE url = '${to}'`, options)
+}
+function setVideoField (serverNumber: number, uuid: string, field: string, value: string) {
+  const seq = getSequelize(serverNumber)
+  const options = { type: QueryTypes.UPDATE }
+  return seq.query(`UPDATE video SET "${field}" = '${value}' WHERE uuid = '${uuid}'`, options)
+}
+function setPlaylistField (serverNumber: number, uuid: string, field: string, value: string) {
+  const seq = getSequelize(serverNumber)
+  const options = { type: QueryTypes.UPDATE }
+  return seq.query(`UPDATE "videoPlaylist" SET "${field}" = '${value}' WHERE uuid = '${uuid}'`, options)
+}
+async function countVideoViewsOf (serverNumber: number, uuid: string) {
+  const seq = getSequelize(serverNumber)
+  // tslint:disable
+  const query = `SELECT SUM("videoView"."views") AS "total" FROM "videoView" INNER JOIN "video" ON "video"."id" = "videoView"."videoId" WHERE "video"."uuid" = '${uuid}'`
+  const options = { type: QueryTypes.SELECT as QueryTypes.SELECT }
+  const [ { total } ] = await seq.query<{ total: number }>(query, options)
+  if (!total) return 0
+  // FIXME: check if we really need parseInt
+  return parseInt(total + '', 10)
+}
+async function closeAllSequelize (servers: any[]) {
+  for (let i = 1; i <= servers.length; i++) {
+    if (sequelizes[ i ]) {
+      await sequelizes[ i ].close()
+      delete sequelizes[ i ]
+    }
+  }
+}
+export {
+  setVideoField,
+  setPlaylistField,
+  setActorField,
+  countVideoViewsOf,
+  closeAllSequelize
+}
diff --git a/shared/utils/miscs/stubs.ts b/shared/extra-utils/miscs/stubs.ts
index d1eb0e3b2..d1eb0e3b2 100644
--- a/shared/utils/miscs/stubs.ts
+++ b/shared/extra-utils/miscs/stubs.ts
diff --git a/shared/utils/overviews/overviews.ts b/shared/extra-utils/overviews/overviews.ts
index 23e3ceb1e..23e3ceb1e 100644
--- a/shared/utils/overviews/overviews.ts
+++ b/shared/extra-utils/overviews/overviews.ts
diff --git a/shared/utils/requests/activitypub.ts b/shared/extra-utils/requests/activitypub.ts
index e2348ace0..4762a8665 100644
--- a/shared/utils/requests/activitypub.ts
+++ b/shared/extra-utils/requests/activitypub.ts
@@ -1,5 +1,5 @@
 import { doRequest } from '../../../server/helpers/requests'
-import { HTTP_SIGNATURE } from '../../../server/initializers'
+import { HTTP_SIGNATURE } from '../../../server/initializers/constants'
 import { buildGlobalHeaders } from '../../../server/lib/job-queue/handlers/utils/activitypub-http-utils'
 import { activityPubContextify } from '../../../server/helpers/activitypub'
diff --git a/shared/utils/requests/check-api-params.ts b/shared/extra-utils/requests/check-api-params.ts
index a2a549682..a2a549682 100644
--- a/shared/utils/requests/check-api-params.ts
+++ b/shared/extra-utils/requests/check-api-params.ts
diff --git a/shared/utils/requests/requests.ts b/shared/extra-utils/requests/requests.ts
index 77e9f6164..3532fb429 100644
--- a/shared/utils/requests/requests.ts
+++ b/shared/extra-utils/requests/requests.ts
@@ -1,24 +1,36 @@
 import * as request from 'supertest'
 import { buildAbsoluteFixturePath, root } from '../miscs/miscs'
 import { isAbsolute, join } from 'path'
+import { parse } from 'url'
+function get4KFileUrl () {
+  return 'https://download.cpy.re/peertube/4k_file.txt'
+}
+function makeRawRequest (url: string, statusCodeExpected?: number, range?: string) {
+  const { host, protocol, pathname } = parse(url)
+  return makeGetRequest({ url: `${protocol}//${host}`, path: pathname, statusCodeExpected, range })
+}
 function makeGetRequest (options: {
  url: string,
-  path: string,
+  path?: string,
  query?: any,
  token?: string,
  statusCodeExpected?: number,
-  contentType?: string
+  contentType?: string,
+  range?: string
 }) {
  if (!options.statusCodeExpected) options.statusCodeExpected = 400
  if (options.contentType === undefined) options.contentType = 'application/json'
-  const req = request(options.url)
+  const req = request(options.url).get(options.path)
-    .get(options.path)
  if (options.contentType) req.set('Accept', options.contentType)
  if (options.token) req.set('Authorization', 'Bearer ' + options.token)
  if (options.query) req.query(options.query)
+  if (options.range) req.set('Range', options.range)
  return req.expect(options.statusCodeExpected)
 }
@@ -65,6 +77,8 @@ function makeUploadRequest (options: {
  Object.keys(options.fields).forEach(field => {
    const value = options.fields[field]
+    if (value === undefined) return
    if (Array.isArray(value)) {
      for (let i = 0; i < value.length; i++) {
        req.field(field + '[' + i + ']', value[i])
@@ -158,11 +172,13 @@ function updateAvatarRequest (options: {
 // ---------------------------------------------------------------------------
 export {
+  get4KFileUrl,
  makeHTMLRequest,
  makeGetRequest,
  makeUploadRequest,
  makePostBodyRequest,
  makePutBodyRequest,
  makeDeleteRequest,
+  makeRawRequest,
  updateAvatarRequest
 }
diff --git a/shared/utils/search/video-channels.ts b/shared/extra-utils/search/video-channels.ts
index 0532134ae..0532134ae 100644
--- a/shared/utils/search/video-channels.ts
+++ b/shared/extra-utils/search/video-channels.ts
diff --git a/shared/utils/search/videos.ts b/shared/extra-utils/search/videos.ts
index ba4627017..ba4627017 100644
--- a/shared/utils/search/videos.ts
+++ b/shared/extra-utils/search/videos.ts
diff --git a/shared/utils/server/activitypub.ts b/shared/extra-utils/server/activitypub.ts
index eccb198ca..eccb198ca 100644
--- a/shared/utils/server/activitypub.ts
+++ b/shared/extra-utils/server/activitypub.ts
diff --git a/shared/utils/server/clients.ts b/shared/extra-utils/server/clients.ts
index 273aac747..273aac747 100644
--- a/shared/utils/server/clients.ts
+++ b/shared/extra-utils/server/clients.ts
diff --git a/shared/utils/server/config.ts b/shared/extra-utils/server/config.ts
index 0c5512bab..deb77e9c0 100644
--- a/shared/utils/server/config.ts
+++ b/shared/extra-utils/server/config.ts
@@ -52,6 +52,7 @@ function updateCustomSubConfig (url: string, token: string, newConfig: any) {
      description: 'my super description',
      terms: 'my super terms',
      defaultClientRoute: '/videos/recently-added',
+      isNSFW: true,
      defaultNSFWPolicy: 'blur',
      customizations: {
        javascript: 'alert("coucou")',
@@ -97,6 +98,9 @@ function updateCustomSubConfig (url: string, token: string, newConfig: any) {
        '480p': true,
        '720p': false,
        '1080p': false
+      },
+      hls: {
+        enabled: false
      }
    },
    import: {
@@ -108,6 +112,19 @@ function updateCustomSubConfig (url: string, token: string, newConfig: any) {
          enabled: false
        }
      }
+    },
+    autoBlacklist: {
+      videos: {
+        ofUsers: {
+          enabled: false
+        }
+      }
+    },
+    followers: {
+      instance: {
+        enabled: true,
+        manualApproval: false
+      }
    }
  }
diff --git a/shared/utils/server/contact-form.ts b/shared/extra-utils/server/contact-form.ts
index 80394cf99..80394cf99 100644
--- a/shared/utils/server/contact-form.ts
+++ b/shared/extra-utils/server/contact-form.ts
diff --git a/shared/utils/server/follows.ts b/shared/extra-utils/server/follows.ts
index 7741757a6..1505804de 100644
--- a/shared/utils/server/follows.ts
+++ b/shared/extra-utils/server/follows.ts
@@ -1,6 +1,7 @@
 import * as request from 'supertest'
 import { ServerInfo } from './servers'
 import { waitJobs } from './jobs'
+import { makeGetRequest, makePostBodyRequest } from '..'
 function getFollowersListPaginationAndSort (url: string, start: number, count: number, sort: string, search?: string) {
  const path = '/api/v1/server/followers'
@@ -16,6 +17,28 @@ function getFollowersListPaginationAndSort (url: string, start: number, count: n
    .expect('Content-Type', /json/)
 }
+function acceptFollower (url: string, token: string, follower: string, statusCodeExpected = 204) {
+  const path = '/api/v1/server/followers/' + follower + '/accept'
+  return makePostBodyRequest({
+    url,
+    token,
+    path,
+    statusCodeExpected
+  })
+}
+function rejectFollower (url: string, token: string, follower: string, statusCodeExpected = 204) {
+  const path = '/api/v1/server/followers/' + follower + '/reject'
+  return makePostBodyRequest({
+    url,
+    token,
+    path,
+    statusCodeExpected
+  })
+}
 function getFollowingListPaginationAndSort (url: string, start: number, count: number, sort: string, search?: string) {
  const path = '/api/v1/server/following'
@@ -30,30 +53,36 @@ function getFollowingListPaginationAndSort (url: string, start: number, count: n
    .expect('Content-Type', /json/)
 }
-async function follow (follower: string, following: string[], accessToken: string, expectedStatus = 204) {
+function follow (follower: string, following: string[], accessToken: string, expectedStatus = 204) {
  const path = '/api/v1/server/following'
  const followingHosts = following.map(f => f.replace(/^http:\/\//, ''))
-  const res = await request(follower)
+  return request(follower)
    .post(path)
    .set('Accept', 'application/json')
    .set('Authorization', 'Bearer ' + accessToken)
    .send({ 'hosts': followingHosts })
    .expect(expectedStatus)
-  return res
 }
 async function unfollow (url: string, accessToken: string, target: ServerInfo, expectedStatus = 204) {
  const path = '/api/v1/server/following/' + target.host
-  const res = await request(url)
+  return request(url)
    .delete(path)
    .set('Accept', 'application/json')
    .set('Authorization', 'Bearer ' + accessToken)
    .expect(expectedStatus)
+}
+function removeFollower (url: string, accessToken: string, follower: ServerInfo, expectedStatus = 204) {
+  const path = '/api/v1/server/followers/peertube@' + follower.host
-  return res
+  return request(url)
+    .delete(path)
+    .set('Accept', 'application/json')
+    .set('Authorization', 'Bearer ' + accessToken)
+    .expect(expectedStatus)
 }
 async function doubleFollow (server1: ServerInfo, server2: ServerInfo) {
@@ -74,6 +103,9 @@ export {
  getFollowersListPaginationAndSort,
  getFollowingListPaginationAndSort,
  unfollow,
+  removeFollower,
  follow,
-  doubleFollow
+  doubleFollow,
+  acceptFollower,
+  rejectFollower
 }
diff --git a/shared/utils/server/jobs.ts b/shared/extra-utils/server/jobs.ts
index 692b5e24d..692b5e24d 100644
--- a/shared/utils/server/jobs.ts
+++ b/shared/extra-utils/server/jobs.ts
diff --git a/shared/utils/server/redundancy.ts b/shared/extra-utils/server/redundancy.ts
index c39ff2c8b..c39ff2c8b 100644
--- a/shared/utils/server/redundancy.ts
+++ b/shared/extra-utils/server/redundancy.ts
diff --git a/shared/extra-utils/server/servers.ts b/shared/extra-utils/server/servers.ts
new file mode 100644
index 000000000..ed41bfa48
--- /dev/null
+++ b/shared/extra-utils/server/servers.ts
@@ -0,0 +1,313 @@
+/* tslint:disable:no-unused-expression */
+import { ChildProcess, exec, fork } from 'child_process'
+import { join } from 'path'
+import { root, wait } from '../miscs/miscs'
+import { copy, readdir, readFile, remove } from 'fs-extra'
+import { existsSync } from 'fs'
+import { expect } from 'chai'
+import { VideoChannel } from '../../models/videos'
+import { randomInt } from '../../core-utils/miscs/miscs'
+interface ServerInfo {
+  app: ChildProcess,
+  url: string
+  host: string
+  port: number
+  parallel: boolean
+  internalServerNumber: number
+  serverNumber: number
+  client: {
+    id: string,
+    secret: string
+  }
+  user: {
+    username: string,
+    password: string,
+    email?: string
+  }
+  customConfigFile?: string
+  accessToken?: string
+  videoChannel?: VideoChannel
+  video?: {
+    id: number
+    uuid: string
+    name: string
+    account: {
+      name: string
+    }
+  }
+  remoteVideo?: {
+    id: number
+    uuid: string
+  }
+  videos?: { id: number, uuid: string }[]
+}
+function parallelTests () {
+  return process.env.MOCHA_PARALLEL === 'true'
+}
+function flushAndRunMultipleServers (totalServers: number, configOverride?: Object) {
+  let apps = []
+  let i = 0
+  return new Promise<ServerInfo[]>(res => {
+    function anotherServerDone (serverNumber, app) {
+      apps[serverNumber - 1] = app
+      i++
+      if (i === totalServers) {
+        return res(apps)
+      }
+    }
+    for (let j = 1; j <= totalServers; j++) {
+      flushAndRunServer(j, configOverride).then(app => anotherServerDone(j, app))
+    }
+  })
+}
+function flushTests (serverNumber?: number) {
+  return new Promise<void>((res, rej) => {
+    const suffix = serverNumber ? ` -- ${serverNumber}` : ''
+    return exec('npm run clean:server:test' + suffix, err => {
+      if (err) return rej(err)
+      return res()
+    })
+  })
+}
+function randomServer () {
+  const low = 10
+  const high = 10000
+  return randomInt(low, high)
+}
+async function flushAndRunServer (serverNumber: number, configOverride?: Object, args = []) {
+  const parallel = parallelTests()
+  const internalServerNumber = parallel ? randomServer() : serverNumber
+  const port = 9000 + internalServerNumber
+  await flushTests(internalServerNumber)
+  const server: ServerInfo = {
+    app: null,
+    port,
+    internalServerNumber,
+    parallel,
+    serverNumber,
+    url: `http://localhost:${port}`,
+    host: `localhost:${port}`,
+    client: {
+      id: null,
+      secret: null
+    },
+    user: {
+      username: null,
+      password: null
+    }
+  }
+  return runServer(server, configOverride, args)
+}
+async function runServer (server: ServerInfo, configOverrideArg?: any, args = []) {
+  // These actions are async so we need to be sure that they have both been done
+  const serverRunString = {
+    'Server listening': false
+  }
+  const key = 'Database peertube_test' + server.internalServerNumber + ' is ready'
+  serverRunString[key] = false
+  const regexps = {
+    client_id: 'Client id: (.+)',
+    client_secret: 'Client secret: (.+)',
+    user_username: 'Username: (.+)',
+    user_password: 'User password: (.+)'
+  }
+  if (server.internalServerNumber !== server.serverNumber) {
+    const basePath = join(root(), 'config')
+    const tmpConfigFile = join(basePath, `test-${server.internalServerNumber}.yaml`)
+    await copy(join(basePath, `test-${server.serverNumber}.yaml`), tmpConfigFile)
+    server.customConfigFile = tmpConfigFile
+  }
+  const configOverride: any = {}
+  if (server.parallel) {
+    Object.assign(configOverride, {
+      listen: {
+        port: server.port
+      },
+      webserver: {
+        port: server.port
+      },
+      database: {
+        suffix: '_test' + server.internalServerNumber
+      },
+      storage: {
+        tmp: `test${server.internalServerNumber}/tmp/`,
+        avatars: `test${server.internalServerNumber}/avatars/`,
+        videos: `test${server.internalServerNumber}/videos/`,
+        streaming_playlists: `test${server.internalServerNumber}/streaming-playlists/`,
+        redundancy: `test${server.internalServerNumber}/redundancy/`,
+        logs: `test${server.internalServerNumber}/logs/`,
+        previews: `test${server.internalServerNumber}/previews/`,
+        thumbnails: `test${server.internalServerNumber}/thumbnails/`,
+        torrents: `test${server.internalServerNumber}/torrents/`,
+        captions: `test${server.internalServerNumber}/captions/`,
+        cache: `test${server.internalServerNumber}/cache/`
+      },
+      admin: {
+        email: `admin${server.internalServerNumber}@example.com`
+      }
+    })
+  }
+  if (configOverrideArg !== undefined) {
+    Object.assign(configOverride, configOverrideArg)
+  }
+  // Share the environment
+  const env = Object.create(process.env)
+  env['NODE_ENV'] = 'test'
+  env['NODE_APP_INSTANCE'] = server.internalServerNumber.toString()
+  env['NODE_CONFIG'] = JSON.stringify(configOverride)
+  const options = {
+    silent: true,
+    env,
+    detached: true
+  }
+  return new Promise<ServerInfo>(res => {
+    server.app = fork(join(root(), 'dist', 'server.js'), args, options)
+    server.app.stdout.on('data', function onStdout (data) {
+      let dontContinue = false
+      // Capture things if we want to
+      for (const key of Object.keys(regexps)) {
+        const regexp = regexps[ key ]
+        const matches = data.toString().match(regexp)
+        if (matches !== null) {
+          if (key === 'client_id') server.client.id = matches[ 1 ]
+          else if (key === 'client_secret') server.client.secret = matches[ 1 ]
+          else if (key === 'user_username') server.user.username = matches[ 1 ]
+          else if (key === 'user_password') server.user.password = matches[ 1 ]
+        }
+      }
+      // Check if all required sentences are here
+      for (const key of Object.keys(serverRunString)) {
+        if (data.toString().indexOf(key) !== -1) serverRunString[ key ] = true
+        if (serverRunString[ key ] === false) dontContinue = true
+      }
+      // If no, there is maybe one thing not already initialized (client/user credentials generation...)
+      if (dontContinue === true) return
+      server.app.stdout.removeListener('data', onStdout)
+      process.on('exit', () => {
+        try {
+          process.kill(server.app.pid)
+        } catch { /* empty */ }
+      })
+      res(server)
+    })
+  })
+}
+async function reRunServer (server: ServerInfo, configOverride?: any) {
+  const newServer = await runServer(server, configOverride)
+  server.app = newServer.app
+  return server
+}
+async function checkTmpIsEmpty (server: ServerInfo) {
+  return checkDirectoryIsEmpty(server, 'tmp')
+}
+async function checkDirectoryIsEmpty (server: ServerInfo, directory: string) {
+  const testDirectory = 'test' + server.serverNumber
+  const directoryPath = join(root(), testDirectory, directory)
+  const directoryExists = existsSync(directoryPath)
+  expect(directoryExists).to.be.true
+  const files = await readdir(directoryPath)
+  expect(files).to.have.lengthOf(0)
+}
+function killallServers (servers: ServerInfo[]) {
+  for (const server of servers) {
+    if (!server.app) continue
+    process.kill(-server.app.pid)
+    server.app = null
+  }
+}
+function cleanupTests (servers: ServerInfo[]) {
+  killallServers(servers)
+  const p: Promise<any>[] = []
+  for (const server of servers) {
+    if (server.parallel) {
+      p.push(flushTests(server.internalServerNumber))
+    }
+    if (server.customConfigFile) {
+      p.push(remove(server.customConfigFile))
+    }
+  }
+  return Promise.all(p)
+}
+async function waitUntilLog (server: ServerInfo, str: string, count = 1) {
+  const logfile = join(root(), 'test' + server.serverNumber, 'logs/peertube.log')
+  while (true) {
+    const buf = await readFile(logfile)
+    const matches = buf.toString().match(new RegExp(str, 'g'))
+    if (matches && matches.length === count) return
+    await wait(1000)
+  }
+}
+// ---------------------------------------------------------------------------
+export {
+  checkDirectoryIsEmpty,
+  checkTmpIsEmpty,
+  ServerInfo,
+  parallelTests,
+  cleanupTests,
+  flushAndRunMultipleServers,
+  flushTests,
+  flushAndRunServer,
+  killallServers,
+  reRunServer,
+  waitUntilLog
+}
diff --git a/shared/utils/server/stats.ts b/shared/extra-utils/server/stats.ts
index 6f079ad18..6f079ad18 100644
--- a/shared/utils/server/stats.ts
+++ b/shared/extra-utils/server/stats.ts
diff --git a/shared/utils/socket/socket-io.ts b/shared/extra-utils/socket/socket-io.ts
index 854ab71af..854ab71af 100644
--- a/shared/utils/socket/socket-io.ts
+++ b/shared/extra-utils/socket/socket-io.ts
diff --git a/shared/utils/users/accounts.ts b/shared/extra-utils/users/accounts.ts
index 388eb6973..f64a2dbad 100644
--- a/shared/utils/users/accounts.ts
+++ b/shared/extra-utils/users/accounts.ts
@@ -1,11 +1,13 @@
 /* tslint:disable:no-unused-expression */
+import * as request from 'supertest'
 import { expect } from 'chai'
 import { existsSync, readdir } from 'fs-extra'
 import { join } from 'path'
 import { Account } from '../../models/actors'
 import { root } from '../miscs/miscs'
 import { makeGetRequest } from '../requests/requests'
+import { VideoRateType } from '../../models/videos'
 function getAccountsList (url: string, sort = '-createdAt', statusCodeExpected = 200) {
  const path = '/api/v1/accounts'
@@ -53,11 +55,26 @@ async function checkActorFilesWereRemoved (actorUUID: string, serverNumber: numb
  }
 }
+function getAccountRatings (url: string, accountName: string, accessToken: string, rating?: VideoRateType, statusCodeExpected = 200) {
+  const path = '/api/v1/accounts/' + accountName + '/ratings'
+  const query = rating ? { rating } : {}
+  return request(url)
+          .get(path)
+          .query(query)
+          .set('Accept', 'application/json')
+          .set('Authorization', 'Bearer ' + accessToken)
+          .expect(statusCodeExpected)
+          .expect('Content-Type', /json/)
+}
 // ---------------------------------------------------------------------------
 export {
  getAccount,
  expectAccountFollows,
  getAccountsList,
-  checkActorFilesWereRemoved
+  checkActorFilesWereRemoved,
+  getAccountRatings
 }
diff --git a/shared/utils/users/blocklist.ts b/shared/extra-utils/users/blocklist.ts
index 5feb84179..5feb84179 100644
--- a/shared/utils/users/blocklist.ts
+++ b/shared/extra-utils/users/blocklist.ts
diff --git a/shared/utils/users/login.ts b/shared/extra-utils/users/login.ts
index ddeb9df2a..ddeb9df2a 100644
--- a/shared/utils/users/login.ts
+++ b/shared/extra-utils/users/login.ts
diff --git a/shared/utils/users/user-notifications.ts b/shared/extra-utils/users/user-notifications.ts
index c8ed7df30..495ff80d9 100644
--- a/shared/utils/users/user-notifications.ts
+++ b/shared/extra-utils/users/user-notifications.ts
@@ -18,7 +18,7 @@ function updateMyNotificationSettings (url: string, token: string, settings: Use
  })
 }
-function getUserNotifications (
+async function getUserNotifications (
  url: string,
  token: string,
  start: number,
@@ -165,12 +165,15 @@ async function checkNewVideoFromSubscription (base: CheckerBaseParams, videoName
      checkVideo(notification.video, videoName, videoUUID)
      checkActor(notification.video.channel)
    } else {
-      expect(notification.video).to.satisfy(v => v === undefined || v.name !== videoName)
+      expect(notification).to.satisfy((n: UserNotification) => {
+        return n === undefined || n.type !== UserNotificationType.NEW_VIDEO_FROM_SUBSCRIPTION || n.video.name !== videoName
+      })
    }
  }
  function emailFinder (email: object) {
-    return email[ 'text' ].indexOf(videoUUID) !== -1
+    const text = email[ 'text' ]
+    return text.indexOf(videoUUID) !== -1 && text.indexOf('Your subscription') !== -1
  }
  await checkNotification(base, notificationChecker, emailFinder, type)
@@ -295,6 +298,35 @@ async function checkNewActorFollow (
  await checkNotification(base, notificationChecker, emailFinder, type)
 }
+async function checkNewInstanceFollower (base: CheckerBaseParams, followerHost: string, type: CheckerType) {
+  const notificationType = UserNotificationType.NEW_INSTANCE_FOLLOWER
+  function notificationChecker (notification: UserNotification, type: CheckerType) {
+    if (type === '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 emailFinder (email: object) {
+    const text: string = email[ 'text' ]
+    return text.includes('instance has a new follower') && text.includes(followerHost)
+  }
+  await checkNotification(base, notificationChecker, emailFinder, type)
+}
 async function checkCommentMention (
  base: CheckerBaseParams,
  uuid: string,
@@ -387,6 +419,31 @@ async function checkNewVideoAbuseForModerators (base: CheckerBaseParams, videoUU
  await checkNotification(base, notificationChecker, emailFinder, type)
 }
+async function checkVideoAutoBlacklistForModerators (base: CheckerBaseParams, videoUUID: string, videoName: string, type: CheckerType) {
+  const notificationType = UserNotificationType.VIDEO_AUTO_BLACKLIST_FOR_MODERATORS
+  function notificationChecker (notification: UserNotification, type: CheckerType) {
+    if (type === 'presence') {
+      expect(notification).to.not.be.undefined
+      expect(notification.type).to.equal(notificationType)
+      expect(notification.video.id).to.be.a('number')
+      checkVideo(notification.video, videoName, videoUUID)
+    } else {
+      expect(notification).to.satisfy((n: UserNotification) => {
+        return n === undefined || n.video === undefined || n.video.uuid !== videoUUID
+      })
+    }
+  }
+  function emailFinder (email: object) {
+    const text = email[ 'text' ]
+    return text.indexOf(videoUUID) !== -1 && email[ 'text' ].indexOf('video-auto-blacklist/list') !== -1
+  }
+  await checkNotification(base, notificationChecker, emailFinder, type)
+}
 async function checkNewBlacklistOnMyVideo (
  base: CheckerBaseParams,
  videoUUID: string,
@@ -431,7 +488,9 @@ export {
  checkCommentMention,
  updateMyNotificationSettings,
  checkNewVideoAbuseForModerators,
+  checkVideoAutoBlacklistForModerators,
  getUserNotifications,
  markAsReadNotifications,
-  getLastNotification
+  getLastNotification,
+  checkNewInstanceFollower
 }
diff --git a/shared/utils/users/user-subscriptions.ts b/shared/extra-utils/users/user-subscriptions.ts
index 7148fbfca..7148fbfca 100644
--- a/shared/utils/users/user-subscriptions.ts
+++ b/shared/extra-utils/users/user-subscriptions.ts
diff --git a/shared/utils/users/users.ts b/shared/extra-utils/users/users.ts
index 61a7e3757..2bd37b8be 100644
--- a/shared/utils/users/users.ts
+++ b/shared/extra-utils/users/users.ts
@@ -3,22 +3,38 @@ import { makePostBodyRequest, makePutBodyRequest, updateAvatarRequest } from '..
 import { UserRole } from '../../index'
 import { NSFWPolicyType } from '../../models/videos/nsfw-policy.type'
+import { ServerInfo, userLogin } from '..'
+import { UserAdminFlag } from '../../models/users/user-flag.model'
-function createUser (
+type CreateUserArgs = { url: string,
-  url: string,
  accessToken: string,
  username: string,
  password: string,
-  videoQuota = 1000000,
+  videoQuota?: number,
-  videoQuotaDaily = -1,
+  videoQuotaDaily?: number,
-  role: UserRole = UserRole.USER,
+  role?: UserRole,
-  specialStatus = 200
+  adminFlags?: UserAdminFlag,
-) {
+  specialStatus?: number
+}
+function createUser (parameters: CreateUserArgs) {
+  const {
+    url,
+    accessToken,
+    username,
+    adminFlags,
+    password = 'password',
+    videoQuota = 1000000,
+    videoQuotaDaily = -1,
+    role = UserRole.USER,
+    specialStatus = 200
+  } = parameters
  const path = '/api/v1/users'
  const body = {
    username,
    password,
    role,
+    adminFlags,
    email: username + '@example.com',
    videoQuota,
    videoQuotaDaily
@@ -32,6 +48,13 @@ function createUser (
          .expect(specialStatus)
 }
+async function generateUserAccessToken (server: ServerInfo, username: string) {
+  const password = 'my super password'
+  await createUser({ url: server.url, accessToken: server.accessToken, username: username, password: password })
+  return userLogin(server, { username, password })
+}
 function registerUser (url: string, username: string, password: string, specialStatus = 204) {
  const path = '/api/v1/users/register'
  const body = {
@@ -213,16 +236,20 @@ function updateUser (options: {
  emailVerified?: boolean,
  videoQuota?: number,
  videoQuotaDaily?: number,
+  password?: string,
+  adminFlags?: UserAdminFlag,
  role?: UserRole
 }) {
  const path = '/api/v1/users/' + options.userId
  const toSend = {}
+  if (options.password !== undefined && options.password !== null) toSend['password'] = options.password
  if (options.email !== undefined && options.email !== null) toSend['email'] = options.email
  if (options.emailVerified !== undefined && options.emailVerified !== null) toSend['emailVerified'] = options.emailVerified
  if (options.videoQuota !== undefined && options.videoQuota !== null) toSend['videoQuota'] = options.videoQuota
  if (options.videoQuotaDaily !== undefined && options.videoQuotaDaily !== null) toSend['videoQuotaDaily'] = options.videoQuotaDaily
  if (options.role !== undefined && options.role !== null) toSend['role'] = options.role
+  if (options.adminFlags !== undefined && options.adminFlags !== null) toSend['adminFlags'] = options.adminFlags
  return makePutBodyRequest({
    url: options.url,
@@ -298,5 +325,6 @@ export {
  resetPassword,
  updateMyAvatar,
  askSendVerifyEmail,
+  generateUserAccessToken,
  verifyEmail
 }
diff --git a/shared/utils/videos/services.ts b/shared/extra-utils/videos/services.ts
index 1a53dd4cf..1a53dd4cf 100644
--- a/shared/utils/videos/services.ts
+++ b/shared/extra-utils/videos/services.ts
diff --git a/shared/utils/videos/video-abuses.ts b/shared/extra-utils/videos/video-abuses.ts
index 7f011ec0f..7f011ec0f 100644
--- a/shared/utils/videos/video-abuses.ts
+++ b/shared/extra-utils/videos/video-abuses.ts
diff --git a/shared/utils/videos/video-blacklist.ts b/shared/extra-utils/videos/video-blacklist.ts
index f2ae0ed26..e25a292fc 100644
--- a/shared/utils/videos/video-blacklist.ts
+++ b/shared/extra-utils/videos/video-blacklist.ts
@@ -1,4 +1,6 @@
 import * as request from 'supertest'
+import { VideoBlacklistType } from '../../models/videos'
+import { makeGetRequest } from '..'
 function addVideoToBlacklist (
  url: string,
@@ -39,28 +41,25 @@ function removeVideoFromBlacklist (url: string, token: string, videoId: number |
          .expect(specialStatus)
 }
-function getBlacklistedVideosList (url: string, token: string, specialStatus = 200) {
+function getBlacklistedVideosList (parameters: {
+  url: string,
+  token: string,
+  sort?: string,
+  type?: VideoBlacklistType,
+  specialStatus?: number
+}) {
+  let { url, token, sort, type, specialStatus = 200 } = parameters
  const path = '/api/v1/videos/blacklist/'
-  return request(url)
+  const query = { sort, type }
-          .get(path)
-          .query({ sort: 'createdAt' })
-          .set('Accept', 'application/json')
-          .set('Authorization', 'Bearer ' + token)
-          .expect(specialStatus)
-          .expect('Content-Type', /json/)
-}
-function getSortedBlacklistedVideosList (url: string, token: string, sort: string, specialStatus = 200) {
+  return makeGetRequest({
-  const path = '/api/v1/videos/blacklist/'
+    url,
+    path,
-  return request(url)
+    query,
-          .get(path)
+    token,
-          .query({ sort: sort })
+    statusCodeExpected: specialStatus
-          .set('Accept', 'application/json')
+  })
-          .set('Authorization', 'Bearer ' + token)
-          .expect(specialStatus)
-          .expect('Content-Type', /json/)
 }
 // ---------------------------------------------------------------------------
@@ -69,6 +68,5 @@ export {
  addVideoToBlacklist,
  removeVideoFromBlacklist,
  getBlacklistedVideosList,
-  getSortedBlacklistedVideosList,
  updateVideoBlacklist
 }
diff --git a/shared/utils/videos/video-captions.ts b/shared/extra-utils/videos/video-captions.ts
index 8d67f617b..8d67f617b 100644
--- a/shared/utils/videos/video-captions.ts
+++ b/shared/extra-utils/videos/video-captions.ts
diff --git a/shared/utils/videos/video-change-ownership.ts b/shared/extra-utils/videos/video-change-ownership.ts
index f288692ea..371d02000 100644
--- a/shared/utils/videos/video-change-ownership.ts
+++ b/shared/extra-utils/videos/video-change-ownership.ts
@@ -1,6 +1,6 @@
 import * as request from 'supertest'
-function changeVideoOwnership (url: string, token: string, videoId: number | string, username) {
+function changeVideoOwnership (url: string, token: string, videoId: number | string, username, expectedStatus = 204) {
  const path = '/api/v1/videos/' + videoId + '/give-ownership'
  return request(url)
@@ -8,7 +8,7 @@ function changeVideoOwnership (url: string, token: string, videoId: number | str
    .set('Accept', 'application/json')
    .set('Authorization', 'Bearer ' + token)
    .send({ username })
-    .expect(204)
+    .expect(expectedStatus)
 }
 function getVideoChangeOwnershipList (url: string, token: string) {
diff --git a/shared/utils/videos/video-channels.ts b/shared/extra-utils/videos/video-channels.ts
index 3935c261e..93a257bf9 100644
--- a/shared/utils/videos/video-channels.ts
+++ b/shared/extra-utils/videos/video-channels.ts
@@ -1,6 +1,8 @@
 import * as request from 'supertest'
 import { VideoChannelCreate, VideoChannelUpdate } from '../../models/videos'
 import { updateAvatarRequest } from '../requests/requests'
+import { getMyUserInformation, ServerInfo } from '..'
+import { User } from '../..'
 function getVideoChannelsList (url: string, start: number, count: number, sort?: string) {
  const path = '/api/v1/video-channels'
@@ -105,6 +107,19 @@ function updateVideoChannelAvatar (options: {
  return updateAvatarRequest(Object.assign(options, { path }))
 }
+function setDefaultVideoChannel (servers: ServerInfo[]) {
+  const tasks: Promise<any>[] = []
+  for (const server of servers) {
+    const p = getMyUserInformation(server.url, server.accessToken)
+      .then(res => server.videoChannel = (res.body as User).videoChannels[0])
+    tasks.push(p)
+  }
+  return Promise.all(tasks)
+}
 // ---------------------------------------------------------------------------
 export {
@@ -114,5 +129,6 @@ export {
  addVideoChannel,
  updateVideoChannel,
  deleteVideoChannel,
-  getVideoChannel
+  getVideoChannel,
+  setDefaultVideoChannel
 }
diff --git a/shared/utils/videos/video-comments.ts b/shared/extra-utils/videos/video-comments.ts
index 0ebf69ced..0ebf69ced 100644
--- a/shared/utils/videos/video-comments.ts
+++ b/shared/extra-utils/videos/video-comments.ts
diff --git a/shared/utils/videos/video-history.ts b/shared/extra-utils/videos/video-history.ts
index dc7095b4d..dc7095b4d 100644
--- a/shared/utils/videos/video-history.ts
+++ b/shared/extra-utils/videos/video-history.ts
diff --git a/shared/utils/videos/video-imports.ts b/shared/extra-utils/videos/video-imports.ts
index ec77cdcda..ec77cdcda 100644
--- a/shared/utils/videos/video-imports.ts
+++ b/shared/extra-utils/videos/video-imports.ts
diff --git a/shared/extra-utils/videos/video-playlists.ts b/shared/extra-utils/videos/video-playlists.ts
new file mode 100644
index 000000000..4d110a131
--- /dev/null
+++ b/shared/extra-utils/videos/video-playlists.ts
@@ -0,0 +1,318 @@
+import { makeDeleteRequest, makeGetRequest, makePostBodyRequest, makePutBodyRequest, makeUploadRequest } from '../requests/requests'
+import { VideoPlaylistCreate } from '../../models/videos/playlist/video-playlist-create.model'
+import { omit } from 'lodash'
+import { VideoPlaylistUpdate } from '../../models/videos/playlist/video-playlist-update.model'
+import { VideoPlaylistElementCreate } from '../../models/videos/playlist/video-playlist-element-create.model'
+import { VideoPlaylistElementUpdate } from '../../models/videos/playlist/video-playlist-element-update.model'
+import { videoUUIDToId } from './videos'
+import { join } from 'path'
+import { root } from '..'
+import { readdir } from 'fs-extra'
+import { expect } from 'chai'
+import { VideoPlaylistType } from '../../models/videos/playlist/video-playlist-type.model'
+function getVideoPlaylistsList (url: string, start: number, count: number, sort?: string) {
+  const path = '/api/v1/video-playlists'
+  const query = {
+    start,
+    count,
+    sort
+  }
+  return makeGetRequest({
+    url,
+    path,
+    query,
+    statusCodeExpected: 200
+  })
+}
+function getVideoChannelPlaylistsList (url: string, videoChannelName: string, start: number, count: number, sort?: string) {
+  const path = '/api/v1/video-channels/' + videoChannelName + '/video-playlists'
+  const query = {
+    start,
+    count,
+    sort
+  }
+  return makeGetRequest({
+    url,
+    path,
+    query,
+    statusCodeExpected: 200
+  })
+}
+function getAccountPlaylistsList (url: string, accountName: string, start: number, count: number, sort?: string) {
+  const path = '/api/v1/accounts/' + accountName + '/video-playlists'
+  const query = {
+    start,
+    count,
+    sort
+  }
+  return makeGetRequest({
+    url,
+    path,
+    query,
+    statusCodeExpected: 200
+  })
+}
+function getAccountPlaylistsListWithToken (
+  url: string,
+  token: string,
+  accountName: string,
+  start: number,
+  count: number,
+  playlistType?: VideoPlaylistType,
+  sort?: string
+) {
+  const path = '/api/v1/accounts/' + accountName + '/video-playlists'
+  const query = {
+    start,
+    count,
+    playlistType,
+    sort
+  }
+  return makeGetRequest({
+    url,
+    token,
+    path,
+    query,
+    statusCodeExpected: 200
+  })
+}
+function getVideoPlaylist (url: string, playlistId: number | string, statusCodeExpected = 200) {
+  const path = '/api/v1/video-playlists/' + playlistId
+  return makeGetRequest({
+    url,
+    path,
+    statusCodeExpected
+  })
+}
+function getVideoPlaylistWithToken (url: string, token: string, playlistId: number | string, statusCodeExpected = 200) {
+  const path = '/api/v1/video-playlists/' + playlistId
+  return makeGetRequest({
+    url,
+    token,
+    path,
+    statusCodeExpected
+  })
+}
+function deleteVideoPlaylist (url: string, token: string, playlistId: number | string, statusCodeExpected = 204) {
+  const path = '/api/v1/video-playlists/' + playlistId
+  return makeDeleteRequest({
+    url,
+    path,
+    token,
+    statusCodeExpected
+  })
+}
+function createVideoPlaylist (options: {
+  url: string,
+  token: string,
+  playlistAttrs: VideoPlaylistCreate,
+  expectedStatus?: number
+}) {
+  const path = '/api/v1/video-playlists'
+  const fields = omit(options.playlistAttrs, 'thumbnailfile')
+  const attaches = options.playlistAttrs.thumbnailfile
+    ? { thumbnailfile: options.playlistAttrs.thumbnailfile }
+    : {}
+  return makeUploadRequest({
+    method: 'POST',
+    url: options.url,
+    path,
+    token: options.token,
+    fields,
+    attaches,
+    statusCodeExpected: options.expectedStatus || 200
+  })
+}
+function updateVideoPlaylist (options: {
+  url: string,
+  token: string,
+  playlistAttrs: VideoPlaylistUpdate,
+  playlistId: number | string,
+  expectedStatus?: number
+}) {
+  const path = '/api/v1/video-playlists/' + options.playlistId
+  const fields = omit(options.playlistAttrs, 'thumbnailfile')
+  const attaches = options.playlistAttrs.thumbnailfile
+    ? { thumbnailfile: options.playlistAttrs.thumbnailfile }
+    : {}
+  return makeUploadRequest({
+    method: 'PUT',
+    url: options.url,
+    path,
+    token: options.token,
+    fields,
+    attaches,
+    statusCodeExpected: options.expectedStatus || 204
+  })
+}
+async function addVideoInPlaylist (options: {
+  url: string,
+  token: string,
+  playlistId: number | string,
+  elementAttrs: VideoPlaylistElementCreate | { videoId: string }
+  expectedStatus?: number
+}) {
+  options.elementAttrs.videoId = await videoUUIDToId(options.url, options.elementAttrs.videoId)
+  const path = '/api/v1/video-playlists/' + options.playlistId + '/videos'
+  return makePostBodyRequest({
+    url: options.url,
+    path,
+    token: options.token,
+    fields: options.elementAttrs,
+    statusCodeExpected: options.expectedStatus || 200
+  })
+}
+function updateVideoPlaylistElement (options: {
+  url: string,
+  token: string,
+  playlistId: number | string,
+  videoId: number | string,
+  elementAttrs: VideoPlaylistElementUpdate,
+  expectedStatus?: number
+}) {
+  const path = '/api/v1/video-playlists/' + options.playlistId + '/videos/' + options.videoId
+  return makePutBodyRequest({
+    url: options.url,
+    path,
+    token: options.token,
+    fields: options.elementAttrs,
+    statusCodeExpected: options.expectedStatus || 204
+  })
+}
+function removeVideoFromPlaylist (options: {
+  url: string,
+  token: string,
+  playlistId: number | string,
+  videoId: number | string,
+  expectedStatus?: number
+}) {
+  const path = '/api/v1/video-playlists/' + options.playlistId + '/videos/' + options.videoId
+  return makeDeleteRequest({
+    url: options.url,
+    path,
+    token: options.token,
+    statusCodeExpected: options.expectedStatus || 204
+  })
+}
+function reorderVideosPlaylist (options: {
+  url: string,
+  token: string,
+  playlistId: number | string,
+  elementAttrs: {
+    startPosition: number,
+    insertAfterPosition: number,
+    reorderLength?: number
+  },
+  expectedStatus?: number
+}) {
+  const path = '/api/v1/video-playlists/' + options.playlistId + '/videos/reorder'
+  return makePostBodyRequest({
+    url: options.url,
+    path,
+    token: options.token,
+    fields: options.elementAttrs,
+    statusCodeExpected: options.expectedStatus || 204
+  })
+}
+async function checkPlaylistFilesWereRemoved (
+  playlistUUID: string,
+  serverNumber: number,
+  directories = [ 'thumbnails' ]
+) {
+  const testDirectory = 'test' + serverNumber
+  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)
+    }
+  }
+}
+function getVideoPlaylistPrivacies (url: string) {
+  const path = '/api/v1/video-playlists/privacies'
+  return makeGetRequest({
+    url,
+    path,
+    statusCodeExpected: 200
+  })
+}
+function doVideosExistInMyPlaylist (url: string, token: string, videoIds: number[]) {
+  const path = '/api/v1/users/me/video-playlists/videos-exist'
+  return makeGetRequest({
+    url,
+    token,
+    path,
+    query: { videoIds },
+    statusCodeExpected: 200
+  })
+}
+// ---------------------------------------------------------------------------
+export {
+  getVideoPlaylistPrivacies,
+  getVideoPlaylistsList,
+  getVideoChannelPlaylistsList,
+  getAccountPlaylistsList,
+  getAccountPlaylistsListWithToken,
+  getVideoPlaylist,
+  getVideoPlaylistWithToken,
+  createVideoPlaylist,
+  updateVideoPlaylist,
+  deleteVideoPlaylist,
+  addVideoInPlaylist,
+  updateVideoPlaylistElement,
+  removeVideoFromPlaylist,
+  reorderVideosPlaylist,
+  checkPlaylistFilesWereRemoved,
+  doVideosExistInMyPlaylist
+}
diff --git a/shared/extra-utils/videos/video-streaming-playlists.ts b/shared/extra-utils/videos/video-streaming-playlists.ts
new file mode 100644
index 000000000..eb25011cb
--- /dev/null
+++ b/shared/extra-utils/videos/video-streaming-playlists.ts
@@ -0,0 +1,51 @@
+import { makeRawRequest } from '../requests/requests'
+import { sha256 } from '../../../server/helpers/core-utils'
+import { VideoStreamingPlaylist } from '../../models/videos/video-streaming-playlist.model'
+import { expect } from 'chai'
+function getPlaylist (url: string, statusCodeExpected = 200) {
+  return makeRawRequest(url, statusCodeExpected)
+}
+function getSegment (url: string, statusCodeExpected = 200, range?: string) {
+  return makeRawRequest(url, statusCodeExpected, range)
+}
+function getSegmentSha256 (url: string, statusCodeExpected = 200) {
+  return makeRawRequest(url, statusCodeExpected)
+}
+async function checkSegmentHash (
+  baseUrlPlaylist: string,
+  baseUrlSegment: string,
+  videoUUID: string,
+  resolution: number,
+  hlsPlaylist: VideoStreamingPlaylist
+) {
+  const res = await getPlaylist(`${baseUrlPlaylist}/${videoUUID}/${resolution}.m3u8`)
+  const playlist = res.text
+  const videoName = `${videoUUID}-${resolution}-fragmented.mp4`
+  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 res2 = await getSegment(`${baseUrlSegment}/${videoUUID}/${videoName}`, 206, `bytes=${range}`)
+  const resSha = await getSegmentSha256(hlsPlaylist.segmentsSha256Url)
+  const sha256Server = resSha.body[ videoName ][range]
+  expect(sha256(res2.body)).to.equal(sha256Server)
+}
+// ---------------------------------------------------------------------------
+export {
+  getPlaylist,
+  getSegment,
+  getSegmentSha256,
+  checkSegmentHash
+}
diff --git a/shared/utils/videos/videos.ts b/shared/extra-utils/videos/videos.ts
index 0cf6e7c4f..b5a07b792 100644
--- a/shared/utils/videos/videos.ts
+++ b/shared/extra-utils/videos/videos.ts
@@ -1,7 +1,7 @@
 /* tslint:disable:no-unused-expression */
 import { expect } from 'chai'
-import { existsSync, readdir, readFile } from 'fs-extra'
+import { pathExists, readdir, readFile } from 'fs-extra'
 import * as parseTorrent from 'parse-torrent'
 import { extname, join } from 'path'
 import * as request from 'supertest'
@@ -16,11 +16,13 @@ import {
  ServerInfo,
  testImage
 } from '../'
+import * as validator from 'validator'
 import { VideoDetails, VideoPrivacy } from '../../models/videos'
-import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../server/initializers/constants'
+import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, loadLanguages, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../server/initializers/constants'
 import { dateIsValid, webtorrentAdd } from '../miscs/miscs'
+loadLanguages()
 type VideoAttributes = {
  name?: string
  category?: number
@@ -28,8 +30,10 @@ type VideoAttributes = {
  language?: string
  nsfw?: boolean
  commentsEnabled?: boolean
+  downloadEnabled?: boolean
  waitTranscoding?: boolean
  description?: string
+  originallyPublishedAt?: string
  tags?: string[]
  channelId?: number
  privacy?: VideoPrivacy
@@ -221,6 +225,28 @@ function getVideoChannelVideos (
  })
 }
+function getPlaylistVideos (
+  url: string,
+  accessToken: string,
+  playlistId: number | string,
+  start: number,
+  count: number,
+  query: { nsfw?: boolean } = {}
+) {
+  const path = '/api/v1/video-playlists/' + playlistId + '/videos'
+  return makeGetRequest({
+    url,
+    path,
+    query: immutableAssign(query, {
+      start,
+      count
+    }),
+    token: accessToken,
+    statusCodeExpected: 200
+  })
+}
 function getVideosListPagination (url: string, start: number, count: number, sort?: string) {
  const path = '/api/v1/videos'
@@ -271,15 +297,24 @@ function removeVideo (url: string, token: string, id: number | string, expectedS
 async function checkVideoFilesWereRemoved (
  videoUUID: string,
  serverNumber: number,
-  directories = [ 'redundancy', 'videos', 'thumbnails', 'torrents', 'previews', 'captions' ]
+  directories = [
+    'redundancy',
+    'videos',
+    'thumbnails',
+    'torrents',
+    'previews',
+    'captions',
+    join('playlists', 'hls'),
+    join('redundancy', 'hls')
+  ]
 ) {
  const testDirectory = 'test' + serverNumber
  for (const directory of directories) {
    const directoryPath = join(root(), testDirectory, directory)
-    const directoryExists = existsSync(directoryPath)
+    const directoryExists = await pathExists(directoryPath)
-    expect(directoryExists).to.be.true
+    if (directoryExists === false) continue
    const files = await readdir(directoryPath)
    for (const file of files) {
@@ -311,6 +346,7 @@ async function uploadVideo (url: string, accessToken: string, videoAttributesArg
    tags: [ 'tag' ],
    privacy: VideoPrivacy.PUBLIC,
    commentsEnabled: true,
+    downloadEnabled: true,
    fixture: 'video_short.webm'
  }, videoAttributesArg)
@@ -321,6 +357,7 @@ async function uploadVideo (url: string, accessToken: string, videoAttributesArg
              .field('name', attributes.name)
              .field('nsfw', JSON.stringify(attributes.nsfw))
              .field('commentsEnabled', JSON.stringify(attributes.commentsEnabled))
+              .field('downloadEnabled', JSON.stringify(attributes.downloadEnabled))
              .field('waitTranscoding', JSON.stringify(attributes.waitTranscoding))
              .field('privacy', attributes.privacy.toString())
              .field('channelId', attributes.channelId)
@@ -357,6 +394,10 @@ async function uploadVideo (url: string, accessToken: string, videoAttributesArg
    }
  }
+  if (attributes.originallyPublishedAt !== undefined) {
+    req.field('originallyPublishedAt', attributes.originallyPublishedAt)
+  }
  return req.attach('videofile', buildAbsoluteFixturePath(attributes.fixture))
            .expect(specialStatus)
 }
@@ -371,6 +412,8 @@ function updateVideo (url: string, accessToken: string, id: number | string, att
  if (attributes.language) body['language'] = attributes.language
  if (attributes.nsfw !== undefined) body['nsfw'] = JSON.stringify(attributes.nsfw)
  if (attributes.commentsEnabled !== undefined) body['commentsEnabled'] = JSON.stringify(attributes.commentsEnabled)
+  if (attributes.downloadEnabled !== undefined) body['downloadEnabled'] = JSON.stringify(attributes.downloadEnabled)
+  if (attributes.originallyPublishedAt !== undefined) body['originallyPublishedAt'] = attributes.originallyPublishedAt
  if (attributes.description) body['description'] = attributes.description
  if (attributes.tags) body['tags'] = attributes.tags
  if (attributes.privacy) body['privacy'] = attributes.privacy
@@ -436,9 +479,11 @@ async function completeVideoCheck (
    language: string
    nsfw: boolean
    commentsEnabled: boolean
+    downloadEnabled: boolean
    description: string
    publishedAt?: string
    support: string
+    originallyPublishedAt?: string,
    account: {
      name: string
      host: string
@@ -496,6 +541,12 @@ async function completeVideoCheck (
    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 res = await getVideo(url, video.uuid)
  const videoDetails: VideoDetails = res.body
@@ -510,6 +561,7 @@ async function completeVideoCheck (
  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)
@@ -547,12 +599,29 @@ async function completeVideoCheck (
  }
 }
+async function videoUUIDToId (url: string, id: number | string) {
+  if (validator.isUUID('' + id) === false) return id
+  const res = await getVideo(url, id)
+  return res.body.id
+}
+async function uploadVideoAndGetId (options: { server: ServerInfo, videoName: string, nsfw?: boolean, token?: string }) {
+  const videoAttrs: any = { name: options.videoName }
+  if (options.nsfw) videoAttrs.nsfw = options.nsfw
+  const res = await uploadVideo(options.server.url, options.token || options.server.accessToken, videoAttrs)
+  return { id: res.body.video.id, uuid: res.body.video.uuid }
+}
 // ---------------------------------------------------------------------------
 export {
  getVideoDescription,
  getVideoCategories,
  getVideoLicences,
+  videoUUIDToId,
  getVideoPrivacies,
  getVideoLanguages,
  getMyVideos,
@@ -573,5 +642,7 @@ export {
  parseTorrentVideo,
  getLocalVideos,
  completeVideoCheck,
-  checkVideoFilesWereRemoved
+  checkVideoFilesWereRemoved,
+  getPlaylistVideos,
+  uploadVideoAndGetId
 }
diff --git a/shared/models/activitypub/activity.ts b/shared/models/activitypub/activity.ts
index 89994f665..95801190d 100644
--- a/shared/models/activitypub/activity.ts
+++ b/shared/models/activitypub/activity.ts
@@ -6,6 +6,7 @@ import { VideoAbuseObject } from './objects/video-abuse-object'
 import { VideoCommentObject } from './objects/video-comment-object'
 import { ViewObject } from './objects/view-object'
 import { APObject } from './objects/object.model'
+import { PlaylistObject } from './objects/playlist-object'
 export type Activity = ActivityCreate | ActivityUpdate |
  ActivityDelete | ActivityFollow | ActivityAccept | ActivityAnnounce |
@@ -31,12 +32,12 @@ export interface BaseActivity {
 export interface ActivityCreate extends BaseActivity {
  type: 'Create'
-  object: VideoTorrentObject | VideoAbuseObject | ViewObject | DislikeObject | VideoCommentObject | CacheFileObject
+  object: VideoTorrentObject | VideoAbuseObject | ViewObject | DislikeObject | VideoCommentObject | CacheFileObject | PlaylistObject
 }
 export interface ActivityUpdate extends BaseActivity {
  type: 'Update'
-  object: VideoTorrentObject | ActivityPubActor | CacheFileObject
+  object: VideoTorrentObject | ActivityPubActor | CacheFileObject | PlaylistObject
 }
 export interface ActivityDelete extends BaseActivity {
diff --git a/shared/models/activitypub/activitypub-actor.ts b/shared/models/activitypub/activitypub-actor.ts
index 119bc22d4..5e30bf783 100644
--- a/shared/models/activitypub/activitypub-actor.ts
+++ b/shared/models/activitypub/activitypub-actor.ts
@@ -8,6 +8,7 @@ export interface ActivityPubActor {
  id: string
  following: string
  followers: string
+  playlists?: string
  inbox: string
  outbox: string
  preferredUsername: string
diff --git a/shared/models/activitypub/activitypub-ordered-collection.ts b/shared/models/activitypub/activitypub-ordered-collection.ts
index dfec0bb76..3de0890bb 100644
--- a/shared/models/activitypub/activitypub-ordered-collection.ts
+++ b/shared/models/activitypub/activitypub-ordered-collection.ts
@@ -2,6 +2,9 @@ export interface ActivityPubOrderedCollection<T> {
  '@context': string[]
  type: 'OrderedCollection' | 'OrderedCollectionPage'
  totalItems: number
-  partOf?: string
  orderedItems: T[]
+  partOf?: string
+  next?: string
+  first?: string
 }
diff --git a/shared/models/activitypub/objects/cache-file-object.ts b/shared/models/activitypub/objects/cache-file-object.ts
index 0a5125f5b..4b0a3a724 100644
--- a/shared/models/activitypub/objects/cache-file-object.ts
+++ b/shared/models/activitypub/objects/cache-file-object.ts
@@ -1,9 +1,9 @@
-import { ActivityVideoUrlObject } from './common-objects'
+import { ActivityVideoUrlObject, ActivityPlaylistUrlObject } from './common-objects'
 export interface CacheFileObject {
  id: string
  type: 'CacheFile',
  object: string
  expires: string
-  url: ActivityVideoUrlObject
+  url: ActivityVideoUrlObject | ActivityPlaylistUrlObject
 }
diff --git a/shared/models/activitypub/objects/common-objects.ts b/shared/models/activitypub/objects/common-objects.ts
index 118a4f43d..8c89810d6 100644
--- a/shared/models/activitypub/objects/common-objects.ts
+++ b/shared/models/activitypub/objects/common-objects.ts
@@ -28,25 +28,47 @@ export type ActivityVideoUrlObject = {
  fps: number
 }
-export type ActivityUrlObject =
+export type ActivityPlaylistSegmentHashesObject = {
-  ActivityVideoUrlObject
+  type: 'Link'
-  |
+  name: 'sha256'
-  {
+  // TODO: remove mimeType (backward compatibility, introduced in v1.1.0)
-    type: 'Link'
+  mimeType?: 'application/json'
-    // TODO: remove mimeType (backward compatibility, introduced in v1.1.0)
+  mediaType: 'application/json'
-    mimeType?: 'application/x-bittorrent' | 'application/x-bittorrent;x-scheme-handler/magnet'
+  href: string
-    mediaType: 'application/x-bittorrent' | 'application/x-bittorrent;x-scheme-handler/magnet'
+}
-    href: string
-    height: number
+export type ActivityPlaylistInfohashesObject = {
-  }
+  type: 'Infohash'
-  |
+  name: string
-  {
+}
-    type: 'Link'
-    // TODO: remove mimeType (backward compatibility, introduced in v1.1.0)
+export type ActivityPlaylistUrlObject = {
-    mimeType?: 'text/html'
+  type: 'Link'
-    mediaType: 'text/html'
+  // TODO: remove mimeType (backward compatibility, introduced in v1.1.0)
-    href: string
+  mimeType?: 'application/x-mpegURL'
-  }
+  mediaType: 'application/x-mpegURL'
+  href: string
+  tag?: (ActivityPlaylistSegmentHashesObject | ActivityPlaylistInfohashesObject)[]
+}
+export type ActivityBitTorrentUrlObject = {
+  type: 'Link'
+  // TODO: remove mimeType (backward compatibility, introduced in v1.1.0)
+  mimeType?: 'application/x-bittorrent' | 'application/x-bittorrent;x-scheme-handler/magnet'
+  mediaType: 'application/x-bittorrent' | 'application/x-bittorrent;x-scheme-handler/magnet'
+  href: string
+  height: number
+}
+export type ActivityHtmlUrlObject = {
+  type: 'Link'
+  // TODO: remove mimeType (backward compatibility, introduced in v1.1.0)
+  mimeType?: 'text/html'
+  mediaType: 'text/html'
+  href: string
+}
+export type ActivityUrlObject = ActivityVideoUrlObject | ActivityPlaylistUrlObject | ActivityBitTorrentUrlObject | ActivityHtmlUrlObject
 export interface ActivityPubAttributedTo {
  type: 'Group' | 'Person'
diff --git a/shared/models/activitypub/objects/playlist-element-object.ts b/shared/models/activitypub/objects/playlist-element-object.ts
new file mode 100644
index 000000000..b85e4fe19
--- /dev/null
+++ b/shared/models/activitypub/objects/playlist-element-object.ts
@@ -0,0 +1,10 @@
+export interface PlaylistElementObject {
+  id: string
+  type: 'PlaylistElement'
+  url: string
+  position: number
+  startTimestamp?: number
+  stopTimestamp?: number
+}
diff --git a/shared/models/activitypub/objects/playlist-object.ts b/shared/models/activitypub/objects/playlist-object.ts
new file mode 100644
index 000000000..b561d8efd
--- /dev/null
+++ b/shared/models/activitypub/objects/playlist-object.ts
@@ -0,0 +1,26 @@
+import { ActivityIconObject } from './common-objects'
+export interface PlaylistObject {
+  id: string
+  type: 'Playlist'
+  name: string
+  content: string
+  uuid: string
+  totalItems: number
+  attributedTo: string[]
+  icon?: ActivityIconObject
+  published: string
+  updated: string
+  orderedItems?: string[]
+  partOf?: string
+  next?: string
+  first?: string
+  to?: string[]
+}
diff --git a/shared/models/activitypub/objects/video-torrent-object.ts b/shared/models/activitypub/objects/video-torrent-object.ts
index 8504c178f..239822bc4 100644
--- a/shared/models/activitypub/objects/video-torrent-object.ts
+++ b/shared/models/activitypub/objects/video-torrent-object.ts
@@ -20,10 +20,12 @@ export interface VideoTorrentObject {
  subtitleLanguage: ActivityIdentifierObject[]
  views: number
  sensitive: boolean
-  commentsEnabled: boolean
+  commentsEnabled: boolean,
+  downloadEnabled: boolean,
  waitTranscoding: boolean
  state: VideoState
  published: string
+  originallyPublishedAt: string
  updated: string
  mediaType: 'text/markdown'
  content: string
diff --git a/shared/models/actors/account.model.ts b/shared/models/actors/account.model.ts
index 7f1dbbc37..043a2507e 100644
--- a/shared/models/actors/account.model.ts
+++ b/shared/models/actors/account.model.ts
@@ -1,4 +1,5 @@
 import { Actor } from './actor.model'
+import { Avatar } from '../avatars'
 export interface Account extends Actor {
  displayName: string
@@ -6,3 +7,13 @@ export interface Account extends Actor {
  userId?: number
 }
+export interface AccountSummary {
+  id: number
+  uuid: string
+  name: string
+  displayName: string
+  url: string
+  host: string
+  avatar?: Avatar
+}
diff --git a/shared/models/i18n/i18n.ts b/shared/models/i18n/i18n.ts
index d7164b73f..5d1d3f2ab 100644
--- a/shared/models/i18n/i18n.ts
+++ b/shared/models/i18n/i18n.ts
@@ -3,16 +3,19 @@ export const LOCALE_FILES = [ 'player', 'server' ]
 export const I18N_LOCALES = {
  'en-US': 'English',
  'fr-FR': 'Français',
+  'ja-JP': '日本語',
  'eu-ES': 'Euskara',
  'ca-ES': 'Català',
  'cs-CZ': 'Čeština',
  'eo': 'Esperanto',
  'de-DE': 'Deutsch',
  'it-IT': 'Italiano',
+  'nl-NL': 'Nederlands',
  'es-ES': 'Español',
  'oc': 'Occitan',
  'zh-Hant-TW': '繁體中文（台灣）',
  'pt-BR': 'Português (Brasil)',
+  'pt-PT': 'Português (Portugal)',
  'sv-SE': 'svenska',
  'pl-PL': 'Polski',
  'ru-RU': 'русский',
@@ -27,10 +30,12 @@ const I18N_LOCALE_ALIAS = {
  'cs': 'cs-CZ',
  'de': 'de-DE',
  'es': 'es-ES',
-  'pt': 'pt-BR',
+  'pt': 'pt-PT',
  'sv': 'sv-SE',
  'pl': 'pl-PL',
-  'ru': 'ru-RU'
+  'ru': 'ru-RU',
+  'nl': 'nl-NL',
+  'zh': 'zh-Hans-CN'
 }
 export const POSSIBLE_LOCALES = Object.keys(I18N_LOCALES)
diff --git a/shared/models/overviews/videos-overview.ts b/shared/models/overviews/videos-overview.ts
index ee009d94c..e725f166b 100644
--- a/shared/models/overviews/videos-overview.ts
+++ b/shared/models/overviews/videos-overview.ts
@@ -1,8 +1,8 @@
-import { Video, VideoChannelAttribute, VideoConstant } from '../videos'
+import { Video, VideoChannelSummary, VideoConstant } from '../videos'
 export interface VideosOverview {
  channels: {
-    channel: VideoChannelAttribute
+    channel: VideoChannelSummary
    videos: Video[]
  }[]
diff --git a/shared/models/search/videos-search-query.model.ts b/shared/models/search/videos-search-query.model.ts
index 0db220758..838063095 100644
--- a/shared/models/search/videos-search-query.model.ts
+++ b/shared/models/search/videos-search-query.model.ts
@@ -11,6 +11,9 @@ export interface VideosSearchQuery {
  startDate?: string // ISO 8601
  endDate?: string // ISO 8601
+  originallyPublishedStartDate?: string // ISO 8601
+  originallyPublishedEndDate?: string // ISO 8601
  nsfw?: NSFWQuery
  categoryOneOf?: number[]
diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts
index 7a3eaa33f..ca52eff4b 100644
--- a/shared/models/server/custom-config.model.ts
+++ b/shared/models/server/custom-config.model.ts
@@ -6,6 +6,7 @@ export interface CustomConfig {
    shortDescription: string
    description: string
    terms: string
+    isNSFW: boolean
    defaultClientRoute: string
    defaultNSFWPolicy: NSFWPolicyType
    customizations: {
@@ -61,6 +62,9 @@ export interface CustomConfig {
      '720p': boolean
      '1080p': boolean
    }
+    hls: {
+      enabled: boolean
+    }
  }
  import: {
@@ -73,4 +77,20 @@ export interface CustomConfig {
      }
    }
  }
+  autoBlacklist: {
+    videos: {
+      ofUsers: {
+        enabled: boolean
+      }
+    }
+  }
+  followers: {
+    instance: {
+      enabled: boolean,
+      manualApproval: boolean
+    }
+  }
 }
diff --git a/shared/models/server/debug.model.ts b/shared/models/server/debug.model.ts
new file mode 100644
index 000000000..61cba6518
--- /dev/null
+++ b/shared/models/server/debug.model.ts
@@ -0,0 +1,3 @@
+export interface Debug {
+  ip: string
+}
diff --git a/shared/models/server/index.ts b/shared/models/server/index.ts
index c42f6f67f..bf61ab270 100644
--- a/shared/models/server/index.ts
+++ b/shared/models/server/index.ts
@@ -1,6 +1,7 @@
 export * from './about.model'
 export * from './contact-form.model'
 export * from './custom-config.model'
+export * from './debug.model'
 export * from './job.model'
 export * from './server-config.model'
 export * from './server-stats.model'
diff --git a/shared/models/server/job.model.ts b/shared/models/server/job.model.ts
index 85bc9541b..1b9aa8a07 100644
--- a/shared/models/server/job.model.ts
+++ b/shared/models/server/job.model.ts
@@ -5,7 +5,7 @@ export type JobType = 'activitypub-http-unicast' |
  'activitypub-http-fetcher' |
  'activitypub-follow' |
  'video-file-import' |
-  'video-file' |
+  'video-transcoding' |
  'email' |
  'video-import' |
  'videos-views' |
diff --git a/shared/models/server/log-level.type.ts b/shared/models/server/log-level.type.ts
new file mode 100644
index 000000000..ce91559e3
--- /dev/null
+++ b/shared/models/server/log-level.type.ts
@@ -0,0 +1 @@
+export type LogLevel = 'debug' | 'info' | 'warn' | 'error'
diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts
index f4245ed4d..d937e9c05 100644
--- a/shared/models/server/server-config.model.ts
+++ b/shared/models/server/server-config.model.ts
@@ -8,6 +8,7 @@ export interface ServerConfig {
    name: string
    shortDescription: string
    defaultClientRoute: string
+    isNSFW: boolean
    defaultNSFWPolicy: NSFWPolicyType
    customizations: {
      javascript: string
@@ -25,11 +26,15 @@ export interface ServerConfig {
  signup: {
    allowed: boolean,
-    allowedForCurrentIP: boolean,
+    allowedForCurrentIP: boolean
    requiresEmailVerification: boolean
  }
  transcoding: {
+    hls: {
+      enabled: boolean
+    }
    enabledResolutions: number[]
  }
@@ -44,11 +49,19 @@ export interface ServerConfig {
    }
  }
+  autoBlacklist: {
+    videos: {
+      ofUsers: {
+        enabled: boolean
+      }
+    }
+  }
  avatar: {
    file: {
      size: {
        max: number
-      },
+      }
      extensions: string[]
    }
  }
@@ -84,4 +97,8 @@ export interface ServerConfig {
      intervalDays: number
    }
  }
+  tracker: {
+    enabled: boolean
+  }
 }
diff --git a/shared/models/users/user-create.model.ts b/shared/models/users/user-create.model.ts
index 08be4db05..6677b42aa 100644
--- a/shared/models/users/user-create.model.ts
+++ b/shared/models/users/user-create.model.ts
@@ -1,4 +1,5 @@
 import { UserRole } from './user-role'
+import { UserAdminFlag } from './user-flag.model'
 export interface UserCreate {
  username: string
@@ -7,4 +8,5 @@ export interface UserCreate {
  videoQuota: number
  videoQuotaDaily: number
  role: UserRole
+  adminFlags?: UserAdminFlag
 }
diff --git a/shared/models/users/user-flag.model.ts b/shared/models/users/user-flag.model.ts
new file mode 100644
index 000000000..f5759f18f
--- /dev/null
+++ b/shared/models/users/user-flag.model.ts
@@ -0,0 +1,4 @@
+export enum UserAdminFlag {
+  NONE = 0,
+  BY_PASS_VIDEO_AUTO_BLACKLIST = 1 << 0
+}
diff --git a/shared/models/users/user-notification-setting.model.ts b/shared/models/users/user-notification-setting.model.ts
index 531e12bba..e2a882b69 100644
--- a/shared/models/users/user-notification-setting.model.ts
+++ b/shared/models/users/user-notification-setting.model.ts
@@ -8,10 +8,12 @@ export interface UserNotificationSetting {
  newVideoFromSubscription: UserNotificationSettingValue
  newCommentOnMyVideo: UserNotificationSettingValue
  videoAbuseAsModerator: UserNotificationSettingValue
+  videoAutoBlacklistAsModerator: UserNotificationSettingValue
  blacklistOnMyVideo: UserNotificationSettingValue
  myVideoPublished: UserNotificationSettingValue
  myVideoImportFinished: UserNotificationSettingValue
  newUserRegistration: UserNotificationSettingValue
  newFollow: UserNotificationSettingValue
  commentMention: UserNotificationSettingValue
+  newInstanceFollower: UserNotificationSettingValue
 }
diff --git a/shared/models/users/user-notification.model.ts b/shared/models/users/user-notification.model.ts
index 186b62612..fafc2b7d7 100644
--- a/shared/models/users/user-notification.model.ts
+++ b/shared/models/users/user-notification.model.ts
@@ -1,3 +1,5 @@
+import { FollowState } from '../actors'
 export enum UserNotificationType {
  NEW_VIDEO_FROM_SUBSCRIPTION = 1,
  NEW_COMMENT_ON_MY_VIDEO = 2,
@@ -13,7 +15,11 @@ export enum UserNotificationType {
  NEW_USER_REGISTRATION = 9,
  NEW_FOLLOW = 10,
-  COMMENT_MENTION = 11
+  COMMENT_MENTION = 11,
+  VIDEO_AUTO_BLACKLIST_FOR_MODERATORS = 12,
+  NEW_INSTANCE_FOLLOWER = 13
 }
 export interface VideoInfo {
@@ -71,6 +77,7 @@ export interface UserNotification {
  actorFollow?: {
    id: number
    follower: ActorInfo
+    state: FollowState
    following: {
      type: 'account' | 'channel'
      name: string
diff --git a/shared/models/users/user-right.enum.ts b/shared/models/users/user-right.enum.ts
index 090256bca..71701bdb4 100644
--- a/shared/models/users/user-right.enum.ts
+++ b/shared/models/users/user-right.enum.ts
@@ -5,6 +5,10 @@ export enum UserRight {
  MANAGE_SERVER_FOLLOW,
+  MANAGE_LOGS,
+  MANAGE_DEBUG,
  MANAGE_SERVER_REDUNDANCY,
  MANAGE_VIDEO_ABUSES,
@@ -20,8 +24,12 @@ export enum UserRight {
  REMOVE_ANY_VIDEO,
  REMOVE_ANY_VIDEO_CHANNEL,
+  REMOVE_ANY_VIDEO_PLAYLIST,
  REMOVE_ANY_VIDEO_COMMENT,
  UPDATE_ANY_VIDEO,
+  UPDATE_ANY_VIDEO_PLAYLIST,
  SEE_ALL_VIDEOS,
  CHANGE_VIDEO_OWNERSHIP
 }
diff --git a/shared/models/users/user-role.ts b/shared/models/users/user-role.ts
index 59c2ba106..0b6554e51 100644
--- a/shared/models/users/user-role.ts
+++ b/shared/models/users/user-role.ts
@@ -25,6 +25,7 @@ const userRoleRights: { [ id: number ]: UserRight[] } = {
    UserRight.MANAGE_VIDEO_ABUSES,
    UserRight.REMOVE_ANY_VIDEO,
    UserRight.REMOVE_ANY_VIDEO_CHANNEL,
+    UserRight.REMOVE_ANY_VIDEO_PLAYLIST,
    UserRight.REMOVE_ANY_VIDEO_COMMENT,
    UserRight.UPDATE_ANY_VIDEO,
    UserRight.SEE_ALL_VIDEOS,
diff --git a/shared/models/users/user-update.model.ts b/shared/models/users/user-update.model.ts
index abde51321..fa43487ac 100644
--- a/shared/models/users/user-update.model.ts
+++ b/shared/models/users/user-update.model.ts
@@ -1,9 +1,12 @@
 import { UserRole } from './user-role'
+import { UserAdminFlag } from './user-flag.model'
 export interface UserUpdate {
+  password?: string
  email?: string
  emailVerified?: boolean
  videoQuota?: number
  videoQuotaDaily?: number
  role?: UserRole
+  adminFlags?: UserAdminFlag
 }
diff --git a/shared/models/users/user.model.ts b/shared/models/users/user.model.ts
index af783d389..2f6a3c719 100644
--- a/shared/models/users/user.model.ts
+++ b/shared/models/users/user.model.ts
@@ -3,6 +3,7 @@ import { VideoChannel } from '../videos/channel/video-channel.model'
 import { UserRole } from './user-role'
 import { NSFWPolicyType } from '../videos/nsfw-policy.type'
 import { UserNotificationSetting } from './user-notification-setting.model'
+import { UserAdminFlag } from './user-flag.model'
 export interface User {
  id: number
@@ -11,11 +12,15 @@ export interface User {
  emailVerified: boolean
  nsfwPolicy: NSFWPolicyType
+  adminFlags?: UserAdminFlag
  autoPlayVideo: boolean
  webTorrentEnabled: boolean
  videosHistoryEnabled: boolean
  role: UserRole
+  roleLabel: string
  videoQuota: number
  videoQuotaDaily: number
  createdAt: Date
diff --git a/shared/models/videos/blacklist/video-blacklist.model.ts b/shared/models/videos/blacklist/video-blacklist.model.ts
index 4bd976190..68d59e489 100644
--- a/shared/models/videos/blacklist/video-blacklist.model.ts
+++ b/shared/models/videos/blacklist/video-blacklist.model.ts
@@ -1,19 +1,17 @@
+import { Video } from '../video.model'
+export enum VideoBlacklistType {
+  MANUAL = 1,
+  AUTO_BEFORE_PUBLISHED = 2
+}
 export interface VideoBlacklist {
  id: number
  createdAt: Date
  updatedAt: Date
  unfederated: boolean
  reason?: string
+  type: VideoBlacklistType
-  video: {
+  video: Video
-    id: number
-    name: string
-    uuid: string
-    description: string
-    duration: number
-    views: number
-    likes: number
-    dislikes: number
-    nsfw: boolean
-  }
 }
diff --git a/shared/models/videos/channel/video-channel.model.ts b/shared/models/videos/channel/video-channel.model.ts
index 92918f66c..14a813f8f 100644
--- a/shared/models/videos/channel/video-channel.model.ts
+++ b/shared/models/videos/channel/video-channel.model.ts
@@ -1,6 +1,6 @@
 import { Actor } from '../../actors/actor.model'
-import { Video } from '../video.model'
 import { Account } from '../../actors/index'
+import { Avatar } from '../../avatars'
 export interface VideoChannel extends Actor {
  displayName: string
@@ -9,3 +9,13 @@ export interface VideoChannel extends Actor {
  isLocal: boolean
  ownerAccount?: Account
 }
+export interface VideoChannelSummary {
+  id: number
+  uuid: string
+  name: string
+  displayName: string
+  url: string
+  host: string
+  avatar?: Avatar
+}
diff --git a/shared/models/videos/import/video-import.model.ts b/shared/models/videos/import/video-import.model.ts
index e2a56617d..92856c70f 100644
--- a/shared/models/videos/import/video-import.model.ts
+++ b/shared/models/videos/import/video-import.model.ts
@@ -11,6 +11,7 @@ export interface VideoImport {
  createdAt: string
  updatedAt: string
+  originallyPublishedAt?: string
  state: VideoConstant<VideoImportState>
  error?: string
diff --git a/shared/models/videos/index.ts b/shared/models/videos/index.ts
index 056ae06da..e3d78220e 100644
--- a/shared/models/videos/index.ts
+++ b/shared/models/videos/index.ts
@@ -1,5 +1,6 @@
 export * from './rate/user-video-rate-update.model'
 export * from './rate/user-video-rate.model'
+export * from './rate/account-video-rate.model'
 export * from './rate/user-video-rate.type'
 export * from './abuse/video-abuse-state.model'
 export * from './abuse/video-abuse-create.model'
@@ -11,6 +12,13 @@ export * from './blacklist/video-blacklist-update.model'
 export * from './channel/video-channel-create.model'
 export * from './channel/video-channel-update.model'
 export * from './channel/video-channel.model'
+export * from './playlist/video-playlist-create.model'
+export * from './playlist/video-playlist-element-create.model'
+export * from './playlist/video-playlist-element-update.model'
+export * from './playlist/video-playlist-privacy.model'
+export * from './playlist/video-playlist-type.model'
+export * from './playlist/video-playlist-update.model'
+export * from './playlist/video-playlist.model'
 export * from './video-change-ownership.model'
 export * from './video-change-ownership-create.model'
 export * from './video-create.model'
@@ -27,4 +35,4 @@ export * from './caption/video-caption-update.model'
 export * from './import/video-import-create.model'
 export * from './import/video-import-state.enum'
 export * from './import/video-import.model'
-export { VideoConstant } from './video-constant.model'
+export * from './video-constant.model'
diff --git a/shared/models/videos/playlist/video-exist-in-playlist.model.ts b/shared/models/videos/playlist/video-exist-in-playlist.model.ts
new file mode 100644
index 000000000..71240f51d
--- /dev/null
+++ b/shared/models/videos/playlist/video-exist-in-playlist.model.ts
@@ -0,0 +1,7 @@
+export type VideoExistInPlaylist = {
+  [videoId: number ]: {
+    playlistId: number
+    startTimestamp?: number
+    stopTimestamp?: number
+  }[]
+}
diff --git a/shared/models/videos/playlist/video-playlist-create.model.ts b/shared/models/videos/playlist/video-playlist-create.model.ts
new file mode 100644
index 000000000..67a33fa35
--- /dev/null
+++ b/shared/models/videos/playlist/video-playlist-create.model.ts
@@ -0,0 +1,11 @@
+import { VideoPlaylistPrivacy } from './video-playlist-privacy.model'
+export interface VideoPlaylistCreate {
+  displayName: string
+  privacy: VideoPlaylistPrivacy
+  description?: string
+  videoChannelId?: number
+  thumbnailfile?: any
+}
diff --git a/shared/models/videos/playlist/video-playlist-element-create.model.ts b/shared/models/videos/playlist/video-playlist-element-create.model.ts
new file mode 100644
index 000000000..c31702892
--- /dev/null
+++ b/shared/models/videos/playlist/video-playlist-element-create.model.ts
@@ -0,0 +1,6 @@
+export interface VideoPlaylistElementCreate {
+  videoId: number
+  startTimestamp?: number
+  stopTimestamp?: number
+}
diff --git a/shared/models/videos/playlist/video-playlist-element-update.model.ts b/shared/models/videos/playlist/video-playlist-element-update.model.ts
new file mode 100644
index 000000000..15a30fbdc
--- /dev/null
+++ b/shared/models/videos/playlist/video-playlist-element-update.model.ts
@@ -0,0 +1,4 @@
+export interface VideoPlaylistElementUpdate {
+  startTimestamp?: number
+  stopTimestamp?: number
+}
diff --git a/shared/models/videos/playlist/video-playlist-privacy.model.ts b/shared/models/videos/playlist/video-playlist-privacy.model.ts
new file mode 100644
index 000000000..96e5e2211
--- /dev/null
+++ b/shared/models/videos/playlist/video-playlist-privacy.model.ts
@@ -0,0 +1,5 @@
+export enum VideoPlaylistPrivacy {
+  PUBLIC = 1,
+  UNLISTED = 2,
+  PRIVATE = 3
+}
diff --git a/shared/models/videos/playlist/video-playlist-reorder.model.ts b/shared/models/videos/playlist/video-playlist-reorder.model.ts
new file mode 100644
index 000000000..63ec714c5
--- /dev/null
+++ b/shared/models/videos/playlist/video-playlist-reorder.model.ts
@@ -0,0 +1,5 @@
+export interface VideoPlaylistReorder {
+  startPosition: number
+  insertAfterPosition: number
+  reorderLength?: number
+}
diff --git a/shared/models/videos/playlist/video-playlist-type.model.ts b/shared/models/videos/playlist/video-playlist-type.model.ts
new file mode 100644
index 000000000..49233b743
--- /dev/null
+++ b/shared/models/videos/playlist/video-playlist-type.model.ts
@@ -0,0 +1,4 @@
+export enum VideoPlaylistType {
+  REGULAR = 1,
+  WATCH_LATER = 2
+}
diff --git a/shared/models/videos/playlist/video-playlist-update.model.ts b/shared/models/videos/playlist/video-playlist-update.model.ts
new file mode 100644
index 000000000..0ff5bcb0f
--- /dev/null
+++ b/shared/models/videos/playlist/video-playlist-update.model.ts
@@ -0,0 +1,10 @@
+import { VideoPlaylistPrivacy } from './video-playlist-privacy.model'
+export interface VideoPlaylistUpdate {
+  displayName: string
+  privacy: VideoPlaylistPrivacy
+  description?: string
+  videoChannelId?: number
+  thumbnailfile?: any
+}
diff --git a/shared/models/videos/playlist/video-playlist.model.ts b/shared/models/videos/playlist/video-playlist.model.ts
new file mode 100644
index 000000000..c0941727a
--- /dev/null
+++ b/shared/models/videos/playlist/video-playlist.model.ts
@@ -0,0 +1,26 @@
+import { AccountSummary } from '../../actors/index'
+import { VideoChannelSummary, VideoConstant } from '..'
+import { VideoPlaylistPrivacy } from './video-playlist-privacy.model'
+import { VideoPlaylistType } from './video-playlist-type.model'
+export interface VideoPlaylist {
+  id: number
+  uuid: string
+  isLocal: boolean
+  displayName: string
+  description: string
+  privacy: VideoConstant<VideoPlaylistPrivacy>
+  thumbnailPath: string
+  videosLength: number
+  type: VideoConstant<VideoPlaylistType>
+  createdAt: Date | string
+  updatedAt: Date | string
+  ownerAccount: AccountSummary
+  videoChannel?: VideoChannelSummary
+}
diff --git a/shared/models/videos/rate/account-video-rate.model.ts b/shared/models/videos/rate/account-video-rate.model.ts
new file mode 100644
index 000000000..e789367dc
--- /dev/null
+++ b/shared/models/videos/rate/account-video-rate.model.ts
@@ -0,0 +1,7 @@
+import { UserVideoRateType } from './user-video-rate.type'
+import { Video } from '../video.model'
+export interface AccountVideoRate {
+  video: Video
+  rating: UserVideoRateType
+}
diff --git a/shared/models/videos/thumbnail.type.ts b/shared/models/videos/thumbnail.type.ts
new file mode 100644
index 000000000..d6c2bef7b
--- /dev/null
+++ b/shared/models/videos/thumbnail.type.ts
@@ -0,0 +1,4 @@
+export enum ThumbnailType {
+  MINIATURE = 1,
+  PREVIEW = 2
+}
diff --git a/shared/models/videos/video-create.model.ts b/shared/models/videos/video-create.model.ts
index 190d63783..53631bf79 100644
--- a/shared/models/videos/video-create.model.ts
+++ b/shared/models/videos/video-create.model.ts
@@ -13,6 +13,8 @@ export interface VideoCreate {
  name: string
  tags?: string[]
  commentsEnabled?: boolean
+  downloadEnabled?: boolean
  privacy: VideoPrivacy
  scheduleUpdate?: VideoScheduleUpdate
+  originallyPublishedAt: Date | string
 }
diff --git a/shared/models/videos/video-streaming-playlist.model.ts b/shared/models/videos/video-streaming-playlist.model.ts
new file mode 100644
index 000000000..17f8fe865
--- /dev/null
+++ b/shared/models/videos/video-streaming-playlist.model.ts
@@ -0,0 +1,12 @@
+import { VideoStreamingPlaylistType } from './video-streaming-playlist.type'
+export class VideoStreamingPlaylist {
+  id: number
+  type: VideoStreamingPlaylistType
+  playlistUrl: string
+  segmentsSha256Url: string
+  redundancies: {
+    baseUrl: string
+  }[]
+}
diff --git a/shared/models/videos/video-streaming-playlist.type.ts b/shared/models/videos/video-streaming-playlist.type.ts
new file mode 100644
index 000000000..3b403f295
--- /dev/null
+++ b/shared/models/videos/video-streaming-playlist.type.ts
@@ -0,0 +1,3 @@
+export enum VideoStreamingPlaylistType {
+  HLS = 1
+}
diff --git a/shared/models/videos/video-update.model.ts b/shared/models/videos/video-update.model.ts
index ed141a824..4ef904156 100644
--- a/shared/models/videos/video-update.model.ts
+++ b/shared/models/videos/video-update.model.ts
@@ -11,10 +11,12 @@ export interface VideoUpdate {
  privacy?: VideoPrivacy
  tags?: string[]
  commentsEnabled?: boolean
+  downloadEnabled?: boolean
  nsfw?: boolean
  waitTranscoding?: boolean
  channelId?: number
  thumbnailfile?: Blob
  previewfile?: Blob
  scheduleUpdate?: VideoScheduleUpdate
+  originallyPublishedAt?: Date | string
 }
diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts
index 022876a0b..963268674 100644
--- a/shared/models/videos/video.model.ts
+++ b/shared/models/videos/video.model.ts
@@ -1,10 +1,11 @@
-import { VideoResolution, VideoState } from '../../index'
+import { AccountSummary, VideoChannelSummary, VideoResolution, VideoState } from '../../index'
 import { Account } from '../actors'
 import { Avatar } from '../avatars/avatar.model'
 import { VideoChannel } from './channel/video-channel.model'
 import { VideoPrivacy } from './video-privacy.enum'
 import { VideoScheduleUpdate } from './video-schedule-update.model'
 import { VideoConstant } from './video-constant.model'
+import { VideoStreamingPlaylist } from './video-streaming-playlist.model'
 export interface VideoFile {
  magnetUri: string
@@ -17,24 +18,10 @@ export interface VideoFile {
  fps: number
 }
-export interface VideoChannelAttribute {
+export interface PlaylistElement {
-  id: number
+  position: number
-  uuid: string
+  startTimestamp: number
-  name: string
+  stopTimestamp: number
-  displayName: string
-  url: string
-  host: string
-  avatar?: Avatar
-}
-export interface AccountAttribute {
-  id: number
-  uuid: string
-  name: string
-  displayName: string
-  url: string
-  host: string
-  avatar?: Avatar
 }
 export interface Video {
@@ -43,6 +30,7 @@ export interface Video {
  createdAt: Date | string
  updatedAt: Date | string
  publishedAt: Date | string
+  originallyPublishedAt: Date | string
  category: VideoConstant<number>
  licence: VideoConstant<number>
  language: VideoConstant<string>
@@ -66,12 +54,14 @@ export interface Video {
  blacklisted?: boolean
  blacklistedReason?: string
-  account: AccountAttribute
+  account: AccountSummary
-  channel: VideoChannelAttribute
+  channel: VideoChannelSummary
  userHistory?: {
    currentTime: number
  }
+  playlistElement?: PlaylistElement
 }
 export interface VideoDetails extends Video {
@@ -82,8 +72,13 @@ export interface VideoDetails extends Video {
  files: VideoFile[]
  account: Account
  commentsEnabled: boolean
+  downloadEnabled: boolean
  // Not optional in details (unlike in Video)
  waitTranscoding: boolean
  state: VideoConstant<VideoState>
+  trackerUrls: string[]
+  streamingPlaylists: VideoStreamingPlaylist[]
 }
diff --git a/shared/utils/miscs/sql.ts b/shared/utils/miscs/sql.ts
deleted file mode 100644
index 027f78131..000000000
--- a/shared/utils/miscs/sql.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import * as Sequelize from 'sequelize'
-function getSequelize (serverNumber: number) {
-  const dbname = 'peertube_test' + serverNumber
-  const username = 'peertube'
-  const password = 'peertube'
-  const host = 'localhost'
-  const port = 5432
-  return new Sequelize(dbname, username, password, {
-    dialect: 'postgres',
-    host,
-    port,
-    operatorsAliases: false,
-    logging: false
-  })
-}
-function setActorField (serverNumber: number, to: string, field: string, value: string) {
-  const seq = getSequelize(serverNumber)
-  const options = { type: Sequelize.QueryTypes.UPDATE }
-  return seq.query(`UPDATE actor SET "${field}" = '${value}' WHERE url = '${to}'`, options)
-}
-function setVideoField (serverNumber: number, uuid: string, field: string, value: string) {
-  const seq = getSequelize(serverNumber)
-  const options = { type: Sequelize.QueryTypes.UPDATE }
-  return seq.query(`UPDATE video SET "${field}" = '${value}' WHERE uuid = '${uuid}'`, options)
-}
-export {
-  setVideoField,
-  setActorField
-}
diff --git a/shared/utils/server/servers.ts b/shared/utils/server/servers.ts
deleted file mode 100644
index cb57e0a69..000000000
--- a/shared/utils/server/servers.ts
+++ /dev/null
@@ -1,210 +0,0 @@
-/* tslint:disable:no-unused-expression */
-import { ChildProcess, exec, fork } from 'child_process'
-import { join } from 'path'
-import { root, wait } from '../miscs/miscs'
-import { readdir, readFile } from 'fs-extra'
-import { existsSync } from 'fs'
-import { expect } from 'chai'
-interface ServerInfo {
-  app: ChildProcess,
-  url: string
-  host: string
-  serverNumber: number
-  client: {
-    id: string,
-    secret: string
-  }
-  user: {
-    username: string,
-    password: string,
-    email?: string
-  }
-  accessToken?: string
-  video?: {
-    id: number
-    uuid: string
-    name: string
-    account: {
-      name: string
-    }
-  }
-  remoteVideo?: {
-    id: number
-    uuid: string
-  }
-}
-function flushAndRunMultipleServers (totalServers: number, configOverride?: Object) {
-  let apps = []
-  let i = 0
-  return new Promise<ServerInfo[]>(res => {
-    function anotherServerDone (serverNumber, app) {
-      apps[serverNumber - 1] = app
-      i++
-      if (i === totalServers) {
-        return res(apps)
-      }
-    }
-    flushTests()
-      .then(() => {
-        for (let j = 1; j <= totalServers; j++) {
-          runServer(j, configOverride).then(app => anotherServerDone(j, app))
-        }
-      })
-  })
-}
-function flushTests () {
-  return new Promise<void>((res, rej) => {
-    return exec('npm run clean:server:test', err => {
-      if (err) return rej(err)
-      return res()
-    })
-  })
-}
-function runServer (serverNumber: number, configOverride?: Object, args = []) {
-  const server: ServerInfo = {
-    app: null,
-    serverNumber: serverNumber,
-    url: `http://localhost:${9000 + serverNumber}`,
-    host: `localhost:${9000 + serverNumber}`,
-    client: {
-      id: null,
-      secret: null
-    },
-    user: {
-      username: null,
-      password: null
-    }
-  }
-  // These actions are async so we need to be sure that they have both been done
-  const serverRunString = {
-    'Server listening': false
-  }
-  const key = 'Database peertube_test' + serverNumber + ' is ready'
-  serverRunString[key] = false
-  const regexps = {
-    client_id: 'Client id: (.+)',
-    client_secret: 'Client secret: (.+)',
-    user_username: 'Username: (.+)',
-    user_password: 'User password: (.+)'
-  }
-  // Share the environment
-  const env = Object.create(process.env)
-  env['NODE_ENV'] = 'test'
-  env['NODE_APP_INSTANCE'] = serverNumber.toString()
-  if (configOverride !== undefined) {
-    env['NODE_CONFIG'] = JSON.stringify(configOverride)
-  }
-  const options = {
-    silent: true,
-    env: env,
-    detached: true
-  }
-  return new Promise<ServerInfo>(res => {
-    server.app = fork(join(root(), 'dist', 'server.js'), args, options)
-    server.app.stdout.on('data', function onStdout (data) {
-      let dontContinue = false
-      // Capture things if we want to
-      for (const key of Object.keys(regexps)) {
-        const regexp = regexps[key]
-        const matches = data.toString().match(regexp)
-        if (matches !== null) {
-          if (key === 'client_id') server.client.id = matches[1]
-          else if (key === 'client_secret') server.client.secret = matches[1]
-          else if (key === 'user_username') server.user.username = matches[1]
-          else if (key === 'user_password') server.user.password = matches[1]
-        }
-      }
-      // Check if all required sentences are here
-      for (const key of Object.keys(serverRunString)) {
-        if (data.toString().indexOf(key) !== -1) serverRunString[key] = true
-        if (serverRunString[key] === false) dontContinue = true
-      }
-      // If no, there is maybe one thing not already initialized (client/user credentials generation...)
-      if (dontContinue === true) return
-      server.app.stdout.removeListener('data', onStdout)
-      process.on('exit', () => {
-        try {
-          process.kill(server.app.pid)
-        } catch { /* empty */ }
-      })
-      res(server)
-    })
-  })
-}
-async function reRunServer (server: ServerInfo, configOverride?: any) {
-  const newServer = await runServer(server.serverNumber, configOverride)
-  server.app = newServer.app
-  return server
-}
-async function checkTmpIsEmpty (server: ServerInfo) {
-  const testDirectory = 'test' + server.serverNumber
-  const directoryPath = join(root(), testDirectory, 'tmp')
-  const directoryExists = existsSync(directoryPath)
-  expect(directoryExists).to.be.true
-  const files = await readdir(directoryPath)
-  expect(files).to.have.lengthOf(0)
-}
-function killallServers (servers: ServerInfo[]) {
-  for (const server of servers) {
-    process.kill(-server.app.pid)
-  }
-}
-async function waitUntilLog (server: ServerInfo, str: string, count = 1) {
-  const logfile = join(root(), 'test' + server.serverNumber, 'logs/peertube.log')
-  while (true) {
-    const buf = await readFile(logfile)
-    const matches = buf.toString().match(new RegExp(str, 'g'))
-    if (matches && matches.length === count) return
-    await wait(1000)
-  }
-}
-// ---------------------------------------------------------------------------
-export {
-  checkTmpIsEmpty,
-  ServerInfo,
-  flushAndRunMultipleServers,
-  flushTests,
-  runServer,
-  killallServers,
-  reRunServer,
-  waitUntilLog
-}