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

15 files changed, 20 insertions, 17 deletions

diff --git a/shared/utils/requests/check-api-params.ts b/shared/utils/requests/check-api-params.ts
index edb47e0e9..a2a549682 100644
--- a/shared/utils/requests/check-api-params.ts
+++ b/shared/utils/requests/check-api-params.ts
@@ -1,5 +1,5 @@
 import { makeGetRequest } from './requests'
-import { immutableAssign } from '..'
+import { immutableAssign } from '../miscs/miscs'
 
 function checkBadStartPagination (url: string, path: string, token?: string, query = {}) {
   return makeGetRequest({
diff --git a/shared/utils/search/videos.ts b/shared/utils/search/videos.ts
index 115b3ff9a..ba4627017 100644
--- a/shared/utils/search/videos.ts
+++ b/shared/utils/search/videos.ts
@@ -2,7 +2,7 @@
 
 import * as request from 'supertest'
 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 --git a/shared/utils/server/config.ts b/shared/utils/server/config.ts
index 15a94432b..5b888b061 100644
--- a/shared/utils/server/config.ts
+++ b/shared/utils/server/config.ts
@@ -1,4 +1,4 @@
-import { makeDeleteRequest, makeGetRequest, makePutBodyRequest } from '../'
+import { makeDeleteRequest, makeGetRequest, makePutBodyRequest } from '../requests/requests'
 import { CustomConfig } from '../../models/server/custom-config.model'
 
 function getConfig (url: string) {
diff --git a/shared/utils/server/jobs.ts b/shared/utils/server/jobs.ts
index 3eec1d7d7..7c7e89824 100644
--- a/shared/utils/server/jobs.ts
+++ b/shared/utils/server/jobs.ts
@@ -1,6 +1,7 @@
 import * as request from 'supertest'
 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 --git a/shared/utils/server/stats.ts b/shared/utils/server/stats.ts
index 01989d952..6f079ad18 100644
--- a/shared/utils/server/stats.ts
+++ b/shared/utils/server/stats.ts
@@ -1,4 +1,4 @@
-import { makeGetRequest } from '../'
+import { makeGetRequest } from '../requests/requests'
 
 function getStats (url: string, useCache = false) {
   const path = '/api/v1/server/stats'
diff --git a/shared/utils/users/accounts.ts b/shared/utils/users/accounts.ts
index 5601f2a77..388eb6973 100644
--- a/shared/utils/users/accounts.ts
+++ b/shared/utils/users/accounts.ts
@@ -4,7 +4,7 @@ import { expect } from 'chai'
 import { existsSync, readdir } from 'fs-extra'
 import { join } from 'path'
 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 --git a/shared/utils/users/blocklist.ts b/shared/utils/users/blocklist.ts
index 35b537571..0ead5e5f6 100644
--- a/shared/utils/users/blocklist.ts
+++ b/shared/utils/users/blocklist.ts
@@ -1,6 +1,6 @@
 /* tslint:disable:no-unused-expression */
 
-import { makeDeleteRequest, makePostBodyRequest } from '../index'
+import { makeDeleteRequest, makePostBodyRequest } from '../requests/requests'
 import { makeGetRequest } from '../requests/requests'
 
 function getAccountBlocklistByAccount (
diff --git a/shared/utils/users/user-subscriptions.ts b/shared/utils/users/user-subscriptions.ts
index b0e7da7cc..7148fbfca 100644
--- a/shared/utils/users/user-subscriptions.ts
+++ b/shared/utils/users/user-subscriptions.ts
@@ -1,4 +1,4 @@
-import { makeDeleteRequest, makeGetRequest, makePostBodyRequest } from '../'
+import { makeDeleteRequest, makeGetRequest, makePostBodyRequest } from '../requests/requests'
 
 function addUserSubscription (url: string, token: string, targetUri: string, statusCodeExpected = 204) {
   const path = '/api/v1/users/me/subscriptions'
diff --git a/shared/utils/users/users.ts b/shared/utils/users/users.ts
index 1b385aaf7..d5d62a507 100644
--- a/shared/utils/users/users.ts
+++ b/shared/utils/users/users.ts
@@ -1,5 +1,5 @@
 import * as request from 'supertest'
-import { makePostBodyRequest, makePutBodyRequest, updateAvatarRequest } from '../'
+import { makePostBodyRequest, makePutBodyRequest, updateAvatarRequest } from '../requests/requests'
 
 import { UserRole } from '../../index'
 import { NSFWPolicyType } from '../../models/videos/nsfw-policy.type'
diff --git a/shared/utils/videos/video-abuses.ts b/shared/utils/videos/video-abuses.ts
index 8be891a9b..7f011ec0f 100644
--- a/shared/utils/videos/video-abuses.ts
+++ b/shared/utils/videos/video-abuses.ts
@@ -1,6 +1,6 @@
 import * as request from 'supertest'
 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 --git a/shared/utils/videos/video-captions.ts b/shared/utils/videos/video-captions.ts
index 41e52be07..8d67f617b 100644
--- a/shared/utils/videos/video-captions.ts
+++ b/shared/utils/videos/video-captions.ts
@@ -1,7 +1,7 @@
-import { makeDeleteRequest, makeGetRequest } from '../'
-import { buildAbsoluteFixturePath, makeUploadRequest } from '../index'
+import { makeDeleteRequest, makeGetRequest, makeUploadRequest } from '../requests/requests'
 import * as request from 'supertest'
 import * as chai from 'chai'
+import { buildAbsoluteFixturePath } from '../miscs/miscs'
 
 const expect = chai.expect
 
diff --git a/shared/utils/videos/video-channels.ts b/shared/utils/videos/video-channels.ts
index 3d37f0e4c..3935c261e 100644
--- a/shared/utils/videos/video-channels.ts
+++ b/shared/utils/videos/video-channels.ts
@@ -1,6 +1,6 @@
 import * as request from 'supertest'
 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 --git a/shared/utils/videos/video-comments.ts b/shared/utils/videos/video-comments.ts
index 7d4cae364..0ebf69ced 100644
--- a/shared/utils/videos/video-comments.ts
+++ b/shared/utils/videos/video-comments.ts
@@ -1,5 +1,5 @@
 import * as request from 'supertest'
-import { makeDeleteRequest } from '../'
+import { makeDeleteRequest } from '../requests/requests'
 
 function getVideoCommentThreads (url: string, videoId: number | string, start: number, count: number, sort?: string, token?: string) {
   const path = '/api/v1/videos/' + videoId + '/comment-threads'
diff --git a/shared/utils/videos/video-imports.ts b/shared/utils/videos/video-imports.ts
index bf5062cd1..3fa49b432 100644
--- a/shared/utils/videos/video-imports.ts
+++ b/shared/utils/videos/video-imports.ts
@@ -1,5 +1,6 @@
+
 import { VideoImportCreate } from '../../models/videos'
-import { makeGetRequest, makeUploadRequest } from '..'
+import { makeGetRequest, makeUploadRequest } from '../requests/requests'
 
 function getYoutubeVideoUrl () {
   return 'https://youtu.be/msX3jv1XdvM'
diff --git a/shared/utils/videos/videos.ts b/shared/utils/videos/videos.ts
index b3206e566..1ab3e7c4b 100644
--- a/shared/utils/videos/videos.ts
+++ b/shared/utils/videos/videos.ts
@@ -16,9 +16,10 @@ import {
   ServerInfo,
   testImage
 } from '../'
+
 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