import { Component, EventEmitter, Input, OnChanges, OnInit, Output, ViewChild } from '@angular/core'
import { MarkdownService, Notifier, UserService } from '@app/core'
import { AuthService } from '@app/core/auth'
-import { Account, Actor, DropdownAction, Video } from '@app/shared/shared-main'
+import { Account, DropdownAction, Video } from '@app/shared/shared-main'
import { CommentReportComponent } from '@app/shared/shared-moderation/report-modals/comment-report.component'
import { VideoComment, VideoCommentThreadTree } from '@app/shared/shared-video-comment'
import { User, UserRight } from '@shared/models'
if (!this.commentTree) {
this.commentTree = {
comment: this.comment,
+ hasDisplayedChildren: false,
children: []
}
this.commentTree.children.unshift({
comment: createdComment,
+ hasDisplayedChildren: false,
children: []
})
this.resetReply.emit()
- delete this.redraftValue
+ this.redraftValue = undefined
}
onWantToReply (comment?: VideoComment) {
this.comment.account &&
this.isUserLoggedIn() &&
this.comment.isDeleted === false &&
- this.authService.getUser().account.id !== this.comment.account.id
+ this.user.account.id !== this.comment.account.id
)
}
switchToDefaultAvatar ($event: Event) {
- ($event.target as HTMLImageElement).src = Actor.GET_DEFAULT_AVATAR_URL()
+ ($event.target as HTMLImageElement).src = Account.GET_DEFAULT_AVATAR_URL()
+ }
+
+ isCommentDisplayed () {
+ // Not deleted
+ return !this.comment.isDeleted ||
+ this.comment.totalReplies !== 0 || // Or root comment thread has replies
+ (this.commentTree?.hasDisplayedChildren) // Or this is a reply that have other replies
}
private getUserIfNeeded (account: Account) {
}
private async init () {
- const html = await this.markdownService.textMarkdownToHTML(this.comment.text, true, true)
+ // Before HTML rendering restore line feed for markdown list compatibility
+ const commentText = this.comment.text.replace(/<br.?\/?>/g, '\r\n')
+ const html = await this.markdownService.textMarkdownToHTML(commentText, true, true)
this.sanitizedCommentHTML = await this.markdownService.processVideoTimestamps(html)
this.newParentComments = this.parentComments.concat([ this.comment ])
if (this.isReportableByUser()) {
this.prependModerationActions.push({
- label: $localize`Report`,
+ label: $localize`Report this comment`,
iconName: 'flag',
handler: () => this.showReportModal()
})