X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Fvideo%2Fvideo.service.ts;h=a51b9cab9eb9cd281642d41d1cdf5516de6b9201;hb=d3217560a611b94f888ecf3de93b428a7521d4de;hp=2da36ff1b721fb8f8afa6621262fbd8cec3d4a61;hpb=e94fc29706cd8e8fd892182d4de0a3ae80a3820f;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/shared/video/video.service.ts b/client/src/app/shared/video/video.service.ts index 2da36ff1b..a51b9cab9 100644 --- a/client/src/app/shared/video/video.service.ts +++ b/client/src/app/shared/video/video.service.ts @@ -4,14 +4,18 @@ import { Injectable } from '@angular/core' import { Observable } from 'rxjs' import { Video as VideoServerModel, VideoDetails as VideoDetailsServerModel } from '../../../../../shared' import { ResultList } from '../../../../../shared/models/result-list.model' -import { UserVideoRateUpdate } from '../../../../../shared/models/videos/user-video-rate-update.model' -import { UserVideoRate } from '../../../../../shared/models/videos/user-video-rate.model' -import { VideoFilter } from '../../../../../shared/models/videos/video-query.type' +import { + UserVideoRate, + UserVideoRateType, + UserVideoRateUpdate, + VideoConstant, + VideoFilter, + VideoPrivacy, + VideoUpdate +} from '../../../../../shared/models/videos' import { FeedFormat } from '../../../../../shared/models/feeds/feed-format.enum' -import { VideoRateType } from '../../../../../shared/models/videos/video-rate.type' -import { VideoUpdate } from '../../../../../shared/models/videos/video-update.model' import { environment } from '../../../environments/environment' -import { ComponentPagination } from '../rest/component-pagination.model' +import { ComponentPaginationLight } from '../rest/component-pagination.model' import { RestExtractor } from '../rest/rest-extractor.service' import { RestService } from '../rest/rest.service' import { UserService } from '../users/user.service' @@ -22,43 +26,55 @@ import { Video } from './video.model' import { objectToFormData } from '@app/shared/misc/utils' import { Account } from '@app/shared/account/account.model' import { AccountService } from '@app/shared/account/account.service' -import { VideoChannel } from '../../../../../shared/models/videos' import { VideoChannelService } from '@app/shared/video-channel/video-channel.service' -import { ServerService } from '@app/core' +import { ServerService, AuthService } from '@app/core' +import { UserSubscriptionService } from '@app/shared/user-subscription/user-subscription.service' +import { VideoChannel } from '@app/shared/video-channel/video-channel.model' +import { I18n } from '@ngx-translate/i18n-polyfill' +import { NSFWPolicyType } from '@shared/models/videos/nsfw-policy.type' + +export interface VideosProvider { + getVideos (parameters: { + videoPagination: ComponentPaginationLight, + sort: VideoSortField, + filter?: VideoFilter, + categoryOneOf?: number, + languageOneOf?: string[] + }): Observable> +} @Injectable() -export class VideoService { - private static BASE_VIDEO_URL = environment.apiUrl + '/api/v1/videos/' - private static BASE_FEEDS_URL = environment.apiUrl + '/feeds/videos.' +export class VideoService implements VideosProvider { + static BASE_VIDEO_URL = environment.apiUrl + '/api/v1/videos/' + static BASE_FEEDS_URL = environment.apiUrl + '/feeds/videos.' constructor ( private authHttp: HttpClient, + private authService: AuthService, + private userService: UserService, private restExtractor: RestExtractor, private restService: RestService, - private serverService: ServerService + private serverService: ServerService, + private i18n: I18n ) {} getVideoViewUrl (uuid: string) { return VideoService.BASE_VIDEO_URL + uuid + '/views' } - getVideo (uuid: string): Observable { - return this.serverService.localeObservable + getUserWatchingVideoUrl (uuid: string) { + return VideoService.BASE_VIDEO_URL + uuid + '/watching' + } + + getVideo (options: { videoId: string }): Observable { + return this.serverService.getServerLocale() .pipe( switchMap(translations => { - return this.authHttp.get(VideoService.BASE_VIDEO_URL + uuid) + return this.authHttp.get(VideoService.BASE_VIDEO_URL + options.videoId) .pipe(map(videoHash => ({ videoHash, translations }))) }), map(({ videoHash, translations }) => new VideoDetails(videoHash, translations)), - catchError(res => this.restExtractor.handleError(res)) - ) - } - - viewVideo (uuid: string): Observable { - return this.authHttp.post(this.getVideoViewUrl(uuid), {}) - .pipe( - map(this.restExtractor.extractDataBool), - catchError(this.restExtractor.handleError) + catchError(err => this.restExtractor.handleError(err)) ) } @@ -69,6 +85,7 @@ export class VideoService { const description = video.description || null const support = video.support || null const scheduleUpdate = video.scheduleUpdate || null + const originallyPublishedAt = video.originallyPublishedAt || null const body: VideoUpdate = { name: video.name, @@ -83,9 +100,11 @@ export class VideoService { nsfw: video.nsfw, waitTranscoding: video.waitTranscoding, commentsEnabled: video.commentsEnabled, + downloadEnabled: video.downloadEnabled, thumbnailfile: video.thumbnailfile, previewfile: video.previewfile, - scheduleUpdate + scheduleUpdate, + originallyPublishedAt } const data = objectToFormData(body) @@ -93,7 +112,7 @@ export class VideoService { return this.authHttp.put(VideoService.BASE_VIDEO_URL + video.id, data) .pipe( map(this.restExtractor.extractDataBool), - catchError(this.restExtractor.handleError) + catchError(err => this.restExtractor.handleError(err)) ) } @@ -102,28 +121,29 @@ export class VideoService { return this.authHttp .request<{ video: { id: number, uuid: string } }>(req) - .pipe(catchError(this.restExtractor.handleError)) + .pipe(catchError(err => this.restExtractor.handleError(err))) } - getMyVideos (videoPagination: ComponentPagination, sort: VideoSortField): Observable<{ videos: Video[], totalVideos: number }> { + getMyVideos (videoPagination: ComponentPaginationLight, sort: VideoSortField, search?: string): Observable> { const pagination = this.restService.componentPaginationToRestPagination(videoPagination) let params = new HttpParams() params = this.restService.addRestGetParams(params, pagination, sort) + params = this.restService.addObjectParams(params, { search }) return this.authHttp - .get>(UserService.BASE_USERS_URL + '/me/videos', { params }) + .get>(UserService.BASE_USERS_URL + 'me/videos', { params }) .pipe( switchMap(res => this.extractVideos(res)), - catchError(res => this.restExtractor.handleError(res)) + catchError(err => this.restExtractor.handleError(err)) ) } getAccountVideos ( account: Account, - videoPagination: ComponentPagination, + videoPagination: ComponentPaginationLight, sort: VideoSortField - ): Observable<{ videos: Video[], totalVideos: number }> { + ): Observable> { const pagination = this.restService.componentPaginationToRestPagination(videoPagination) let params = new HttpParams() @@ -133,61 +153,106 @@ export class VideoService { .get>(AccountService.BASE_ACCOUNT_URL + account.nameWithHost + '/videos', { params }) .pipe( switchMap(res => this.extractVideos(res)), - catchError(res => this.restExtractor.handleError(res)) + catchError(err => this.restExtractor.handleError(err)) ) } getVideoChannelVideos ( videoChannel: VideoChannel, - videoPagination: ComponentPagination, + videoPagination: ComponentPaginationLight, sort: VideoSortField - ): Observable<{ videos: Video[], totalVideos: number }> { + ): Observable> { + const pagination = this.restService.componentPaginationToRestPagination(videoPagination) + + let params = new HttpParams() + params = this.restService.addRestGetParams(params, pagination, sort) + + return this.authHttp + .get>(VideoChannelService.BASE_VIDEO_CHANNEL_URL + videoChannel.nameWithHost + '/videos', { params }) + .pipe( + switchMap(res => this.extractVideos(res)), + catchError(err => this.restExtractor.handleError(err)) + ) + } + + getUserSubscriptionVideos (parameters: { + videoPagination: ComponentPaginationLight, + sort: VideoSortField, + skipCount?: boolean + }): Observable> { + const { videoPagination, sort, skipCount } = parameters const pagination = this.restService.componentPaginationToRestPagination(videoPagination) let params = new HttpParams() params = this.restService.addRestGetParams(params, pagination, sort) + if (skipCount) params = params.set('skipCount', skipCount + '') + return this.authHttp - .get>(VideoChannelService.BASE_VIDEO_CHANNEL_URL + videoChannel.uuid + '/videos', { params }) + .get>(UserSubscriptionService.BASE_USER_SUBSCRIPTIONS_URL + '/videos', { params }) .pipe( switchMap(res => this.extractVideos(res)), - catchError(res => this.restExtractor.handleError(res)) + catchError(err => this.restExtractor.handleError(err)) ) } - getVideos ( - videoPagination: ComponentPagination, + getVideos (parameters: { + videoPagination: ComponentPaginationLight, sort: VideoSortField, - filter?: VideoFilter - ): Observable<{ videos: Video[], totalVideos: number }> { + filter?: VideoFilter, + categoryOneOf?: number, + languageOneOf?: string[], + skipCount?: boolean, + nsfw?: boolean + }): Observable> { + const { videoPagination, sort, filter, categoryOneOf, languageOneOf, skipCount, nsfw } = parameters + const pagination = this.restService.componentPaginationToRestPagination(videoPagination) let params = new HttpParams() params = this.restService.addRestGetParams(params, pagination, sort) - if (filter) { - params = params.set('filter', filter) + if (filter) params = params.set('filter', filter) + if (categoryOneOf) params = params.set('categoryOneOf', categoryOneOf + '') + if (skipCount) params = params.set('skipCount', skipCount + '') + + if (nsfw) { + params = params.set('nsfw', nsfw + '') + } else { + const nsfwPolicy = this.authService.isLoggedIn() + ? this.authService.getUser().nsfwPolicy + : this.userService.getAnonymousUser().nsfwPolicy + if (this.nsfwPolicyToFilter(nsfwPolicy)) params.set('nsfw', 'false') + } + + if (languageOneOf) { + for (const l of languageOneOf) { + params = params.append('languageOneOf[]', l) + } } return this.authHttp .get>(VideoService.BASE_VIDEO_URL, { params }) .pipe( switchMap(res => this.extractVideos(res)), - catchError(res => this.restExtractor.handleError(res)) + catchError(err => this.restExtractor.handleError(err)) ) } buildBaseFeedUrls (params: HttpParams) { const feeds = [ { + format: FeedFormat.RSS, label: 'rss 2.0', url: VideoService.BASE_FEEDS_URL + FeedFormat.RSS.toLowerCase() }, { + format: FeedFormat.ATOM, label: 'atom 1.0', url: VideoService.BASE_FEEDS_URL + FeedFormat.ATOM.toLowerCase() }, { + format: FeedFormat.JSON, label: 'json 1.0', url: VideoService.BASE_FEEDS_URL + FeedFormat.JSON.toLowerCase() } @@ -202,11 +267,13 @@ export class VideoService { return feeds } - getVideoFeedUrls (sort: VideoSortField, filter?: VideoFilter) { + getVideoFeedUrls (sort: VideoSortField, filter?: VideoFilter, categoryOneOf?: number) { let params = this.restService.addRestGetParams(new HttpParams(), undefined, sort) if (filter) params = params.set('filter', filter) + if (categoryOneOf) params = params.set('categoryOneOf', categoryOneOf + '') + return this.buildBaseFeedUrls(params) } @@ -224,42 +291,21 @@ export class VideoService { return this.buildBaseFeedUrls(params) } - searchVideos ( - search: string, - videoPagination: ComponentPagination, - sort: VideoSortField - ): Observable<{ videos: Video[], totalVideos: number }> { - const url = VideoService.BASE_VIDEO_URL + 'search' - - const pagination = this.restService.componentPaginationToRestPagination(videoPagination) - - let params = new HttpParams() - params = this.restService.addRestGetParams(params, pagination, sort) - params = params.append('search', search) - - return this.authHttp - .get>(url, { params }) - .pipe( - switchMap(res => this.extractVideos(res)), - catchError(res => this.restExtractor.handleError(res)) - ) - } - removeVideo (id: number) { return this.authHttp .delete(VideoService.BASE_VIDEO_URL + id) .pipe( map(this.restExtractor.extractDataBool), - catchError(res => this.restExtractor.handleError(res)) + catchError(err => this.restExtractor.handleError(err)) ) } loadCompleteDescription (descriptionPath: string) { return this.authHttp - .get(environment.apiUrl + descriptionPath) + .get<{ description: string }>(environment.apiUrl + descriptionPath) .pipe( - map(res => res[ 'description' ]), - catchError(res => this.restExtractor.handleError(res)) + map(res => res.description), + catchError(err => this.restExtractor.handleError(err)) ) } @@ -279,25 +325,11 @@ export class VideoService { const url = UserService.BASE_USERS_URL + 'me/videos/' + id + '/rating' return this.authHttp.get(url) - .pipe(catchError(res => this.restExtractor.handleError(res))) - } - - private setVideoRate (id: number, rateType: VideoRateType) { - const url = VideoService.BASE_VIDEO_URL + id + '/rate' - const body: UserVideoRateUpdate = { - rating: rateType - } - - return this.authHttp - .put(url, body) - .pipe( - map(this.restExtractor.extractDataBool), - catchError(res => this.restExtractor.handleError(res)) - ) + .pipe(catchError(err => this.restExtractor.handleError(err))) } - private extractVideos (result: ResultList) { - return this.serverService.localeObservable + extractVideos (result: ResultList) { + return this.serverService.getServerLocale() .pipe( map(translations => { const videosJson = result.data @@ -308,8 +340,49 @@ export class VideoService { videos.push(new Video(videoJson, translations)) } - return { videos, totalVideos } + return { total: totalVideos, data: videos } }) ) } + + explainedPrivacyLabels (privacies: VideoConstant[]) { + const base = [ + { + id: VideoPrivacy.PRIVATE, + label: this.i18n('Only I can see this video') + }, + { + id: VideoPrivacy.UNLISTED, + label: this.i18n('Only people with the private link can see this video') + }, + { + id: VideoPrivacy.PUBLIC, + label: this.i18n('Anyone can see this video') + }, + { + id: VideoPrivacy.INTERNAL, + label: this.i18n('Only users of this instance can see this video') + } + ] + + return base.filter(o => !!privacies.find(p => p.id === o.id)) + } + + private setVideoRate (id: number, rateType: UserVideoRateType) { + const url = VideoService.BASE_VIDEO_URL + id + '/rate' + const body: UserVideoRateUpdate = { + rating: rateType + } + + return this.authHttp + .put(url, body) + .pipe( + map(this.restExtractor.extractDataBool), + catchError(err => this.restExtractor.handleError(err)) + ) + } + + private nsfwPolicyToFilter (policy: NSFWPolicyType) { + return policy === 'do_not_list' + } }