diff options
| author | buoyantair <buoyantair@protonmail.com> | 2018-11-20 12:28:13 +0530 |
|---|---|---|
| committer | buoyantair <buoyantair@protonmail.com> | 2018-11-20 12:28:13 +0530 |
| commit | bc22d60899e14631cba0fb6450f4e85fc9528293 (patch) | |
| tree | 285fa55033bc065df803adc2e4e3142fdfdd7309 /shared/utils/videos/videos.ts | |
| parent | b9f234371bfaf0d9cfa81e02fcea92cac1f9ae13 (diff) | |
| parent | d216b5387fb774d1355df3ace002f7be469bd450 (diff) | |
| download | PeerTube-bc22d60899e14631cba0fb6450f4e85fc9528293.tar.gz PeerTube-bc22d60899e14631cba0fb6450f4e85fc9528293.tar.zst PeerTube-bc22d60899e14631cba0fb6450f4e85fc9528293.zip | |
Merge branch 'develop' of https://github.com/Chocobozzz/PeerTube into move-utils-to-shared
Diffstat (limited to 'shared/utils/videos/videos.ts')
| -rw-r--r-- | shared/utils/videos/videos.ts | 5 |
1 files changed, 3 insertions, 2 deletions
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 { | |||
| 16 | ServerInfo, | 16 | ServerInfo, |
| 17 | testImage | 17 | testImage |
| 18 | } from '../' | 18 | } from '../' |
| 19 | |||
| 19 | import { VideoDetails, VideoPrivacy } from '../../models/videos' | 20 | import { VideoDetails, VideoPrivacy } from '../../models/videos' |
| 20 | import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../server/initializers' | 21 | import { VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES } from '../../../server/initializers/constants' |
| 21 | import { dateIsValid, webtorrentAdd } from '../index' | 22 | import { dateIsValid, webtorrentAdd } from '../miscs/miscs' |
| 22 | 23 | ||
| 23 | type VideoAttributes = { | 24 | type VideoAttributes = { |
| 24 | name?: string | 25 | name?: string |