Preferably use the docker hub image

[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 2ecc8a143a08e5e043f0716cd34fec5a3a06bbd8..e90008de9b603fb8cbf2a5972ae23b72eebc20b8 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,10 +1,9 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
+import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'
+import { LinkifierService } from '@app/videos/+video-watch/comment/linkifier.service'
 import * as sanitizeHtml from 'sanitize-html'
-import { Account as AccountInterface } from '../../../../../../shared/models/actors'
 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'
 
@@ -13,11 +12,13 @@ import { VideoComment } from './video-comment.model'
   templateUrl: './video-comment.component.html',
   styleUrls: ['./video-comment.component.scss']
 })
-export class VideoCommentComponent implements OnInit {
+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>()
@@ -25,17 +26,23 @@ export class VideoCommentComponent implements OnInit {
   @Output() resetReply = new EventEmitter()
 
   sanitizedCommentHTML = ''
+  newParentComments = []
 
-  constructor (private authService: AuthService) {}
+  constructor (
+    private linkifierService: LinkifierService,
+    private authService: AuthService
+  ) {}
 
   get user () {
     return this.authService.getUser()
   }
 
   ngOnInit () {
-    this.sanitizedCommentHTML = sanitizeHtml(this.comment.text, {
-      allowedTags: [ 'p', 'span' ]
-    })
+    this.init()
+  }
+
+  ngOnChanges () {
+    this.init()
   }
 
   onCommentReplyCreated (createdComment: VideoComment) {
@@ -48,7 +55,7 @@ export class VideoCommentComponent implements OnInit {
       this.threadCreated.emit(this.commentTree)
     }
 
-    this.commentTree.children.push({
+    this.commentTree.children.unshift({
       comment: createdComment,
       children: []
     })
@@ -71,10 +78,6 @@ export class VideoCommentComponent implements OnInit {
     this.resetReply.emit()
   }
 
-  getAvatarUrl (account: AccountInterface) {
-    return Account.GET_ACCOUNT_AVATAR_URL(account)
-  }
-
   isRemovableByUser () {
     return this.isUserLoggedIn() &&
       (
@@ -82,4 +85,30 @@ export class VideoCommentComponent implements OnInit {
         this.user.hasRight(UserRight.REMOVE_ANY_VIDEO_COMMENT)
       )
   }
+
+  private init () {
+    // Convert possible markdown to html
+    const html = this.linkifierService.linkify(this.comment.text)
+
+    this.sanitizedCommentHTML = sanitizeHtml(html, {
+      allowedTags: [ 'a', 'p', 'span', 'br' ],
+      allowedSchemes: [ 'http', 'https' ],
+      allowedAttributes: {
+        'a': [ 'href', 'class', 'target' ]
+      },
+      transformTags: {
+        a: (tagName, attribs) => {
+          return {
+            tagName,
+            attribs: Object.assign(attribs, {
+              target: '_blank',
+              rel: 'noopener noreferrer'
+            })
+          }
+        }
+      }
+    })
+
+    this.newParentComments = this.parentComments.concat([ this.comment ])
+  }
 }