-import { Observable } from 'rxjs'
-import { catchError, map } from 'rxjs/operators'
+import { SortMeta } from 'primeng/api'
+import { from, Observable } from 'rxjs'
+import { catchError, concatMap, map, toArray } from 'rxjs/operators'
import { HttpClient, HttpParams } from '@angular/common/http'
import { Injectable } from '@angular/core'
import { ComponentPaginationLight, RestExtractor, RestPagination, RestService } from '@app/core'
import {
FeedFormat,
ResultList,
+ ThreadsResultList,
+ Video,
VideoComment as VideoCommentServerModel,
VideoCommentAdmin,
VideoCommentCreate,
import { environment } from '../../../environments/environment'
import { VideoCommentThreadTree } from './video-comment-thread-tree.model'
import { VideoComment } from './video-comment.model'
-import { SortMeta } from 'primeng/api'
@Injectable()
export class VideoCommentService {
private restService: RestService
) {}
- addCommentThread (videoId: number | string, comment: VideoCommentCreate) {
+ addCommentThread (videoId: string, comment: VideoCommentCreate) {
const url = VideoCommentService.BASE_VIDEO_URL + videoId + '/comment-threads'
const normalizedComment = objectLineFeedToHtml(comment, 'text')
return this.authHttp.post<{ comment: VideoCommentServerModel }>(url, normalizedComment)
.pipe(
- map(data => this.extractVideoComment(data.comment)),
- catchError(err => this.restExtractor.handleError(err))
+ map(data => this.extractVideoComment(data.comment)),
+ catchError(err => this.restExtractor.handleError(err))
)
}
- addCommentReply (videoId: number | string, inReplyToCommentId: number, comment: VideoCommentCreate) {
+ addCommentReply (videoId: string, inReplyToCommentId: number, comment: VideoCommentCreate) {
const url = VideoCommentService.BASE_VIDEO_URL + videoId + '/comments/' + inReplyToCommentId
const normalizedComment = objectLineFeedToHtml(comment, 'text')
}
getAdminVideoComments (options: {
- pagination: RestPagination,
- sort: SortMeta,
+ pagination: RestPagination
+ sort: SortMeta
search?: string
}): Observable<ResultList<VideoCommentAdmin>> {
const { pagination, sort, search } = options
}
getVideoCommentThreads (parameters: {
- videoId: number | string,
- componentPagination: ComponentPaginationLight,
+ videoId: string
+ componentPagination: ComponentPaginationLight
sort: string
- }): Observable<ResultList<VideoComment>> {
+ }): Observable<ThreadsResultList<VideoComment>> {
const { videoId, componentPagination, sort } = parameters
- const pagination = this.restService.componentPaginationToRestPagination(componentPagination)
+ const pagination = this.restService.componentToRestPagination(componentPagination)
let params = new HttpParams()
params = this.restService.addRestGetParams(params, pagination, sort)
const url = VideoCommentService.BASE_VIDEO_URL + videoId + '/comment-threads'
- return this.authHttp.get<ResultList<VideoComment>>(url, { params })
+ return this.authHttp.get<ThreadsResultList<VideoComment>>(url, { params })
.pipe(
map(result => this.extractVideoComments(result)),
catchError(err => this.restExtractor.handleError(err))
}
getVideoThreadComments (parameters: {
- videoId: number | string,
+ videoId: string
threadId: number
}): Observable<VideoCommentThreadTree> {
const { videoId, threadId } = parameters
return this.authHttp
.delete(url)
- .pipe(
- map(this.restExtractor.extractDataBool),
- catchError(err => this.restExtractor.handleError(err))
- )
+ .pipe(catchError(err => this.restExtractor.handleError(err)))
}
- getVideoCommentsFeeds (videoUUID?: string) {
+ deleteVideoComments (comments: { videoId: number | string, commentId: number }[]) {
+ return from(comments)
+ .pipe(
+ concatMap(c => this.deleteVideoComment(c.videoId, c.commentId)),
+ toArray()
+ )
+ }
+
+ getVideoCommentsFeeds (video: Pick<Video, 'uuid'>) {
const feeds = [
{
format: FeedFormat.RSS,
}
]
- if (videoUUID !== undefined) {
+ if (video !== undefined) {
for (const feed of feeds) {
- feed.url += '?videoId=' + videoUUID
+ feed.url += '?videoId=' + video.uuid
}
}
return new VideoComment(videoComment)
}
- private extractVideoComments (result: ResultList<VideoCommentServerModel>) {
+ private extractVideoComments (result: ThreadsResultList<VideoCommentServerModel>) {
const videoCommentsJson = result.data
const totalComments = result.total
const comments: VideoComment[] = []
comments.push(new VideoComment(videoCommentJson))
}
- return { data: comments, total: totalComments }
+ return { data: comments, total: totalComments, totalNotDeletedComments: result.totalNotDeletedComments }
}
- private extractVideoCommentTree (tree: VideoCommentThreadTreeServerModel) {
- if (!tree) return tree as VideoCommentThreadTree
+ private extractVideoCommentTree (serverTree: VideoCommentThreadTreeServerModel): VideoCommentThreadTree {
+ if (!serverTree) return null
- tree.comment = new VideoComment(tree.comment)
- tree.children.forEach(c => this.extractVideoCommentTree(c))
+ const tree = {
+ comment: new VideoComment(serverTree.comment),
+ children: serverTree.children.map(c => this.extractVideoCommentTree(c))
+ }
+
+ const hasDisplayedChildren = tree.children.length === 0
+ ? !tree.comment.isDeleted
+ : tree.children.some(c => c.hasDisplayedChildren)
- return tree as VideoCommentThreadTree
+ return Object.assign(tree, { hasDisplayedChildren })
}
private buildParamsFromSearch (search: string, params: HttpParams) {
const filters = this.restService.parseQueryStringFilter(search, {
isLocal: {
prefix: 'local:',
- isBoolean: true,
- handler: v => {
- if (v === 'true') return v
- if (v === 'false') return v
-
- return undefined
- }
+ isBoolean: true
},
searchAccount: { prefix: 'account:' },