aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/models/video
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-12-24 10:14:47 +0100
committerChocobozzz <me@florianbigard.com>2021-12-24 10:14:47 +0100
commitd17c7b4e8c52317bdc874917387b7a49f6cf8b01 (patch)
tree83a736f566f8cb4c696fa8e59086a523bbb4b4bf /server/models/video
parent1e9c1b1b44b4cbd4bc4b1e97e8e6ba2df93371de (diff)
downloadPeerTube-d17c7b4e8c52317bdc874917387b7a49f6cf8b01.tar.gz
PeerTube-d17c7b4e8c52317bdc874917387b7a49f6cf8b01.tar.zst
PeerTube-d17c7b4e8c52317bdc874917387b7a49f6cf8b01.zip
Fix shared imports
Diffstat (limited to 'server/models/video')
-rw-r--r--server/models/video/video-import.ts2
-rw-r--r--server/models/video/video.ts21
2 files changed, 16 insertions, 7 deletions
diff --git a/server/models/video/video-import.ts b/server/models/video/video-import.ts
index c41085ef9..c5c1a10f4 100644
--- a/server/models/video/video-import.ts
+++ b/server/models/video/video-import.ts
@@ -15,8 +15,8 @@ import {
15} from 'sequelize-typescript' 15} from 'sequelize-typescript'
16import { afterCommitIfTransaction } from '@server/helpers/database-utils' 16import { afterCommitIfTransaction } from '@server/helpers/database-utils'
17import { MVideoImportDefault, MVideoImportFormattable } from '@server/types/models/video/video-import' 17import { MVideoImportDefault, MVideoImportFormattable } from '@server/types/models/video/video-import'
18import { VideoImport, VideoImportState } from '@shared/models'
18import { AttributesOnly } from '@shared/typescript-utils' 19import { AttributesOnly } from '@shared/typescript-utils'
19import { VideoImport, VideoImportState } from '../../../shared'
20import { isVideoImportStateValid, isVideoImportTargetUrlValid } from '../../helpers/custom-validators/video-imports' 20import { isVideoImportStateValid, isVideoImportTargetUrlValid } from '../../helpers/custom-validators/video-imports'
21import { isVideoMagnetUriValid } from '../../helpers/custom-validators/videos' 21import { isVideoMagnetUriValid } from '../../helpers/custom-validators/videos'
22import { CONSTRAINTS_FIELDS, VIDEO_IMPORT_STATES } from '../../initializers/constants' 22import { CONSTRAINTS_FIELDS, VIDEO_IMPORT_STATES } from '../../initializers/constants'
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index 66a9a28fa..1f103f930 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -33,13 +33,22 @@ import { VideoPathManager } from '@server/lib/video-path-manager'
33import { getServerActor } from '@server/models/application/application' 33import { getServerActor } from '@server/models/application/application'
34import { ModelCache } from '@server/models/model-cache' 34import { ModelCache } from '@server/models/model-cache'
35import { buildVideoEmbedPath, buildVideoWatchPath, pick, uuidToShort } from '@shared/core-utils' 35import { buildVideoEmbedPath, buildVideoWatchPath, pick, uuidToShort } from '@shared/core-utils'
36import { VideoFile, VideoInclude } from '@shared/models' 36import {
37 ResultList,
38 ThumbnailType,
39 UserRight,
40 Video,
41 VideoDetails,
42 VideoFile,
43 VideoInclude,
44 VideoObject,
45 VideoPrivacy,
46 VideoRateType,
47 VideoState,
48 VideoStorage,
49 VideoStreamingPlaylistType
50} from '@shared/models'
37import { AttributesOnly } from '@shared/typescript-utils' 51import { AttributesOnly } from '@shared/typescript-utils'
38import { ResultList, UserRight, VideoPrivacy, VideoState } from '../../../shared'
39import { VideoObject } from '../../../shared/models/activitypub/objects'
40import { Video, VideoDetails, VideoRateType, VideoStorage } from '../../../shared/models/videos'
41import { ThumbnailType } from '../../../shared/models/videos/thumbnail.type'
42import { VideoStreamingPlaylistType } from '../../../shared/models/videos/video-streaming-playlist.type'
43import { peertubeTruncate } from '../../helpers/core-utils' 52import { peertubeTruncate } from '../../helpers/core-utils'
44import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' 53import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc'
45import { exists, isBooleanValid } from '../../helpers/custom-validators/misc' 54import { exists, isBooleanValid } from '../../helpers/custom-validators/misc'