d0800f7661
* client: remove unused file * refactor(client/my-actor-avatar): size from input Read size from component input instead of scss, to make it possible to use smaller avatar images when implemented. * implement avatar miniatures close #4560 * fix(test): max file size * fix(search-index): normalize res acc to avatarMini * refactor avatars to an array * client/search: resize channel avatar to 120 * refactor(client/videos): remove unused function * client(actor-avatar): set default size * fix tests and avatars full result When findOne is used only an array containting one avatar is returned. * update migration version and version notations * server/search: harmonize normalizing * Cleanup avatar miniature PR Co-authored-by: Chocobozzz <me@florianbigard.com>
881 lines
32 KiB
TypeScript
881 lines
32 KiB
TypeScript
/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
|
|
|
|
import 'mocha'
|
|
import * as chai from 'chai'
|
|
import { UserNotificationType } from '@shared/models'
|
|
import {
|
|
BlocklistCommand,
|
|
cleanupTests,
|
|
CommentsCommand,
|
|
createMultipleServers,
|
|
doubleFollow,
|
|
PeerTubeServer,
|
|
setAccessTokensToServers,
|
|
setDefaultAccountAvatar,
|
|
waitJobs
|
|
} from '@shared/server-commands'
|
|
|
|
const expect = chai.expect
|
|
|
|
async function checkAllVideos (server: PeerTubeServer, token: string) {
|
|
{
|
|
const { data } = await server.videos.listWithToken({ token })
|
|
expect(data).to.have.lengthOf(5)
|
|
}
|
|
|
|
{
|
|
const { data } = await server.videos.list()
|
|
expect(data).to.have.lengthOf(5)
|
|
}
|
|
}
|
|
|
|
async function checkAllComments (server: PeerTubeServer, token: string, videoUUID: string) {
|
|
const { data } = await server.comments.listThreads({ videoId: videoUUID, start: 0, count: 25, sort: '-createdAt', token })
|
|
|
|
const threads = data.filter(t => t.isDeleted === false)
|
|
expect(threads).to.have.lengthOf(2)
|
|
|
|
for (const thread of threads) {
|
|
const tree = await server.comments.getThread({ videoId: videoUUID, threadId: thread.id, token })
|
|
expect(tree.children).to.have.lengthOf(1)
|
|
}
|
|
}
|
|
|
|
async function checkCommentNotification (
|
|
mainServer: PeerTubeServer,
|
|
comment: { server: PeerTubeServer, token: string, videoUUID: string, text: string },
|
|
check: 'presence' | 'absence'
|
|
) {
|
|
const command = comment.server.comments
|
|
|
|
const { threadId, createdAt } = await command.createThread({ token: comment.token, videoId: comment.videoUUID, text: comment.text })
|
|
|
|
await waitJobs([ mainServer, comment.server ])
|
|
|
|
const { data } = await mainServer.notifications.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)
|
|
|
|
await command.delete({ token: comment.token, videoId: comment.videoUUID, commentId: threadId })
|
|
|
|
await waitJobs([ mainServer, comment.server ])
|
|
}
|
|
|
|
describe('Test blocklist', function () {
|
|
let servers: PeerTubeServer[]
|
|
let videoUUID1: string
|
|
let videoUUID2: string
|
|
let videoUUID3: string
|
|
let userToken1: string
|
|
let userModeratorToken: string
|
|
let userToken2: string
|
|
|
|
let command: BlocklistCommand
|
|
let commentsCommand: CommentsCommand[]
|
|
|
|
before(async function () {
|
|
this.timeout(120000)
|
|
|
|
servers = await createMultipleServers(3)
|
|
await setAccessTokensToServers(servers)
|
|
await setDefaultAccountAvatar(servers)
|
|
|
|
command = servers[0].blocklist
|
|
commentsCommand = servers.map(s => s.comments)
|
|
|
|
{
|
|
const user = { username: 'user1', password: 'password' }
|
|
await servers[0].users.create({ username: user.username, password: user.password })
|
|
|
|
userToken1 = await servers[0].login.getAccessToken(user)
|
|
await servers[0].videos.upload({ token: userToken1, attributes: { name: 'video user 1' } })
|
|
}
|
|
|
|
{
|
|
const user = { username: 'moderator', password: 'password' }
|
|
await servers[0].users.create({ username: user.username, password: user.password })
|
|
|
|
userModeratorToken = await servers[0].login.getAccessToken(user)
|
|
}
|
|
|
|
{
|
|
const user = { username: 'user2', password: 'password' }
|
|
await servers[1].users.create({ username: user.username, password: user.password })
|
|
|
|
userToken2 = await servers[1].login.getAccessToken(user)
|
|
await servers[1].videos.upload({ token: userToken2, attributes: { name: 'video user 2' } })
|
|
}
|
|
|
|
{
|
|
const { uuid } = await servers[0].videos.upload({ attributes: { name: 'video server 1' } })
|
|
videoUUID1 = uuid
|
|
}
|
|
|
|
{
|
|
const { uuid } = await servers[1].videos.upload({ attributes: { name: 'video server 2' } })
|
|
videoUUID2 = uuid
|
|
}
|
|
|
|
{
|
|
const { uuid } = await servers[0].videos.upload({ attributes: { name: 'video 2 server 1' } })
|
|
videoUUID3 = uuid
|
|
}
|
|
|
|
await doubleFollow(servers[0], servers[1])
|
|
await doubleFollow(servers[0], servers[2])
|
|
|
|
{
|
|
const created = await commentsCommand[0].createThread({ videoId: videoUUID1, text: 'comment root 1' })
|
|
const reply = await commentsCommand[0].addReply({
|
|
token: userToken1,
|
|
videoId: videoUUID1,
|
|
toCommentId: created.id,
|
|
text: 'comment user 1'
|
|
})
|
|
await commentsCommand[0].addReply({ videoId: videoUUID1, toCommentId: reply.id, text: 'comment root 1' })
|
|
}
|
|
|
|
{
|
|
const created = await commentsCommand[0].createThread({ token: userToken1, videoId: videoUUID1, text: 'comment user 1' })
|
|
await commentsCommand[0].addReply({ videoId: videoUUID1, toCommentId: created.id, text: 'comment root 1' })
|
|
}
|
|
|
|
await waitJobs(servers)
|
|
})
|
|
|
|
describe('User blocklist', function () {
|
|
|
|
describe('When managing account blocklist', function () {
|
|
it('Should list all videos', function () {
|
|
return checkAllVideos(servers[0], servers[0].accessToken)
|
|
})
|
|
|
|
it('Should list the comments', function () {
|
|
return checkAllComments(servers[0], servers[0].accessToken, videoUUID1)
|
|
})
|
|
|
|
it('Should block a remote account', async function () {
|
|
await command.addToMyBlocklist({ account: 'user2@localhost:' + servers[1].port })
|
|
})
|
|
|
|
it('Should hide its videos', async function () {
|
|
const { data } = await servers[0].videos.listWithToken()
|
|
|
|
expect(data).to.have.lengthOf(4)
|
|
|
|
const v = data.find(v => v.name === 'video user 2')
|
|
expect(v).to.be.undefined
|
|
})
|
|
|
|
it('Should block a local account', async function () {
|
|
await command.addToMyBlocklist({ account: 'user1' })
|
|
})
|
|
|
|
it('Should hide its videos', async function () {
|
|
const { data } = await servers[0].videos.listWithToken()
|
|
|
|
expect(data).to.have.lengthOf(3)
|
|
|
|
const v = data.find(v => v.name === 'video user 1')
|
|
expect(v).to.be.undefined
|
|
})
|
|
|
|
it('Should hide its comments', async function () {
|
|
const { data } = await commentsCommand[0].listThreads({
|
|
token: servers[0].accessToken,
|
|
videoId: videoUUID1,
|
|
start: 0,
|
|
count: 25,
|
|
sort: '-createdAt'
|
|
})
|
|
|
|
expect(data).to.have.lengthOf(1)
|
|
expect(data[0].totalReplies).to.equal(1)
|
|
|
|
const t = data.find(t => t.text === 'comment user 1')
|
|
expect(t).to.be.undefined
|
|
|
|
for (const thread of data) {
|
|
const tree = await commentsCommand[0].getThread({
|
|
videoId: videoUUID1,
|
|
threadId: thread.id,
|
|
token: servers[0].accessToken
|
|
})
|
|
expect(tree.children).to.have.lengthOf(0)
|
|
}
|
|
})
|
|
|
|
it('Should not have notifications from blocked accounts', async function () {
|
|
this.timeout(20000)
|
|
|
|
{
|
|
const comment = { server: servers[0], token: userToken1, videoUUID: videoUUID1, text: 'hidden comment' }
|
|
await checkCommentNotification(servers[0], comment, 'absence')
|
|
}
|
|
|
|
{
|
|
const comment = {
|
|
server: servers[0],
|
|
token: userToken1,
|
|
videoUUID: videoUUID2,
|
|
text: 'hello @root@localhost:' + servers[0].port
|
|
}
|
|
await checkCommentNotification(servers[0], comment, 'absence')
|
|
}
|
|
})
|
|
|
|
it('Should list all the videos with another user', async function () {
|
|
return checkAllVideos(servers[0], userToken1)
|
|
})
|
|
|
|
it('Should list blocked accounts', async function () {
|
|
{
|
|
const body = await command.listMyAccountBlocklist({ start: 0, count: 1, sort: 'createdAt' })
|
|
expect(body.total).to.equal(2)
|
|
|
|
const block = body.data[0]
|
|
expect(block.byAccount.displayName).to.equal('root')
|
|
expect(block.byAccount.name).to.equal('root')
|
|
expect(block.blockedAccount.displayName).to.equal('user2')
|
|
expect(block.blockedAccount.name).to.equal('user2')
|
|
expect(block.blockedAccount.host).to.equal('localhost:' + servers[1].port)
|
|
}
|
|
|
|
{
|
|
const body = await command.listMyAccountBlocklist({ start: 1, count: 2, sort: 'createdAt' })
|
|
expect(body.total).to.equal(2)
|
|
|
|
const block = body.data[0]
|
|
expect(block.byAccount.displayName).to.equal('root')
|
|
expect(block.byAccount.name).to.equal('root')
|
|
expect(block.blockedAccount.displayName).to.equal('user1')
|
|
expect(block.blockedAccount.name).to.equal('user1')
|
|
expect(block.blockedAccount.host).to.equal('localhost:' + servers[0].port)
|
|
}
|
|
})
|
|
|
|
it('Should get blocked status', async function () {
|
|
const remoteHandle = 'user2@' + servers[1].host
|
|
const localHandle = 'user1@' + servers[0].host
|
|
const unknownHandle = 'user5@' + servers[0].host
|
|
|
|
{
|
|
const status = await command.getStatus({ accounts: [ remoteHandle ] })
|
|
expect(Object.keys(status.accounts)).to.have.lengthOf(1)
|
|
expect(status.accounts[remoteHandle].blockedByUser).to.be.false
|
|
expect(status.accounts[remoteHandle].blockedByServer).to.be.false
|
|
|
|
expect(Object.keys(status.hosts)).to.have.lengthOf(0)
|
|
}
|
|
|
|
{
|
|
const status = await command.getStatus({ token: servers[0].accessToken, accounts: [ remoteHandle ] })
|
|
expect(Object.keys(status.accounts)).to.have.lengthOf(1)
|
|
expect(status.accounts[remoteHandle].blockedByUser).to.be.true
|
|
expect(status.accounts[remoteHandle].blockedByServer).to.be.false
|
|
|
|
expect(Object.keys(status.hosts)).to.have.lengthOf(0)
|
|
}
|
|
|
|
{
|
|
const status = await command.getStatus({ token: servers[0].accessToken, accounts: [ localHandle, remoteHandle, unknownHandle ] })
|
|
expect(Object.keys(status.accounts)).to.have.lengthOf(3)
|
|
|
|
for (const handle of [ localHandle, remoteHandle ]) {
|
|
expect(status.accounts[handle].blockedByUser).to.be.true
|
|
expect(status.accounts[handle].blockedByServer).to.be.false
|
|
}
|
|
|
|
expect(status.accounts[unknownHandle].blockedByUser).to.be.false
|
|
expect(status.accounts[unknownHandle].blockedByServer).to.be.false
|
|
|
|
expect(Object.keys(status.hosts)).to.have.lengthOf(0)
|
|
}
|
|
})
|
|
|
|
it('Should not allow a remote blocked user to comment my videos', async function () {
|
|
this.timeout(60000)
|
|
|
|
{
|
|
await commentsCommand[1].createThread({ token: userToken2, videoId: videoUUID3, text: 'comment user 2' })
|
|
await waitJobs(servers)
|
|
|
|
await commentsCommand[0].createThread({ token: servers[0].accessToken, videoId: videoUUID3, text: 'uploader' })
|
|
await waitJobs(servers)
|
|
|
|
const commentId = await commentsCommand[1].findCommentId({ videoId: videoUUID3, text: 'uploader' })
|
|
const message = 'reply by user 2'
|
|
const reply = await commentsCommand[1].addReply({ token: userToken2, videoId: videoUUID3, toCommentId: commentId, text: message })
|
|
await commentsCommand[1].addReply({ videoId: videoUUID3, toCommentId: reply.id, text: 'another reply' })
|
|
|
|
await waitJobs(servers)
|
|
}
|
|
|
|
// Server 2 has all the comments
|
|
{
|
|
const { data } = await commentsCommand[1].listThreads({ videoId: videoUUID3, count: 25, sort: '-createdAt' })
|
|
|
|
expect(data).to.have.lengthOf(2)
|
|
expect(data[0].text).to.equal('uploader')
|
|
expect(data[1].text).to.equal('comment user 2')
|
|
|
|
const tree = await commentsCommand[1].getThread({ videoId: videoUUID3, threadId: data[0].id })
|
|
expect(tree.children).to.have.lengthOf(1)
|
|
expect(tree.children[0].comment.text).to.equal('reply by user 2')
|
|
expect(tree.children[0].children).to.have.lengthOf(1)
|
|
expect(tree.children[0].children[0].comment.text).to.equal('another reply')
|
|
}
|
|
|
|
// Server 1 and 3 should only have uploader comments
|
|
for (const server of [ servers[0], servers[2] ]) {
|
|
const { data } = await server.comments.listThreads({ videoId: videoUUID3, count: 25, sort: '-createdAt' })
|
|
|
|
expect(data).to.have.lengthOf(1)
|
|
expect(data[0].text).to.equal('uploader')
|
|
|
|
const tree = await server.comments.getThread({ videoId: videoUUID3, threadId: data[0].id })
|
|
|
|
if (server.serverNumber === 1) expect(tree.children).to.have.lengthOf(0)
|
|
else expect(tree.children).to.have.lengthOf(1)
|
|
}
|
|
})
|
|
|
|
it('Should unblock the remote account', async function () {
|
|
await command.removeFromMyBlocklist({ account: 'user2@localhost:' + servers[1].port })
|
|
})
|
|
|
|
it('Should display its videos', async function () {
|
|
const { data } = await servers[0].videos.listWithToken()
|
|
expect(data).to.have.lengthOf(4)
|
|
|
|
const v = data.find(v => v.name === 'video user 2')
|
|
expect(v).not.to.be.undefined
|
|
})
|
|
|
|
it('Should display its comments on my video', async function () {
|
|
for (const server of servers) {
|
|
const { data } = await server.comments.listThreads({ videoId: videoUUID3, count: 25, sort: '-createdAt' })
|
|
|
|
// Server 3 should not have 2 comment threads, because server 1 did not forward the server 2 comment
|
|
if (server.serverNumber === 3) {
|
|
expect(data).to.have.lengthOf(1)
|
|
continue
|
|
}
|
|
|
|
expect(data).to.have.lengthOf(2)
|
|
expect(data[0].text).to.equal('uploader')
|
|
expect(data[1].text).to.equal('comment user 2')
|
|
|
|
const tree = await server.comments.getThread({ videoId: videoUUID3, threadId: data[0].id })
|
|
expect(tree.children).to.have.lengthOf(1)
|
|
expect(tree.children[0].comment.text).to.equal('reply by user 2')
|
|
expect(tree.children[0].children).to.have.lengthOf(1)
|
|
expect(tree.children[0].children[0].comment.text).to.equal('another reply')
|
|
}
|
|
})
|
|
|
|
it('Should unblock the local account', async function () {
|
|
await command.removeFromMyBlocklist({ account: 'user1' })
|
|
})
|
|
|
|
it('Should display its comments', function () {
|
|
return checkAllComments(servers[0], servers[0].accessToken, videoUUID1)
|
|
})
|
|
|
|
it('Should have a notification from a non blocked account', async function () {
|
|
this.timeout(20000)
|
|
|
|
{
|
|
const comment = { server: servers[1], token: userToken2, videoUUID: videoUUID1, text: 'displayed comment' }
|
|
await checkCommentNotification(servers[0], comment, 'presence')
|
|
}
|
|
|
|
{
|
|
const comment = {
|
|
server: servers[0],
|
|
token: userToken1,
|
|
videoUUID: videoUUID2,
|
|
text: 'hello @root@localhost:' + servers[0].port
|
|
}
|
|
await checkCommentNotification(servers[0], comment, 'presence')
|
|
}
|
|
})
|
|
})
|
|
|
|
describe('When managing server blocklist', function () {
|
|
|
|
it('Should list all videos', function () {
|
|
return checkAllVideos(servers[0], servers[0].accessToken)
|
|
})
|
|
|
|
it('Should list the comments', function () {
|
|
return checkAllComments(servers[0], servers[0].accessToken, videoUUID1)
|
|
})
|
|
|
|
it('Should block a remote server', async function () {
|
|
await command.addToMyBlocklist({ server: 'localhost:' + servers[1].port })
|
|
})
|
|
|
|
it('Should hide its videos', async function () {
|
|
const { data } = await servers[0].videos.listWithToken()
|
|
|
|
expect(data).to.have.lengthOf(3)
|
|
|
|
const v1 = data.find(v => v.name === 'video user 2')
|
|
const v2 = data.find(v => v.name === 'video server 2')
|
|
|
|
expect(v1).to.be.undefined
|
|
expect(v2).to.be.undefined
|
|
})
|
|
|
|
it('Should list all the videos with another user', async function () {
|
|
return checkAllVideos(servers[0], userToken1)
|
|
})
|
|
|
|
it('Should hide its comments', async function () {
|
|
this.timeout(10000)
|
|
|
|
const { id } = await commentsCommand[1].createThread({ token: userToken2, videoId: videoUUID1, text: 'hidden comment 2' })
|
|
|
|
await waitJobs(servers)
|
|
|
|
await checkAllComments(servers[0], servers[0].accessToken, videoUUID1)
|
|
|
|
await commentsCommand[1].delete({ token: userToken2, videoId: videoUUID1, commentId: id })
|
|
})
|
|
|
|
it('Should not have notifications from blocked server', async function () {
|
|
this.timeout(20000)
|
|
|
|
{
|
|
const comment = { server: servers[1], token: userToken2, videoUUID: videoUUID1, text: 'hidden comment' }
|
|
await checkCommentNotification(servers[0], comment, 'absence')
|
|
}
|
|
|
|
{
|
|
const comment = {
|
|
server: servers[1],
|
|
token: userToken2,
|
|
videoUUID: videoUUID1,
|
|
text: 'hello @root@localhost:' + servers[0].port
|
|
}
|
|
await checkCommentNotification(servers[0], comment, 'absence')
|
|
}
|
|
})
|
|
|
|
it('Should list blocked servers', async function () {
|
|
const body = await command.listMyServerBlocklist({ start: 0, count: 1, sort: 'createdAt' })
|
|
expect(body.total).to.equal(1)
|
|
|
|
const block = body.data[0]
|
|
expect(block.byAccount.displayName).to.equal('root')
|
|
expect(block.byAccount.name).to.equal('root')
|
|
expect(block.blockedServer.host).to.equal('localhost:' + servers[1].port)
|
|
})
|
|
|
|
it('Should get blocklist status', async function () {
|
|
const blockedServer = servers[1].host
|
|
const notBlockedServer = 'example.com'
|
|
|
|
{
|
|
const status = await command.getStatus({ hosts: [ blockedServer, notBlockedServer ] })
|
|
expect(Object.keys(status.accounts)).to.have.lengthOf(0)
|
|
|
|
expect(Object.keys(status.hosts)).to.have.lengthOf(2)
|
|
expect(status.hosts[blockedServer].blockedByUser).to.be.false
|
|
expect(status.hosts[blockedServer].blockedByServer).to.be.false
|
|
|
|
expect(status.hosts[notBlockedServer].blockedByUser).to.be.false
|
|
expect(status.hosts[notBlockedServer].blockedByServer).to.be.false
|
|
}
|
|
|
|
{
|
|
const status = await command.getStatus({ token: servers[0].accessToken, hosts: [ blockedServer, notBlockedServer ] })
|
|
expect(Object.keys(status.accounts)).to.have.lengthOf(0)
|
|
|
|
expect(Object.keys(status.hosts)).to.have.lengthOf(2)
|
|
expect(status.hosts[blockedServer].blockedByUser).to.be.true
|
|
expect(status.hosts[blockedServer].blockedByServer).to.be.false
|
|
|
|
expect(status.hosts[notBlockedServer].blockedByUser).to.be.false
|
|
expect(status.hosts[notBlockedServer].blockedByServer).to.be.false
|
|
}
|
|
})
|
|
|
|
it('Should unblock the remote server', async function () {
|
|
await command.removeFromMyBlocklist({ server: 'localhost:' + servers[1].port })
|
|
})
|
|
|
|
it('Should display its videos', function () {
|
|
return checkAllVideos(servers[0], servers[0].accessToken)
|
|
})
|
|
|
|
it('Should display its comments', function () {
|
|
return checkAllComments(servers[0], servers[0].accessToken, videoUUID1)
|
|
})
|
|
|
|
it('Should have notification from unblocked server', async function () {
|
|
this.timeout(20000)
|
|
|
|
{
|
|
const comment = { server: servers[1], token: userToken2, videoUUID: videoUUID1, text: 'displayed comment' }
|
|
await checkCommentNotification(servers[0], comment, 'presence')
|
|
}
|
|
|
|
{
|
|
const comment = {
|
|
server: servers[1],
|
|
token: userToken2,
|
|
videoUUID: videoUUID1,
|
|
text: 'hello @root@localhost:' + servers[0].port
|
|
}
|
|
await checkCommentNotification(servers[0], comment, 'presence')
|
|
}
|
|
})
|
|
})
|
|
})
|
|
|
|
describe('Server blocklist', function () {
|
|
|
|
describe('When managing account blocklist', function () {
|
|
it('Should list all videos', async function () {
|
|
for (const token of [ userModeratorToken, servers[0].accessToken ]) {
|
|
await checkAllVideos(servers[0], token)
|
|
}
|
|
})
|
|
|
|
it('Should list the comments', async function () {
|
|
for (const token of [ userModeratorToken, servers[0].accessToken ]) {
|
|
await checkAllComments(servers[0], token, videoUUID1)
|
|
}
|
|
})
|
|
|
|
it('Should block a remote account', async function () {
|
|
await command.addToServerBlocklist({ account: 'user2@localhost:' + servers[1].port })
|
|
})
|
|
|
|
it('Should hide its videos', async function () {
|
|
for (const token of [ userModeratorToken, servers[0].accessToken ]) {
|
|
const { data } = await servers[0].videos.listWithToken({ token })
|
|
|
|
expect(data).to.have.lengthOf(4)
|
|
|
|
const v = data.find(v => v.name === 'video user 2')
|
|
expect(v).to.be.undefined
|
|
}
|
|
})
|
|
|
|
it('Should block a local account', async function () {
|
|
await command.addToServerBlocklist({ account: 'user1' })
|
|
})
|
|
|
|
it('Should hide its videos', async function () {
|
|
for (const token of [ userModeratorToken, servers[0].accessToken ]) {
|
|
const { data } = await servers[0].videos.listWithToken({ token })
|
|
|
|
expect(data).to.have.lengthOf(3)
|
|
|
|
const v = data.find(v => v.name === 'video user 1')
|
|
expect(v).to.be.undefined
|
|
}
|
|
})
|
|
|
|
it('Should hide its comments', async function () {
|
|
for (const token of [ userModeratorToken, servers[0].accessToken ]) {
|
|
const { data } = await commentsCommand[0].listThreads({ videoId: videoUUID1, count: 20, sort: '-createdAt', token })
|
|
const threads = data.filter(t => t.isDeleted === false)
|
|
|
|
expect(threads).to.have.lengthOf(1)
|
|
expect(threads[0].totalReplies).to.equal(1)
|
|
|
|
const t = threads.find(t => t.text === 'comment user 1')
|
|
expect(t).to.be.undefined
|
|
|
|
for (const thread of threads) {
|
|
const tree = await commentsCommand[0].getThread({ videoId: videoUUID1, threadId: thread.id, token })
|
|
expect(tree.children).to.have.lengthOf(0)
|
|
}
|
|
}
|
|
})
|
|
|
|
it('Should not have notification from blocked accounts by instance', async function () {
|
|
this.timeout(20000)
|
|
|
|
{
|
|
const comment = { server: servers[0], token: userToken1, videoUUID: videoUUID1, text: 'hidden comment' }
|
|
await checkCommentNotification(servers[0], comment, 'absence')
|
|
}
|
|
|
|
{
|
|
const comment = {
|
|
server: servers[1],
|
|
token: userToken2,
|
|
videoUUID: videoUUID1,
|
|
text: 'hello @root@localhost:' + servers[0].port
|
|
}
|
|
await checkCommentNotification(servers[0], comment, 'absence')
|
|
}
|
|
})
|
|
|
|
it('Should list blocked accounts', async function () {
|
|
{
|
|
const body = await command.listServerAccountBlocklist({ start: 0, count: 1, sort: 'createdAt' })
|
|
expect(body.total).to.equal(2)
|
|
|
|
const block = body.data[0]
|
|
expect(block.byAccount.displayName).to.equal('peertube')
|
|
expect(block.byAccount.name).to.equal('peertube')
|
|
expect(block.blockedAccount.displayName).to.equal('user2')
|
|
expect(block.blockedAccount.name).to.equal('user2')
|
|
expect(block.blockedAccount.host).to.equal('localhost:' + servers[1].port)
|
|
}
|
|
|
|
{
|
|
const body = await command.listServerAccountBlocklist({ start: 1, count: 2, sort: 'createdAt' })
|
|
expect(body.total).to.equal(2)
|
|
|
|
const block = body.data[0]
|
|
expect(block.byAccount.displayName).to.equal('peertube')
|
|
expect(block.byAccount.name).to.equal('peertube')
|
|
expect(block.blockedAccount.displayName).to.equal('user1')
|
|
expect(block.blockedAccount.name).to.equal('user1')
|
|
expect(block.blockedAccount.host).to.equal('localhost:' + servers[0].port)
|
|
}
|
|
})
|
|
|
|
it('Should get blocked status', async function () {
|
|
const remoteHandle = 'user2@' + servers[1].host
|
|
const localHandle = 'user1@' + servers[0].host
|
|
const unknownHandle = 'user5@' + servers[0].host
|
|
|
|
for (const token of [ undefined, servers[0].accessToken ]) {
|
|
const status = await command.getStatus({ token, accounts: [ localHandle, remoteHandle, unknownHandle ] })
|
|
expect(Object.keys(status.accounts)).to.have.lengthOf(3)
|
|
|
|
for (const handle of [ localHandle, remoteHandle ]) {
|
|
expect(status.accounts[handle].blockedByUser).to.be.false
|
|
expect(status.accounts[handle].blockedByServer).to.be.true
|
|
}
|
|
|
|
expect(status.accounts[unknownHandle].blockedByUser).to.be.false
|
|
expect(status.accounts[unknownHandle].blockedByServer).to.be.false
|
|
|
|
expect(Object.keys(status.hosts)).to.have.lengthOf(0)
|
|
}
|
|
})
|
|
|
|
it('Should unblock the remote account', async function () {
|
|
await command.removeFromServerBlocklist({ account: 'user2@localhost:' + servers[1].port })
|
|
})
|
|
|
|
it('Should display its videos', async function () {
|
|
for (const token of [ userModeratorToken, servers[0].accessToken ]) {
|
|
const { data } = await servers[0].videos.listWithToken({ token })
|
|
expect(data).to.have.lengthOf(4)
|
|
|
|
const v = data.find(v => v.name === 'video user 2')
|
|
expect(v).not.to.be.undefined
|
|
}
|
|
})
|
|
|
|
it('Should unblock the local account', async function () {
|
|
await command.removeFromServerBlocklist({ account: 'user1' })
|
|
})
|
|
|
|
it('Should display its comments', async function () {
|
|
for (const token of [ userModeratorToken, servers[0].accessToken ]) {
|
|
await checkAllComments(servers[0], token, videoUUID1)
|
|
}
|
|
})
|
|
|
|
it('Should have notifications from unblocked accounts', async function () {
|
|
this.timeout(20000)
|
|
|
|
{
|
|
const comment = { server: servers[0], token: userToken1, videoUUID: videoUUID1, text: 'displayed comment' }
|
|
await checkCommentNotification(servers[0], comment, 'presence')
|
|
}
|
|
|
|
{
|
|
const comment = {
|
|
server: servers[1],
|
|
token: userToken2,
|
|
videoUUID: videoUUID1,
|
|
text: 'hello @root@localhost:' + servers[0].port
|
|
}
|
|
await checkCommentNotification(servers[0], comment, 'presence')
|
|
}
|
|
})
|
|
})
|
|
|
|
describe('When managing server blocklist', function () {
|
|
|
|
it('Should list all videos', async function () {
|
|
for (const token of [ userModeratorToken, servers[0].accessToken ]) {
|
|
await checkAllVideos(servers[0], token)
|
|
}
|
|
})
|
|
|
|
it('Should list the comments', async function () {
|
|
for (const token of [ userModeratorToken, servers[0].accessToken ]) {
|
|
await checkAllComments(servers[0], token, videoUUID1)
|
|
}
|
|
})
|
|
|
|
it('Should block a remote server', async function () {
|
|
await command.addToServerBlocklist({ server: 'localhost:' + servers[1].port })
|
|
})
|
|
|
|
it('Should hide its videos', async function () {
|
|
for (const token of [ userModeratorToken, servers[0].accessToken ]) {
|
|
const requests = [
|
|
servers[0].videos.list(),
|
|
servers[0].videos.listWithToken({ token })
|
|
]
|
|
|
|
for (const req of requests) {
|
|
const { data } = await req
|
|
expect(data).to.have.lengthOf(3)
|
|
|
|
const v1 = data.find(v => v.name === 'video user 2')
|
|
const v2 = data.find(v => v.name === 'video server 2')
|
|
|
|
expect(v1).to.be.undefined
|
|
expect(v2).to.be.undefined
|
|
}
|
|
}
|
|
})
|
|
|
|
it('Should hide its comments', async function () {
|
|
this.timeout(10000)
|
|
|
|
const { id } = await commentsCommand[1].createThread({ token: userToken2, videoId: videoUUID1, text: 'hidden comment 2' })
|
|
|
|
await waitJobs(servers)
|
|
|
|
await checkAllComments(servers[0], servers[0].accessToken, videoUUID1)
|
|
|
|
await commentsCommand[1].delete({ token: userToken2, videoId: videoUUID1, commentId: id })
|
|
})
|
|
|
|
it('Should not have notification from blocked instances by instance', async function () {
|
|
this.timeout(50000)
|
|
|
|
{
|
|
const comment = { server: servers[1], token: userToken2, videoUUID: videoUUID1, text: 'hidden comment' }
|
|
await checkCommentNotification(servers[0], comment, 'absence')
|
|
}
|
|
|
|
{
|
|
const comment = {
|
|
server: servers[1],
|
|
token: userToken2,
|
|
videoUUID: videoUUID1,
|
|
text: 'hello @root@localhost:' + servers[0].port
|
|
}
|
|
await checkCommentNotification(servers[0], comment, 'absence')
|
|
}
|
|
|
|
{
|
|
const now = new Date()
|
|
await servers[1].follows.unfollow({ target: servers[0] })
|
|
await waitJobs(servers)
|
|
await servers[1].follows.follow({ hosts: [ servers[0].host ] })
|
|
|
|
await waitJobs(servers)
|
|
|
|
const { data } = await servers[0].notifications.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)
|
|
}
|
|
})
|
|
|
|
it('Should list blocked servers', async function () {
|
|
const body = await command.listServerServerBlocklist({ start: 0, count: 1, sort: 'createdAt' })
|
|
expect(body.total).to.equal(1)
|
|
|
|
const block = body.data[0]
|
|
expect(block.byAccount.displayName).to.equal('peertube')
|
|
expect(block.byAccount.name).to.equal('peertube')
|
|
expect(block.blockedServer.host).to.equal('localhost:' + servers[1].port)
|
|
})
|
|
|
|
it('Should get blocklist status', async function () {
|
|
const blockedServer = servers[1].host
|
|
const notBlockedServer = 'example.com'
|
|
|
|
for (const token of [ undefined, servers[0].accessToken ]) {
|
|
const status = await command.getStatus({ token, hosts: [ blockedServer, notBlockedServer ] })
|
|
expect(Object.keys(status.accounts)).to.have.lengthOf(0)
|
|
|
|
expect(Object.keys(status.hosts)).to.have.lengthOf(2)
|
|
expect(status.hosts[blockedServer].blockedByUser).to.be.false
|
|
expect(status.hosts[blockedServer].blockedByServer).to.be.true
|
|
|
|
expect(status.hosts[notBlockedServer].blockedByUser).to.be.false
|
|
expect(status.hosts[notBlockedServer].blockedByServer).to.be.false
|
|
}
|
|
})
|
|
|
|
it('Should unblock the remote server', async function () {
|
|
await command.removeFromServerBlocklist({ server: 'localhost:' + servers[1].port })
|
|
})
|
|
|
|
it('Should list all videos', async function () {
|
|
for (const token of [ userModeratorToken, servers[0].accessToken ]) {
|
|
await checkAllVideos(servers[0], token)
|
|
}
|
|
})
|
|
|
|
it('Should list the comments', async function () {
|
|
for (const token of [ userModeratorToken, servers[0].accessToken ]) {
|
|
await checkAllComments(servers[0], token, videoUUID1)
|
|
}
|
|
})
|
|
|
|
it('Should have notification from unblocked instances', async function () {
|
|
this.timeout(50000)
|
|
|
|
{
|
|
const comment = { server: servers[1], token: userToken2, videoUUID: videoUUID1, text: 'displayed comment' }
|
|
await checkCommentNotification(servers[0], comment, 'presence')
|
|
}
|
|
|
|
{
|
|
const comment = {
|
|
server: servers[1],
|
|
token: userToken2,
|
|
videoUUID: videoUUID1,
|
|
text: 'hello @root@localhost:' + servers[0].port
|
|
}
|
|
await checkCommentNotification(servers[0], comment, 'presence')
|
|
}
|
|
|
|
{
|
|
const now = new Date()
|
|
await servers[1].follows.unfollow({ target: servers[0] })
|
|
await waitJobs(servers)
|
|
await servers[1].follows.follow({ hosts: [ servers[0].host ] })
|
|
|
|
await waitJobs(servers)
|
|
|
|
const { data } = await servers[0].notifications.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)
|
|
}
|
|
})
|
|
})
|
|
})
|
|
|
|
after(async function () {
|
|
await cleanupTests(servers)
|
|
})
|
|
})
|