yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-05 19:42:24 +02:00
Code Issues Releases Wiki Activity

Introduce server commands

Browse source
This commit is contained in:
Chocobozzz 2021-07-13 09:43:59 +02:00
parent 0d8ecb7592
commit 6c5065a011
No known key found for this signature in database
GPG key ID: 583A612D890159BE
63 changed files with 688 additions and 708 deletions
Download patch file Download diff file Expand all files Collapse all files

13
server/tests/api/notifications/moderation-notifications.ts
View file

@ -20,7 +20,6 @@ import {
createUser,
generateUserAccessToken,
getVideoIdFromUUID,
immutableAssign,
MockInstancesIndex,
MockSmtpServer,
prepareNotificationsTest,
@ -347,7 +346,7 @@ describe('Test moderation notifications', function () {
await checkUserRegistered(baseParams, 'user_45', 'presence')
const userOverride = { socketNotifications: userNotifications, token: userAccessToken, check: { web: true, mail: false } }
await checkUserRegistered(immutableAssign(baseParams, userOverride), 'user_45', 'absence')
await checkUserRegistered({ ...baseParams, ...userOverride }, 'user_45', 'absence')
})
})
@ -389,7 +388,7 @@ describe('Test moderation notifications', function () {
await checkNewInstanceFollower(baseParams, 'localhost:' + servers[2].port, 'presence')
const userOverride = { socketNotifications: userNotifications, token: userAccessToken, check: { web: true, mail: false } }
await checkNewInstanceFollower(immutableAssign(baseParams, userOverride), 'localhost:' + servers[2].port, 'absence')
await checkNewInstanceFollower({ ...baseParams, ...userOverride }, 'localhost:' + servers[2].port, 'absence')
})
it('Should send a notification on auto follow back', async function () {
@ -416,7 +415,7 @@ describe('Test moderation notifications', function () {
await checkAutoInstanceFollowing(baseParams, followerHost, followingHost, 'presence')
const userOverride = { socketNotifications: userNotifications, token: userAccessToken, check: { web: true, mail: false } }
await checkAutoInstanceFollowing(immutableAssign(baseParams, userOverride), followerHost, followingHost, 'absence')
await checkAutoInstanceFollowing({ ...baseParams, ...userOverride }, followerHost, followingHost, 'absence')
config.followings.instance.autoFollowBack.enabled = false
await servers[0].configCommand.updateCustomSubConfig({ newConfig: config })
@ -476,7 +475,9 @@ describe('Test moderation notifications', function () {
currentCustomConfig = await servers[0].configCommand.getCustomConfig()
const autoBlacklistTestsCustomConfig = immutableAssign(currentCustomConfig, {
const autoBlacklistTestsCustomConfig = {
...currentCustomConfig,
autoBlacklist: {
videos: {
ofUsers: {
@ -484,7 +485,7 @@ describe('Test moderation notifications', function () {
}
}
}
})
}
// enable transcoding otherwise own publish notification after transcoding not expected
autoBlacklistTestsCustomConfig.transcoding.enabled = true