Fix dependency issues

diff --git a/shared/utils/search/videos.ts b/shared/utils/search/videos.ts
index 3a0c10e4249deb31d0ea8a2369b0f9c5c16a26b2..115b3ff9ab1cd38b1654f07dc659b6ef8f7e4d31 100644 (file)
--- a/shared/utils/search/videos.ts
+++ b/shared/utils/search/videos.ts
@@ -1,7 +1,7 @@
 /* tslint:disable:no-unused-expression */
 
 import * as request from 'supertest'
-import { VideosSearchQuery } from '../../../../shared/models/search'
+import { VideosSearchQuery } from '../../models/search'
 import { immutableAssign } from '..'
 
 function searchVideo (url: string, search: string) {

diff --git a/shared/utils/server/config.ts b/shared/utils/server/config.ts
index b85e02ab7712a41ad370a82aa9b8f2a247ed7219..15a94432b76300ee8a3e6225be3e73f24fed801c 100644 (file)
--- a/shared/utils/server/config.ts
+++ b/shared/utils/server/config.ts
@@ -1,5 +1,5 @@
 import { makeDeleteRequest, makeGetRequest, makePutBodyRequest } from '../'
-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 --git a/shared/utils/server/jobs.ts b/shared/utils/server/jobs.ts
index 4c02cace56871e8ab30b0e8fb6364c90b36c20cf..3eec1d7d784fb407e732bfbf3a44b37d12a10850 100644 (file)
--- a/shared/utils/server/jobs.ts
+++ b/shared/utils/server/jobs.ts
@@ -1,5 +1,5 @@
 import * as request from 'supertest'
-import { Job, JobState } from '../../../../shared/models'
+import { Job, JobState } from '../../models'
 import { ServerInfo, wait } from '../index'
 
 function getJobsList (url: string, accessToken: string, state: JobState) {

diff --git a/shared/utils/users/accounts.ts b/shared/utils/users/accounts.ts
index f82b8d90699cd6462c4784b3c8a59ee9ce634efb..5601f2a77527238603d6d2067d10549a5c027001 100644 (file)
--- a/shared/utils/users/accounts.ts
+++ b/shared/utils/users/accounts.ts
@@ -3,7 +3,7 @@
 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 { makeGetRequest } from '../requests/requests'
 

diff --git a/shared/utils/videos/video-abuses.ts b/shared/utils/videos/video-abuses.ts
index 14907e6a0921ac430314d7919e255c7e8f442689..8be891a9b0ea89d32f6f4eb756a06f5129fe8714 100644 (file)
--- a/shared/utils/videos/video-abuses.ts
+++ b/shared/utils/videos/video-abuses.ts
@@ -1,5 +1,5 @@
 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 '..'
 
 function reportVideoAbuse (url: string, token: string, videoId: number | string, reason: string, specialStatus = 200) {

diff --git a/shared/utils/videos/video-channels.ts b/shared/utils/videos/video-channels.ts
index 09298577798ff98eb69ba547ff62b0a6e8d58d2d..3d37f0e4c74a7a015bacc7a66093dc74ed7fb966 100644 (file)
--- a/shared/utils/videos/video-channels.ts
+++ b/shared/utils/videos/video-channels.ts
@@ -1,5 +1,5 @@
 import * as request from 'supertest'
-import { VideoChannelCreate, VideoChannelUpdate } from '../../../../shared/models/videos'
+import { VideoChannelCreate, VideoChannelUpdate } from '../../models/videos'
 import { updateAvatarRequest } from '../index'
 
 function getVideoChannelsList (url: string, start: number, count: number, sort?: string) {

diff --git a/shared/utils/videos/video-imports.ts b/shared/utils/videos/video-imports.ts
index 59dfd481abf21f35487b635c862d2a152f8dd4fa..bf5062cd13555d9532aa61db7565b5b3c33cde1f 100644 (file)
--- a/shared/utils/videos/video-imports.ts
+++ b/shared/utils/videos/video-imports.ts
@@ -1,4 +1,4 @@
-import { VideoImportCreate } from '../../../../shared/models/videos'
+import { VideoImportCreate } from '../../models/videos'
 import { makeGetRequest, makeUploadRequest } from '..'
 
 function getYoutubeVideoUrl () {

diff --git a/shared/utils/videos/videos.ts b/shared/utils/videos/videos.ts
index 87c385f3877f87109c23e21f187a87fc0c793b4a..b3206e56606b78666bf3dbf245c89722084124b8 100644 (file)
--- a/shared/utils/videos/videos.ts
+++ b/shared/utils/videos/videos.ts
@@ -16,8 +16,8 @@ import {
   ServerInfo,
   testImage
 } from '../'
-import { VideoDetails, VideoPrivacy } from '../../../../shared/models/videos'
-import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../initializers'
+import { VideoDetails, VideoPrivacy } from '../../models/videos'
+import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../server/initializers'
 import { dateIsValid, webtorrentAdd } from '../index'
 
 type VideoAttributes = {