-import { Observable } from 'rxjs'
-import { catchError, map, switchMap } from 'rxjs/operators'
-import { HttpClient, HttpParams, HttpRequest } from '@angular/common/http'
+import { Observable, of, throwError } from 'rxjs'
+import { catchError, map, mergeMap, switchMap } from 'rxjs/operators'
+import { HttpClient, HttpErrorResponse, HttpParams, HttpRequest } from '@angular/common/http'
import { Injectable } from '@angular/core'
-import { ComponentPaginationLight, RestExtractor, RestService, ServerService, UserService } from '@app/core'
+import { ComponentPaginationLight, RestExtractor, RestService, ServerService, UserService, AuthService } from '@app/core'
import { objectToFormData } from '@app/helpers'
-import { I18n } from '@ngx-translate/i18n-polyfill'
import {
FeedFormat,
NSFWPolicyType,
Video as VideoServerModel,
VideoConstant,
VideoDetails as VideoDetailsServerModel,
+ VideoFileMetadata,
VideoFilter,
VideoPrivacy,
VideoSortField,
- VideoUpdate,
- VideoFileMetadata
+ VideoUpdate
} from '@shared/models'
import { environment } from '../../../../environments/environment'
-import { Account, AccountService } from '../account'
+import { Account } from '../account/account.model'
+import { AccountService } from '../account/account.service'
import { VideoChannel, VideoChannelService } from '../video-channel'
import { VideoDetails } from './video-details.model'
import { VideoEdit } from './video-edit.model'
export class VideoService implements VideosProvider {
static BASE_VIDEO_URL = environment.apiUrl + '/api/v1/videos/'
static BASE_FEEDS_URL = environment.apiUrl + '/feeds/videos.'
+ static BASE_SUBSCRIPTION_FEEDS_URL = environment.apiUrl + '/feeds/subscriptions.'
constructor (
private authHttp: HttpClient,
private restExtractor: RestExtractor,
private restService: RestService,
- private serverService: ServerService,
- private i18n: I18n
+ private serverService: ServerService
) {}
getVideoViewUrl (uuid: string) {
downloadEnabled: video.downloadEnabled,
thumbnailfile: video.thumbnailfile,
previewfile: video.previewfile,
+ pluginData: video.pluginData,
scheduleUpdate,
originallyPublishedAt
}
let params = new HttpParams()
params = this.restService.addRestGetParams(params, pagination, sort)
- params = this.restService.addObjectParams(params, { search })
+
+ if (search) {
+ const filters = this.restService.parseQueryStringFilter(search, {
+ isLive: {
+ prefix: 'isLive:',
+ isBoolean: true
+ }
+ })
+
+ params = this.restService.addObjectParams(params, filters)
+ }
return this.authHttp
.get<ResultList<Video>>(UserService.BASE_USERS_URL + 'me/videos', { params })
)
}
- getAccountVideos (
+ getAccountVideos (parameters: {
account: Account,
videoPagination: ComponentPaginationLight,
sort: VideoSortField
- ): Observable<ResultList<Video>> {
+ nsfwPolicy?: NSFWPolicyType
+ videoFilter?: VideoFilter
+ search?: string
+ }): Observable<ResultList<Video>> {
+ const { account, videoPagination, sort, videoFilter, nsfwPolicy, search } = parameters
+
const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
let params = new HttpParams()
params = this.restService.addRestGetParams(params, pagination, sort)
+ if (nsfwPolicy) {
+ params = params.set('nsfw', this.nsfwPolicyToParam(nsfwPolicy))
+ }
+
+ if (videoFilter) {
+ params = params.set('filter', videoFilter)
+ }
+
+ if (search) {
+ params = params.set('search', search)
+ }
+
return this.authHttp
.get<ResultList<Video>>(AccountService.BASE_ACCOUNT_URL + account.nameWithHost + '/videos', { params })
.pipe(
)
}
- getVideoChannelVideos (
+ getVideoChannelVideos (parameters: {
videoChannel: VideoChannel,
videoPagination: ComponentPaginationLight,
sort: VideoSortField,
nsfwPolicy?: NSFWPolicyType
- ): Observable<ResultList<Video>> {
+ videoFilter?: VideoFilter
+ }): Observable<ResultList<Video>> {
+ const { videoChannel, videoPagination, sort, nsfwPolicy, videoFilter } = parameters
+
const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
let params = new HttpParams()
params = params.set('nsfw', this.nsfwPolicyToParam(nsfwPolicy))
}
+ if (videoFilter) {
+ params = params.set('filter', videoFilter)
+ }
+
return this.authHttp
.get<ResultList<Video>>(VideoChannelService.BASE_VIDEO_CHANNEL_URL + videoChannel.nameWithHost + '/videos', { params })
.pipe(
)
}
- buildBaseFeedUrls (params: HttpParams) {
+ buildBaseFeedUrls (params: HttpParams, base = VideoService.BASE_FEEDS_URL) {
const feeds = [
{
format: FeedFormat.RSS,
label: 'media rss 2.0',
- url: VideoService.BASE_FEEDS_URL + FeedFormat.RSS.toLowerCase()
+ url: base + FeedFormat.RSS.toLowerCase()
},
{
format: FeedFormat.ATOM,
label: 'atom 1.0',
- url: VideoService.BASE_FEEDS_URL + FeedFormat.ATOM.toLowerCase()
+ url: base + FeedFormat.ATOM.toLowerCase()
},
{
format: FeedFormat.JSON,
label: 'json 1.0',
- url: VideoService.BASE_FEEDS_URL + FeedFormat.JSON.toLowerCase()
+ url: base + FeedFormat.JSON.toLowerCase()
}
]
return this.buildBaseFeedUrls(params)
}
+ getVideoSubscriptionFeedUrls (accountId: number, feedToken: string) {
+ let params = this.restService.addRestGetParams(new HttpParams())
+ params = params.set('accountId', accountId.toString())
+ params = params.set('token', feedToken)
+
+ return this.buildBaseFeedUrls(params, VideoService.BASE_SUBSCRIPTION_FEEDS_URL)
+ }
+
getVideoFileMetadata (metadataUrl: string) {
return this.authHttp
.get<VideoFileMetadata>(metadataUrl)
const base = [
{
id: VideoPrivacy.PRIVATE,
- label: this.i18n('Only I can see this video')
+ description: $localize`Only I can see this video`
},
{
id: VideoPrivacy.UNLISTED,
- label: this.i18n('Only people with the private link can see this video')
+ description: $localize`Only shareable via a private link`
},
{
id: VideoPrivacy.PUBLIC,
- label: this.i18n('Anyone can see this video')
+ description: $localize`Anyone can see this video`
},
{
id: VideoPrivacy.INTERNAL,
- label: this.i18n('Only users of this instance can see this video')
+ description: $localize`Only users of this instance can see this video`
}
]
- return base.filter(o => !!privacies.find(p => p.id === o.id))
+ return base
+ .filter(o => !!privacies.find(p => p.id === o.id)) // filter down to privacies that where in the input
+ .map(o => ({ ...privacies[o.id - 1], ...o })) // merge the input privacies that contain a label, and extend them with a description
}
nsfwPolicyToParam (nsfwPolicy: NSFWPolicyType) {