Merge branch 'develop' of https://github.com/Chocobozzz/PeerTube into move-utils...

diff --cc server/tests/api/activitypub/security.ts
index 69b7c01482030cd4139eeb9be4a3cc79d25b742a,7349749f1fc8e8b574a46554bef5bac0444369c3..b71a61c8c0b3ec46d53385df5f6feb3f94a348f0
--- 1/server/tests/api/activitypub/security.ts
--- 2/server/tests/api/activitypub/security.ts
+++ b/server/tests/api/activitypub/security.ts
@@@ -2,16 -2,7 +2,12 @@@
  
  import 'mocha'
  
 -import { flushAndRunMultipleServers, flushTests, killallServers, ServerInfo } from '../../utils'
 +import {
 +  flushAndRunMultipleServers,
 +  flushTests,
 +  killallServers,
 +  ServerInfo
 +} from '../../../../shared/utils'
- import {
-   makePOSTAPRequest,
-   makeFollowRequest,
- } from '../../utils/requests/activitypub'
  import { HTTP_SIGNATURE } from '../../../initializers'
  import { buildDigest, buildGlobalHeaders } from '../../../lib/job-queue/handlers/utils/activitypub-http-utils'
  import * as chai from 'chai'

diff --cc server/tests/api/videos/video-blacklist-management.ts
Simple merge

diff --cc server/tests/api/videos/video-channels.ts
index 5bffffc660806cbdbf410912b7f3c8535bd62a09,41429a3d85f8b11f43d72354333a0c62ae4c8f05..63514d69c413ed5fc8b96abbf68b0f2c87dc4a06
--- 1/server/tests/api/videos/video-channels.ts
--- 2/server/tests/api/videos/video-channels.ts
+++ b/server/tests/api/videos/video-channels.ts
@@@ -7,11 -7,13 +7,13 @@@ import 
    createUser,
    doubleFollow,
    flushAndRunMultipleServers,
-   getVideoChannelVideos, serverLogin, testImage,
+   getVideoChannelVideos,
+   testImage,
    updateVideo,
    updateVideoChannelAvatar,
-   uploadVideo, wait, userLogin
+   uploadVideo,
+   userLogin
 -} from '../../utils'
 +} from '../../../../shared/utils'
  import {
    addVideoChannel,
    deleteVideoChannel,

diff --cc server/tests/api/videos/video-schedule-update.ts
index ecfc5e034cfa53d55ef1357c907a08ce28a8c1f8,b226a9d5016cdbc0476522bbc0f78673de8f03e9..632c4244ce22caa7fe8a953a3c9302fc5c0da918
--- 1/server/tests/api/videos/video-schedule-update.ts
--- 2/server/tests/api/videos/video-schedule-update.ts
+++ b/server/tests/api/videos/video-schedule-update.ts
@@@ -15,9 -15,8 +15,8 @@@ import 
    updateVideo,
    uploadVideo,
    wait
 -} from '../../utils'
 -import { waitJobs } from '../../utils/server/jobs'
 +} from '../../../../shared/utils'
- import { join } from 'path'
 +import { waitJobs } from '../../../../shared/utils/server/jobs'
  
  const expect = chai.expect
  

diff --cc server/tests/api/videos/video-transcoder.ts
index f9458f0ece5d8694d3cf8a8a6c949b7ec5191346,23920d45258ec1ef7df09f8246016b470df112e5..68cf001947a8c772028ca87cf6d2ef7b919ae1f2
--- 1/server/tests/api/videos/video-transcoder.ts
--- 2/server/tests/api/videos/video-transcoder.ts
+++ b/server/tests/api/videos/video-transcoder.ts
@@@ -18,12 -18,10 +18,11 @@@ import 
    ServerInfo,
    setAccessTokensToServers,
    uploadVideo,
-   webtorrentAdd,
-   generateHighBitrateVideo
+   webtorrentAdd
 -} from '../../utils'
 +} from '../../../../shared/utils'
  import { join } from 'path'
 -import { waitJobs } from '../../utils/server/jobs'
 +import { waitJobs } from '../../../../shared/utils/server/jobs'
 +import { pathExists } from 'fs-extra'
  import { VIDEO_TRANSCODING_FPS } from '../../../../server/initializers/constants'
  
  const expect = chai.expect

diff --cc shared/utils/requests/check-api-params.ts
Simple merge

