diff options
Diffstat (limited to 'client/src/app/shared')
3 files changed, 15 insertions, 5 deletions
diff --git a/client/src/app/shared/shared-main/video/video-details.model.ts b/client/src/app/shared/shared-main/video/video-details.model.ts index f060d1dc9..45c053507 100644 --- a/client/src/app/shared/shared-main/video/video-details.model.ts +++ b/client/src/app/shared/shared-main/video/video-details.model.ts | |||
@@ -15,7 +15,6 @@ export class VideoDetails extends Video implements VideoDetailsServerModel { | |||
15 | support: string | 15 | support: string |
16 | channel: VideoChannel | 16 | channel: VideoChannel |
17 | tags: string[] | 17 | tags: string[] |
18 | files: VideoFile[] | ||
19 | account: Account | 18 | account: Account |
20 | commentsEnabled: boolean | 19 | commentsEnabled: boolean |
21 | downloadEnabled: boolean | 20 | downloadEnabled: boolean |
@@ -28,13 +27,13 @@ export class VideoDetails extends Video implements VideoDetailsServerModel { | |||
28 | 27 | ||
29 | trackerUrls: string[] | 28 | trackerUrls: string[] |
30 | 29 | ||
30 | files: VideoFile[] | ||
31 | streamingPlaylists: VideoStreamingPlaylist[] | 31 | streamingPlaylists: VideoStreamingPlaylist[] |
32 | 32 | ||
33 | constructor (hash: VideoDetailsServerModel, translations = {}) { | 33 | constructor (hash: VideoDetailsServerModel, translations = {}) { |
34 | super(hash, translations) | 34 | super(hash, translations) |
35 | 35 | ||
36 | this.descriptionPath = hash.descriptionPath | 36 | this.descriptionPath = hash.descriptionPath |
37 | this.files = hash.files | ||
38 | this.channel = new VideoChannel(hash.channel) | 37 | this.channel = new VideoChannel(hash.channel) |
39 | this.account = new Account(hash.account) | 38 | this.account = new Account(hash.account) |
40 | this.tags = hash.tags | 39 | this.tags = hash.tags |
@@ -43,7 +42,6 @@ export class VideoDetails extends Video implements VideoDetailsServerModel { | |||
43 | this.downloadEnabled = hash.downloadEnabled | 42 | this.downloadEnabled = hash.downloadEnabled |
44 | 43 | ||
45 | this.trackerUrls = hash.trackerUrls | 44 | this.trackerUrls = hash.trackerUrls |
46 | this.streamingPlaylists = hash.streamingPlaylists | ||
47 | 45 | ||
48 | this.buildLikeAndDislikePercents() | 46 | this.buildLikeAndDislikePercents() |
49 | } | 47 | } |
diff --git a/client/src/app/shared/shared-main/video/video.model.ts b/client/src/app/shared/shared-main/video/video.model.ts index 699eac7f1..b11316471 100644 --- a/client/src/app/shared/shared-main/video/video.model.ts +++ b/client/src/app/shared/shared-main/video/video.model.ts | |||
@@ -10,9 +10,11 @@ import { | |||
10 | UserRight, | 10 | UserRight, |
11 | Video as VideoServerModel, | 11 | Video as VideoServerModel, |
12 | VideoConstant, | 12 | VideoConstant, |
13 | VideoFile, | ||
13 | VideoPrivacy, | 14 | VideoPrivacy, |
14 | VideoScheduleUpdate, | 15 | VideoScheduleUpdate, |
15 | VideoState | 16 | VideoState, |
17 | VideoStreamingPlaylist | ||
16 | } from '@shared/models' | 18 | } from '@shared/models' |
17 | 19 | ||
18 | export class Video implements VideoServerModel { | 20 | export class Video implements VideoServerModel { |
@@ -96,6 +98,9 @@ export class Video implements VideoServerModel { | |||
96 | 98 | ||
97 | pluginData?: any | 99 | pluginData?: any |
98 | 100 | ||
101 | streamingPlaylists?: VideoStreamingPlaylist[] | ||
102 | files?: VideoFile[] | ||
103 | |||
99 | static buildWatchUrl (video: Partial<Pick<Video, 'uuid' | 'shortUUID'>>) { | 104 | static buildWatchUrl (video: Partial<Pick<Video, 'uuid' | 'shortUUID'>>) { |
100 | return buildVideoWatchPath({ shortUUID: video.shortUUID || video.uuid }) | 105 | return buildVideoWatchPath({ shortUUID: video.shortUUID || video.uuid }) |
101 | } | 106 | } |
@@ -172,6 +177,9 @@ export class Video implements VideoServerModel { | |||
172 | this.blockedOwner = hash.blockedOwner | 177 | this.blockedOwner = hash.blockedOwner |
173 | this.blockedServer = hash.blockedServer | 178 | this.blockedServer = hash.blockedServer |
174 | 179 | ||
180 | this.streamingPlaylists = hash.streamingPlaylists | ||
181 | this.files = hash.files | ||
182 | |||
175 | this.userHistory = hash.userHistory | 183 | this.userHistory = hash.userHistory |
176 | 184 | ||
177 | this.originInstanceHost = this.account.host | 185 | this.originInstanceHost = this.account.host |
diff --git a/client/src/app/shared/shared-main/video/video.service.ts b/client/src/app/shared/shared-main/video/video.service.ts index 0a3a51b0c..5db9a8704 100644 --- a/client/src/app/shared/shared-main/video/video.service.ts +++ b/client/src/app/shared/shared-main/video/video.service.ts | |||
@@ -208,7 +208,11 @@ export class VideoService { | |||
208 | ): Observable<ResultList<Video>> { | 208 | ): Observable<ResultList<Video>> { |
209 | const { pagination, search } = parameters | 209 | const { pagination, search } = parameters |
210 | 210 | ||
211 | const include = VideoInclude.BLACKLISTED | VideoInclude.BLOCKED_OWNER | VideoInclude.HIDDEN_PRIVACY | VideoInclude.NOT_PUBLISHED_STATE | 211 | const include = VideoInclude.BLACKLISTED | |
212 | VideoInclude.BLOCKED_OWNER | | ||
213 | VideoInclude.HIDDEN_PRIVACY | | ||
214 | VideoInclude.NOT_PUBLISHED_STATE | | ||
215 | VideoInclude.FILES | ||
212 | 216 | ||
213 | let params = new HttpParams() | 217 | let params = new HttpParams() |
214 | params = this.buildCommonVideosParams({ params, include, ...parameters }) | 218 | params = this.buildCommonVideosParams({ params, include, ...parameters }) |