From d4681c0074ba51c62a3aeb9fb3f2cd071dd21e32 Mon Sep 17 00:00:00 2001 From: buoyantair Date: Mon, 29 Oct 2018 22:36:09 +0530 Subject: [PATCH] Fix dependency issues --- shared/utils/search/videos.ts | 2 +- shared/utils/server/config.ts | 2 +- shared/utils/server/jobs.ts | 2 +- shared/utils/users/accounts.ts | 2 +- shared/utils/videos/video-abuses.ts | 2 +- shared/utils/videos/video-channels.ts | 2 +- shared/utils/videos/video-imports.ts | 2 +- shared/utils/videos/videos.ts | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/shared/utils/search/videos.ts b/shared/utils/search/videos.ts index 3a0c10e42..115b3ff9a 100644 --- 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 b85e02ab7..15a94432b 100644 --- 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 4c02cace5..3eec1d7d7 100644 --- 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 f82b8d906..5601f2a77 100644 --- 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 14907e6a0..8be891a9b 100644 --- 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 092985777..3d37f0e4c 100644 --- 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 59dfd481a..bf5062cd1 100644 --- 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 87c385f38..b3206e566 100644 --- 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 = { -- 2.25.1