diff --cc shared/utils/search/videos.ts
index 115b3ff9ab1cd38b1654f07dc659b6ef8f7e4d31,8c0037ccc1eaed20740ee728daa5ae28ae22b5f4..ba46270175f45edc395deb80a450b38c9f83897a
--- 1/shared/utils/search/videos.ts
--- 2/server/tests/utils/search/videos.ts
+++ b/shared/utils/search/videos.ts
@@@ -1,8 -1,8 +1,8 @@@
  /* tslint:disable:no-unused-expression */
  
  import * as request from 'supertest'
 -import { VideosSearchQuery } from '../../../../shared/models/search'
 +import { VideosSearchQuery } from '../../models/search'
- import { immutableAssign } from '..'
+ import { immutableAssign } from '../miscs/miscs'
  
  function searchVideo (url: string, search: string) {
    const path = '/api/v1/search/videos'

diff --cc shared/utils/server/config.ts
index 15a94432b76300ee8a3e6225be3e73f24fed801c,aa3100d3439962735477487f567233170d7a78ca..5b888b061b0e8ceed37e575f703ea9eadc997ed2
--- 1/shared/utils/server/config.ts
--- 2/server/tests/utils/server/config.ts
+++ b/shared/utils/server/config.ts
@@@ -1,5 -1,5 +1,5 @@@
- import { makeDeleteRequest, makeGetRequest, makePutBodyRequest } from '../'
+ import { makeDeleteRequest, makeGetRequest, makePutBodyRequest } from '../requests/requests'
 -import { CustomConfig } from '../../../../shared/models/server/custom-config.model'
 +import { CustomConfig } from '../../models/server/custom-config.model'
  
  function getConfig (url: string) {
    const path = '/api/v1/config'

diff --cc shared/utils/server/jobs.ts
index 3eec1d7d784fb407e732bfbf3a44b37d12a10850,26180ec725cb2de12f27991d5e3d85aed32a56cb..7c7e898240e375ff88b50c1dea1d50a6207b1293
--- 1/shared/utils/server/jobs.ts
--- 2/server/tests/utils/server/jobs.ts
+++ b/shared/utils/server/jobs.ts
@@@ -1,6 -1,7 +1,7 @@@
  import * as request from 'supertest'
 -import { Job, JobState } from '../../../../shared/models'
 -import { ServerInfo } from './servers'
 +import { Job, JobState } from '../../models'
- import { ServerInfo, wait } from '../index'
+ import { wait } from '../miscs/miscs'
++import { ServerInfo } from './servers'
  
  function getJobsList (url: string, accessToken: string, state: JobState) {
    const path = '/api/v1/jobs/' + state

diff --cc shared/utils/server/stats.ts
Simple merge

diff --cc shared/utils/users/accounts.ts
index 5601f2a77527238603d6d2067d10549a5c027001,257fa5b2750ad593fa81b7e6797464d68c06dd3d..388eb6973c79a7ca3c1c3d54161f9857ebe1e72a
--- 1/shared/utils/users/accounts.ts
--- 2/server/tests/utils/users/accounts.ts
+++ b/shared/utils/users/accounts.ts
@@@ -3,8 -3,8 +3,8 @@@
  import { expect } from 'chai'
  import { existsSync, readdir } from 'fs-extra'
  import { join } from 'path'
 -import { Account } from '../../../../shared/models/actors'
 +import { Account } from '../../models/actors'
- import { root } from '../index'
+ import { root } from '../miscs/miscs'
  import { makeGetRequest } from '../requests/requests'
  
  function getAccountsList (url: string, sort = '-createdAt', statusCodeExpected = 200) {

diff --cc shared/utils/users/blocklist.ts
Simple merge

diff --cc shared/utils/users/user-subscriptions.ts
Simple merge

diff --cc shared/utils/users/users.ts
index 1b385aaf77e00e5ef3afa73c6cc94253566a5947,2c21a9ecf9c5c3ea4e41778eec9d6b5f12886c71..d5d62a5073926bd454633d7f0764f1cbd87edf99
--- 1/shared/utils/users/users.ts
--- 2/server/tests/utils/users/users.ts
+++ b/shared/utils/users/users.ts
@@@ -1,8 -1,8 +1,8 @@@
  import * as request from 'supertest'
- import { makePostBodyRequest, makePutBodyRequest, updateAvatarRequest } from '../'
+ import { makePostBodyRequest, makePutBodyRequest, updateAvatarRequest } from '../requests/requests'
  
 -import { UserRole } from '../../../../shared/index'
 -import { NSFWPolicyType } from '../../../../shared/models/videos/nsfw-policy.type'
 +import { UserRole } from '../../index'
 +import { NSFWPolicyType } from '../../models/videos/nsfw-policy.type'
  
  function createUser (
    url: string,

diff --cc shared/utils/videos/video-abuses.ts
index 8be891a9b0ea89d32f6f4eb756a06f5129fe8714,4ad82ad8cb7dcec2cc1691e00d462144834daf81..7f011ec0ff0acd4baa7754d7809471882fe5ba1d
--- 1/shared/utils/videos/video-abuses.ts
--- 2/server/tests/utils/videos/video-abuses.ts
+++ b/shared/utils/videos/video-abuses.ts
@@@ -1,6 -1,6 +1,6 @@@
  import * as request from 'supertest'
 -import { VideoAbuseUpdate } from '../../../../shared/models/videos/abuse/video-abuse-update.model'
 +import { VideoAbuseUpdate } from '../../models/videos/abuse/video-abuse-update.model'
- import { makeDeleteRequest, makePutBodyRequest } from '..'
+ import { makeDeleteRequest, makePutBodyRequest } from '../requests/requests'
  
  function reportVideoAbuse (url: string, token: string, videoId: number | string, reason: string, specialStatus = 200) {
    const path = '/api/v1/videos/' + videoId + '/abuse'

diff --cc shared/utils/videos/video-captions.ts
Simple merge

diff --cc shared/utils/videos/video-channels.ts
index 3d37f0e4c74a7a015bacc7a66093dc74ed7fb966,70e8d1a6b7e4905a9e17ee0e978771960c2f43e6..3935c261e9803a4d047af6f99c993e3369dd2cea
--- 1/shared/utils/videos/video-channels.ts
--- 2/server/tests/utils/videos/video-channels.ts
+++ b/shared/utils/videos/video-channels.ts
@@@ -1,6 -1,6 +1,6 @@@
  import * as request from 'supertest'
 -import { VideoChannelCreate, VideoChannelUpdate } from '../../../../shared/models/videos'
 +import { VideoChannelCreate, VideoChannelUpdate } from '../../models/videos'
- import { updateAvatarRequest } from '../index'
+ import { updateAvatarRequest } from '../requests/requests'
  
  function getVideoChannelsList (url: string, start: number, count: number, sort?: string) {
    const path = '/api/v1/video-channels'

diff --cc shared/utils/videos/video-comments.ts
Simple merge

diff --cc shared/utils/videos/video-imports.ts
index bf5062cd13555d9532aa61db7565b5b3c33cde1f,eb985a5b16ddf2dccf4c6eb8a96a53025ebb3215..3fa49b4320fad5da696afd9d0544a1bc0541790d
--- 1/shared/utils/videos/video-imports.ts
--- 2/server/tests/utils/videos/video-imports.ts
+++ b/shared/utils/videos/video-imports.ts
@@@ -1,5 -1,5 +1,6 @@@
 -import { VideoImportCreate } from '../../../../shared/models/videos'
++
 +import { VideoImportCreate } from '../../models/videos'
- import { makeGetRequest, makeUploadRequest } from '..'
+ import { makeGetRequest, makeUploadRequest } from '../requests/requests'
  
  function getYoutubeVideoUrl () {
    return 'https://youtu.be/msX3jv1XdvM'

diff --cc shared/utils/videos/videos.ts
index b3206e56606b78666bf3dbf245c89722084124b8,d6c3e5dac06b0ce5de86906053a6404b05257316..1ab3e7c4be7dea0fadd4623f8b85a690f0893ad6
--- 1/shared/utils/videos/videos.ts
--- 2/server/tests/utils/videos/videos.ts
+++ b/shared/utils/videos/videos.ts
@@@ -16,9 -16,9 +16,10 @@@ import 
    ServerInfo,
    testImage
  } from '../'
 -import { VideoDetails, VideoPrivacy } from '../../../../shared/models/videos'
 -import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../initializers/constants'
++
 +import { VideoDetails, VideoPrivacy } from '../../models/videos'
- import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../server/initializers'
- import { dateIsValid, webtorrentAdd } from '../index'
++import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../server/initializers/constants'
+ import { dateIsValid, webtorrentAdd } from '../miscs/miscs'
  
  type VideoAttributes = {
    name?: string