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

6 files changed, 10 insertions, 8 deletions

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