X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-watch%2Fcomment%2Fvideo-comment.component.ts;h=0c18b6e5d5b872a030d34d37a327c4c78dae57c1;hb=218b0874ede2f0d35fdbcfb64dbe19083b0a2b04;hp=38e603d0dc8cdf3bf8b6d0a1702a9485ac53f34f;hpb=d7e70384a360cda51fe23712331110a5c8b1124c;p=github%2FChocobozzz%2FPeerTube.git

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 38e603d0d..0c18b6e5d 100644
--- 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,45 +1,59 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
-import * as sanitizeHtml from 'sanitize-html'
-import { Account as AccountInterface } from '../../../../../../shared/models/actors'
-import { UserRight } from '../../../../../../shared/models/users'
+import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'
+import { User, 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 { AuthService } from '@app/core/auth'
+import { AccountService } from '@app/shared/account/account.service'
+import { Video } from '@app/shared/video/video.model'
 import { VideoComment } from './video-comment.model'
+import { MarkdownService } from '@app/shared/renderer'
+import { Account } from '@app/shared/account/account.model'
+import { Notifier } from '@app/core'
+import { UserService } from '@app/shared'
 
 @Component({
   selector: 'my-video-comment',
   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
+  @Input() firstInThread = false
 
   @Output() wantedToDelete = new EventEmitter<VideoComment>()
   @Output() wantedToReply = new EventEmitter<VideoComment>()
   @Output() threadCreated = new EventEmitter<VideoCommentThreadTree>()
   @Output() resetReply = new EventEmitter()
+  @Output() timestampClicked = new EventEmitter<number>()
 
   sanitizedCommentHTML = ''
-  newParentComments = []
+  newParentComments: VideoComment[] = []
 
-  constructor (private authService: AuthService) {}
+  commentAccount: Account
+  commentUser: User
+
+  constructor (
+    private markdownService: MarkdownService,
+    private authService: AuthService,
+    private accountService: AccountService,
+    private userService: UserService,
+    private notifier: Notifier
+  ) {}
 
   get user () {
     return this.authService.getUser()
   }
 
   ngOnInit () {
-    this.sanitizedCommentHTML = sanitizeHtml(this.comment.text, {
-      allowedTags: [ 'p', 'span' ]
-    })
+    this.init()
+  }
 
-    this.newParentComments = this.parentComments.concat([ this.comment ])
+  ngOnChanges () {
+    this.init()
   }
 
   onCommentReplyCreated (createdComment: VideoComment) {
@@ -52,7 +66,7 @@ export class VideoCommentComponent implements OnInit {
       this.threadCreated.emit(this.commentTree)
     }
 
-    this.commentTree.children.push({
+    this.commentTree.children.unshift({
       comment: createdComment,
       children: []
     })
@@ -75,15 +89,38 @@ export class VideoCommentComponent implements OnInit {
     this.resetReply.emit()
   }
 
-  getAvatarUrl (account: AccountInterface) {
-    return Account.GET_ACCOUNT_AVATAR_URL(account)
+  handleTimestampClicked (timestamp: number) {
+    this.timestampClicked.emit(timestamp)
   }
 
   isRemovableByUser () {
-    return this.isUserLoggedIn() &&
+    return this.comment.account && this.isUserLoggedIn() &&
       (
         this.user.account.id === this.comment.account.id ||
         this.user.hasRight(UserRight.REMOVE_ANY_VIDEO_COMMENT)
       )
   }
+
+  private getUserIfNeeded (account: Account) {
+    if (!account.userId) return
+    if (!this.authService.isLoggedIn()) return
+
+    const user = this.authService.getUser()
+    if (user.hasRight(UserRight.MANAGE_USERS)) {
+      this.userService.getUserWithCache(account.userId)
+          .subscribe(
+            user => this.commentUser = user,
+
+            err => this.notifier.error(err.message)
+          )
+    }
+  }
+
+  private async init () {
+    const html = await this.markdownService.textMarkdownToHTML(this.comment.text, true)
+    this.sanitizedCommentHTML = await this.markdownService.processVideoTimestamps(html)
+    this.newParentComments = this.parentComments.concat([ this.comment ])
+    this.commentAccount = new Account(this.comment.account)
+    this.getUserIfNeeded(this.commentAccount)
+  }
 }