interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Introduce notifications command

This commit is contained in:
Chocobozzz 2021-07-09 16:23:01 +02:00
parent 9293139fde
commit dd0ebb7151
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
17 changed files with 272 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/tests/api/check-params/contact-form.ts
View File

@ -69,7 +69,7 @@ describe('Test contact form API validators', function () {
})
it('Should accept a contact form with the correct parameters', async function () {
await command.send({ ...defaultBody })
await command.send(defaultBody)
})
after(async function () {

2
server/tests/api/check-params/video-comments.ts
View File

@ -278,7 +278,7 @@ describe('Test video comments API validator', function () {
let commentToDelete: number
{
const created = await server.commentsCommand.createThread({ videoId: video.uuid, text: 'hello' })
const created = await server.commentsCommand.createThread({ videoId: video.uuid, token: userAccessToken, text: 'hello' })
commentToDelete = created.id
}

47
server/tests/api/moderation/blocklist-notification.ts
View File

@ -7,27 +7,22 @@ import {
createUser,
doubleFollow,
flushAndRunMultipleServers,
getUserNotifications,
markAsReadAllNotifications,
ServerInfo,
setAccessTokensToServers,
uploadVideo,
userLogin,
waitJobs
} from '@shared/extra-utils'
import { UserNotification, UserNotificationType } from '@shared/models'
import { UserNotificationType } from '@shared/models'
const expect = chai.expect
async function checkNotifications (url: string, token: string, expected: UserNotificationType[]) {
const res = await getUserNotifications(url, token, 0, 10, true)
const notifications: UserNotification[] = res.body.data
expect(notifications).to.have.lengthOf(expected.length)
async function checkNotifications (server: ServerInfo, token: string, expected: UserNotificationType[]) {
const { data } = await server.notificationsCommand.list({ token, start: 0, count: 10, unread: true })
expect(data).to.have.lengthOf(expected.length)
for (const type of expected) {
expect(notifications.find(n => n.type === type)).to.exist
expect(data.find(n => n.type === type)).to.exist
}
}
@ -47,8 +42,8 @@ describe('Test blocklist', function () {
await waitJobs(servers)
await markAsReadAllNotifications(servers[0].url, userToken1)
await markAsReadAllNotifications(servers[0].url, userToken2)
await servers[0].notificationsCommand.markAsReadAll({ token: userToken1 })
await servers[0].notificationsCommand.markAsReadAll({ token: userToken2 })
{
const res = await uploadVideo(servers[0].url, userToken1, { name: 'video' })
@ -122,7 +117,7 @@ describe('Test blocklist', function () {
it('Should have appropriate notifications', async function () {
const notifs = [ UserNotificationType.NEW_COMMENT_ON_MY_VIDEO, UserNotificationType.NEW_FOLLOW ]
await checkNotifications(servers[0].url, userToken1, notifs)
await checkNotifications(servers[0], userToken1, notifs)
})
it('Should block an account', async function () {
@ -133,13 +128,13 @@ describe('Test blocklist', function () {
})
it('Should not have notifications from this account', async function () {
await checkNotifications(servers[0].url, userToken1, [])
await checkNotifications(servers[0], userToken1, [])
})
it('Should have notifications of this account on user 2', async function () {
const notifs = [ UserNotificationType.COMMENT_MENTION, UserNotificationType.NEW_FOLLOW ]
await checkNotifications(servers[0].url, userToken2, notifs)
await checkNotifications(servers[0], userToken2, notifs)
await servers[0].blocklistCommand.removeFromMyBlocklist({ token: userToken1, account: 'user3@' + servers[1].host })
})
@ -155,7 +150,7 @@ describe('Test blocklist', function () {
it('Should have appropriate notifications', async function () {
const notifs = [ UserNotificationType.NEW_COMMENT_ON_MY_VIDEO, UserNotificationType.NEW_FOLLOW ]
await checkNotifications(servers[0].url, userToken1, notifs)
await checkNotifications(servers[0], userToken1, notifs)
})
it('Should block an account', async function () {
@ -166,13 +161,13 @@ describe('Test blocklist', function () {
})
it('Should not have notifications from this account', async function () {
await checkNotifications(servers[0].url, userToken1, [])
await checkNotifications(servers[0], userToken1, [])
})
it('Should have notifications of this account on user 2', async function () {
const notifs = [ UserNotificationType.COMMENT_MENTION, UserNotificationType.NEW_FOLLOW ]
await checkNotifications(servers[0].url, userToken2, notifs)
await checkNotifications(servers[0], userToken2, notifs)
await servers[0].blocklistCommand.removeFromMyBlocklist({ token: userToken1, server: servers[1].host })
})
@ -189,12 +184,12 @@ describe('Test blocklist', function () {
it('Should have appropriate notifications', async function () {
{
const notifs = [ UserNotificationType.NEW_COMMENT_ON_MY_VIDEO, UserNotificationType.NEW_FOLLOW ]
await checkNotifications(servers[0].url, userToken1, notifs)
await checkNotifications(servers[0], userToken1, notifs)
}
{
const notifs = [ UserNotificationType.COMMENT_MENTION, UserNotificationType.NEW_FOLLOW ]
await checkNotifications(servers[0].url, userToken2, notifs)
await checkNotifications(servers[0], userToken2, notifs)
}
})
@ -206,8 +201,8 @@ describe('Test blocklist', function () {
})
it('Should not have notifications from this account', async function () {
await checkNotifications(servers[0].url, userToken1, [])
await checkNotifications(servers[0].url, userToken2, [])
await checkNotifications(servers[0], userToken1, [])
await checkNotifications(servers[0], userToken2, [])
await servers[0].blocklistCommand.removeFromServerBlocklist({ account: 'user3@' + servers[1].host })
})
@ -224,12 +219,12 @@ describe('Test blocklist', function () {
it('Should have appropriate notifications', async function () {
{
const notifs = [ UserNotificationType.NEW_COMMENT_ON_MY_VIDEO, UserNotificationType.NEW_FOLLOW ]
await checkNotifications(servers[0].url, userToken1, notifs)
await checkNotifications(servers[0], userToken1, notifs)
}
{
const notifs = [ UserNotificationType.COMMENT_MENTION, UserNotificationType.NEW_FOLLOW ]
await checkNotifications(servers[0].url, userToken2, notifs)
await checkNotifications(servers[0], userToken2, notifs)
}
})
@ -241,8 +236,8 @@ describe('Test blocklist', function () {
})
it('Should not have notifications from this account', async function () {
await checkNotifications(servers[0].url, userToken1, [])
await checkNotifications(servers[0].url, userToken2, [])
await checkNotifications(servers[0], userToken1, [])
await checkNotifications(servers[0], userToken2, [])
})
})

28
server/tests/api/moderation/blocklist.ts
View File

@ -9,7 +9,6 @@ import {
createUser,
doubleFollow,
flushAndRunMultipleServers,
getUserNotifications,
getVideosList,
getVideosListWithToken,
ServerInfo,
@ -18,7 +17,7 @@ import {
userLogin,
waitJobs
} from '@shared/extra-utils'
import { UserNotification, UserNotificationType, Video } from '@shared/models'
import { UserNotificationType, Video } from '@shared/models'
const expect = chai.expect
@ -59,9 +58,8 @@ async function checkCommentNotification (
await waitJobs([ mainServer, comment.server ])
const res = await getUserNotifications(mainServer.url, mainServer.accessToken, 0, 30)
const commentNotifications = (res.body.data as UserNotification[])
.filter(n => n.comment && n.comment.video.uuid === comment.videoUUID && n.createdAt >= createdAt)
const { data } = await mainServer.notificationsCommand.list({ start: 0, count: 30 })
const commentNotifications = data.filter(n => n.comment && n.comment.video.uuid === comment.videoUUID && n.createdAt >= createdAt)
if (check === 'presence') expect(commentNotifications).to.have.lengthOf(1)
else expect(commentNotifications).to.have.lengthOf(0)
@ -710,12 +708,10 @@ describe('Test blocklist', function () {
await waitJobs(servers)
const res = await getUserNotifications(servers[0].url, servers[0].accessToken, 0, 30)
const commentNotifications = (res.body.data as UserNotification[])
.filter(n => {
return n.type === UserNotificationType.NEW_INSTANCE_FOLLOWER &&
n.createdAt >= now.toISOString()
})
const { data } = await servers[0].notificationsCommand.list({ start: 0, count: 30 })
const commentNotifications = data.filter(n => {
return n.type === UserNotificationType.NEW_INSTANCE_FOLLOWER && n.createdAt >= now.toISOString()
})
expect(commentNotifications).to.have.lengthOf(0)
}
@ -773,12 +769,10 @@ describe('Test blocklist', function () {
await waitJobs(servers)
const res = await getUserNotifications(servers[0].url, servers[0].accessToken, 0, 30)
const commentNotifications = (res.body.data as UserNotification[])
.filter(n => {
return n.type === UserNotificationType.NEW_INSTANCE_FOLLOWER &&
n.createdAt >= now.toISOString()
})
const { data } = await servers[0].notificationsCommand.list({ start: 0, count: 30 })
const commentNotifications = data.filter(n => {
return n.type === UserNotificationType.NEW_INSTANCE_FOLLOWER && n.createdAt >= now.toISOString()
})
expect(commentNotifications).to.have.lengthOf(1)
}

90
server/tests/api/notifications/notifications-api.ts
View File

@ -8,14 +8,10 @@ import {
cleanupTests,
getAllNotificationsSettings,
getMyUserInformation,
getUserNotifications,
immutableAssign,
markAsReadAllNotifications,
markAsReadNotifications,
MockSmtpServer,
prepareNotificationsTest,
ServerInfo,
updateMyNotificationSettings,
uploadRandomVideo,
waitJobs
} from '@shared/extra-utils'
@ -26,7 +22,7 @@ const expect = chai.expect
describe('Test notifications API', function () {
let server: ServerInfo
let userNotifications: UserNotification[] = []
let userAccessToken: string
let userToken: string
let emails: object[] = []
before(async function () {
@ -34,11 +30,11 @@ describe('Test notifications API', function () {
const res = await prepareNotificationsTest(1)
emails = res.emails
userAccessToken = res.userAccessToken
userToken = res.userAccessToken
userNotifications = res.userNotifications
server = res.servers[0]
await server.subscriptionsCommand.add({ token: userAccessToken, targetUri: 'root_channel@localhost:' + server.port })
await server.subscriptionsCommand.add({ token: userToken, targetUri: 'root_channel@localhost:' + server.port })
for (let i = 0; i < 10; i++) {
await uploadRandomVideo(server, false)
@ -50,49 +46,46 @@ describe('Test notifications API', function () {
describe('Mark as read', function () {
it('Should mark as read some notifications', async function () {
const res = await getUserNotifications(server.url, userAccessToken, 2, 3)
const ids = res.body.data.map(n => n.id)
const { data } = await server.notificationsCommand.list({ token: userToken, start: 2, count: 3 })
const ids = data.map(n => n.id)
await markAsReadNotifications(server.url, userAccessToken, ids)
await server.notificationsCommand.markAsRead({ token: userToken, ids })
})
it('Should have the notifications marked as read', async function () {
const res = await getUserNotifications(server.url, userAccessToken, 0, 10)
const { data } = await server.notificationsCommand.list({ token: userToken, start: 0, count: 10 })
const notifications = res.body.data as UserNotification[]
expect(notifications[0].read).to.be.false
expect(notifications[1].read).to.be.false
expect(notifications[2].read).to.be.true
expect(notifications[3].read).to.be.true
expect(notifications[4].read).to.be.true
expect(notifications[5].read).to.be.false
expect(data[0].read).to.be.false
expect(data[1].read).to.be.false
expect(data[2].read).to.be.true
expect(data[3].read).to.be.true
expect(data[4].read).to.be.true
expect(data[5].read).to.be.false
})
it('Should only list read notifications', async function () {
const res = await getUserNotifications(server.url, userAccessToken, 0, 10, false)
const { data } = await server.notificationsCommand.list({ token: userToken, start: 0, count: 10, unread: false })
const notifications = res.body.data as UserNotification[]
for (const notification of notifications) {
for (const notification of data) {
expect(notification.read).to.be.true
}
})
it('Should only list unread notifications', async function () {
const res = await getUserNotifications(server.url, userAccessToken, 0, 10, true)
const { data } = await server.notificationsCommand.list({ token: userToken, start: 0, count: 10, unread: true })
const notifications = res.body.data as UserNotification[]
for (const notification of notifications) {
for (const notification of data) {
expect(notification.read).to.be.false
}
})
it('Should mark as read all notifications', async function () {
await markAsReadAllNotifications(server.url, userAccessToken)
await server.notificationsCommand.markAsReadAll({ token: userToken })
const res = await getUserNotifications(server.url, userAccessToken, 0, 10, true)
const body = await server.notificationsCommand.list({ token: userToken, start: 0, count: 10, unread: true })
expect(res.body.total).to.equal(0)
expect(res.body.data).to.have.lengthOf(0)
expect(body.total).to.equal(0)
expect(body.data).to.have.lengthOf(0)
})
})
@ -104,19 +97,20 @@ describe('Test notifications API', function () {
server: server,
emails,
socketNotifications: userNotifications,
token: userAccessToken
token: userToken
}
})
it('Should not have notifications', async function () {
this.timeout(20000)
await updateMyNotificationSettings(server.url, userAccessToken, immutableAssign(getAllNotificationsSettings(), {
newVideoFromSubscription: UserNotificationSettingValue.NONE
}))
await server.notificationsCommand.updateMySettings({
token: userToken,
settings: { ...getAllNotificationsSettings(), newVideoFromSubscription: UserNotificationSettingValue.NONE }
})
{
const res = await getMyUserInformation(server.url, userAccessToken)
const res = await getMyUserInformation(server.url, userToken)
const info = res.body as User
expect(info.notificationSettings.newVideoFromSubscription).to.equal(UserNotificationSettingValue.NONE)
}
@ -130,12 +124,13 @@ describe('Test notifications API', function () {
it('Should only have web notifications', async function () {
this.timeout(20000)
await updateMyNotificationSettings(server.url, userAccessToken, immutableAssign(getAllNotificationsSettings(), {
newVideoFromSubscription: UserNotificationSettingValue.WEB
}))
await server.notificationsCommand.updateMySettings({
token: userToken,
settings: { ...getAllNotificationsSettings(), newVideoFromSubscription: UserNotificationSettingValue.WEB }
})
{
const res = await getMyUserInformation(server.url, userAccessToken)
const res = await getMyUserInformation(server.url, userToken)
const info = res.body as User
expect(info.notificationSettings.newVideoFromSubscription).to.equal(UserNotificationSettingValue.WEB)
}
@ -156,12 +151,13 @@ describe('Test notifications API', function () {
it('Should only have mail notifications', async function () {
this.timeout(20000)
await updateMyNotificationSettings(server.url, userAccessToken, immutableAssign(getAllNotificationsSettings(), {
newVideoFromSubscription: UserNotificationSettingValue.EMAIL
}))
await server.notificationsCommand.updateMySettings({
token: userToken,
settings: { ...getAllNotificationsSettings(), newVideoFromSubscription: UserNotificationSettingValue.EMAIL }
})
{
const res = await getMyUserInformation(server.url, userAccessToken)
const res = await getMyUserInformation(server.url, userToken)
const info = res.body as User
expect(info.notificationSettings.newVideoFromSubscription).to.equal(UserNotificationSettingValue.EMAIL)
}
@ -182,12 +178,16 @@ describe('Test notifications API', function () {
it('Should have email and web notifications', async function () {
this.timeout(20000)
await updateMyNotificationSettings(server.url, userAccessToken, immutableAssign(getAllNotificationsSettings(), {
newVideoFromSubscription: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL
}))
await server.notificationsCommand.updateMySettings({
token: userToken,
settings: {
...getAllNotificationsSettings(),
newVideoFromSubscription: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL
}
})
{
const res = await getMyUserInformation(server.url, userAccessToken)
const res = await getMyUserInformation(server.url, userToken)
const info = res.body as User
expect(info.notificationSettings.newVideoFromSubscription).to.equal(
UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL

5
server/tests/api/notifications/user-notifications.ts
View File

@ -10,7 +10,6 @@ import {
checkNewVideoFromSubscription,
checkVideoIsPublished,
cleanupTests,
getLastNotification,
ImportsCommand,
MockSmtpServer,
prepareNotificationsTest,
@ -64,7 +63,7 @@ describe('Test user notifications', function () {
await uploadRandomVideoOnServers(servers, 1)
const notification = await getLastNotification(servers[0].url, userAccessToken)
const notification = await servers[0].notificationsCommand.getLastest({ token: userAccessToken })
expect(notification).to.be.undefined
expect(emails).to.have.lengthOf(0)
@ -245,7 +244,7 @@ describe('Test user notifications', function () {
await uploadRandomVideoOnServers(servers, 2, { waitTranscoding: false })
await waitJobs(servers)
const notification = await getLastNotification(servers[0].url, userAccessToken)
const notification = await servers[0].notificationsCommand.getLastest({ token: userAccessToken })
if (notification) {
expect(notification.type).to.not.equal(UserNotificationType.MY_VIDEO_PUBLISHED)
}

3
server/tests/api/server/plugins.ts
View File

@ -146,13 +146,12 @@ describe('Test plugins', function () {
}
{
const body = await command.list({
const { data } = await command.list({
count: 2,
start: 0,
sort: 'name'
})
const data = body
expect(data[0].name).to.equal('background-red')
expect(data[1].name).to.equal('hello-world')
}

1
server/tests/api/videos/video-hls.ts
View File

@ -109,6 +109,7 @@ describe('Test HLS videos', function () {
let videoAudioUUID = ''
function runTestSuite (hlsOnly: boolean) {
it('Should upload a video and transcode it to HLS', async function () {
this.timeout(120000)

130
server/tests/api/videos/video-nsfw.ts
View File

@ -18,13 +18,13 @@ import {
uploadVideo,
userLogin
} from '@shared/extra-utils'
import { BooleanBothQuery, CustomConfig, User, VideosOverview } from '@shared/models'
import { BooleanBothQuery, CustomConfig, ResultList, User, Video, VideosOverview } from '@shared/models'
const expect = chai.expect
function createOverviewRes (overview: VideosOverview) {
const videos = overview.categories[0].videos
return { body: { data: videos, total: videos.length } }
return { data: videos, total: videos.length }
}
describe('Test video NSFW policy', function () {
@ -32,49 +32,47 @@ describe('Test video NSFW policy', function () {
let userAccessToken: string
let customConfig: CustomConfig
function getVideosFunctions (token?: string, query: { nsfw?: BooleanBothQuery } = {}) {
return getMyUserInformation(server.url, server.accessToken)
.then(res => {
const user: User = res.body
const videoChannelName = user.videoChannels[0].name
const accountName = user.account.name + '@' + user.account.host
const hasQuery = Object.keys(query).length !== 0
let promises: Promise<any>[]
async function getVideosFunctions (token?: string, query: { nsfw?: BooleanBothQuery } = {}) {
const res = await getMyUserInformation(server.url, server.accessToken)
const user: User = res.body
const videoChannelName = user.videoChannels[0].name
const accountName = user.account.name + '@' + user.account.host
const hasQuery = Object.keys(query).length !== 0
let promises: Promise<ResultList<Video>>[]
if (token) {
promises = [
getVideosListWithToken(server.url, token, query),
server.searchCommand.advancedVideoSearch({ token, search: { search: 'n', ...query } }),
getAccountVideos(server.url, token, accountName, 0, 5, undefined, query),
getVideoChannelVideos(server.url, token, videoChannelName, 0, 5, undefined, query)
]
if (token) {
promises = [
getVideosListWithToken(server.url, token, query).then(res => res.body),
server.searchCommand.advancedVideoSearch({ token, search: { search: 'n', ...query } }),
getAccountVideos(server.url, token, accountName, 0, 5, undefined, query).then(res => res.body),
getVideoChannelVideos(server.url, token, videoChannelName, 0, 5, undefined, query).then(res => res.body)
]
// Overviews do not support video filters
if (!hasQuery) {
const p = server.overviewsCommand.getVideos({ page: 1, token })
.then(res => createOverviewRes(res))
promises.push(p)
}
// Overviews do not support video filters
if (!hasQuery) {
const p = server.overviewsCommand.getVideos({ page: 1, token })
.then(res => createOverviewRes(res))
promises.push(p)
}
return Promise.all(promises)
}
return Promise.all(promises)
}
promises = [
getVideosList(server.url),
server.searchCommand.searchVideos({ search: 'n' }),
getAccountVideos(server.url, undefined, accountName, 0, 5),
getVideoChannelVideos(server.url, undefined, videoChannelName, 0, 5)
]
promises = [
getVideosList(server.url).then(res => res.body),
server.searchCommand.searchVideos({ search: 'n' }),
getAccountVideos(server.url, undefined, accountName, 0, 5).then(res => res.body),
getVideoChannelVideos(server.url, undefined, videoChannelName, 0, 5).then(res => res.body)
]
// Overviews do not support video filters
if (!hasQuery) {
const p = server.overviewsCommand.getVideos({ page: 1 })
.then(res => createOverviewRes(res))
promises.push(p)
}
// Overviews do not support video filters
if (!hasQuery) {
const p = server.overviewsCommand.getVideos({ page: 1 })
.then(res => createOverviewRes(res))
promises.push(p)
}
return Promise.all(promises)
})
return Promise.all(promises)
}
before(async function () {
@ -102,10 +100,10 @@ describe('Test video NSFW policy', function () {
const serverConfig = await server.configCommand.getConfig()
expect(serverConfig.instance.defaultNSFWPolicy).to.equal('display')
for (const res of await getVideosFunctions()) {
expect(res.body.total).to.equal(2)
for (const body of await getVideosFunctions()) {
expect(body.total).to.equal(2)
const videos = res.body.data
const videos = body.data
expect(videos).to.have.lengthOf(2)
expect(videos[0].name).to.equal('normal')
expect(videos[1].name).to.equal('nsfw')
@ -119,10 +117,10 @@ describe('Test video NSFW policy', function () {
const serverConfig = await server.configCommand.getConfig()
expect(serverConfig.instance.defaultNSFWPolicy).to.equal('do_not_list')
for (const res of await getVideosFunctions()) {
expect(res.body.total).to.equal(1)
for (const body of await getVideosFunctions()) {
expect(body.total).to.equal(1)
const videos = res.body.data
const videos = body.data
expect(videos).to.have.lengthOf(1)
expect(videos[0].name).to.equal('normal')
}
@ -135,10 +133,10 @@ describe('Test video NSFW policy', function () {
const serverConfig = await server.configCommand.getConfig()
expect(serverConfig.instance.defaultNSFWPolicy).to.equal('blur')
for (const res of await getVideosFunctions()) {
expect(res.body.total).to.equal(2)
for (const body of await getVideosFunctions()) {
expect(body.total).to.equal(2)
const videos = res.body.data
const videos = body.data
expect(videos).to.have.lengthOf(2)
expect(videos[0].name).to.equal('normal')
expect(videos[1].name).to.equal('nsfw')
@ -165,10 +163,10 @@ describe('Test video NSFW policy', function () {
customConfig.instance.defaultNSFWPolicy = 'do_not_list'
await server.configCommand.updateCustomConfig({ newCustomConfig: customConfig })
for (const res of await getVideosFunctions(userAccessToken)) {
expect(res.body.total).to.equal(2)
for (const body of await getVideosFunctions(userAccessToken)) {
expect(body.total).to.equal(2)
const videos = res.body.data
const videos = body.data
expect(videos).to.have.lengthOf(2)
expect(videos[0].name).to.equal('normal')
expect(videos[1].name).to.equal('nsfw')
@ -182,10 +180,10 @@ describe('Test video NSFW policy', function () {
nsfwPolicy: 'display'
})
for (const res of await getVideosFunctions(server.accessToken)) {
expect(res.body.total).to.equal(2)
for (const body of await getVideosFunctions(server.accessToken)) {
expect(body.total).to.equal(2)
const videos = res.body.data
const videos = body.data
expect(videos).to.have.lengthOf(2)
expect(videos[0].name).to.equal('normal')
expect(videos[1].name).to.equal('nsfw')
@ -199,10 +197,10 @@ describe('Test video NSFW policy', function () {
nsfwPolicy: 'do_not_list'
})
for (const res of await getVideosFunctions(server.accessToken)) {
expect(res.body.total).to.equal(1)
for (const body of await getVideosFunctions(server.accessToken)) {
expect(body.total).to.equal(1)
const videos = res.body.data
const videos = body.data
expect(videos).to.have.lengthOf(1)
expect(videos[0].name).to.equal('normal')
}
@ -219,30 +217,30 @@ describe('Test video NSFW policy', function () {
})
it('Should display NSFW videos when the nsfw param === true', async function () {
for (const res of await getVideosFunctions(server.accessToken, { nsfw: 'true' })) {
expect(res.body.total).to.equal(1)
for (const body of await getVideosFunctions(server.accessToken, { nsfw: 'true' })) {
expect(body.total).to.equal(1)
const videos = res.body.data
const videos = body.data
expect(videos).to.have.lengthOf(1)
expect(videos[0].name).to.equal('nsfw')
}
})
it('Should hide NSFW videos when the nsfw param === true', async function () {
for (const res of await getVideosFunctions(server.accessToken, { nsfw: 'false' })) {
expect(res.body.total).to.equal(1)
for (const body of await getVideosFunctions(server.accessToken, { nsfw: 'false' })) {
expect(body.total).to.equal(1)
const videos = res.body.data
const videos = body.data
expect(videos).to.have.lengthOf(1)
expect(videos[0].name).to.equal('normal')
}
})
it('Should display both videos when the nsfw param === both', async function () {
for (const res of await getVideosFunctions(server.accessToken, { nsfw: 'both' })) {
expect(res.body.total).to.equal(2)
for (const body of await getVideosFunctions(server.accessToken, { nsfw: 'both' })) {
expect(body.total).to.equal(2)
const videos = res.body.data
const videos = body.data
expect(videos).to.have.lengthOf(2)
expect(videos[0].name).to.equal('normal')
expect(videos[1].name).to.equal('nsfw')

2
server/tools/test-live.ts
View File

@ -38,7 +38,7 @@ async function run () {
const server = await flushAndRunServer(1, {}, [], { hideLogs: false, execArgv: [ '--inspect' ] })
const cleanup = () => {
const cleanup = async () => {
console.log('Killing server')
await killallServers([ server ])
}

2
shared/extra-utils/search/search-command.ts
View File

@ -90,7 +90,7 @@ export class SearchCommand extends AbstractCommand {
...options,
path,
query: search,
query: { sort: '-publishedAt', ...search },
implicitToken: false,
defaultExpectedStatus: HttpStatusCode.OK_200
})

6
shared/extra-utils/server/servers.ts
View File

@ -11,13 +11,14 @@ import { CLICommand } from '../cli'
import { CustomPagesCommand } from '../custom-pages'
import { FeedCommand } from '../feeds'
import { LogsCommand } from '../logs'
import { SQLCommand } from '../miscs'
import { buildServerDirectory, getFileSize, isGithubCI, root, wait } from '../miscs/miscs'
import { AbusesCommand } from '../moderation'
import { OverviewsCommand } from '../overviews'
import { makeGetRequest } from '../requests/requests'
import { SearchCommand } from '../search'
import { SocketIOCommand } from '../socket'
import { AccountsCommand, BlocklistCommand, SubscriptionsCommand } from '../users'
import { AccountsCommand, BlocklistCommand, NotificationsCommand, SubscriptionsCommand } from '../users'
import {
BlacklistCommand,
CaptionsCommand,
@ -30,7 +31,6 @@ import {
ServicesCommand,
StreamingPlaylistsCommand
} from '../videos'
import { SQLCommand } from '../miscs'
import { CommentsCommand } from '../videos/comments-command'
import { ConfigCommand } from './config-command'
import { ContactFormCommand } from './contact-form-command'
@ -125,6 +125,7 @@ interface ServerInfo {
channelsCommand?: ChannelsCommand
commentsCommand?: CommentsCommand
sqlCommand?: SQLCommand
notificationsCommand?: NotificationsCommand
}
function parallelTests () {
@ -370,6 +371,7 @@ function assignCommands (server: ServerInfo) {
server.channelsCommand = new ChannelsCommand(server)
server.commentsCommand = new CommentsCommand(server)
server.sqlCommand = new SQLCommand(server)
server.notificationsCommand = new NotificationsCommand(server)
}
async function reRunServer (server: ServerInfo, configOverride?: any) {

7
shared/extra-utils/shared/abstract-command.ts
View File

@ -78,7 +78,7 @@ abstract class AbstractCommand {
}
protected getRequest (options: InternalGetCommandOptions) {
const { redirects, query, contentType, accept } = options
const { redirects, query, contentType, accept, range } = options
return makeGetRequest({
...this.buildCommonRequestOptions(options),
@ -86,6 +86,7 @@ abstract class AbstractCommand {
redirects,
query,
contentType,
range,
accept
})
}
@ -168,10 +169,10 @@ abstract class AbstractCommand {
}
private buildCommonRequestOptions (options: InternalCommonCommandOptions) {
const { path } = options
const { url, path } = options
return {
url: this.server.url,
url: url ?? this.server.url,
path,
token: this.buildCommonRequestToken(options),

3
shared/extra-utils/users/index.ts
View File

@ -2,6 +2,7 @@ export * from './accounts-command'
export * from './accounts'
export * from './blocklist-command'
export * from './login'
export * from './user-notifications'
export * from './notifications'
export * from './notifications-command'
export * from './subscriptions-command'
export * from './users'

87
shared/extra-utils/users/notifications-command.ts Normal file
View File

@ -0,0 +1,87 @@
import { ResultList } from '@shared/models'
import { HttpStatusCode } from '../../core-utils/miscs/http-error-codes'
import { UserNotification, UserNotificationSetting } from '../../models/users'
import { AbstractCommand, OverrideCommandOptions } from '../shared'
export class NotificationsCommand extends AbstractCommand {
updateMySettings (options: OverrideCommandOptions & {
settings: UserNotificationSetting
}) {
const path = '/api/v1/users/me/notification-settings'
return this.putBodyRequest({
...options,
path,
fields: options.settings,
implicitToken: true,
defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
})
}
list (options: OverrideCommandOptions & {
start?: number
count?: number
unread?: boolean
sort?: string
}) {
const { start, count, unread, sort = '-createdAt' } = options
const path = '/api/v1/users/me/notifications'
return this.getRequestBody<ResultList<UserNotification>>({
...options,
path,
query: {
start,
count,
sort,
unread
},
implicitToken: true,
defaultExpectedStatus: HttpStatusCode.OK_200
})
}
markAsRead (options: OverrideCommandOptions & {
ids: number[]
}) {
const { ids } = options
const path = '/api/v1/users/me/notifications/read'
return this.postBodyRequest({
...options,
path,
fields: { ids },
implicitToken: true,
defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
})
}
markAsReadAll (options: OverrideCommandOptions) {
const path = '/api/v1/users/me/notifications/read-all'
return this.postBodyRequest({
...options,
path,
implicitToken: true,
defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
})
}
async getLastest (options: OverrideCommandOptions = {}) {
const { total, data } = await this.list({
...options,
start: 0,
count: 1,
sort: '-createdAt'
})
if (total === 0) return undefined
return data[0]
}
}

129
shared/extra-utils/users/user-notifications.ts → shared/extra-utils/users/notifications.ts
View File

@ -3,86 +3,32 @@
import { expect } from 'chai'
import { inspect } from 'util'
import { AbuseState, PluginType } from '@shared/models'
import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
import { UserNotification, UserNotificationSetting, UserNotificationSettingValue, UserNotificationType } from '../../models/users'
import { MockSmtpServer } from '../mock-servers/mock-email'
import { makeGetRequest, makePostBodyRequest, makePutBodyRequest } from '../requests/requests'
import { doubleFollow } from '../server/follows'
import { flushAndRunMultipleServers, ServerInfo } from '../server/servers'
import { setAccessTokensToServers, userLogin } from './login'
import { createUser, getMyUserInformation } from './users'
function updateMyNotificationSettings (
url: string,
token: string,
settings: UserNotificationSetting,
statusCodeExpected = HttpStatusCode.NO_CONTENT_204
) {
const path = '/api/v1/users/me/notification-settings'
return makePutBodyRequest({
url,
path,
token,
fields: settings,
statusCodeExpected
})
}
async function getUserNotifications (
url: string,
token: string,
start: number,
count: number,
unread?: boolean,
sort = '-createdAt',
statusCodeExpected = HttpStatusCode.OK_200
) {
const path = '/api/v1/users/me/notifications'
return makeGetRequest({
url,
path,
token,
query: {
start,
count,
sort,
unread
},
statusCodeExpected
})
}
function markAsReadNotifications (url: string, token: string, ids: number[], statusCodeExpected = HttpStatusCode.NO_CONTENT_204) {
const path = '/api/v1/users/me/notifications/read'
return makePostBodyRequest({
url,
path,
token,
fields: { ids },
statusCodeExpected
})
}
function markAsReadAllNotifications (url: string, token: string, statusCodeExpected = HttpStatusCode.NO_CONTENT_204) {
const path = '/api/v1/users/me/notifications/read-all'
return makePostBodyRequest({
url,
path,
token,
statusCodeExpected
})
}
async function getLastNotification (serverUrl: string, accessToken: string) {
const res = await getUserNotifications(serverUrl, accessToken, 0, 1, undefined, '-createdAt')
if (res.body.total === 0) return undefined
return res.body.data[0] as UserNotification
function getAllNotificationsSettings (): UserNotificationSetting {
return {
newVideoFromSubscription: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
newCommentOnMyVideo: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
abuseAsModerator: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
videoAutoBlacklistAsModerator: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
blacklistOnMyVideo: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
myVideoImportFinished: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
myVideoPublished: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
commentMention: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
newFollow: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
newUserRegistration: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
newInstanceFollower: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
abuseNewMessage: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
abuseStateChange: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
autoInstanceFollowing: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
newPeerTubeVersion: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
newPluginVersion: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL
}
}
type CheckerBaseParams = {
@ -104,7 +50,7 @@ async function checkNotification (
const check = base.check || { web: true, mail: true }
if (check.web) {
const notification = await getLastNotification(base.server.url, base.token)
const notification = await base.server.notificationsCommand.getLastest({ token: base.token })
if (notification || checkType !== 'absence') {
notificationChecker(notification, checkType)
@ -680,27 +626,6 @@ async function checkNewPluginVersion (base: CheckerBaseParams, pluginType: Plugi
await checkNotification(base, notificationChecker, emailNotificationFinder, type)
}
function getAllNotificationsSettings (): UserNotificationSetting {
return {
newVideoFromSubscription: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
newCommentOnMyVideo: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
abuseAsModerator: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
videoAutoBlacklistAsModerator: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
blacklistOnMyVideo: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
myVideoImportFinished: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
myVideoPublished: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
commentMention: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
newFollow: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
newUserRegistration: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
newInstanceFollower: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
abuseNewMessage: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
abuseStateChange: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
autoInstanceFollowing: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
newPeerTubeVersion: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL,
newPluginVersion: UserNotificationSettingValue.WEB | UserNotificationSettingValue.EMAIL
}
}
async function prepareNotificationsTest (serversCount = 3, overrideConfigArg: any = {}) {
const userNotifications: UserNotification[] = []
const adminNotifications: UserNotification[] = []
@ -739,11 +664,11 @@ async function prepareNotificationsTest (serversCount = 3, overrideConfigArg: an
})
const userAccessToken = await userLogin(servers[0], user)
await updateMyNotificationSettings(servers[0].url, userAccessToken, getAllNotificationsSettings())
await updateMyNotificationSettings(servers[0].url, servers[0].accessToken, getAllNotificationsSettings())
await servers[0].notificationsCommand.updateMySettings({ token: userAccessToken, settings: getAllNotificationsSettings() })
await servers[0].notificationsCommand.updateMySettings({ settings: getAllNotificationsSettings() })
if (serversCount > 1) {
await updateMyNotificationSettings(servers[1].url, servers[1].accessToken, getAllNotificationsSettings())
await servers[1].notificationsCommand.updateMySettings({ settings: getAllNotificationsSettings() })
}
{
@ -777,11 +702,11 @@ async function prepareNotificationsTest (serversCount = 3, overrideConfigArg: an
// ---------------------------------------------------------------------------
export {
getAllNotificationsSettings,
CheckerBaseParams,
CheckerType,
getAllNotificationsSettings,
checkNotification,
markAsReadAllNotifications,
checkMyVideoImportIsFinished,
checkUserRegistered,
checkAutoInstanceFollowing,
@ -791,14 +716,10 @@ export {
checkNewCommentOnMyVideo,
checkNewBlacklistOnMyVideo,
checkCommentMention,
updateMyNotificationSettings,
checkNewVideoAbuseForModerators,
checkVideoAutoBlacklistForModerators,
checkNewAbuseMessage,
checkAbuseStateChange,
getUserNotifications,
markAsReadNotifications,
getLastNotification,
checkNewInstanceFollower,
prepareNotificationsTest,
checkNewCommentAbuseForModerators,

2
shared/extra-utils/videos/streaming-playlists-command.ts
View File

@ -21,7 +21,7 @@ export class StreamingPlaylistsCommand extends AbstractCommand {
url: string
range?: string
}) {
return unwrapText(this.getRawRequest({
return unwrapBody<Buffer>(this.getRawRequest({
...options,
url: options.url,