X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fnotifications%2Fmoderation-notifications.ts;h=3e66e7517e4243c8bdf25e9f25fb9bf7ad007c36;hb=65e6e2602c0d5521f3a6740f7469bb92830ecb53;hp=cff19223fd6ae09c252e64579f594dd9ab9f5638;hpb=26171379d0196ac645923e72b12e1cf29089835b;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/notifications/moderation-notifications.ts b/server/tests/api/notifications/moderation-notifications.ts index cff19223f..3e66e7517 100644 --- a/server/tests/api/notifications/moderation-notifications.ts +++ b/server/tests/api/notifications/moderation-notifications.ts @@ -1,37 +1,15 @@ /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ import 'mocha' -import { v4 as uuidv4 } from 'uuid' - +import { buildUUID } from '@server/helpers/uuid' import { + addUserSubscription, addVideoCommentThread, addVideoToBlacklist, - cleanupTests, - createUser, - follow, - generateUserAccessToken, - getAccount, - getCustomConfig, - getVideoCommentThreads, - getVideoIdFromUUID, - immutableAssign, - MockInstancesIndex, - registerUser, - removeVideoFromBlacklist, - reportAbuse, - unfollow, - updateCustomConfig, - updateCustomSubConfig, - wait, - updateAbuse, - addAbuseMessage -} from '../../../../shared/extra-utils' -import { ServerInfo, uploadVideo } from '../../../../shared/extra-utils/index' -import { MockSmtpServer } from '../../../../shared/extra-utils/miscs/email' -import { waitJobs } from '../../../../shared/extra-utils/server/jobs' -import { + checkAbuseStateChange, checkAutoInstanceFollowing, CheckerBaseParams, + checkNewAbuseMessage, checkNewAccountAbuseForModerators, checkNewBlacklistOnMyVideo, checkNewCommentAbuseForModerators, @@ -41,15 +19,25 @@ import { checkUserRegistered, checkVideoAutoBlacklistForModerators, checkVideoIsPublished, + cleanupTests, + createUser, + generateUserAccessToken, + getAccount, + getVideoCommentThreads, + getVideoIdFromUUID, + immutableAssign, + MockInstancesIndex, + MockSmtpServer, prepareNotificationsTest, - checkAbuseStateChange, - checkNewAbuseMessage -} from '../../../../shared/extra-utils/users/user-notifications' -import { addUserSubscription, removeUserSubscription } from '../../../../shared/extra-utils/users/user-subscriptions' -import { CustomConfig } from '../../../../shared/models/server' -import { UserNotification } from '../../../../shared/models/users' -import { VideoPrivacy } from '../../../../shared/models/videos' -import { AbuseState } from '@shared/models' + registerUser, + removeUserSubscription, + removeVideoFromBlacklist, + ServerInfo, + uploadVideo, + wait, + waitJobs +} from '@shared/extra-utils' +import { AbuseState, CustomConfig, UserNotification, VideoPrivacy } from '@shared/models' describe('Test moderation notifications', function () { let servers: ServerInfo[] = [] @@ -86,11 +74,11 @@ describe('Test moderation notifications', function () { it('Should send a notification to moderators on local video abuse', async function () { this.timeout(20000) - const name = 'video for abuse ' + uuidv4() + const name = 'video for abuse ' + buildUUID() const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name }) const video = resVideo.body.video - await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, videoId: video.id, reason: 'super reason' }) + await servers[0].abusesCommand.report({ videoId: video.id, reason: 'super reason' }) await waitJobs(servers) await checkNewVideoAbuseForModerators(baseParams, video.uuid, name, 'presence') @@ -99,14 +87,14 @@ describe('Test moderation notifications', function () { it('Should send a notification to moderators on remote video abuse', async function () { this.timeout(20000) - const name = 'video for abuse ' + uuidv4() + const name = 'video for abuse ' + buildUUID() const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name }) const video = resVideo.body.video await waitJobs(servers) const videoId = await getVideoIdFromUUID(servers[1].url, video.uuid) - await reportAbuse({ url: servers[1].url, token: servers[1].accessToken, videoId, reason: 'super reason' }) + await servers[1].abusesCommand.report({ videoId, reason: 'super reason' }) await waitJobs(servers) await checkNewVideoAbuseForModerators(baseParams, video.uuid, name, 'presence') @@ -115,13 +103,15 @@ describe('Test moderation notifications', function () { it('Should send a notification to moderators on local comment abuse', async function () { this.timeout(20000) - const name = 'video for abuse ' + uuidv4() + const name = 'video for abuse ' + buildUUID() const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name }) const video = resVideo.body.video - const resComment = await addVideoCommentThread(servers[0].url, userAccessToken, video.id, 'comment abuse ' + uuidv4()) + const resComment = await addVideoCommentThread(servers[0].url, userAccessToken, video.id, 'comment abuse ' + buildUUID()) const comment = resComment.body.comment - await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, commentId: comment.id, reason: 'super reason' }) + await waitJobs(servers) + + await servers[0].abusesCommand.report({ commentId: comment.id, reason: 'super reason' }) await waitJobs(servers) await checkNewCommentAbuseForModerators(baseParams, video.uuid, name, 'presence') @@ -130,16 +120,16 @@ describe('Test moderation notifications', function () { it('Should send a notification to moderators on remote comment abuse', async function () { this.timeout(20000) - const name = 'video for abuse ' + uuidv4() + const name = 'video for abuse ' + buildUUID() const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name }) const video = resVideo.body.video - await addVideoCommentThread(servers[0].url, userAccessToken, video.id, 'comment abuse ' + uuidv4()) + await addVideoCommentThread(servers[0].url, userAccessToken, video.id, 'comment abuse ' + buildUUID()) await waitJobs(servers) const resComments = await getVideoCommentThreads(servers[1].url, video.uuid, 0, 5) const commentId = resComments.body.data[0].id - await reportAbuse({ url: servers[1].url, token: servers[1].accessToken, commentId, reason: 'super reason' }) + await servers[1].abusesCommand.report({ commentId, reason: 'super reason' }) await waitJobs(servers) await checkNewCommentAbuseForModerators(baseParams, video.uuid, name, 'presence') @@ -152,7 +142,7 @@ describe('Test moderation notifications', function () { const resUser = await createUser({ url: servers[0].url, accessToken: servers[0].accessToken, username, password: 'donald' }) const accountId = resUser.body.user.account.id - await reportAbuse({ url: servers[0].url, token: servers[0].accessToken, accountId, reason: 'super reason' }) + await servers[0].abusesCommand.report({ accountId, reason: 'super reason' }) await waitJobs(servers) await checkNewAccountAbuseForModerators(baseParams, username, 'presence') @@ -168,7 +158,7 @@ describe('Test moderation notifications', function () { await waitJobs(servers) const resAccount = await getAccount(servers[1].url, username + '@' + servers[0].host) - await reportAbuse({ url: servers[1].url, token: servers[1].accessToken, accountId: resAccount.body.id, reason: 'super reason' }) + await servers[1].abusesCommand.report({ accountId: resAccount.body.id, reason: 'super reason' }) await waitJobs(servers) await checkNewAccountAbuseForModerators(baseParams, username, 'presence') @@ -187,18 +177,18 @@ describe('Test moderation notifications', function () { token: userAccessToken } - const name = 'abuse ' + uuidv4() + const name = 'abuse ' + buildUUID() const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name }) const video = resVideo.body.video - const res = await reportAbuse({ url: servers[0].url, token: userAccessToken, videoId: video.id, reason: 'super reason' }) - abuseId = res.body.abuse.id + const body = await servers[0].abusesCommand.report({ token: userAccessToken, videoId: video.id, reason: 'super reason' }) + abuseId = body.abuse.id }) it('Should send a notification to reporter if the abuse has been accepted', async function () { this.timeout(10000) - await updateAbuse(servers[0].url, servers[0].accessToken, abuseId, { state: AbuseState.ACCEPTED }) + await servers[0].abusesCommand.update({ abuseId, body: { state: AbuseState.ACCEPTED } }) await waitJobs(servers) await checkAbuseStateChange(baseParams, abuseId, AbuseState.ACCEPTED, 'presence') @@ -207,7 +197,7 @@ describe('Test moderation notifications', function () { it('Should send a notification to reporter if the abuse has been rejected', async function () { this.timeout(10000) - await updateAbuse(servers[0].url, servers[0].accessToken, abuseId, { state: AbuseState.REJECTED }) + await servers[0].abusesCommand.update({ abuseId, body: { state: AbuseState.REJECTED } }) await waitJobs(servers) await checkAbuseStateChange(baseParams, abuseId, AbuseState.REJECTED, 'presence') @@ -235,18 +225,18 @@ describe('Test moderation notifications', function () { token: servers[0].accessToken } - const name = 'abuse ' + uuidv4() + const name = 'abuse ' + buildUUID() const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name }) const video = resVideo.body.video { - const res = await reportAbuse({ url: servers[0].url, token: userAccessToken, videoId: video.id, reason: 'super reason' }) - abuseId = res.body.abuse.id + const body = await servers[0].abusesCommand.report({ token: userAccessToken, videoId: video.id, reason: 'super reason' }) + abuseId = body.abuse.id } { - const res = await reportAbuse({ url: servers[0].url, token: userAccessToken, videoId: video.id, reason: 'super reason 2' }) - abuseId2 = res.body.abuse.id + const body = await servers[0].abusesCommand.report({ token: userAccessToken, videoId: video.id, reason: 'super reason 2' }) + abuseId2 = body.abuse.id } }) @@ -254,7 +244,7 @@ describe('Test moderation notifications', function () { this.timeout(10000) const message = 'my super message to users' - await addAbuseMessage(servers[0].url, servers[0].accessToken, abuseId, message) + await servers[0].abusesCommand.addMessage({ abuseId, message }) await waitJobs(servers) await checkNewAbuseMessage(baseParamsUser, abuseId, message, 'user_1@example.com', 'presence') @@ -264,7 +254,7 @@ describe('Test moderation notifications', function () { this.timeout(10000) const message = 'my super message that should not be sent to the admin' - await addAbuseMessage(servers[0].url, servers[0].accessToken, abuseId, message) + await servers[0].abusesCommand.addMessage({ abuseId, message }) await waitJobs(servers) await checkNewAbuseMessage(baseParamsAdmin, abuseId, message, 'admin' + servers[0].internalServerNumber + '@example.com', 'absence') @@ -274,7 +264,7 @@ describe('Test moderation notifications', function () { this.timeout(10000) const message = 'my super message to moderators' - await addAbuseMessage(servers[0].url, userAccessToken, abuseId2, message) + await servers[0].abusesCommand.addMessage({ token: userAccessToken, abuseId: abuseId2, message }) await waitJobs(servers) await checkNewAbuseMessage(baseParamsAdmin, abuseId2, message, 'admin' + servers[0].internalServerNumber + '@example.com', 'presence') @@ -284,7 +274,7 @@ describe('Test moderation notifications', function () { this.timeout(10000) const message = 'my super message that should not be sent to reporter' - await addAbuseMessage(servers[0].url, userAccessToken, abuseId2, message) + await servers[0].abusesCommand.addMessage({ token: userAccessToken, abuseId: abuseId2, message }) await waitJobs(servers) await checkNewAbuseMessage(baseParamsUser, abuseId2, message, 'user_1@example.com', 'absence') @@ -306,7 +296,7 @@ describe('Test moderation notifications', function () { it('Should send a notification to video owner on blacklist', async function () { this.timeout(10000) - const name = 'video for abuse ' + uuidv4() + const name = 'video for abuse ' + buildUUID() const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name }) const uuid = resVideo.body.video.uuid @@ -319,7 +309,7 @@ describe('Test moderation notifications', function () { it('Should send a notification to video owner on unblacklist', async function () { this.timeout(10000) - const name = 'video for abuse ' + uuidv4() + const name = 'video for abuse ' + buildUUID() const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name }) const uuid = resVideo.body.video.uuid @@ -362,16 +352,7 @@ describe('Test moderation notifications', function () { describe('New instance follows', function () { const instanceIndexServer = new MockInstancesIndex() - const config = { - followings: { - instance: { - autoFollowIndex: { - indexUrl: 'http://localhost:42101/api/v1/instances/hosts', - enabled: true - } - } - } - } + let config: any let baseParams: CheckerBaseParams before(async () => { @@ -382,14 +363,25 @@ describe('Test moderation notifications', function () { token: servers[0].accessToken } - await instanceIndexServer.initialize() + const port = await instanceIndexServer.initialize() instanceIndexServer.addInstance(servers[1].host) + + config = { + followings: { + instance: { + autoFollowIndex: { + indexUrl: `http://localhost:${port}/api/v1/instances/hosts`, + enabled: true + } + } + } + } }) it('Should send a notification only to admin when there is a new instance follower', async function () { this.timeout(20000) - await follow(servers[2].url, [ servers[0].url ], servers[2].accessToken) + await servers[2].followsCommand.follow({ targets: [ servers[0].url ] }) await waitJobs(servers) @@ -402,7 +394,7 @@ describe('Test moderation notifications', function () { it('Should send a notification on auto follow back', async function () { this.timeout(40000) - await unfollow(servers[2].url, servers[2].accessToken, servers[0]) + await servers[2].followsCommand.unfollow({ target: servers[0] }) await waitJobs(servers) const config = { @@ -412,9 +404,9 @@ describe('Test moderation notifications', function () { } } } - await updateCustomSubConfig(servers[0].url, servers[0].accessToken, config) + await servers[0].configCommand.updateCustomSubConfig({ newConfig: config }) - await follow(servers[2].url, [ servers[0].url ], servers[2].accessToken) + await servers[2].followsCommand.follow({ targets: [ servers[0].url ] }) await waitJobs(servers) @@ -426,16 +418,16 @@ describe('Test moderation notifications', function () { await checkAutoInstanceFollowing(immutableAssign(baseParams, userOverride), followerHost, followingHost, 'absence') config.followings.instance.autoFollowBack.enabled = false - await updateCustomSubConfig(servers[0].url, servers[0].accessToken, config) - await unfollow(servers[0].url, servers[0].accessToken, servers[2]) - await unfollow(servers[2].url, servers[2].accessToken, servers[0]) + await servers[0].configCommand.updateCustomSubConfig({ newConfig: config }) + await servers[0].followsCommand.unfollow({ target: servers[2] }) + await servers[2].followsCommand.unfollow({ target: servers[0] }) }) it('Should send a notification on auto instances index follow', async function () { this.timeout(30000) - await unfollow(servers[0].url, servers[0].accessToken, servers[1]) + await servers[0].followsCommand.unfollow({ target: servers[1] }) - await updateCustomSubConfig(servers[0].url, servers[0].accessToken, config) + await servers[0].configCommand.updateCustomSubConfig({ newConfig: config }) await wait(5000) await waitJobs(servers) @@ -445,8 +437,8 @@ describe('Test moderation notifications', function () { await checkAutoInstanceFollowing(baseParams, followerHost, followingHost, 'presence') config.followings.instance.autoFollowIndex.enabled = false - await updateCustomSubConfig(servers[0].url, servers[0].accessToken, config) - await unfollow(servers[0].url, servers[0].accessToken, servers[1]) + await servers[0].configCommand.updateCustomSubConfig({ newConfig: config }) + await servers[0].followsCommand.unfollow({ target: servers[1] }) }) }) @@ -481,8 +473,8 @@ describe('Test moderation notifications', function () { token: userAccessToken } - const resCustomConfig = await getCustomConfig(servers[0].url, servers[0].accessToken) - currentCustomConfig = resCustomConfig.body + currentCustomConfig = await servers[0].configCommand.getCustomConfig() + const autoBlacklistTestsCustomConfig = immutableAssign(currentCustomConfig, { autoBlacklist: { videos: { @@ -492,9 +484,10 @@ describe('Test moderation notifications', function () { } } }) + // enable transcoding otherwise own publish notification after transcoding not expected autoBlacklistTestsCustomConfig.transcoding.enabled = true - await updateCustomConfig(servers[0].url, servers[0].accessToken, autoBlacklistTestsCustomConfig) + await servers[0].configCommand.updateCustomConfig({ newCustomConfig: autoBlacklistTestsCustomConfig }) await addUserSubscription(servers[0].url, servers[0].accessToken, 'user_1_channel@localhost:' + servers[0].port) await addUserSubscription(servers[1].url, servers[1].accessToken, 'user_1_channel@localhost:' + servers[0].port) @@ -504,7 +497,7 @@ describe('Test moderation notifications', function () { it('Should send notification to moderators on new video with auto-blacklist', async function () { this.timeout(40000) - videoName = 'video with auto-blacklist ' + uuidv4() + videoName = 'video with auto-blacklist ' + buildUUID() const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name: videoName }) videoUUID = resVideo.body.video.uuid @@ -550,7 +543,7 @@ describe('Test moderation notifications', function () { const updateAt = new Date(new Date().getTime() + 1000000) - const name = 'video with auto-blacklist and future schedule ' + uuidv4() + const name = 'video with auto-blacklist and future schedule ' + buildUUID() const data = { name, @@ -583,7 +576,7 @@ describe('Test moderation notifications', function () { // In 2 seconds const updateAt = new Date(new Date().getTime() + 2000) - const name = 'video with schedule done and still auto-blacklisted ' + uuidv4() + const name = 'video with schedule done and still auto-blacklisted ' + buildUUID() const data = { name, @@ -606,7 +599,7 @@ describe('Test moderation notifications', function () { it('Should not send a notification to moderators on new video without auto-blacklist', async function () { this.timeout(60000) - const name = 'video without auto-blacklist ' + uuidv4() + const name = 'video without auto-blacklist ' + buildUUID() // admin with blacklist right will not be auto-blacklisted const resVideo = await uploadVideo(servers[0].url, servers[0].accessToken, { name }) @@ -617,7 +610,7 @@ describe('Test moderation notifications', function () { }) after(async () => { - await updateCustomConfig(servers[0].url, servers[0].accessToken, currentCustomConfig) + await servers[0].configCommand.updateCustomConfig({ newCustomConfig: currentCustomConfig }) await removeUserSubscription(servers[0].url, servers[0].accessToken, 'user_1_channel@localhost:' + servers[0].port) await removeUserSubscription(servers[1].url, servers[1].accessToken, 'user_1_channel@localhost:' + servers[0].port)