X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-watch%2Fcomment%2Fvideo-comments.component.ts;h=a87bc16d7347fabe08d04d0104dea6c321acad22;hb=34102d19a1b6964cd2ec747a934e2bff3962bcce;hp=7970a5dcfd7f39a2c8bbd3094e5ba056e8ddc2ce;hpb=d5b53822ae7e1660cebe3a35be5ce76ea73dc1b9;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.ts b/client/src/app/videos/+video-watch/comment/video-comments.component.ts index 7970a5dcf..a87bc16d7 100644 --- a/client/src/app/videos/+video-watch/comment/video-comments.component.ts +++ b/client/src/app/videos/+video-watch/comment/video-comments.component.ts @@ -1,27 +1,34 @@ -import { Component, Input, OnChanges, SimpleChanges } from '@angular/core' -import { ConfirmService } from '@app/core' -import { NotificationsService } from 'angular2-notifications' -import { VideoComment as VideoCommentInterface, VideoCommentThreadTree } from '../../../../../../shared/models/videos/video-comment.model' +import { Component, ElementRef, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core' +import { ActivatedRoute } from '@angular/router' +import { ConfirmService, Notifier } from '@app/core' +import { Subject, Subscription } from 'rxjs' import { AuthService } from '../../../core/auth' -import { ComponentPagination } from '../../../shared/rest/component-pagination.model' +import { ComponentPagination, hasMoreItems } from '../../../shared/rest/component-pagination.model' import { User } from '../../../shared/users' -import { SortField } from '../../../shared/video/sort-field.type' +import { CommentSortField } from '../../../shared/video/sort-field.type' import { VideoDetails } from '../../../shared/video/video-details.model' import { VideoComment } from './video-comment.model' import { VideoCommentService } from './video-comment.service' -import { ActivatedRoute } from '@angular/router' +import { I18n } from '@ngx-translate/i18n-polyfill' +import { Syndication } from '@app/shared/video/syndication.model' +import { HooksService } from '@app/core/plugins/hooks.service' +import { VideoCommentThreadTree } from '@app/videos/+video-watch/comment/video-comment-thread-tree.model' @Component({ selector: 'my-video-comments', templateUrl: './video-comments.component.html', styleUrls: ['./video-comments.component.scss'] }) -export class VideoCommentsComponent implements OnChanges { +export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy { + @ViewChild('commentHighlightBlock') commentHighlightBlock: ElementRef @Input() video: VideoDetails @Input() user: User + @Output() timestampClicked = new EventEmitter() + comments: VideoComment[] = [] - sort: SortField = '-createdAt' + highlightedThread: VideoComment + sort: CommentSortField = '-createdAt' componentPagination: ComponentPagination = { currentPage: 1, itemsPerPage: 10, @@ -30,60 +37,105 @@ export class VideoCommentsComponent implements OnChanges { inReplyToCommentId: number threadComments: { [ id: number ]: VideoCommentThreadTree } = {} threadLoading: { [ id: number ]: boolean } = {} - markedCommentID: number + + syndicationItems: Syndication[] = [] + + onDataSubject = new Subject() + + private sub: Subscription constructor ( private authService: AuthService, - private notificationsService: NotificationsService, + private notifier: Notifier, private confirmService: ConfirmService, private videoCommentService: VideoCommentService, - private activatedRoute: ActivatedRoute + private activatedRoute: ActivatedRoute, + private i18n: I18n, + private hooks: HooksService ) {} + ngOnInit () { + // Find highlighted comment in params + this.sub = this.activatedRoute.params.subscribe( + params => { + if (params['threadId']) { + const highlightedThreadId = +params['threadId'] + this.processHighlightedThread(highlightedThreadId) + } + } + ) + } + ngOnChanges (changes: SimpleChanges) { if (changes['video']) { - this.loadVideoComments() + this.resetVideo() } } - viewReplies (comment: VideoCommentInterface) { - this.threadLoading[comment.id] = true + ngOnDestroy () { + if (this.sub) this.sub.unsubscribe() + } - this.videoCommentService.getVideoThreadComments(this.video.id, comment.id) - .subscribe( - res => { - this.threadComments[comment.id] = res - this.threadLoading[comment.id] = false - }, + viewReplies (commentId: number, highlightThread = false) { + this.threadLoading[commentId] = true - err => this.notificationsService.error('Error', err.message) - ) - } + const params = { + videoId: this.video.id, + threadId: commentId + } - loadMoreComments () { - this.videoCommentService.getVideoCommentThreads(this.video.id, this.componentPagination, this.sort) - .subscribe( + const obs = this.hooks.wrapObsFun( + this.videoCommentService.getVideoThreadComments.bind(this.videoCommentService), + params, + 'video-watch', + 'filter:api.video-watch.video-thread-replies.list.params', + 'filter:api.video-watch.video-thread-replies.list.result' + ) + + obs.subscribe( res => { - this.comments = this.comments.concat(res.comments) - this.componentPagination.totalItems = res.totalComments - - if (this.markedCommentID) { - // If there is a marked comment, retrieve it separately as it may not be on this page, filter to prevent duplicate - this.comments = this.comments.filter(value => value.id !== this.markedCommentID) - this.videoCommentService.getVideoThreadComments(this.video.id, this.markedCommentID).subscribe( - res => { - let comment = new VideoComment(res.comment) - comment.marked = true - this.comments.unshift(comment) // Insert marked comment at the beginning - } - ) + this.threadComments[commentId] = res + this.threadLoading[commentId] = false + + if (highlightThread) { + this.highlightedThread = new VideoComment(res.comment) + + // Scroll to the highlighted thread + setTimeout(() => this.commentHighlightBlock.nativeElement.scrollIntoView(), 0) } }, - err => this.notificationsService.error('Error', err.message) + err => this.notifier.error(err.message) ) } + loadMoreThreads () { + const params = { + videoId: this.video.id, + componentPagination: this.componentPagination, + sort: this.sort + } + + const obs = this.hooks.wrapObsFun( + this.videoCommentService.getVideoCommentThreads.bind(this.videoCommentService), + params, + 'video-watch', + 'filter:api.video-watch.video-threads.list.params', + 'filter:api.video-watch.video-threads.list.result' + ) + + obs.subscribe( + res => { + this.comments = this.comments.concat(res.data) + this.componentPagination.totalItems = res.total + + this.onDataSubject.next(res.data) + }, + + err => this.notifier.error(err.message) + ) + } + onCommentThreadCreated (comment: VideoComment) { this.comments.unshift(comment) } @@ -97,80 +149,67 @@ export class VideoCommentsComponent implements OnChanges { } onThreadCreated (commentTree: VideoCommentThreadTree) { - this.viewReplies(commentTree.comment) + this.viewReplies(commentTree.comment.id) } - onWantedToDelete (commentToDelete: VideoComment) { - let message = 'Do you really want to delete this comment?' - if (commentToDelete.totalReplies !== 0) message += `${commentToDelete.totalReplies} would be deleted too.` + handleSortChange (sort: CommentSortField) { + if (this.sort === sort) return - this.confirmService.confirm(message, 'Delete').subscribe( - res => { - if (res === false) return - - this.videoCommentService.deleteVideoComment(commentToDelete.videoId, commentToDelete.id) - .subscribe( - () => { - // Delete the comment in the tree - if (commentToDelete.inReplyToCommentId) { - const thread = this.threadComments[commentToDelete.threadId] - if (!thread) { - console.error(`Cannot find thread ${commentToDelete.threadId} of the comment to delete ${commentToDelete.id}`) - return - } - - this.deleteLocalCommentThread(thread, commentToDelete) - return - } - - // Delete the thread - this.comments = this.comments.filter(c => c.id !== commentToDelete.id) - this.componentPagination.totalItems-- - }, - - err => this.notificationsService.error('Error', err.message) - ) - } - ) + this.sort = sort + this.resetVideo() } - isUserLoggedIn () { - return this.authService.isLoggedIn() + handleTimestampClicked (timestamp: number) { + this.timestampClicked.emit(timestamp) } - onNearOfBottom () { - this.componentPagination.currentPage++ + async onWantedToDelete (commentToDelete: VideoComment) { + let message = 'Do you really want to delete this comment?' - if (this.hasMoreComments()) { - this.loadMoreComments() + if (commentToDelete.isLocal) { + message += this.i18n(' The deletion will be sent to remote instances, so they remove the comment too.') + } else { + message += this.i18n(' It is a remote comment, so the deletion will only be effective on your instance.') } - } - private hasMoreComments () { - // No results - if (this.componentPagination.totalItems === 0) return false + const res = await this.confirmService.confirm(message, this.i18n('Delete')) + if (res === false) return - // Not loaded yet - if (!this.componentPagination.totalItems) return true + this.videoCommentService.deleteVideoComment(commentToDelete.videoId, commentToDelete.id) + .subscribe( + () => { + // Mark the comment as deleted + this.softDeleteComment(commentToDelete) + + if (this.highlightedThread.id === commentToDelete.id) this.highlightedThread = undefined + }, - const maxPage = this.componentPagination.totalItems / this.componentPagination.itemsPerPage - return maxPage > this.componentPagination.currentPage + err => this.notifier.error(err.message) + ) } - private deleteLocalCommentThread (parentComment: VideoCommentThreadTree, commentToDelete: VideoComment) { - for (const commentChild of parentComment.children) { - if (commentChild.comment.id === commentToDelete.id) { - parentComment.children = parentComment.children.filter(c => c.comment.id !== commentToDelete.id) - return - } + isUserLoggedIn () { + return this.authService.isLoggedIn() + } - this.deleteLocalCommentThread(commentChild, commentToDelete) + onNearOfBottom () { + if (hasMoreItems(this.componentPagination)) { + this.componentPagination.currentPage++ + this.loadMoreThreads() } } - private loadVideoComments () { + private softDeleteComment (comment: VideoComment) { + comment.isDeleted = true + comment.deletedAt = new Date() + comment.text = '' + comment.account = null + } + + private resetVideo () { if (this.video.commentsEnabled === true) { // Reset all our fields + this.highlightedThread = null this.comments = [] this.threadComments = {} this.threadLoading = {} @@ -178,16 +217,15 @@ export class VideoCommentsComponent implements OnChanges { this.componentPagination.currentPage = 1 this.componentPagination.totalItems = null - // Find marked comment in params - this.activatedRoute.params.subscribe( - params => { - if (params['commentId']) { - this.markedCommentID = +params['commentId'] - } - } - ) - - this.loadMoreComments() + this.syndicationItems = this.videoCommentService.getVideoCommentsFeeds(this.video.uuid) + this.loadMoreThreads() } } + + private processHighlightedThread (highlightedThreadId: number) { + this.highlightedThread = this.comments.find(c => c.id === highlightedThreadId) + + const highlightThread = true + this.viewReplies(highlightedThreadId, highlightThread) + } }