From 0c1a77e9ccf915184c431145a8b326d4ce271b46 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 6 Jul 2021 12:01:59 +0200 Subject: Introduce abuse command --- server/tests/api/moderation/abuses.ts | 631 ++++++++++++++++------------------ 1 file changed, 294 insertions(+), 337 deletions(-) (limited to 'server/tests/api/moderation') diff --git a/server/tests/api/moderation/abuses.ts b/server/tests/api/moderation/abuses.ts index fb765e7e3..a9f5332ce 100644 --- a/server/tests/api/moderation/abuses.ts +++ b/server/tests/api/moderation/abuses.ts @@ -3,51 +3,32 @@ import 'mocha' import * as chai from 'chai' import { - AbuseFilter, - AbuseMessage, - AbusePredefinedReasonsString, - AbuseState, - Account, - AdminAbuse, - UserAbuse, - VideoComment -} from '@shared/models' -import { - addAbuseMessage, + AbusesCommand, + addAccountToServerBlocklist, + addServerToServerBlocklist, addVideoCommentThread, cleanupTests, createUser, - deleteAbuse, - deleteAbuseMessage, deleteVideoComment, + doubleFollow, flushAndRunMultipleServers, generateUserAccessToken, getAccount, - getAdminAbusesList, - getUserAbusesList, getVideoCommentThreads, getVideoIdFromUUID, getVideosList, - immutableAssign, - listAbuseMessages, + removeAccountFromServerBlocklist, + removeServerFromServerBlocklist, removeUser, removeVideo, - reportAbuse, ServerInfo, setAccessTokensToServers, - updateAbuse, uploadVideo, uploadVideoAndGetId, - userLogin -} from '../../../../shared/extra-utils/index' -import { doubleFollow } from '../../../../shared/extra-utils/server/follows' -import { waitJobs } from '../../../../shared/extra-utils/server/jobs' -import { - addAccountToServerBlocklist, - addServerToServerBlocklist, - removeAccountFromServerBlocklist, - removeServerFromServerBlocklist -} from '../../../../shared/extra-utils/users/blocklist' + userLogin, + waitJobs +} from '@shared/extra-utils' +import { AbuseMessage, AbusePredefinedReasonsString, AbuseState, Account, AdminAbuse, UserAbuse, VideoComment } from '@shared/models' const expect = chai.expect @@ -55,6 +36,7 @@ describe('Test abuses', function () { let servers: ServerInfo[] = [] let abuseServer1: AdminAbuse let abuseServer2: AdminAbuse + let commands: AbusesCommand[] before(async function () { this.timeout(50000) @@ -67,6 +49,8 @@ describe('Test abuses', function () { // Server 1 and server 2 follow each other await doubleFollow(servers[0], servers[1]) + + commands = servers.map(s => s.abusesCommand) }) describe('Video abuses', function () { @@ -100,54 +84,58 @@ describe('Test abuses', function () { }) it('Should not have abuses', async function () { - const res = await getAdminAbusesList({ url: servers[0].url, token: servers[0].accessToken }) + const body = await commands[0].getAdminList() - expect(res.body.total).to.equal(0) - expect(res.body.data).to.be.an('array') - expect(res.body.data.length).to.equal(0) + expect(body.total).to.equal(0) + expect(body.data).to.be.an('array') + expect(body.data.length).to.equal(0) }) it('Should report abuse on a local video', async function () { this.timeout(15000) const reason = 'my super bad reason' - await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, videoId: servers[0].video.id, reason }) + await commands[0].report({ videoId: servers[0].video.id, reason }) // We wait requests propagation, even if the server 1 is not supposed to make a request to server 2 await waitJobs(servers) }) it('Should have 1 video abuses on server 1 and 0 on server 2', async function () { - const res1 = await getAdminAbusesList({ url: servers[0].url, token: servers[0].accessToken }) + { + const body = await commands[0].getAdminList() - expect(res1.body.total).to.equal(1) - expect(res1.body.data).to.be.an('array') - expect(res1.body.data.length).to.equal(1) + expect(body.total).to.equal(1) + expect(body.data).to.be.an('array') + expect(body.data.length).to.equal(1) - const abuse: AdminAbuse = res1.body.data[0] - expect(abuse.reason).to.equal('my super bad reason') + const abuse = body.data[0] + expect(abuse.reason).to.equal('my super bad reason') - expect(abuse.reporterAccount.name).to.equal('root') - expect(abuse.reporterAccount.host).to.equal(servers[0].host) + expect(abuse.reporterAccount.name).to.equal('root') + expect(abuse.reporterAccount.host).to.equal(servers[0].host) - expect(abuse.video.id).to.equal(servers[0].video.id) - expect(abuse.video.channel).to.exist + expect(abuse.video.id).to.equal(servers[0].video.id) + expect(abuse.video.channel).to.exist - expect(abuse.comment).to.be.null + expect(abuse.comment).to.be.null - expect(abuse.flaggedAccount.name).to.equal('root') - expect(abuse.flaggedAccount.host).to.equal(servers[0].host) + expect(abuse.flaggedAccount.name).to.equal('root') + expect(abuse.flaggedAccount.host).to.equal(servers[0].host) - expect(abuse.video.countReports).to.equal(1) - expect(abuse.video.nthReport).to.equal(1) + expect(abuse.video.countReports).to.equal(1) + expect(abuse.video.nthReport).to.equal(1) - expect(abuse.countReportsForReporter).to.equal(1) - expect(abuse.countReportsForReportee).to.equal(1) + expect(abuse.countReportsForReporter).to.equal(1) + expect(abuse.countReportsForReportee).to.equal(1) + } - const res2 = await getAdminAbusesList({ url: servers[1].url, token: servers[1].accessToken }) - expect(res2.body.total).to.equal(0) - expect(res2.body.data).to.be.an('array') - expect(res2.body.data.length).to.equal(0) + { + const body = await commands[1].getAdminList() + expect(body.total).to.equal(0) + expect(body.data).to.be.an('array') + expect(body.data.length).to.equal(0) + } }) it('Should report abuse on a remote video', async function () { @@ -155,68 +143,72 @@ describe('Test abuses', function () { const reason = 'my super bad reason 2' const videoId = await getVideoIdFromUUID(servers[0].url, servers[1].video.uuid) - await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, videoId, reason }) + await commands[0].report({ videoId, reason }) // We wait requests propagation await waitJobs(servers) }) it('Should have 2 video abuses on server 1 and 1 on server 2', async function () { - const res1 = await getAdminAbusesList({ url: servers[0].url, token: servers[0].accessToken }) + { + const body = await commands[0].getAdminList() - expect(res1.body.total).to.equal(2) - expect(res1.body.data.length).to.equal(2) + expect(body.total).to.equal(2) + expect(body.data.length).to.equal(2) - const abuse1: AdminAbuse = res1.body.data[0] - expect(abuse1.reason).to.equal('my super bad reason') - expect(abuse1.reporterAccount.name).to.equal('root') - expect(abuse1.reporterAccount.host).to.equal(servers[0].host) + const abuse1 = body.data[0] + expect(abuse1.reason).to.equal('my super bad reason') + expect(abuse1.reporterAccount.name).to.equal('root') + expect(abuse1.reporterAccount.host).to.equal(servers[0].host) - expect(abuse1.video.id).to.equal(servers[0].video.id) - expect(abuse1.video.countReports).to.equal(1) - expect(abuse1.video.nthReport).to.equal(1) + expect(abuse1.video.id).to.equal(servers[0].video.id) + expect(abuse1.video.countReports).to.equal(1) + expect(abuse1.video.nthReport).to.equal(1) - expect(abuse1.comment).to.be.null + expect(abuse1.comment).to.be.null - expect(abuse1.flaggedAccount.name).to.equal('root') - expect(abuse1.flaggedAccount.host).to.equal(servers[0].host) + expect(abuse1.flaggedAccount.name).to.equal('root') + expect(abuse1.flaggedAccount.host).to.equal(servers[0].host) - expect(abuse1.state.id).to.equal(AbuseState.PENDING) - expect(abuse1.state.label).to.equal('Pending') - expect(abuse1.moderationComment).to.be.null + expect(abuse1.state.id).to.equal(AbuseState.PENDING) + expect(abuse1.state.label).to.equal('Pending') + expect(abuse1.moderationComment).to.be.null - const abuse2: AdminAbuse = res1.body.data[1] - expect(abuse2.reason).to.equal('my super bad reason 2') + const abuse2 = body.data[1] + expect(abuse2.reason).to.equal('my super bad reason 2') - expect(abuse2.reporterAccount.name).to.equal('root') - expect(abuse2.reporterAccount.host).to.equal(servers[0].host) + expect(abuse2.reporterAccount.name).to.equal('root') + expect(abuse2.reporterAccount.host).to.equal(servers[0].host) - expect(abuse2.video.id).to.equal(servers[1].video.id) + expect(abuse2.video.id).to.equal(servers[1].video.id) - expect(abuse2.comment).to.be.null + expect(abuse2.comment).to.be.null - expect(abuse2.flaggedAccount.name).to.equal('root') - expect(abuse2.flaggedAccount.host).to.equal(servers[1].host) + expect(abuse2.flaggedAccount.name).to.equal('root') + expect(abuse2.flaggedAccount.host).to.equal(servers[1].host) - expect(abuse2.state.id).to.equal(AbuseState.PENDING) - expect(abuse2.state.label).to.equal('Pending') - expect(abuse2.moderationComment).to.be.null + expect(abuse2.state.id).to.equal(AbuseState.PENDING) + expect(abuse2.state.label).to.equal('Pending') + expect(abuse2.moderationComment).to.be.null + } - const res2 = await getAdminAbusesList({ url: servers[1].url, token: servers[1].accessToken }) - expect(res2.body.total).to.equal(1) - expect(res2.body.data.length).to.equal(1) + { + const body = await commands[1].getAdminList() + expect(body.total).to.equal(1) + expect(body.data.length).to.equal(1) - abuseServer2 = res2.body.data[0] - expect(abuseServer2.reason).to.equal('my super bad reason 2') - expect(abuseServer2.reporterAccount.name).to.equal('root') - expect(abuseServer2.reporterAccount.host).to.equal(servers[0].host) + abuseServer2 = body.data[0] + expect(abuseServer2.reason).to.equal('my super bad reason 2') + expect(abuseServer2.reporterAccount.name).to.equal('root') + expect(abuseServer2.reporterAccount.host).to.equal(servers[0].host) - expect(abuse2.flaggedAccount.name).to.equal('root') - expect(abuse2.flaggedAccount.host).to.equal(servers[1].host) + expect(abuseServer2.flaggedAccount.name).to.equal('root') + expect(abuseServer2.flaggedAccount.host).to.equal(servers[1].host) - expect(abuseServer2.state.id).to.equal(AbuseState.PENDING) - expect(abuseServer2.state.label).to.equal('Pending') - expect(abuseServer2.moderationComment).to.be.null + expect(abuseServer2.state.id).to.equal(AbuseState.PENDING) + expect(abuseServer2.state.label).to.equal('Pending') + expect(abuseServer2.moderationComment).to.be.null + } }) it('Should hide video abuses from blocked accounts', async function () { @@ -224,11 +216,11 @@ describe('Test abuses', function () { { const videoId = await getVideoIdFromUUID(servers[1].url, servers[0].video.uuid) - await reportAbuse({ url: servers[1].url, token: servers[1].accessToken, videoId, reason: 'will mute this' }) + await commands[1].report({ videoId, reason: 'will mute this' }) await waitJobs(servers) - const res = await getAdminAbusesList({ url: servers[0].url, token: servers[0].accessToken }) - expect(res.body.total).to.equal(3) + const body = await commands[0].getAdminList() + expect(body.total).to.equal(3) } const accountToBlock = 'root@' + servers[1].host @@ -236,18 +228,18 @@ describe('Test abuses', function () { { await addAccountToServerBlocklist(servers[0].url, servers[0].accessToken, accountToBlock) - const res = await getAdminAbusesList({ url: servers[0].url, token: servers[0].accessToken }) - expect(res.body.total).to.equal(2) + const body = await commands[0].getAdminList() + expect(body.total).to.equal(2) - const abuse = res.body.data.find(a => a.reason === 'will mute this') + const abuse = body.data.find(a => a.reason === 'will mute this') expect(abuse).to.be.undefined } { await removeAccountFromServerBlocklist(servers[0].url, servers[0].accessToken, accountToBlock) - const res = await getAdminAbusesList({ url: servers[0].url, token: servers[0].accessToken }) - expect(res.body.total).to.equal(3) + const body = await commands[0].getAdminList() + expect(body.total).to.equal(3) } }) @@ -257,18 +249,18 @@ describe('Test abuses', function () { { await addServerToServerBlocklist(servers[0].url, servers[0].accessToken, servers[1].host) - const res = await getAdminAbusesList({ url: servers[0].url, token: servers[0].accessToken }) - expect(res.body.total).to.equal(2) + const body = await commands[0].getAdminList() + expect(body.total).to.equal(2) - const abuse = res.body.data.find(a => a.reason === 'will mute this') + const abuse = body.data.find(a => a.reason === 'will mute this') expect(abuse).to.be.undefined } { await removeServerFromServerBlocklist(servers[0].url, servers[0].accessToken, serverToBlock) - const res = await getAdminAbusesList({ url: servers[0].url, token: servers[0].accessToken }) - expect(res.body.total).to.equal(3) + const body = await commands[0].getAdminList() + expect(body.total).to.equal(3) } }) @@ -279,11 +271,11 @@ describe('Test abuses', function () { await waitJobs(servers) - const res = await getAdminAbusesList({ url: servers[1].url, token: servers[1].accessToken }) - expect(res.body.total).to.equal(2, "wrong number of videos returned") - expect(res.body.data).to.have.lengthOf(2, "wrong number of videos returned") + const body = await commands[1].getAdminList() + expect(body.total).to.equal(2, "wrong number of videos returned") + expect(body.data).to.have.lengthOf(2, "wrong number of videos returned") - const abuse: AdminAbuse = res.body.data[0] + const abuse = body.data[0] expect(abuse.id).to.equal(abuseServer2.id, "wrong origin server id for first video") expect(abuse.video.id).to.equal(abuseServer2.video.id, "wrong video id") expect(abuse.video.channel).to.exist @@ -303,24 +295,21 @@ describe('Test abuses', function () { name: 'my second super name for server 1', description: 'my second super description for server 1' } - await uploadVideo(servers[0].url, userAccessToken, video3Attributes) - - const res1 = await getVideosList(servers[0].url) - const videos = res1.body.data - const video3 = videos.find(video => video.name === 'my second super name for server 1') + const resUpload = await uploadVideo(servers[0].url, userAccessToken, video3Attributes) + const video3Id = resUpload.body.video.id // resume with the test const reason3 = 'my super bad reason 3' - await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, videoId: video3.id, reason: reason3 }) + await commands[0].report({ videoId: video3Id, reason: reason3 }) const reason4 = 'my super bad reason 4' - await reportAbuse({ url: servers[0].url, token: userAccessToken, videoId: servers[0].video.id, reason: reason4 }) + await commands[0].report({ token: userAccessToken, videoId: servers[0].video.id, reason: reason4 }) { - const res2 = await getAdminAbusesList({ url: servers[0].url, token: servers[0].accessToken }) - const abuses = res2.body.data as AdminAbuse[] + const body = await commands[0].getAdminList() + const abuses = body.data - const abuseVideo3 = res2.body.data.find(a => a.video.id === video3.id) + const abuseVideo3 = body.data.find(a => a.video.id === video3Id) expect(abuseVideo3).to.not.be.undefined expect(abuseVideo3.video.countReports).to.equal(1, "wrong reports count for video 3") expect(abuseVideo3.video.nthReport).to.equal(1, "wrong report position in report list for video 3") @@ -337,20 +326,18 @@ describe('Test abuses', function () { const reason5 = 'my super bad reason 5' const predefinedReasons5: AbusePredefinedReasonsString[] = [ 'violentOrRepulsive', 'captions' ] - const createdAbuse = (await reportAbuse({ - url: servers[0].url, - token: servers[0].accessToken, + const createRes = await commands[0].report({ videoId: servers[0].video.id, reason: reason5, predefinedReasons: predefinedReasons5, startAt: 1, endAt: 5 - })).body.abuse + }) - const res = await getAdminAbusesList({ url: servers[0].url, token: servers[0].accessToken }) + const body = await commands[0].getAdminList() { - const abuse = (res.body.data as AdminAbuse[]).find(a => a.id === createdAbuse.id) + const abuse = body.data.find(a => a.id === createRes.abuse.id) expect(abuse.reason).to.equals(reason5) expect(abuse.predefinedReasons).to.deep.equals(predefinedReasons5, "predefined reasons do not match the one reported") expect(abuse.video.startAt).to.equal(1, "starting timestamp doesn't match the one reported") @@ -361,37 +348,30 @@ describe('Test abuses', function () { it('Should delete the video abuse', async function () { this.timeout(10000) - await deleteAbuse(servers[1].url, servers[1].accessToken, abuseServer2.id) + await commands[1].delete({ abuseId: abuseServer2.id }) await waitJobs(servers) { - const res = await getAdminAbusesList({ url: servers[1].url, token: servers[1].accessToken }) - expect(res.body.total).to.equal(1) - expect(res.body.data.length).to.equal(1) - expect(res.body.data[0].id).to.not.equal(abuseServer2.id) + const body = await commands[1].getAdminList() + expect(body.total).to.equal(1) + expect(body.data.length).to.equal(1) + expect(body.data[0].id).to.not.equal(abuseServer2.id) } { - const res = await getAdminAbusesList({ url: servers[0].url, token: servers[0].accessToken }) - expect(res.body.total).to.equal(6) + const body = await commands[0].getAdminList() + expect(body.total).to.equal(6) } }) it('Should list and filter video abuses', async function () { this.timeout(10000) - async function list (query: Omit[0], 'url' | 'token'>) { - const options = { - url: servers[0].url, - token: servers[0].accessToken - } - - Object.assign(options, query) + async function list (query: Parameters[0]) { + const body = await commands[0].getAdminList(query) - const res = await getAdminAbusesList(options) - - return res.body.data as AdminAbuse[] + return body.data } expect(await list({ id: 56 })).to.have.lengthOf(0) @@ -452,7 +432,7 @@ describe('Test abuses', function () { const comment = await getComment(servers[0].url, servers[0].video.id) const reason = 'it is a bad comment' - await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, commentId: comment.id, reason }) + await commands[0].report({ commentId: comment.id, reason }) await waitJobs(servers) }) @@ -460,12 +440,12 @@ describe('Test abuses', function () { it('Should have 1 comment abuse on server 1 and 0 on server 2', async function () { { const comment = await getComment(servers[0].url, servers[0].video.id) - const res = await getAdminAbusesList({ url: servers[0].url, token: servers[0].accessToken, filter: 'comment' }) + const body = await commands[0].getAdminList({ filter: 'comment' }) - expect(res.body.total).to.equal(1) - expect(res.body.data).to.have.lengthOf(1) + expect(body.total).to.equal(1) + expect(body.data).to.have.lengthOf(1) - const abuse: AdminAbuse = res.body.data[0] + const abuse = body.data[0] expect(abuse.reason).to.equal('it is a bad comment') expect(abuse.reporterAccount.name).to.equal('root') @@ -485,9 +465,9 @@ describe('Test abuses', function () { } { - const res = await getAdminAbusesList({ url: servers[1].url, token: servers[1].accessToken, filter: 'comment' }) - expect(res.body.total).to.equal(0) - expect(res.body.data.length).to.equal(0) + const body = await commands[1].getAdminList({ filter: 'comment' }) + expect(body.total).to.equal(0) + expect(body.data.length).to.equal(0) } }) @@ -497,7 +477,7 @@ describe('Test abuses', function () { const comment = await getComment(servers[0].url, servers[1].video.uuid) const reason = 'it is a really bad comment' - await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, commentId: comment.id, reason }) + await commands[0].report({ commentId: comment.id, reason }) await waitJobs(servers) }) @@ -505,54 +485,58 @@ describe('Test abuses', function () { it('Should have 2 comment abuses on server 1 and 1 on server 2', async function () { const commentServer2 = await getComment(servers[0].url, servers[1].video.id) - const res1 = await getAdminAbusesList({ url: servers[0].url, token: servers[0].accessToken, filter: 'comment' }) - expect(res1.body.total).to.equal(2) - expect(res1.body.data.length).to.equal(2) + { + const body = await commands[0].getAdminList({ filter: 'comment' }) + expect(body.total).to.equal(2) + expect(body.data.length).to.equal(2) - const abuse: AdminAbuse = res1.body.data[0] - expect(abuse.reason).to.equal('it is a bad comment') - expect(abuse.countReportsForReporter).to.equal(6) - expect(abuse.countReportsForReportee).to.equal(5) + const abuse = body.data[0] + expect(abuse.reason).to.equal('it is a bad comment') + expect(abuse.countReportsForReporter).to.equal(6) + expect(abuse.countReportsForReportee).to.equal(5) - const abuse2: AdminAbuse = res1.body.data[1] + const abuse2 = body.data[1] - expect(abuse2.reason).to.equal('it is a really bad comment') + expect(abuse2.reason).to.equal('it is a really bad comment') - expect(abuse2.reporterAccount.name).to.equal('root') - expect(abuse2.reporterAccount.host).to.equal(servers[0].host) + expect(abuse2.reporterAccount.name).to.equal('root') + expect(abuse2.reporterAccount.host).to.equal(servers[0].host) - expect(abuse2.video).to.be.null + expect(abuse2.video).to.be.null - expect(abuse2.comment.deleted).to.be.false - expect(abuse2.comment.id).to.equal(commentServer2.id) - expect(abuse2.comment.text).to.equal(commentServer2.text) - expect(abuse2.comment.video.name).to.equal('server 2') - expect(abuse2.comment.video.uuid).to.equal(servers[1].video.uuid) + expect(abuse2.comment.deleted).to.be.false + expect(abuse2.comment.id).to.equal(commentServer2.id) + expect(abuse2.comment.text).to.equal(commentServer2.text) + expect(abuse2.comment.video.name).to.equal('server 2') + expect(abuse2.comment.video.uuid).to.equal(servers[1].video.uuid) - expect(abuse2.state.id).to.equal(AbuseState.PENDING) - expect(abuse2.state.label).to.equal('Pending') + expect(abuse2.state.id).to.equal(AbuseState.PENDING) + expect(abuse2.state.label).to.equal('Pending') - expect(abuse2.moderationComment).to.be.null + expect(abuse2.moderationComment).to.be.null - expect(abuse2.countReportsForReporter).to.equal(6) - expect(abuse2.countReportsForReportee).to.equal(2) + expect(abuse2.countReportsForReporter).to.equal(6) + expect(abuse2.countReportsForReportee).to.equal(2) + } - const res2 = await getAdminAbusesList({ url: servers[1].url, token: servers[1].accessToken, filter: 'comment' }) - expect(res2.body.total).to.equal(1) - expect(res2.body.data.length).to.equal(1) + { + const body = await commands[1].getAdminList({ filter: 'comment' }) + expect(body.total).to.equal(1) + expect(body.data.length).to.equal(1) - abuseServer2 = res2.body.data[0] - expect(abuseServer2.reason).to.equal('it is a really bad comment') - expect(abuseServer2.reporterAccount.name).to.equal('root') - expect(abuseServer2.reporterAccount.host).to.equal(servers[0].host) + abuseServer2 = body.data[0] + expect(abuseServer2.reason).to.equal('it is a really bad comment') + expect(abuseServer2.reporterAccount.name).to.equal('root') + expect(abuseServer2.reporterAccount.host).to.equal(servers[0].host) - expect(abuseServer2.state.id).to.equal(AbuseState.PENDING) - expect(abuseServer2.state.label).to.equal('Pending') + expect(abuseServer2.state.id).to.equal(AbuseState.PENDING) + expect(abuseServer2.state.label).to.equal('Pending') - expect(abuseServer2.moderationComment).to.be.null + expect(abuseServer2.moderationComment).to.be.null - expect(abuseServer2.countReportsForReporter).to.equal(1) - expect(abuseServer2.countReportsForReportee).to.equal(1) + expect(abuseServer2.countReportsForReporter).to.equal(1) + expect(abuseServer2.countReportsForReportee).to.equal(1) + } }) it('Should keep the comment abuse when deleting the comment', async function () { @@ -564,11 +548,11 @@ describe('Test abuses', function () { await waitJobs(servers) - const res = await getAdminAbusesList({ url: servers[0].url, token: servers[0].accessToken, filter: 'comment' }) - expect(res.body.total).to.equal(2) - expect(res.body.data).to.have.lengthOf(2) + const body = await commands[0].getAdminList({ filter: 'comment' }) + expect(body.total).to.equal(2) + expect(body.data).to.have.lengthOf(2) - const abuse = (res.body.data as AdminAbuse[]).find(a => a.comment?.id === commentServer2.id) + const abuse = body.data.find(a => a.comment?.id === commentServer2.id) expect(abuse).to.not.be.undefined expect(abuse.comment.text).to.be.empty @@ -579,53 +563,43 @@ describe('Test abuses', function () { it('Should delete the comment abuse', async function () { this.timeout(10000) - await deleteAbuse(servers[1].url, servers[1].accessToken, abuseServer2.id) + await commands[1].delete({ abuseId: abuseServer2.id }) await waitJobs(servers) { - const res = await getAdminAbusesList({ url: servers[1].url, token: servers[1].accessToken, filter: 'comment' }) - expect(res.body.total).to.equal(0) - expect(res.body.data.length).to.equal(0) + const body = await commands[1].getAdminList({ filter: 'comment' }) + expect(body.total).to.equal(0) + expect(body.data.length).to.equal(0) } { - const res = await getAdminAbusesList({ url: servers[0].url, token: servers[0].accessToken, filter: 'comment' }) - expect(res.body.total).to.equal(2) + const body = await commands[0].getAdminList({ filter: 'comment' }) + expect(body.total).to.equal(2) } }) it('Should list and filter video abuses', async function () { { - const res = await getAdminAbusesList({ - url: servers[0].url, - token: servers[0].accessToken, - filter: 'comment', - searchReportee: 'foo' - }) - expect(res.body.total).to.equal(0) + const body = await commands[0].getAdminList({ filter: 'comment', searchReportee: 'foo' }) + expect(body.total).to.equal(0) } { - const res = await getAdminAbusesList({ - url: servers[0].url, - token: servers[0].accessToken, - filter: 'comment', - searchReportee: 'ot' - }) - expect(res.body.total).to.equal(2) + const body = await commands[0].getAdminList({ filter: 'comment', searchReportee: 'ot' }) + expect(body.total).to.equal(2) } { - const baseParams = { url: servers[0].url, token: servers[0].accessToken, filter: 'comment' as AbuseFilter, start: 1, count: 1 } - - const res1 = await getAdminAbusesList(immutableAssign(baseParams, { sort: 'createdAt' })) - expect(res1.body.data).to.have.lengthOf(1) - expect(res1.body.data[0].comment.text).to.be.empty + const body = await commands[0].getAdminList({ filter: 'comment', start: 1, count: 1, sort: 'createdAt' }) + expect(body.data).to.have.lengthOf(1) + expect(body.data[0].comment.text).to.be.empty + } - const res2 = await getAdminAbusesList(immutableAssign(baseParams, { sort: '-createdAt' })) - expect(res2.body.data).to.have.lengthOf(1) - expect(res2.body.data[0].comment.text).to.equal('comment server 1') + { + const body = await commands[0].getAdminList({ filter: 'comment', start: 1, count: 1, sort: '-createdAt' }) + expect(body.data).to.have.lengthOf(1) + expect(body.data[0].comment.text).to.equal('comment server 1') } }) }) @@ -655,19 +629,19 @@ describe('Test abuses', function () { const account = await getAccountFromServer(servers[0].url, 'user_1', servers[0]) const reason = 'it is a bad account' - await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, accountId: account.id, reason }) + await commands[0].report({ accountId: account.id, reason }) await waitJobs(servers) }) it('Should have 1 account abuse on server 1 and 0 on server 2', async function () { { - const res = await getAdminAbusesList({ url: servers[0].url, token: servers[0].accessToken, filter: 'account' }) + const body = await commands[0].getAdminList({ filter: 'account' }) - expect(res.body.total).to.equal(1) - expect(res.body.data).to.have.lengthOf(1) + expect(body.total).to.equal(1) + expect(body.data).to.have.lengthOf(1) - const abuse: AdminAbuse = res.body.data[0] + const abuse = body.data[0] expect(abuse.reason).to.equal('it is a bad account') expect(abuse.reporterAccount.name).to.equal('root') @@ -681,9 +655,9 @@ describe('Test abuses', function () { } { - const res = await getAdminAbusesList({ url: servers[1].url, token: servers[1].accessToken, filter: 'comment' }) - expect(res.body.total).to.equal(0) - expect(res.body.data.length).to.equal(0) + const body = await commands[1].getAdminList({ filter: 'comment' }) + expect(body.total).to.equal(0) + expect(body.data.length).to.equal(0) } }) @@ -693,48 +667,52 @@ describe('Test abuses', function () { const account = await getAccountFromServer(servers[0].url, 'user_2', servers[1]) const reason = 'it is a really bad account' - await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, accountId: account.id, reason }) + await commands[0].report({ accountId: account.id, reason }) await waitJobs(servers) }) it('Should have 2 comment abuses on server 1 and 1 on server 2', async function () { - const res1 = await getAdminAbusesList({ url: servers[0].url, token: servers[0].accessToken, filter: 'account' }) - expect(res1.body.total).to.equal(2) - expect(res1.body.data.length).to.equal(2) + { + const body = await commands[0].getAdminList({ filter: 'account' }) + expect(body.total).to.equal(2) + expect(body.data.length).to.equal(2) - const abuse: AdminAbuse = res1.body.data[0] - expect(abuse.reason).to.equal('it is a bad account') + const abuse: AdminAbuse = body.data[0] + expect(abuse.reason).to.equal('it is a bad account') - const abuse2: AdminAbuse = res1.body.data[1] - expect(abuse2.reason).to.equal('it is a really bad account') + const abuse2: AdminAbuse = body.data[1] + expect(abuse2.reason).to.equal('it is a really bad account') - expect(abuse2.reporterAccount.name).to.equal('root') - expect(abuse2.reporterAccount.host).to.equal(servers[0].host) + expect(abuse2.reporterAccount.name).to.equal('root') + expect(abuse2.reporterAccount.host).to.equal(servers[0].host) - expect(abuse2.video).to.be.null - expect(abuse2.comment).to.be.null + expect(abuse2.video).to.be.null + expect(abuse2.comment).to.be.null - expect(abuse2.state.id).to.equal(AbuseState.PENDING) - expect(abuse2.state.label).to.equal('Pending') + expect(abuse2.state.id).to.equal(AbuseState.PENDING) + expect(abuse2.state.label).to.equal('Pending') - expect(abuse2.moderationComment).to.be.null + expect(abuse2.moderationComment).to.be.null + } - const res2 = await getAdminAbusesList({ url: servers[1].url, token: servers[1].accessToken, filter: 'account' }) - expect(res2.body.total).to.equal(1) - expect(res2.body.data.length).to.equal(1) + { + const body = await commands[1].getAdminList({ filter: 'account' }) + expect(body.total).to.equal(1) + expect(body.data.length).to.equal(1) - abuseServer2 = res2.body.data[0] + abuseServer2 = body.data[0] - expect(abuseServer2.reason).to.equal('it is a really bad account') + expect(abuseServer2.reason).to.equal('it is a really bad account') - expect(abuseServer2.reporterAccount.name).to.equal('root') - expect(abuseServer2.reporterAccount.host).to.equal(servers[0].host) + expect(abuseServer2.reporterAccount.name).to.equal('root') + expect(abuseServer2.reporterAccount.host).to.equal(servers[0].host) - expect(abuseServer2.state.id).to.equal(AbuseState.PENDING) - expect(abuseServer2.state.label).to.equal('Pending') + expect(abuseServer2.state.id).to.equal(AbuseState.PENDING) + expect(abuseServer2.state.label).to.equal('Pending') - expect(abuseServer2.moderationComment).to.be.null + expect(abuseServer2.moderationComment).to.be.null + } }) it('Should keep the account abuse when deleting the account', async function () { @@ -745,32 +723,32 @@ describe('Test abuses', function () { await waitJobs(servers) - const res = await getAdminAbusesList({ url: servers[0].url, token: servers[0].accessToken, filter: 'account' }) - expect(res.body.total).to.equal(2) - expect(res.body.data).to.have.lengthOf(2) + const body = await commands[0].getAdminList({ filter: 'account' }) + expect(body.total).to.equal(2) + expect(body.data).to.have.lengthOf(2) - const abuse = (res.body.data as AdminAbuse[]).find(a => a.reason === 'it is a really bad account') + const abuse = body.data.find(a => a.reason === 'it is a really bad account') expect(abuse).to.not.be.undefined }) it('Should delete the account abuse', async function () { this.timeout(10000) - await deleteAbuse(servers[1].url, servers[1].accessToken, abuseServer2.id) + await commands[1].delete({ abuseId: abuseServer2.id }) await waitJobs(servers) { - const res = await getAdminAbusesList({ url: servers[1].url, token: servers[1].accessToken, filter: 'account' }) - expect(res.body.total).to.equal(0) - expect(res.body.data.length).to.equal(0) + const body = await commands[1].getAdminList({ filter: 'account' }) + expect(body.total).to.equal(0) + expect(body.data.length).to.equal(0) } { - const res = await getAdminAbusesList({ url: servers[0].url, token: servers[0].accessToken, filter: 'account' }) - expect(res.body.total).to.equal(2) + const body = await commands[0].getAdminList({ filter: 'account' }) + expect(body.total).to.equal(2) - abuseServer1 = res.body.data[0] + abuseServer1 = body.data[0] } }) }) @@ -778,20 +756,18 @@ describe('Test abuses', function () { describe('Common actions on abuses', function () { it('Should update the state of an abuse', async function () { - const body = { state: AbuseState.REJECTED } - await updateAbuse(servers[0].url, servers[0].accessToken, abuseServer1.id, body) + await commands[0].update({ abuseId: abuseServer1.id, body: { state: AbuseState.REJECTED } }) - const res = await getAdminAbusesList({ url: servers[0].url, token: servers[0].accessToken, id: abuseServer1.id }) - expect(res.body.data[0].state.id).to.equal(AbuseState.REJECTED) + const body = await commands[0].getAdminList({ id: abuseServer1.id }) + expect(body.data[0].state.id).to.equal(AbuseState.REJECTED) }) it('Should add a moderation comment', async function () { - const body = { state: AbuseState.ACCEPTED, moderationComment: 'It is valid' } - await updateAbuse(servers[0].url, servers[0].accessToken, abuseServer1.id, body) + await commands[0].update({ abuseId: abuseServer1.id, body: { state: AbuseState.ACCEPTED, moderationComment: 'Valid' } }) - const res = await getAdminAbusesList({ url: servers[0].url, token: servers[0].accessToken, id: abuseServer1.id }) - expect(res.body.data[0].state.id).to.equal(AbuseState.ACCEPTED) - expect(res.body.data[0].moderationComment).to.equal('It is valid') + const body = await commands[0].getAdminList({ id: abuseServer1.id }) + expect(body.data[0].state.id).to.equal(AbuseState.ACCEPTED) + expect(body.data[0].moderationComment).to.equal('Valid') }) }) @@ -802,18 +778,18 @@ describe('Test abuses', function () { before(async function () { userAccessToken = await generateUserAccessToken(servers[0], 'user_42') - await reportAbuse({ url: servers[0].url, token: userAccessToken, videoId: servers[0].video.id, reason: 'user reason 1' }) + await commands[0].report({ token: userAccessToken, videoId: servers[0].video.id, reason: 'user reason 1' }) const videoId = await getVideoIdFromUUID(servers[0].url, servers[1].video.uuid) - await reportAbuse({ url: servers[0].url, token: userAccessToken, videoId, reason: 'user reason 2' }) + await commands[0].report({ token: userAccessToken, videoId, reason: 'user reason 2' }) }) it('Should correctly list my abuses', async function () { { - const res = await getUserAbusesList({ url: servers[0].url, token: userAccessToken, start: 0, count: 5, sort: 'createdAt' }) - expect(res.body.total).to.equal(2) + const body = await commands[0].getUserList({ token: userAccessToken, start: 0, count: 5, sort: 'createdAt' }) + expect(body.total).to.equal(2) - const abuses: UserAbuse[] = res.body.data + const abuses = body.data expect(abuses[0].reason).to.equal('user reason 1') expect(abuses[1].reason).to.equal('user reason 2') @@ -821,95 +797,77 @@ describe('Test abuses', function () { } { - const res = await getUserAbusesList({ url: servers[0].url, token: userAccessToken, start: 1, count: 1, sort: 'createdAt' }) - expect(res.body.total).to.equal(2) + const body = await commands[0].getUserList({ token: userAccessToken, start: 1, count: 1, sort: 'createdAt' }) + expect(body.total).to.equal(2) - const abuses: UserAbuse[] = res.body.data + const abuses: UserAbuse[] = body.data expect(abuses[0].reason).to.equal('user reason 2') } { - const res = await getUserAbusesList({ url: servers[0].url, token: userAccessToken, start: 1, count: 1, sort: '-createdAt' }) - expect(res.body.total).to.equal(2) + const body = await commands[0].getUserList({ token: userAccessToken, start: 1, count: 1, sort: '-createdAt' }) + expect(body.total).to.equal(2) - const abuses: UserAbuse[] = res.body.data + const abuses: UserAbuse[] = body.data expect(abuses[0].reason).to.equal('user reason 1') } }) it('Should correctly filter my abuses by id', async function () { - const res = await getUserAbusesList({ url: servers[0].url, token: userAccessToken, id: abuseId1 }) - - expect(res.body.total).to.equal(1) + const body = await commands[0].getUserList({ token: userAccessToken, id: abuseId1 }) + expect(body.total).to.equal(1) - const abuses: UserAbuse[] = res.body.data + const abuses: UserAbuse[] = body.data expect(abuses[0].reason).to.equal('user reason 1') }) it('Should correctly filter my abuses by search', async function () { - const res = await getUserAbusesList({ - url: servers[0].url, - token: userAccessToken, - search: 'server 2' - }) - - expect(res.body.total).to.equal(1) + const body = await commands[0].getUserList({ token: userAccessToken, search: 'server 2' }) + expect(body.total).to.equal(1) - const abuses: UserAbuse[] = res.body.data + const abuses: UserAbuse[] = body.data expect(abuses[0].reason).to.equal('user reason 2') }) it('Should correctly filter my abuses by state', async function () { - const body = { state: AbuseState.REJECTED } - await updateAbuse(servers[0].url, servers[0].accessToken, abuseId1, body) - - const res = await getUserAbusesList({ - url: servers[0].url, - token: userAccessToken, - state: AbuseState.REJECTED - }) + await commands[0].update({ abuseId: abuseId1, body: { state: AbuseState.REJECTED } }) - expect(res.body.total).to.equal(1) + const body = await commands[0].getUserList({ token: userAccessToken, state: AbuseState.REJECTED }) + expect(body.total).to.equal(1) - const abuses: UserAbuse[] = res.body.data + const abuses: UserAbuse[] = body.data expect(abuses[0].reason).to.equal('user reason 1') }) }) describe('Abuse messages', async function () { let abuseId: number - let userAccessToken: string + let userToken: string let abuseMessageUserId: number let abuseMessageModerationId: number before(async function () { - userAccessToken = await generateUserAccessToken(servers[0], 'user_43') - - const res = await reportAbuse({ - url: servers[0].url, - token: userAccessToken, - videoId: servers[0].video.id, - reason: 'user 43 reason 1' - }) + userToken = await generateUserAccessToken(servers[0], 'user_43') - abuseId = res.body.abuse.id + const body = await commands[0].report({ token: userToken, videoId: servers[0].video.id, reason: 'user 43 reason 1' }) + abuseId = body.abuse.id }) it('Should create some messages on the abuse', async function () { - await addAbuseMessage(servers[0].url, userAccessToken, abuseId, 'message 1') - await addAbuseMessage(servers[0].url, servers[0].accessToken, abuseId, 'message 2') - await addAbuseMessage(servers[0].url, servers[0].accessToken, abuseId, 'message 3') - await addAbuseMessage(servers[0].url, userAccessToken, abuseId, 'message 4') + await commands[0].addMessage({ token: userToken, abuseId, message: 'message 1' }) + await commands[0].addMessage({ abuseId, message: 'message 2' }) + await commands[0].addMessage({ abuseId, message: 'message 3' }) + await commands[0].addMessage({ token: userToken, abuseId, message: 'message 4' }) }) it('Should have the correct messages count when listing abuses', async function () { const results = await Promise.all([ - getAdminAbusesList({ url: servers[0].url, token: servers[0].accessToken, start: 0, count: 50 }), - getUserAbusesList({ url: servers[0].url, token: userAccessToken, start: 0, count: 50 }) + commands[0].getAdminList({ start: 0, count: 50 }), + commands[0].getUserList({ token: userToken, start: 0, count: 50 }) ]) - for (const res of results) { - const abuses: AdminAbuse[] = res.body.data + for (const body of results) { + const abuses = body.data const abuse = abuses.find(a => a.id === abuseId) expect(abuse.countMessages).to.equal(4) } @@ -917,14 +875,14 @@ describe('Test abuses', function () { it('Should correctly list messages of this abuse', async function () { const results = await Promise.all([ - listAbuseMessages(servers[0].url, servers[0].accessToken, abuseId), - listAbuseMessages(servers[0].url, userAccessToken, abuseId) + commands[0].listMessages({ abuseId }), + commands[0].listMessages({ token: userToken, abuseId }) ]) - for (const res of results) { - expect(res.body.total).to.equal(4) + for (const body of results) { + expect(body.total).to.equal(4) - const abuseMessages: AbuseMessage[] = res.body.data + const abuseMessages: AbuseMessage[] = body.data expect(abuseMessages[0].message).to.equal('message 1') expect(abuseMessages[0].byModerator).to.be.false @@ -948,19 +906,18 @@ describe('Test abuses', function () { }) it('Should delete messages', async function () { - await deleteAbuseMessage(servers[0].url, servers[0].accessToken, abuseId, abuseMessageModerationId) - await deleteAbuseMessage(servers[0].url, userAccessToken, abuseId, abuseMessageUserId) + await commands[0].deleteMessage({ abuseId, messageId: abuseMessageModerationId }) + await commands[0].deleteMessage({ token: userToken, abuseId, messageId: abuseMessageUserId }) const results = await Promise.all([ - listAbuseMessages(servers[0].url, servers[0].accessToken, abuseId), - listAbuseMessages(servers[0].url, userAccessToken, abuseId) + commands[0].listMessages({ abuseId }), + commands[0].listMessages({ token: userToken, abuseId }) ]) - for (const res of results) { - expect(res.body.total).to.equal(2) - - const abuseMessages: AbuseMessage[] = res.body.data + for (const body of results) { + expect(body.total).to.equal(2) + const abuseMessages: AbuseMessage[] = body.data expect(abuseMessages[0].message).to.equal('message 2') expect(abuseMessages[1].message).to.equal('message 4') } -- cgit v1.2.3