Merge branch 'release/v1.2.0'

[github/Chocobozzz/PeerTube.git] / client / src / app / videos / +video-watch / comment / video-comment.component.ts

diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.ts b/client/src/app/videos/+video-watch/comment/video-comment.component.ts
index 9bc9c8844c68261c3c6cd1e1d92ca694d0e8ad8a..aba7f9d1c2cb9f87144b5be7d6193a9add8407f2 100644 (file)
--- a/client/src/app/videos/+video-watch/comment/video-comment.component.ts
+++ b/client/src/app/videos/+video-watch/comment/video-comment.component.ts
@@ -1,34 +1,49 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core'
-import { Account as AccountInterface } from '../../../../../../shared/models/actors'
+import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'
 import { UserRight } from '../../../../../../shared/models/users'
 import { VideoCommentThreadTree } from '../../../../../../shared/models/videos/video-comment.model'
 import { AuthService } from '../../../core/auth'
-import { Account } from '../../../shared/account/account.model'
 import { Video } from '../../../shared/video/video.model'
 import { VideoComment } from './video-comment.model'
+import { HtmlRendererService } from '@app/shared/renderer'
 
 @Component({
   selector: 'my-video-comment',
   templateUrl: './video-comment.component.html',
   styleUrls: ['./video-comment.component.scss']
 })
-export class VideoCommentComponent {
+export class VideoCommentComponent implements OnInit, OnChanges {
   @Input() video: Video
   @Input() comment: VideoComment
+  @Input() parentComments: VideoComment[] = []
   @Input() commentTree: VideoCommentThreadTree
   @Input() inReplyToCommentId: number
+  @Input() highlightedComment = false
 
   @Output() wantedToDelete = new EventEmitter<VideoComment>()
   @Output() wantedToReply = new EventEmitter<VideoComment>()
   @Output() threadCreated = new EventEmitter<VideoCommentThreadTree>()
   @Output() resetReply = new EventEmitter()
 
-  constructor (private authService: AuthService) {}
+  sanitizedCommentHTML = ''
+  newParentComments: VideoComment[] = []
+
+  constructor (
+    private htmlRenderer: HtmlRendererService,
+    private authService: AuthService
+  ) {}
 
   get user () {
     return this.authService.getUser()
   }
 
+  ngOnInit () {
+    this.init()
+  }
+
+  ngOnChanges () {
+    this.init()
+  }
+
   onCommentReplyCreated (createdComment: VideoComment) {
     if (!this.commentTree) {
       this.commentTree = {
@@ -39,7 +54,7 @@ export class VideoCommentComponent {
       this.threadCreated.emit(this.commentTree)
     }
 
-    this.commentTree.children.push({
+    this.commentTree.children.unshift({
       comment: createdComment,
       children: []
     })
@@ -62,10 +77,6 @@ export class VideoCommentComponent {
     this.resetReply.emit()
   }
 
-  getAvatarUrl (account: AccountInterface) {
-    return Account.GET_ACCOUNT_AVATAR_URL(account)
-  }
-
   isRemovableByUser () {
     return this.isUserLoggedIn() &&
       (
@@ -73,4 +84,10 @@ export class VideoCommentComponent {
         this.user.hasRight(UserRight.REMOVE_ANY_VIDEO_COMMENT)
       )
   }
+
+  private init () {
+    this.sanitizedCommentHTML = this.htmlRenderer.toSafeHtml(this.comment.text)
+
+    this.newParentComments = this.parentComments.concat([ this.comment ])
+  }
 }