|
@@ -17,7 +17,9 @@ import {
|
|
|
updateVideo,
|
|
|
updateVideoChannel,
|
|
|
userLogin,
|
|
|
- wait
|
|
|
+ wait,
|
|
|
+ getCustomConfig,
|
|
|
+ updateCustomConfig
|
|
|
} from '../../../../shared/utils'
|
|
|
import { killallServers, ServerInfo, uploadVideo } from '../../../../shared/utils/index'
|
|
|
import { setAccessTokensToServers } from '../../../../shared/utils/users/login'
|
|
@@ -31,6 +33,7 @@ import {
|
|
|
checkNewBlacklistOnMyVideo,
|
|
|
checkNewCommentOnMyVideo,
|
|
|
checkNewVideoAbuseForModerators,
|
|
|
+ checkVideoAutoBlacklistForModerators,
|
|
|
checkNewVideoFromSubscription,
|
|
|
checkUserRegistered,
|
|
|
checkVideoIsPublished,
|
|
@@ -54,6 +57,7 @@ import { getBadVideoUrl, getYoutubeVideoUrl, importVideo } from '../../../../sha
|
|
|
import { addVideoCommentReply, addVideoCommentThread } from '../../../../shared/utils/videos/video-comments'
|
|
|
import * as uuidv4 from 'uuid/v4'
|
|
|
import { addAccountToAccountBlocklist, removeAccountFromAccountBlocklist } from '../../../../shared/utils/users/blocklist'
|
|
|
+import { CustomConfig } from '../../../../shared/models/server'
|
|
|
|
|
|
const expect = chai.expect
|
|
|
|
|
@@ -92,6 +96,7 @@ describe('Test users notifications', function () {
|
|
|
newVideoFromSubscription: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
|
|
|
newCommentOnMyVideo: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
|
|
|
videoAbuseAsModerator: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
|
|
|
+ videoAutoBlacklistAsModerator: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
|
|
|
blacklistOnMyVideo: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
|
|
|
myVideoImportFinished: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
|
|
|
myVideoPublished: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
|
|
@@ -305,7 +310,7 @@ describe('Test users notifications', function () {
|
|
|
})
|
|
|
|
|
|
it('Should send a new video notification after a video import', async function () {
|
|
|
- this.timeout(30000)
|
|
|
+ this.timeout(100000)
|
|
|
|
|
|
const name = 'video import ' + uuidv4()
|
|
|
|
|
@@ -907,6 +912,180 @@ describe('Test users notifications', function () {
|
|
|
})
|
|
|
})
|
|
|
|
|
|
+ describe('Video-related notifications when video auto-blacklist is enabled', function () {
|
|
|
+ let userBaseParams: CheckerBaseParams
|
|
|
+ let adminBaseParamsServer1: CheckerBaseParams
|
|
|
+ let adminBaseParamsServer2: CheckerBaseParams
|
|
|
+ let videoUUID: string
|
|
|
+ let videoName: string
|
|
|
+ let currentCustomConfig: CustomConfig
|
|
|
+
|
|
|
+ before(async () => {
|
|
|
+
|
|
|
+ adminBaseParamsServer1 = {
|
|
|
+ server: servers[0],
|
|
|
+ emails,
|
|
|
+ socketNotifications: adminNotifications,
|
|
|
+ token: servers[0].accessToken
|
|
|
+ }
|
|
|
+
|
|
|
+ adminBaseParamsServer2 = {
|
|
|
+ server: servers[1],
|
|
|
+ emails,
|
|
|
+ socketNotifications: adminNotificationsServer2,
|
|
|
+ token: servers[1].accessToken
|
|
|
+ }
|
|
|
+
|
|
|
+ userBaseParams = {
|
|
|
+ server: servers[0],
|
|
|
+ emails,
|
|
|
+ socketNotifications: userNotifications,
|
|
|
+ token: userAccessToken
|
|
|
+ }
|
|
|
+
|
|
|
+ const resCustomConfig = await getCustomConfig(servers[0].url, servers[0].accessToken)
|
|
|
+ currentCustomConfig = resCustomConfig.body
|
|
|
+ const autoBlacklistTestsCustomConfig = immutableAssign(currentCustomConfig, {
|
|
|
+ autoBlacklist: {
|
|
|
+ videos: {
|
|
|
+ ofUsers: {
|
|
|
+ enabled: true
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ // enable transcoding otherwise own publish notification after transcoding not expected
|
|
|
+ autoBlacklistTestsCustomConfig.transcoding.enabled = true
|
|
|
+ await updateCustomConfig(servers[0].url, servers[0].accessToken, autoBlacklistTestsCustomConfig)
|
|
|
+
|
|
|
+ await addUserSubscription(servers[0].url, servers[0].accessToken, 'user_1_channel@localhost:9001')
|
|
|
+ await addUserSubscription(servers[1].url, servers[1].accessToken, 'user_1_channel@localhost:9001')
|
|
|
+
|
|
|
+ })
|
|
|
+
|
|
|
+ it('Should send notification to moderators on new video with auto-blacklist', async function () {
|
|
|
+ this.timeout(20000)
|
|
|
+
|
|
|
+ videoName = 'video with auto-blacklist ' + uuidv4()
|
|
|
+ const resVideo = await uploadVideo(servers[0].url, userAccessToken, { name: videoName })
|
|
|
+ videoUUID = resVideo.body.video.uuid
|
|
|
+
|
|
|
+ await waitJobs(servers)
|
|
|
+ await checkVideoAutoBlacklistForModerators(adminBaseParamsServer1, videoUUID, videoName, 'presence')
|
|
|
+ })
|
|
|
+
|
|
|
+ it('Should not send video publish notification if auto-blacklisted', async function () {
|
|
|
+ await checkVideoIsPublished(userBaseParams, videoName, videoUUID, 'absence')
|
|
|
+ })
|
|
|
+
|
|
|
+ it('Should not send a local user subscription notification if auto-blacklisted', async function () {
|
|
|
+ await checkNewVideoFromSubscription(adminBaseParamsServer1, videoName, videoUUID, 'absence')
|
|
|
+ })
|
|
|
+
|
|
|
+ it('Should not send a remote user subscription notification if auto-blacklisted', async function () {
|
|
|
+ await checkNewVideoFromSubscription(adminBaseParamsServer2, videoName, videoUUID, 'absence')
|
|
|
+ })
|
|
|
+
|
|
|
+ it('Should send video published and unblacklist after video unblacklisted', async function () {
|
|
|
+ this.timeout(20000)
|
|
|
+
|
|
|
+ await removeVideoFromBlacklist(servers[0].url, servers[0].accessToken, videoUUID)
|
|
|
+
|
|
|
+ await waitJobs(servers)
|
|
|
+
|
|
|
+ // FIXME: Can't test as two notifications sent to same user and util only checks last one
|
|
|
+ // One notification might be better anyways
|
|
|
+ // await checkNewBlacklistOnMyVideo(userBaseParams, videoUUID, videoName, 'unblacklist')
|
|
|
+ // await checkVideoIsPublished(userBaseParams, videoName, videoUUID, 'presence')
|
|
|
+ })
|
|
|
+
|
|
|
+ it('Should send a local user subscription notification after removed from blacklist', async function () {
|
|
|
+ await checkNewVideoFromSubscription(adminBaseParamsServer1, videoName, videoUUID, 'presence')
|
|
|
+ })
|
|
|
+
|
|
|
+ it('Should send a remote user subscription notification after removed from blacklist', async function () {
|
|
|
+ await checkNewVideoFromSubscription(adminBaseParamsServer2, videoName, videoUUID, 'presence')
|
|
|
+ })
|
|
|
+
|
|
|
+ it('Should send unblacklist but not published/subscription notes after unblacklisted if scheduled update pending', async function () {
|
|
|
+ this.timeout(20000)
|
|
|
+
|
|
|
+ let updateAt = new Date(new Date().getTime() + 100000)
|
|
|
+
|
|
|
+ const name = 'video with auto-blacklist and future schedule ' + uuidv4()
|
|
|
+
|
|
|
+ const data = {
|
|
|
+ name,
|
|
|
+ privacy: VideoPrivacy.PRIVATE,
|
|
|
+ scheduleUpdate: {
|
|
|
+ updateAt: updateAt.toISOString(),
|
|
|
+ privacy: VideoPrivacy.PUBLIC
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ const resVideo = await uploadVideo(servers[0].url, userAccessToken, data)
|
|
|
+ const uuid = resVideo.body.video.uuid
|
|
|
+
|
|
|
+ await removeVideoFromBlacklist(servers[0].url, servers[0].accessToken, uuid)
|
|
|
+
|
|
|
+ await waitJobs(servers)
|
|
|
+ await checkNewBlacklistOnMyVideo(userBaseParams, uuid, name, 'unblacklist')
|
|
|
+
|
|
|
+ // FIXME: Can't test absence as two notifications sent to same user and util only checks last one
|
|
|
+ // One notification might be better anyways
|
|
|
+ // await checkVideoIsPublished(userBaseParams, name, uuid, 'absence')
|
|
|
+
|
|
|
+ await checkNewVideoFromSubscription(adminBaseParamsServer1, name, uuid, 'absence')
|
|
|
+ await checkNewVideoFromSubscription(adminBaseParamsServer2, name, uuid, 'absence')
|
|
|
+ })
|
|
|
+
|
|
|
+ it('Should not send publish/subscription notifications after scheduled update if video still auto-blacklisted', async function () {
|
|
|
+ this.timeout(20000)
|
|
|
+
|
|
|
+ // In 2 seconds
|
|
|
+ let updateAt = new Date(new Date().getTime() + 2000)
|
|
|
+
|
|
|
+ const name = 'video with schedule done and still auto-blacklisted ' + uuidv4()
|
|
|
+
|
|
|
+ const data = {
|
|
|
+ name,
|
|
|
+ privacy: VideoPrivacy.PRIVATE,
|
|
|
+ scheduleUpdate: {
|
|
|
+ updateAt: updateAt.toISOString(),
|
|
|
+ privacy: VideoPrivacy.PUBLIC
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ const resVideo = await uploadVideo(servers[0].url, userAccessToken, data)
|
|
|
+ const uuid = resVideo.body.video.uuid
|
|
|
+
|
|
|
+ await wait(6000)
|
|
|
+ await checkVideoIsPublished(userBaseParams, name, uuid, 'absence')
|
|
|
+ await checkNewVideoFromSubscription(adminBaseParamsServer1, name, uuid, 'absence')
|
|
|
+ await checkNewVideoFromSubscription(adminBaseParamsServer2, name, uuid, 'absence')
|
|
|
+ })
|
|
|
+
|
|
|
+ it('Should not send a notification to moderators on new video without auto-blacklist', async function () {
|
|
|
+ this.timeout(20000)
|
|
|
+
|
|
|
+ const name = 'video without auto-blacklist ' + uuidv4()
|
|
|
+
|
|
|
+ // admin with blacklist right will not be auto-blacklisted
|
|
|
+ const resVideo = await uploadVideo(servers[0].url, servers[0].accessToken, { name })
|
|
|
+ const uuid = resVideo.body.video.uuid
|
|
|
+
|
|
|
+ await waitJobs(servers)
|
|
|
+ await checkVideoAutoBlacklistForModerators(adminBaseParamsServer1, uuid, name, 'absence')
|
|
|
+ })
|
|
|
+
|
|
|
+ after(async () => {
|
|
|
+ await updateCustomConfig(servers[0].url, servers[0].accessToken, currentCustomConfig)
|
|
|
+
|
|
|
+ await removeUserSubscription(servers[0].url, servers[0].accessToken, 'user_1_channel@localhost:9001')
|
|
|
+ await removeUserSubscription(servers[1].url, servers[1].accessToken, 'user_1_channel@localhost:9001')
|
|
|
+ })
|
|
|
+ })
|
|
|
+
|
|
|
describe('Mark as read', function () {
|
|
|
it('Should mark as read some notifications', async function () {
|
|
|
const res = await getUserNotifications(servers[ 0 ].url, userAccessToken, 2, 3)
|
|
@@ -968,7 +1147,7 @@ describe('Test users notifications', function () {
|
|
|
})
|
|
|
|
|
|
it('Should not have notifications', async function () {
|
|
|
- this.timeout(10000)
|
|
|
+ this.timeout(20000)
|
|
|
|
|
|
await updateMyNotificationSettings(servers[0].url, userAccessToken, immutableAssign(allNotificationSettings, {
|
|
|
newVideoFromSubscription: UserNotificationSettingValue.NONE
|
|
@@ -987,7 +1166,7 @@ describe('Test users notifications', function () {
|
|
|
})
|
|
|
|
|
|
it('Should only have web notifications', async function () {
|
|
|
- this.timeout(10000)
|
|
|
+ this.timeout(20000)
|
|
|
|
|
|
await updateMyNotificationSettings(servers[0].url, userAccessToken, immutableAssign(allNotificationSettings, {
|
|
|
newVideoFromSubscription: UserNotificationSettingValue.WEB
|
|
@@ -1013,7 +1192,7 @@ describe('Test users notifications', function () {
|
|
|
})
|
|
|
|
|
|
it('Should only have mail notifications', async function () {
|
|
|
- this.timeout(10000)
|
|
|
+ this.timeout(20000)
|
|
|
|
|
|
await updateMyNotificationSettings(servers[0].url, userAccessToken, immutableAssign(allNotificationSettings, {
|
|
|
newVideoFromSubscription: UserNotificationSettingValue.EMAIL
|
|
@@ -1039,7 +1218,7 @@ describe('Test users notifications', function () {
|
|
|
})
|
|
|
|
|
|
it('Should have email and web notifications', async function () {
|
|
|
- this.timeout(10000)
|
|
|
+ this.timeout(20000)
|
|
|
|
|
|
await updateMyNotificationSettings(servers[0].url, userAccessToken, immutableAssign(allNotificationSettings, {
|
|
|
newVideoFromSubscription: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL
|