import { SortMeta } from 'primeng/api'
import { filter } from 'rxjs/operators'
import { AfterViewInit, Component, OnInit } from '@angular/core'
-import { DomSanitizer } from '@angular/platform-browser'
import { ActivatedRoute, Params, Router } from '@angular/router'
-import { ConfirmService, MarkdownService, Notifier, RestPagination, RestTable, ServerService } from '@app/core'
-import { DropdownAction, VideoService } from '@app/shared/shared-main'
+import { AuthService, ConfirmService, MarkdownService, Notifier, RestPagination, RestTable } from '@app/core'
+import { DropdownAction } from '@app/shared/shared-main'
+import { BulkService } from '@app/shared/shared-moderation'
import { VideoCommentAdmin, VideoCommentService } from '@app/shared/shared-video-comment'
+import { FeedFormat, UserRight } from '@shared/models'
@Component({
selector: 'my-video-comment-list',
templateUrl: './video-comment-list.component.html',
- styleUrls: [ './video-comment-list.component.scss' ]
+ styleUrls: [ '../../../shared/shared-moderation/moderation.scss', './video-comment-list.component.scss' ]
})
export class VideoCommentListComponent extends RestTable implements OnInit, AfterViewInit {
comments: VideoCommentAdmin[]
videoCommentActions: DropdownAction<VideoCommentAdmin>[][] = []
+ syndicationItems = [
+ {
+ format: FeedFormat.RSS,
+ label: 'media rss 2.0',
+ url: VideoCommentService.BASE_FEEDS_URL + FeedFormat.RSS.toLowerCase()
+ },
+ {
+ format: FeedFormat.ATOM,
+ label: 'atom 1.0',
+ url: VideoCommentService.BASE_FEEDS_URL + FeedFormat.ATOM.toLowerCase()
+ },
+ {
+ format: FeedFormat.JSON,
+ label: 'json 1.0',
+ url: VideoCommentService.BASE_FEEDS_URL + FeedFormat.JSON.toLowerCase()
+ }
+ ]
+
+ get authUser () {
+ return this.auth.getUser()
+ }
+
constructor (
+ private auth: AuthService,
private notifier: Notifier,
- private serverService: ServerService,
private confirmService: ConfirmService,
private videoCommentService: VideoCommentService,
private markdownRenderer: MarkdownService,
- private sanitizer: DomSanitizer,
- private videoService: VideoService,
private route: ActivatedRoute,
- private router: Router
+ private router: Router,
+ private bulkService: BulkService
) {
super()
this.videoCommentActions = [
[
+ {
+ label: $localize`Delete this comment`,
+ handler: comment => this.deleteComment(comment),
+ isDisplayed: () => this.authUser.hasRight(UserRight.REMOVE_ANY_VIDEO_COMMENT)
+ },
- // remove this comment,
-
- // remove all comments of this account
-
+ {
+ label: $localize`Delete all comments of this account`,
+ description: $localize`Comments are deleted after a few minutes`,
+ handler: comment => this.deleteUserComments(comment),
+ isDisplayed: () => this.authUser.hasRight(UserRight.REMOVE_ANY_VIDEO_COMMENT)
+ }
]
]
}
if (this.search) this.setTableFilter(this.search)
}
- onSearch (event: Event) {
+ onInputSearch (event: Event) {
this.onSearch(event)
this.setQueryParams((event.target as HTMLInputElement).value)
}
}
toHtml (text: string) {
- return this.markdownRenderer.textMarkdownToHTML(text)
+ return this.markdownRenderer.textMarkdownToHTML(text, true, true)
}
protected loadData () {
err => this.notifier.error(err.message)
)
}
+
+ private deleteComment (comment: VideoCommentAdmin) {
+ this.videoCommentService.deleteVideoComment(comment.video.id, comment.id)
+ .subscribe(
+ () => this.loadData(),
+
+ err => this.notifier.error(err.message)
+ )
+ }
+
+ private async deleteUserComments (comment: VideoCommentAdmin) {
+ const message = $localize`Do you really want to delete all comments of ${comment.by}?`
+ const res = await this.confirmService.confirm(message, $localize`Delete`)
+ if (res === false) return
+
+ const options = {
+ accountName: comment.by,
+ scope: 'instance' as 'instance'
+ }
+
+ this.bulkService.removeCommentsOf(options)
+ .subscribe(
+ () => {
+ this.notifier.success($localize`Comments of ${options.accountName} will be deleted in a few minutes`)
+ },
+
+ err => this.notifier.error(err.message)
+ )
+ }
}
import * as chai from 'chai'
import 'mocha'
-import { VideoComment, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
+import { VideoComment, VideoCommentAdmin, VideoCommentThreadTree } from '../../../../shared/models/videos/video-comment.model'
import { cleanupTests, testImage } from '../../../../shared/extra-utils'
import {
createUser,
addVideoCommentReply,
addVideoCommentThread,
deleteVideoComment,
+ getAdminVideoComments,
getVideoCommentThreads,
getVideoThreadComments
} from '../../../../shared/extra-utils/videos/video-comments'
+import { isLocalLiveVideoAccepted } from '@server/lib/moderation'
const expect = chai.expect
userAccessTokenServer1 = await getAccessToken(server.url, 'user1', 'password')
})
- it('Should not have threads on this video', async function () {
- const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5)
+ describe('User comments', function () {
- expect(res.body.total).to.equal(0)
- expect(res.body.data).to.be.an('array')
- expect(res.body.data).to.have.lengthOf(0)
- })
+ it('Should not have threads on this video', async function () {
+ const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5)
- it('Should create a thread in this video', async function () {
- const text = 'my super first comment'
-
- const res = await addVideoCommentThread(server.url, server.accessToken, videoUUID, text)
- const comment = res.body.comment
-
- expect(comment.inReplyToCommentId).to.be.null
- expect(comment.text).equal('my super first comment')
- expect(comment.videoId).to.equal(videoId)
- expect(comment.id).to.equal(comment.threadId)
- expect(comment.account.name).to.equal('root')
- expect(comment.account.host).to.equal('localhost:' + server.port)
- expect(comment.account.url).to.equal('http://localhost:' + server.port + '/accounts/root')
- expect(comment.totalReplies).to.equal(0)
- expect(comment.totalRepliesFromVideoAuthor).to.equal(0)
- expect(dateIsValid(comment.createdAt as string)).to.be.true
- expect(dateIsValid(comment.updatedAt as string)).to.be.true
- })
+ expect(res.body.total).to.equal(0)
+ expect(res.body.data).to.be.an('array')
+ expect(res.body.data).to.have.lengthOf(0)
+ })
- it('Should list threads of this video', async function () {
- const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5)
+ it('Should create a thread in this video', async function () {
+ const text = 'my super first comment'
+
+ const res = await addVideoCommentThread(server.url, server.accessToken, videoUUID, text)
+ const comment = res.body.comment
+
+ expect(comment.inReplyToCommentId).to.be.null
+ expect(comment.text).equal('my super first comment')
+ expect(comment.videoId).to.equal(videoId)
+ expect(comment.id).to.equal(comment.threadId)
+ expect(comment.account.name).to.equal('root')
+ expect(comment.account.host).to.equal('localhost:' + server.port)
+ expect(comment.account.url).to.equal('http://localhost:' + server.port + '/accounts/root')
+ expect(comment.totalReplies).to.equal(0)
+ expect(comment.totalRepliesFromVideoAuthor).to.equal(0)
+ expect(dateIsValid(comment.createdAt as string)).to.be.true
+ expect(dateIsValid(comment.updatedAt as string)).to.be.true
+ })
- expect(res.body.total).to.equal(1)
- expect(res.body.data).to.be.an('array')
- expect(res.body.data).to.have.lengthOf(1)
+ it('Should list threads of this video', async function () {
+ const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5)
- const comment: VideoComment = res.body.data[0]
- expect(comment.inReplyToCommentId).to.be.null
- expect(comment.text).equal('my super first comment')
- expect(comment.videoId).to.equal(videoId)
- expect(comment.id).to.equal(comment.threadId)
- expect(comment.account.name).to.equal('root')
- expect(comment.account.host).to.equal('localhost:' + server.port)
+ expect(res.body.total).to.equal(1)
+ expect(res.body.data).to.be.an('array')
+ expect(res.body.data).to.have.lengthOf(1)
- await testImage(server.url, 'avatar-resized', comment.account.avatar.path, '.png')
+ const comment: VideoComment = res.body.data[0]
+ expect(comment.inReplyToCommentId).to.be.null
+ expect(comment.text).equal('my super first comment')
+ expect(comment.videoId).to.equal(videoId)
+ expect(comment.id).to.equal(comment.threadId)
+ expect(comment.account.name).to.equal('root')
+ expect(comment.account.host).to.equal('localhost:' + server.port)
- expect(comment.totalReplies).to.equal(0)
- expect(comment.totalRepliesFromVideoAuthor).to.equal(0)
- expect(dateIsValid(comment.createdAt as string)).to.be.true
- expect(dateIsValid(comment.updatedAt as string)).to.be.true
+ await testImage(server.url, 'avatar-resized', comment.account.avatar.path, '.png')
- threadId = comment.threadId
- })
+ expect(comment.totalReplies).to.equal(0)
+ expect(comment.totalRepliesFromVideoAuthor).to.equal(0)
+ expect(dateIsValid(comment.createdAt as string)).to.be.true
+ expect(dateIsValid(comment.updatedAt as string)).to.be.true
- it('Should get all the thread created', async function () {
- const res = await getVideoThreadComments(server.url, videoUUID, threadId)
+ threadId = comment.threadId
+ })
- const rootComment = res.body.comment
- expect(rootComment.inReplyToCommentId).to.be.null
- expect(rootComment.text).equal('my super first comment')
- expect(rootComment.videoId).to.equal(videoId)
- expect(dateIsValid(rootComment.createdAt as string)).to.be.true
- expect(dateIsValid(rootComment.updatedAt as string)).to.be.true
- })
+ it('Should get all the thread created', async function () {
+ const res = await getVideoThreadComments(server.url, videoUUID, threadId)
- it('Should create multiple replies in this thread', async function () {
- const text1 = 'my super answer to thread 1'
- const childCommentRes = await addVideoCommentReply(server.url, server.accessToken, videoId, threadId, text1)
- const childCommentId = childCommentRes.body.comment.id
+ const rootComment = res.body.comment
+ expect(rootComment.inReplyToCommentId).to.be.null
+ expect(rootComment.text).equal('my super first comment')
+ expect(rootComment.videoId).to.equal(videoId)
+ expect(dateIsValid(rootComment.createdAt as string)).to.be.true
+ expect(dateIsValid(rootComment.updatedAt as string)).to.be.true
+ })
- const text2 = 'my super answer to answer of thread 1'
- await addVideoCommentReply(server.url, server.accessToken, videoId, childCommentId, text2)
+ it('Should create multiple replies in this thread', async function () {
+ const text1 = 'my super answer to thread 1'
+ const childCommentRes = await addVideoCommentReply(server.url, server.accessToken, videoId, threadId, text1)
+ const childCommentId = childCommentRes.body.comment.id
- const text3 = 'my second answer to thread 1'
- await addVideoCommentReply(server.url, server.accessToken, videoId, threadId, text3)
- })
+ const text2 = 'my super answer to answer of thread 1'
+ await addVideoCommentReply(server.url, server.accessToken, videoId, childCommentId, text2)
- it('Should get correctly the replies', async function () {
- const res = await getVideoThreadComments(server.url, videoUUID, threadId)
+ const text3 = 'my second answer to thread 1'
+ await addVideoCommentReply(server.url, server.accessToken, videoId, threadId, text3)
+ })
- const tree: VideoCommentThreadTree = res.body
- expect(tree.comment.text).equal('my super first comment')
- expect(tree.children).to.have.lengthOf(2)
+ it('Should get correctly the replies', async function () {
+ const res = await getVideoThreadComments(server.url, videoUUID, threadId)
- const firstChild = tree.children[0]
- expect(firstChild.comment.text).to.equal('my super answer to thread 1')
- expect(firstChild.children).to.have.lengthOf(1)
+ const tree: VideoCommentThreadTree = res.body
+ expect(tree.comment.text).equal('my super first comment')
+ expect(tree.children).to.have.lengthOf(2)
- const childOfFirstChild = firstChild.children[0]
- expect(childOfFirstChild.comment.text).to.equal('my super answer to answer of thread 1')
- expect(childOfFirstChild.children).to.have.lengthOf(0)
+ const firstChild = tree.children[0]
+ expect(firstChild.comment.text).to.equal('my super answer to thread 1')
+ expect(firstChild.children).to.have.lengthOf(1)
- const secondChild = tree.children[1]
- expect(secondChild.comment.text).to.equal('my second answer to thread 1')
- expect(secondChild.children).to.have.lengthOf(0)
+ const childOfFirstChild = firstChild.children[0]
+ expect(childOfFirstChild.comment.text).to.equal('my super answer to answer of thread 1')
+ expect(childOfFirstChild.children).to.have.lengthOf(0)
- replyToDeleteId = secondChild.comment.id
- })
+ const secondChild = tree.children[1]
+ expect(secondChild.comment.text).to.equal('my second answer to thread 1')
+ expect(secondChild.children).to.have.lengthOf(0)
- it('Should create other threads', async function () {
- const text1 = 'super thread 2'
- await addVideoCommentThread(server.url, server.accessToken, videoUUID, text1)
+ replyToDeleteId = secondChild.comment.id
+ })
- const text2 = 'super thread 3'
- await addVideoCommentThread(server.url, server.accessToken, videoUUID, text2)
- })
+ it('Should create other threads', async function () {
+ const text1 = 'super thread 2'
+ await addVideoCommentThread(server.url, server.accessToken, videoUUID, text1)
- it('Should list the threads', async function () {
- const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5, 'createdAt')
+ const text2 = 'super thread 3'
+ await addVideoCommentThread(server.url, server.accessToken, videoUUID, text2)
+ })
- expect(res.body.total).to.equal(3)
- expect(res.body.data).to.be.an('array')
- expect(res.body.data).to.have.lengthOf(3)
+ it('Should list the threads', async function () {
+ const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5, 'createdAt')
- expect(res.body.data[0].text).to.equal('my super first comment')
- expect(res.body.data[0].totalReplies).to.equal(3)
- expect(res.body.data[1].text).to.equal('super thread 2')
- expect(res.body.data[1].totalReplies).to.equal(0)
- expect(res.body.data[2].text).to.equal('super thread 3')
- expect(res.body.data[2].totalReplies).to.equal(0)
- })
+ expect(res.body.total).to.equal(3)
+ expect(res.body.data).to.be.an('array')
+ expect(res.body.data).to.have.lengthOf(3)
+
+ expect(res.body.data[0].text).to.equal('my super first comment')
+ expect(res.body.data[0].totalReplies).to.equal(3)
+ expect(res.body.data[1].text).to.equal('super thread 2')
+ expect(res.body.data[1].totalReplies).to.equal(0)
+ expect(res.body.data[2].text).to.equal('super thread 3')
+ expect(res.body.data[2].totalReplies).to.equal(0)
+ })
- it('Should delete a reply', async function () {
- await deleteVideoComment(server.url, server.accessToken, videoId, replyToDeleteId)
+ it('Should delete a reply', async function () {
+ await deleteVideoComment(server.url, server.accessToken, videoId, replyToDeleteId)
- const res = await getVideoThreadComments(server.url, videoUUID, threadId)
+ const res = await getVideoThreadComments(server.url, videoUUID, threadId)
- const tree: VideoCommentThreadTree = res.body
- expect(tree.comment.text).equal('my super first comment')
- expect(tree.children).to.have.lengthOf(2)
+ const tree: VideoCommentThreadTree = res.body
+ expect(tree.comment.text).equal('my super first comment')
+ expect(tree.children).to.have.lengthOf(2)
- const firstChild = tree.children[0]
- expect(firstChild.comment.text).to.equal('my super answer to thread 1')
- expect(firstChild.children).to.have.lengthOf(1)
+ const firstChild = tree.children[0]
+ expect(firstChild.comment.text).to.equal('my super answer to thread 1')
+ expect(firstChild.children).to.have.lengthOf(1)
- const childOfFirstChild = firstChild.children[0]
- expect(childOfFirstChild.comment.text).to.equal('my super answer to answer of thread 1')
- expect(childOfFirstChild.children).to.have.lengthOf(0)
+ const childOfFirstChild = firstChild.children[0]
+ expect(childOfFirstChild.comment.text).to.equal('my super answer to answer of thread 1')
+ expect(childOfFirstChild.children).to.have.lengthOf(0)
- const deletedChildOfFirstChild = tree.children[1]
- expect(deletedChildOfFirstChild.comment.text).to.equal('')
- expect(deletedChildOfFirstChild.comment.isDeleted).to.be.true
- expect(deletedChildOfFirstChild.comment.deletedAt).to.not.be.null
- expect(deletedChildOfFirstChild.comment.account).to.be.null
- expect(deletedChildOfFirstChild.children).to.have.lengthOf(0)
- })
+ const deletedChildOfFirstChild = tree.children[1]
+ expect(deletedChildOfFirstChild.comment.text).to.equal('')
+ expect(deletedChildOfFirstChild.comment.isDeleted).to.be.true
+ expect(deletedChildOfFirstChild.comment.deletedAt).to.not.be.null
+ expect(deletedChildOfFirstChild.comment.account).to.be.null
+ expect(deletedChildOfFirstChild.children).to.have.lengthOf(0)
+ })
+
+ it('Should delete a complete thread', async function () {
+ await deleteVideoComment(server.url, server.accessToken, videoId, threadId)
+
+ const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5, 'createdAt')
+ expect(res.body.total).to.equal(3)
+ expect(res.body.data).to.be.an('array')
+ expect(res.body.data).to.have.lengthOf(3)
+
+ expect(res.body.data[0].text).to.equal('')
+ expect(res.body.data[0].isDeleted).to.be.true
+ expect(res.body.data[0].deletedAt).to.not.be.null
+ expect(res.body.data[0].account).to.be.null
+ expect(res.body.data[0].totalReplies).to.equal(3)
+ expect(res.body.data[1].text).to.equal('super thread 2')
+ expect(res.body.data[1].totalReplies).to.equal(0)
+ expect(res.body.data[2].text).to.equal('super thread 3')
+ expect(res.body.data[2].totalReplies).to.equal(0)
+ })
- it('Should delete a complete thread', async function () {
- await deleteVideoComment(server.url, server.accessToken, videoId, threadId)
-
- const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5, 'createdAt')
- expect(res.body.total).to.equal(3)
- expect(res.body.data).to.be.an('array')
- expect(res.body.data).to.have.lengthOf(3)
-
- expect(res.body.data[0].text).to.equal('')
- expect(res.body.data[0].isDeleted).to.be.true
- expect(res.body.data[0].deletedAt).to.not.be.null
- expect(res.body.data[0].account).to.be.null
- expect(res.body.data[0].totalReplies).to.equal(3)
- expect(res.body.data[1].text).to.equal('super thread 2')
- expect(res.body.data[1].totalReplies).to.equal(0)
- expect(res.body.data[2].text).to.equal('super thread 3')
- expect(res.body.data[2].totalReplies).to.equal(0)
+ it('Should count replies from the video author correctly', async function () {
+ const text = 'my super first comment'
+ await addVideoCommentThread(server.url, server.accessToken, videoUUID, text)
+ let res = await getVideoCommentThreads(server.url, videoUUID, 0, 5)
+ const comment: VideoComment = res.body.data[0]
+ const threadId2 = comment.threadId
+
+ const text2 = 'a first answer to thread 4 by a third party'
+ await addVideoCommentReply(server.url, userAccessTokenServer1, videoId, threadId2, text2)
+
+ const text3 = 'my second answer to thread 4'
+ await addVideoCommentReply(server.url, server.accessToken, videoId, threadId2, text3)
+
+ res = await getVideoThreadComments(server.url, videoUUID, threadId2)
+ const tree: VideoCommentThreadTree = res.body
+ expect(tree.comment.totalReplies).to.equal(tree.comment.totalRepliesFromVideoAuthor + 1)
+ })
})
- it('Should count replies from the video author correctly', async function () {
- const text = 'my super first comment'
- await addVideoCommentThread(server.url, server.accessToken, videoUUID, text)
- let res = await getVideoCommentThreads(server.url, videoUUID, 0, 5)
- const comment: VideoComment = res.body.data[0]
- const threadId2 = comment.threadId
+ describe('All instance comments', function () {
+ async function getComments (options: any = {}) {
+ const res = await getAdminVideoComments(Object.assign({
+ url: server.url,
+ token: server.accessToken,
+ start: 0,
+ count: 10
+ }, options))
+
+ return { comments: res.body.data as VideoCommentAdmin[], total: res.body.total as number }
+ }
+
+ it('Should list instance comments as admin', async function () {
+ const { comments } = await getComments({ start: 0, count: 1 })
+
+ expect(comments[0].text).to.equal('my second answer to thread 4')
+ })
+
+ it('Should filter instance comments by isLocal', async function () {
+ const { total, comments } = await getComments({ isLocal: false })
+
+ expect(comments).to.have.lengthOf(0)
+ expect(total).to.equal(0)
+ })
+
+ it('Should search instance comments by account', async function () {
+ const { total, comments } = await getComments({ searchAccount: 'user' })
+
+ expect(comments).to.have.lengthOf(1)
+ expect(total).to.equal(1)
+
+ expect(comments[0].text).to.equal('a first answer to thread 4 by a third party')
+ })
- const text2 = 'a first answer to thread 4 by a third party'
- await addVideoCommentReply(server.url, userAccessTokenServer1, videoId, threadId2, text2)
+ it('Should search instance comments by video', async function () {
+ {
+ const { total, comments } = await getComments({ searchVideo: 'video' })
- const text3 = 'my second answer to thread 4'
- await addVideoCommentReply(server.url, server.accessToken, videoId, threadId2, text3)
+ expect(comments).to.have.lengthOf(7)
+ expect(total).to.equal(7)
+ }
- res = await getVideoThreadComments(server.url, videoUUID, threadId2)
- const tree: VideoCommentThreadTree = res.body
- expect(tree.comment.totalReplies).to.equal(tree.comment.totalRepliesFromVideoAuthor + 1)
+ {
+ const { total, comments } = await getComments({ searchVideo: 'hello' })
+
+ expect(comments).to.have.lengthOf(0)
+ expect(total).to.equal(0)
+ }
+ })
+
+ it('Should search instance comments', async function () {
+ const { total, comments } = await getComments({ search: 'super thread 3' })
+
+ expect(comments).to.have.lengthOf(1)
+ expect(total).to.equal(1)
+ expect(comments[0].text).to.equal('super thread 3')
+ })
})
after(async function () {
projects / github / Chocobozzz / PeerTube.git / commitdiff
