diff options
author | Chocobozzz <me@florianbigard.com> | 2019-07-31 15:57:32 +0200 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2019-08-01 09:11:04 +0200 |
commit | bfbd912886eba17b4aa9a40dcef2fddc685d85bf (patch) | |
tree | 85e0f22980210a8ccd0888eb5e1790b152074677 /client/src/app/shared/video | |
parent | 85394ba22a07bde1dfccebf3f591a5d6dbe9df56 (diff) | |
download | PeerTube-bfbd912886eba17b4aa9a40dcef2fddc685d85bf.tar.gz PeerTube-bfbd912886eba17b4aa9a40dcef2fddc685d85bf.tar.zst PeerTube-bfbd912886eba17b4aa9a40dcef2fddc685d85bf.zip |
Fix broken playlist api
Diffstat (limited to 'client/src/app/shared/video')
-rw-r--r-- | client/src/app/shared/video/video.model.ts | 6 | ||||
-rw-r--r-- | client/src/app/shared/video/video.service.ts | 18 |
2 files changed, 1 insertions, 23 deletions
diff --git a/client/src/app/shared/video/video.model.ts b/client/src/app/shared/video/video.model.ts index 6f9de9241..fb98d5382 100644 --- a/client/src/app/shared/video/video.model.ts +++ b/client/src/app/shared/video/video.model.ts | |||
@@ -1,5 +1,5 @@ | |||
1 | import { User } from '../' | 1 | import { User } from '../' |
2 | import { PlaylistElement, UserRight, Video as VideoServerModel, VideoPrivacy, VideoState } from '../../../../../shared' | 2 | import { UserRight, Video as VideoServerModel, VideoPrivacy, VideoState } from '../../../../../shared' |
3 | import { Avatar } from '../../../../../shared/models/avatars/avatar.model' | 3 | import { Avatar } from '../../../../../shared/models/avatars/avatar.model' |
4 | import { VideoConstant } from '../../../../../shared/models/videos/video-constant.model' | 4 | import { VideoConstant } from '../../../../../shared/models/videos/video-constant.model' |
5 | import { durationToString, getAbsoluteAPIUrl } from '../misc/utils' | 5 | import { durationToString, getAbsoluteAPIUrl } from '../misc/utils' |
@@ -48,8 +48,6 @@ export class Video implements VideoServerModel { | |||
48 | blacklisted?: boolean | 48 | blacklisted?: boolean |
49 | blacklistedReason?: string | 49 | blacklistedReason?: string |
50 | 50 | ||
51 | playlistElement?: PlaylistElement | ||
52 | |||
53 | account: { | 51 | account: { |
54 | id: number | 52 | id: number |
55 | name: string | 53 | name: string |
@@ -126,8 +124,6 @@ export class Video implements VideoServerModel { | |||
126 | this.blacklistedReason = hash.blacklistedReason | 124 | this.blacklistedReason = hash.blacklistedReason |
127 | 125 | ||
128 | this.userHistory = hash.userHistory | 126 | this.userHistory = hash.userHistory |
129 | |||
130 | this.playlistElement = hash.playlistElement | ||
131 | } | 127 | } |
132 | 128 | ||
133 | isVideoNSFWForUser (user: User, serverConfig: ServerConfig) { | 129 | isVideoNSFWForUser (user: User, serverConfig: ServerConfig) { |
diff --git a/client/src/app/shared/video/video.service.ts b/client/src/app/shared/video/video.service.ts index 114b014ad..45366e3e3 100644 --- a/client/src/app/shared/video/video.service.ts +++ b/client/src/app/shared/video/video.service.ts | |||
@@ -31,7 +31,6 @@ import { ServerService } from '@app/core' | |||
31 | import { UserSubscriptionService } from '@app/shared/user-subscription/user-subscription.service' | 31 | import { UserSubscriptionService } from '@app/shared/user-subscription/user-subscription.service' |
32 | import { VideoChannel } from '@app/shared/video-channel/video-channel.model' | 32 | import { VideoChannel } from '@app/shared/video-channel/video-channel.model' |
33 | import { I18n } from '@ngx-translate/i18n-polyfill' | 33 | import { I18n } from '@ngx-translate/i18n-polyfill' |
34 | import { VideoPlaylistService } from '@app/shared/video-playlist/video-playlist.service' | ||
35 | 34 | ||
36 | export interface VideosProvider { | 35 | export interface VideosProvider { |
37 | getVideos (parameters: { | 36 | getVideos (parameters: { |
@@ -172,23 +171,6 @@ export class VideoService implements VideosProvider { | |||
172 | ) | 171 | ) |
173 | } | 172 | } |
174 | 173 | ||
175 | getPlaylistVideos ( | ||
176 | videoPlaylistId: number | string, | ||
177 | videoPagination: ComponentPagination | ||
178 | ): Observable<ResultList<Video>> { | ||
179 | const pagination = this.restService.componentPaginationToRestPagination(videoPagination) | ||
180 | |||
181 | let params = new HttpParams() | ||
182 | params = this.restService.addRestGetParams(params, pagination) | ||
183 | |||
184 | return this.authHttp | ||
185 | .get<ResultList<Video>>(VideoPlaylistService.BASE_VIDEO_PLAYLIST_URL + videoPlaylistId + '/videos', { params }) | ||
186 | .pipe( | ||
187 | switchMap(res => this.extractVideos(res)), | ||
188 | catchError(err => this.restExtractor.handleError(err)) | ||
189 | ) | ||
190 | } | ||
191 | |||
192 | getUserSubscriptionVideos (parameters: { | 174 | getUserSubscriptionVideos (parameters: { |
193 | videoPagination: ComponentPagination, | 175 | videoPagination: ComponentPagination, |
194 | sort: VideoSortField | 176 | sort: VideoSortField |