import { ResultList } from '../../../../../shared/models/result-list.model'
import {
UserVideoRate,
+ UserVideoRateType,
UserVideoRateUpdate,
- VideoChannel,
+ VideoConstant,
VideoFilter,
- VideoRateType,
+ VideoPrivacy,
VideoUpdate
} from '../../../../../shared/models/videos'
import { FeedFormat } from '../../../../../shared/models/feeds/feed-format.enum'
import { AccountService } from '@app/shared/account/account.service'
import { VideoChannelService } from '@app/shared/video-channel/video-channel.service'
import { ServerService } 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'
+
+export interface VideosProvider {
+ getVideos (parameters: {
+ videoPagination: ComponentPagination,
+ sort: VideoSortField,
+ filter?: VideoFilter,
+ categoryOneOf?: number,
+ languageOneOf?: string[]
+ }): Observable<ResultList<Video>>
+}
@Injectable()
-export class VideoService {
+export class VideoService implements VideosProvider {
static BASE_VIDEO_URL = environment.apiUrl + '/api/v1/videos/'
static BASE_FEEDS_URL = environment.apiUrl + '/feeds/videos.'
private authHttp: HttpClient,
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<VideoDetails> {
+ getUserWatchingVideoUrl (uuid: string) {
+ return VideoService.BASE_VIDEO_URL + uuid + '/watching'
+ }
+
+ getVideo (options: { videoId: string }): Observable<VideoDetails> {
return this.serverService.localeObservable
.pipe(
switchMap(translations => {
- return this.authHttp.get<VideoDetailsServerModel>(VideoService.BASE_VIDEO_URL + uuid)
+ return this.authHttp.get<VideoDetailsServerModel>(VideoService.BASE_VIDEO_URL + options.videoId)
.pipe(map(videoHash => ({ videoHash, translations })))
}),
map(({ videoHash, translations }) => new VideoDetails(videoHash, translations)),
)
}
- viewVideo (uuid: string): Observable<boolean> {
- return this.authHttp.post(this.getVideoViewUrl(uuid), {})
- .pipe(
- map(this.restExtractor.extractDataBool),
- catchError(err => this.restExtractor.handleError(err))
- )
- }
-
updateVideo (video: VideoEdit) {
const language = video.language || null
const licence = video.licence || null
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,
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)
.pipe(catchError(err => this.restExtractor.handleError(err)))
}
- getMyVideos (videoPagination: ComponentPagination, sort: VideoSortField): Observable<{ videos: Video[], totalVideos: number }> {
+ getMyVideos (videoPagination: ComponentPagination, sort: VideoSortField): Observable<ResultList<Video>> {
const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
let params = new HttpParams()
account: Account,
videoPagination: ComponentPagination,
sort: VideoSortField
- ): Observable<{ videos: Video[], totalVideos: number }> {
+ ): Observable<ResultList<Video>> {
const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
let params = new HttpParams()
videoChannel: VideoChannel,
videoPagination: ComponentPagination,
sort: VideoSortField
- ): Observable<{ videos: Video[], totalVideos: number }> {
+ ): Observable<ResultList<Video>> {
const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
let params = new HttpParams()
params = this.restService.addRestGetParams(params, pagination, sort)
return this.authHttp
- .get<ResultList<Video>>(VideoChannelService.BASE_VIDEO_CHANNEL_URL + videoChannel.name + '/videos', { params })
+ .get<ResultList<Video>>(VideoChannelService.BASE_VIDEO_CHANNEL_URL + videoChannel.nameWithHost + '/videos', { params })
.pipe(
switchMap(res => this.extractVideos(res)),
catchError(err => this.restExtractor.handleError(err))
)
}
- getVideos (
+ getUserSubscriptionVideos (parameters: {
+ videoPagination: ComponentPagination,
+ sort: VideoSortField
+ }): Observable<ResultList<Video>> {
+ const { videoPagination, sort } = parameters
+ const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
+
+ let params = new HttpParams()
+ params = this.restService.addRestGetParams(params, pagination, sort)
+
+ return this.authHttp
+ .get<ResultList<Video>>(UserSubscriptionService.BASE_USER_SUBSCRIPTIONS_URL + '/videos', { params })
+ .pipe(
+ switchMap(res => this.extractVideos(res)),
+ catchError(err => this.restExtractor.handleError(err))
+ )
+ }
+
+ getVideos (parameters: {
videoPagination: ComponentPagination,
sort: VideoSortField,
filter?: VideoFilter,
- categoryOneOf?: number
- ): Observable<{ videos: Video[], totalVideos: number }> {
+ categoryOneOf?: number,
+ languageOneOf?: string[]
+ }): Observable<ResultList<Video>> {
+ const { videoPagination, sort, filter, categoryOneOf, languageOneOf } = parameters
+
const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
let params = new HttpParams()
params = params.set('categoryOneOf', categoryOneOf + '')
}
+ if (languageOneOf) {
+ for (const l of languageOneOf) {
+ params = params.append('languageOneOf[]', l)
+ }
+ }
+
return this.authHttp
.get<ResultList<Video>>(VideoService.BASE_VIDEO_URL, { params })
.pipe(
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()
}
loadCompleteDescription (descriptionPath: string) {
return this.authHttp
- .get(environment.apiUrl + descriptionPath)
+ .get<{ description: string }>(environment.apiUrl + descriptionPath)
.pipe(
- map(res => res[ 'description' ]),
+ map(res => res.description),
catchError(err => this.restExtractor.handleError(err))
)
}
videos.push(new Video(videoJson, translations))
}
- return { videos, totalVideos }
+ return { total: totalVideos, data: videos }
})
)
}
- private setVideoRate (id: number, rateType: VideoRateType) {
+ explainedPrivacyLabels (privacies: VideoConstant<VideoPrivacy>[]) {
+ const newPrivacies = privacies.slice()
+
+ const privatePrivacy = newPrivacies.find(p => p.id === VideoPrivacy.PRIVATE)
+ if (privatePrivacy) privatePrivacy.label = this.i18n('Only I can see this video')
+
+ const unlistedPrivacy = newPrivacies.find(p => p.id === VideoPrivacy.UNLISTED)
+ if (unlistedPrivacy) unlistedPrivacy.label = this.i18n('Only people with the private link can see this video')
+
+ const publicPrivacy = newPrivacies.find(p => p.id === VideoPrivacy.PUBLIC)
+ if (publicPrivacy) publicPrivacy.label = this.i18n('Anyone can see this video')
+
+ return privacies
+ }
+
+ private setVideoRate (id: number, rateType: UserVideoRateType) {
const url = VideoService.BASE_VIDEO_URL + id + '/rate'
const body: UserVideoRateUpdate = {
rating: rateType