X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-watch%2Fcomment%2Fvideo-comment.component.ts;h=f7eca45fda269af958f507485eaa0c0efbb5b5db;hb=be27ef3b4682c5639039474c39ee0d234d16f482;hp=26fc9d0b8c3ec9a730baf08bb75976e25f2b6d5a;hpb=632c5e3629c2432371bb6339ad883208bff64ac2;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 26fc9d0b8..f7eca45fd 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,13 +1,15 @@ 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 { User, UserRight } from '../../../../../../shared/models/users' +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' +import { Actor } from '@app/shared/actor/actor.model' +import { VideoCommentThreadTree } from '@app/videos/+video-watch/comment/video-comment-thread-tree.model' @Component({ selector: 'my-video-comment', @@ -21,18 +23,26 @@ export class VideoCommentComponent implements OnInit, OnChanges { @Input() commentTree: VideoCommentThreadTree @Input() inReplyToCommentId: number @Input() highlightedComment = false + @Input() firstInThread = false @Output() wantedToDelete = new EventEmitter() @Output() wantedToReply = new EventEmitter() @Output() threadCreated = new EventEmitter() @Output() resetReply = new EventEmitter() + @Output() timestampClicked = new EventEmitter() sanitizedCommentHTML = '' - newParentComments = [] + newParentComments: VideoComment[] = [] + + commentAccount: Account + commentUser: User constructor ( - private linkifierService: LinkifierService, - private authService: AuthService + private markdownService: MarkdownService, + private authService: AuthService, + private accountService: AccountService, + private userService: UserService, + private notifier: Notifier ) {} get user () { @@ -80,41 +90,42 @@ export class VideoCommentComponent implements OnInit, OnChanges { 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 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' - }) - } - } - } - }) + switchToDefaultAvatar ($event: Event) { + ($event.target as HTMLImageElement).src = Actor.GET_DEFAULT_AVATAR_URL() + } + + 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) } }