+ ![]()
+
+
+ {{ videoComment.account.displayName }}
+ {{ videoComment.by }}
+
+
+
> {
const { pagination, sort, search } = options
- const url = VideoCommentService.BASE_VIDEO_URL + '/comments'
+ const url = VideoCommentService.BASE_VIDEO_URL + 'comments'
let params = new HttpParams()
params = this.restService.addRestGetParams(params, pagination, sort)
@@ -172,7 +173,7 @@ export class VideoCommentService {
private buildParamsFromSearch (search: string, params: HttpParams) {
const filters = this.restService.parseQueryStringFilter(search, {
- state: {
+ isLocal: {
prefix: 'local:',
isBoolean: true,
handler: v => {
diff --git a/server/middlewares/validators/users.ts b/server/middlewares/validators/users.ts
index 452c7fb93..c91c378b3 100644
--- a/server/middlewares/validators/users.ts
+++ b/server/middlewares/validators/users.ts
@@ -41,6 +41,7 @@ import { Hooks } from '@server/lib/plugins/hooks'
const usersListValidator = [
query('blocked')
.optional()
+ .customSanitizer(toBooleanOrNull)
.isBoolean().withMessage('Should be a valid boolean banned state'),
(req: express.Request, res: express.Response, next: express.NextFunction) => {
diff --git a/server/middlewares/validators/videos/video-comments.ts b/server/middlewares/validators/videos/video-comments.ts
index 55fb60b98..a3c9febc4 100644
--- a/server/middlewares/validators/videos/video-comments.ts
+++ b/server/middlewares/validators/videos/video-comments.ts
@@ -2,7 +2,7 @@ import * as express from 'express'
import { body, param, query } from 'express-validator'
import { MUserAccountUrl } from '@server/types/models'
import { UserRight } from '../../../../shared'
-import { exists, isBooleanValid, isIdOrUUIDValid, isIdValid } from '../../../helpers/custom-validators/misc'
+import { exists, isBooleanValid, isIdOrUUIDValid, isIdValid, toBooleanOrNull } from '../../../helpers/custom-validators/misc'
import {
doesVideoCommentExist,
doesVideoCommentThreadExist,
@@ -18,6 +18,7 @@ import { areValidationErrors } from '../utils'
const listVideoCommentsValidator = [
query('isLocal')
.optional()
+ .customSanitizer(toBooleanOrNull)
.custom(isBooleanValid)
.withMessage('Should have a valid is local boolean'),
diff --git a/server/models/video/video-comment.ts b/server/models/video/video-comment.ts
index 70aed75d6..ed4a345eb 100644
--- a/server/models/video/video-comment.ts
+++ b/server/models/video/video-comment.ts
@@ -323,14 +323,8 @@ export class VideoCommentModel extends Model {
}) {
const { start, count, sort, isLocal, search, searchAccount, searchVideo } = parameters
- const query: FindAndCountOptions = {
- offset: start,
- limit: count,
- order: getCommentSort(sort)
- }
-
const where: WhereOptions = {
- isDeleted: false
+ deletedAt: null
}
const whereAccount: WhereOptions = {}
@@ -338,11 +332,11 @@ export class VideoCommentModel extends Model {
const whereVideo: WhereOptions = {}
if (isLocal === true) {
- Object.assign(where, {
+ Object.assign(whereActor, {
serverId: null
})
} else if (isLocal === false) {
- Object.assign(where, {
+ Object.assign(whereActor, {
serverId: {
[Op.ne]: null
}
@@ -350,43 +344,57 @@ export class VideoCommentModel extends Model {
}
if (search) {
- Object.assign(where, searchAttribute(search, 'text'))
- Object.assign(whereActor, searchAttribute(search, 'preferredUsername'))
- Object.assign(whereAccount, searchAttribute(search, 'name'))
- Object.assign(whereVideo, searchAttribute(search, 'name'))
+ Object.assign(where, {
+ [Op.or]: [
+ searchAttribute(search, 'text'),
+ searchAttribute(search, '$Account.Actor.preferredUsername$'),
+ searchAttribute(search, '$Account.name$'),
+ searchAttribute(search, '$Video.name$')
+ ]
+ })
}
if (searchAccount) {
- Object.assign(whereActor, searchAttribute(search, 'preferredUsername'))
- Object.assign(whereAccount, searchAttribute(search, 'name'))
+ Object.assign(whereActor, {
+ [Op.or]: [
+ searchAttribute(searchAccount, '$Account.Actor.preferredUsername$'),
+ searchAttribute(searchAccount, '$Account.name$')
+ ]
+ })
}
if (searchVideo) {
- Object.assign(whereVideo, searchAttribute(search, 'name'))
+ Object.assign(whereVideo, searchAttribute(searchVideo, 'name'))
}
- query.include = [
- {
- model: AccountModel.unscoped(),
- required: !!searchAccount,
- where: whereAccount,
- include: [
- {
- attributes: {
- exclude: unusedActorAttributesForAPI
- },
- model: ActorModel, // Default scope includes avatar and server
- required: true,
- where: whereActor
- }
- ]
- },
- {
- model: VideoModel.unscoped(),
- required: true,
- where: whereVideo
- }
- ]
+ const query: FindAndCountOptions = {
+ offset: start,
+ limit: count,
+ order: getCommentSort(sort),
+ where,
+ include: [
+ {
+ model: AccountModel.unscoped(),
+ required: true,
+ where: whereAccount,
+ include: [
+ {
+ attributes: {
+ exclude: unusedActorAttributesForAPI
+ },
+ model: ActorModel, // Default scope includes avatar and server
+ required: true,
+ where: whereActor
+ }
+ ]
+ },
+ {
+ model: VideoModel.unscoped(),
+ required: true,
+ where: whereVideo
+ }
+ ]
+ }
return VideoCommentModel
.findAndCountAll(query)
diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts
index 3e53c445d..2a220be83 100644
--- a/server/tests/api/check-params/users.ts
+++ b/server/tests/api/check-params/users.ts
@@ -154,18 +154,6 @@ describe('Test users API validators', function () {
await checkBadSortPagination(server.url, path, server.accessToken)
})
- it('Should fail with a bad blocked/banned user filter', async function () {
- await makeGetRequest({
- url: server.url,
- path,
- query: {
- blocked: 42
- },
- token: server.accessToken,
- statusCodeExpected: 400
- })
- })
-
it('Should fail with a non authenticated user', async function () {
await makeGetRequest({
url: server.url,
diff --git a/server/tests/api/check-params/video-comments.ts b/server/tests/api/check-params/video-comments.ts
index 181282ce1..662d4a70d 100644
--- a/server/tests/api/check-params/video-comments.ts
+++ b/server/tests/api/check-params/video-comments.ts
@@ -296,6 +296,54 @@ describe('Test video comments API validator', function () {
it('Should return conflict on comment thread add')
})
+ describe('When listing admin comments threads', function () {
+ const path = '/api/v1/videos/comments'
+
+ it('Should fail with a bad start pagination', async function () {
+ await checkBadStartPagination(server.url, path, server.accessToken)
+ })
+
+ it('Should fail with a bad count pagination', async function () {
+ await checkBadCountPagination(server.url, path, server.accessToken)
+ })
+
+ it('Should fail with an incorrect sort', async function () {
+ await checkBadSortPagination(server.url, path, server.accessToken)
+ })
+
+ it('Should fail with a non authenticated user', async function () {
+ await makeGetRequest({
+ url: server.url,
+ path,
+ statusCodeExpected: 401
+ })
+ })
+
+ it('Should fail with a non admin user', async function () {
+ await makeGetRequest({
+ url: server.url,
+ path,
+ token: userAccessToken,
+ statusCodeExpected: 403
+ })
+ })
+
+ it('Should succeed with the correct params', async function () {
+ await makeGetRequest({
+ url: server.url,
+ path,
+ token: server.accessToken,
+ query: {
+ isLocal: false,
+ search: 'toto',
+ searchAccount: 'toto',
+ searchVideo: 'toto'
+ },
+ statusCodeExpected: 200
+ })
+ })
+ })
+
after(async function () {
await cleanupTests([ server ])
})
diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts
index d7b04373f..c90fd09fb 100644
--- a/server/tests/api/videos/multiple-servers.ts
+++ b/server/tests/api/videos/multiple-servers.ts
@@ -158,7 +158,7 @@ describe('Test multiple servers', function () {
})
it('Should upload the video on server 2 and propagate on each server', async function () {
- this.timeout(50000)
+ this.timeout(100000)
const user = {
username: 'user1',
diff --git a/server/tests/api/videos/video-comments.ts b/server/tests/api/videos/video-comments.ts
index afb58e95a..18a86bead 100644
--- a/server/tests/api/videos/video-comments.ts
+++ b/server/tests/api/videos/video-comments.ts
@@ -2,7 +2,7 @@
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,
@@ -18,9 +18,11 @@ import {
addVideoCommentReply,
addVideoCommentThread,
deleteVideoComment,
+ getAdminVideoComments,
getVideoCommentThreads,
getVideoThreadComments
} from '../../../../shared/extra-utils/videos/video-comments'
+import { isLocalLiveVideoAccepted } from '@server/lib/moderation'
const expect = chai.expect
@@ -59,186 +61,248 @@ describe('Test video comments', function () {
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)
+
+ 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 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
+ })
+
+ it('Should list threads of this video', async function () {
+ const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5)
+
+ expect(res.body.total).to.equal(1)
+ expect(res.body.data).to.be.an('array')
+ expect(res.body.data).to.have.lengthOf(1)
+
+ 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)
+
+ await testImage(server.url, 'avatar-resized', comment.account.avatar.path, '.png')
+
+ 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
+
+ threadId = comment.threadId
+ })
+
+ it('Should get all the thread created', async function () {
+ const res = await getVideoThreadComments(server.url, videoUUID, 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 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 text2 = 'my super answer to answer of thread 1'
+ await addVideoCommentReply(server.url, server.accessToken, videoId, childCommentId, text2)
+
+ const text3 = 'my second answer to thread 1'
+ await addVideoCommentReply(server.url, server.accessToken, videoId, threadId, text3)
+ })
+
+ it('Should get correctly the replies', async function () {
+ 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 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 secondChild = tree.children[1]
+ expect(secondChild.comment.text).to.equal('my second answer to thread 1')
+ expect(secondChild.children).to.have.lengthOf(0)
+
+ replyToDeleteId = secondChild.comment.id
+ })
+
+ it('Should create other threads', async function () {
+ const text1 = 'super thread 2'
+ await addVideoCommentThread(server.url, server.accessToken, videoUUID, text1)
+
+ const text2 = 'super thread 3'
+ await addVideoCommentThread(server.url, server.accessToken, videoUUID, text2)
+ })
+
+ it('Should list the threads', async function () {
+ 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('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)
+
+ 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 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 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 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 create a thread in this video', async function () {
- const text = 'my super first comment'
+ 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))
- const res = await addVideoCommentThread(server.url, server.accessToken, videoUUID, text)
- const comment = res.body.comment
+ return { comments: res.body.data as VideoCommentAdmin[], total: res.body.total as number }
+ }
- 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
- })
+ it('Should list instance comments as admin', async function () {
+ const { comments } = await getComments({ start: 0, count: 1 })
- it('Should list threads of this video', async function () {
- const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5)
+ expect(comments[0].text).to.equal('my second answer to thread 4')
+ })
- 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 filter instance comments by isLocal', async function () {
+ const { total, comments } = await getComments({ isLocal: false })
- 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(comments).to.have.lengthOf(0)
+ expect(total).to.equal(0)
+ })
- await testImage(server.url, 'avatar-resized', comment.account.avatar.path, '.png')
+ it('Should search instance comments by account', async function () {
+ const { total, comments } = await getComments({ searchAccount: 'user' })
- 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(comments).to.have.lengthOf(1)
+ expect(total).to.equal(1)
- threadId = comment.threadId
- })
+ expect(comments[0].text).to.equal('a first answer to thread 4 by a third party')
+ })
- it('Should get all the thread created', async function () {
- const res = await getVideoThreadComments(server.url, videoUUID, threadId)
+ it('Should search instance comments by video', async function () {
+ {
+ const { total, comments } = await getComments({ searchVideo: 'video' })
- 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
- })
+ expect(comments).to.have.lengthOf(7)
+ expect(total).to.equal(7)
+ }
- 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 { total, comments } = await getComments({ searchVideo: 'hello' })
- const text2 = 'my super answer to answer of thread 1'
- await addVideoCommentReply(server.url, server.accessToken, videoId, childCommentId, text2)
+ expect(comments).to.have.lengthOf(0)
+ expect(total).to.equal(0)
+ }
+ })
- const text3 = 'my second answer to thread 1'
- await addVideoCommentReply(server.url, server.accessToken, videoId, threadId, text3)
- })
+ it('Should search instance comments', async function () {
+ const { total, comments } = await getComments({ search: 'super thread 3' })
- it('Should get correctly the replies', async function () {
- 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 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 secondChild = tree.children[1]
- expect(secondChild.comment.text).to.equal('my second answer to thread 1')
- expect(secondChild.children).to.have.lengthOf(0)
-
- replyToDeleteId = secondChild.comment.id
- })
-
- it('Should create other threads', async function () {
- const text1 = 'super thread 2'
- await addVideoCommentThread(server.url, server.accessToken, videoUUID, text1)
-
- const text2 = 'super thread 3'
- await addVideoCommentThread(server.url, server.accessToken, videoUUID, text2)
- })
-
- it('Should list the threads', async function () {
- 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('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)
-
- 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 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 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 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)
+ expect(comments).to.have.lengthOf(1)
+ expect(total).to.equal(1)
+ expect(comments[0].text).to.equal('super thread 3')
+ })
})
after(async function () {
diff --git a/shared/extra-utils/videos/video-comments.ts b/shared/extra-utils/videos/video-comments.ts
index 831e5e7d4..0b0df81dc 100644
--- a/shared/extra-utils/videos/video-comments.ts
+++ b/shared/extra-utils/videos/video-comments.ts
@@ -1,7 +1,41 @@
/* eslint-disable @typescript-eslint/no-floating-promises */
import * as request from 'supertest'
-import { makeDeleteRequest } from '../requests/requests'
+import { makeDeleteRequest, makeGetRequest } from '../requests/requests'
+
+function getAdminVideoComments (options: {
+ url: string
+ token: string
+ start: number
+ count: number
+ sort?: string
+ isLocal?: boolean
+ search?: string
+ searchAccount?: string
+ searchVideo?: string
+}) {
+ const { url, token, start, count, sort, isLocal, search, searchAccount, searchVideo } = options
+ const path = '/api/v1/videos/comments'
+
+ const query = {
+ start,
+ count,
+ sort: sort || '-createdAt'
+ }
+
+ if (isLocal !== undefined) Object.assign(query, { isLocal })
+ if (search !== undefined) Object.assign(query, { search })
+ if (searchAccount !== undefined) Object.assign(query, { searchAccount })
+ if (searchVideo !== undefined) Object.assign(query, { searchVideo })
+
+ return makeGetRequest({
+ url,
+ path,
+ token,
+ query,
+ statusCodeExpected: 200
+ })
+}
function getVideoCommentThreads (url: string, videoId: number | string, start: number, count: number, sort?: string, token?: string) {
const path = '/api/v1/videos/' + videoId + '/comment-threads'
@@ -88,6 +122,7 @@ function deleteVideoComment (
export {
getVideoCommentThreads,
+ getAdminVideoComments,
getVideoThreadComments,
addVideoCommentThread,
addVideoCommentReply,