Verified Commit 511765c9 authored by Chocobozzz's avatar Chocobozzz
Browse files

Remove comment federation by video owner

parent fd2ddcae
Pipeline #157135 passed with stage
in 62 minutes and 24 seconds
...@@ -27,6 +27,10 @@ import { auditLoggerFactory, CommentAuditView, getAuditIdFromRes } from '../../. ...@@ -27,6 +27,10 @@ import { auditLoggerFactory, CommentAuditView, getAuditIdFromRes } from '../../.
import { AccountModel } from '../../../models/account/account' import { AccountModel } from '../../../models/account/account'
import { Notifier } from '../../../lib/notifier' import { Notifier } from '../../../lib/notifier'
import { Hooks } from '../../../lib/plugins/hooks' import { Hooks } from '../../../lib/plugins/hooks'
import { ActorModel } from '../../../models/activitypub/actor'
import { VideoChannelModel } from '../../../models/video/video-channel'
import { VideoModel } from '../../../models/video/video'
import { sendDeleteVideoComment } from '../../../lib/activitypub/send'
const auditLogger = auditLoggerFactory('comments') const auditLogger = auditLoggerFactory('comments')
const videoCommentRouter = express.Router() const videoCommentRouter = express.Router()
...@@ -179,6 +183,10 @@ async function removeVideoComment (req: express.Request, res: express.Response) ...@@ -179,6 +183,10 @@ async function removeVideoComment (req: express.Request, res: express.Response)
await sequelizeTypescript.transaction(async t => { await sequelizeTypescript.transaction(async t => {
await videoCommentInstance.destroy({ transaction: t }) await videoCommentInstance.destroy({ transaction: t })
if (videoCommentInstance.isOwned() || videoCommentInstance.Video.isOwned()) {
await sendDeleteVideoComment(videoCommentInstance, t)
}
}) })
auditLogger.delete(getAuditIdFromRes(res), new CommentAuditView(videoCommentInstance.toFormattedJSON())) auditLogger.delete(getAuditIdFromRes(res), new CommentAuditView(videoCommentInstance.toFormattedJSON()))
......
...@@ -34,7 +34,7 @@ async function processDeleteActivity (options: APProcessorOptions<ActivityDelete ...@@ -34,7 +34,7 @@ async function processDeleteActivity (options: APProcessorOptions<ActivityDelete
} }
{ {
const videoCommentInstance = await VideoCommentModel.loadByUrlAndPopulateAccount(objectUrl) const videoCommentInstance = await VideoCommentModel.loadByUrlAndPopulateAccountAndVideo(objectUrl)
if (videoCommentInstance) { if (videoCommentInstance) {
return retryTransactionWrapper(processDeleteVideoComment, byActor, videoCommentInstance, activity) return retryTransactionWrapper(processDeleteVideoComment, byActor, videoCommentInstance, activity)
} }
...@@ -121,8 +121,8 @@ function processDeleteVideoComment (byActor: ActorModel, videoComment: VideoComm ...@@ -121,8 +121,8 @@ function processDeleteVideoComment (byActor: ActorModel, videoComment: VideoComm
logger.debug('Removing remote video comment "%s".', videoComment.url) logger.debug('Removing remote video comment "%s".', videoComment.url)
return sequelizeTypescript.transaction(async t => { return sequelizeTypescript.transaction(async t => {
if (videoComment.Account.id !== byActor.Account.id) { if (byActor.Account.id !== videoComment.Account.id && byActor.Account.id !== videoComment.Video.VideoChannel.accountId) {
throw new Error('Account ' + byActor.url + ' does not own video comment ' + videoComment.url) throw new Error(`Account ${byActor.url} does not own video comment ${videoComment.url} or video ${videoComment.Video.url}`)
} }
await videoComment.destroy({ transaction: t }) await videoComment.destroy({ transaction: t })
......
...@@ -48,7 +48,10 @@ async function sendDeleteVideoComment (videoComment: VideoCommentModel, t: Trans ...@@ -48,7 +48,10 @@ async function sendDeleteVideoComment (videoComment: VideoCommentModel, t: Trans
const isVideoOrigin = videoComment.Video.isOwned() const isVideoOrigin = videoComment.Video.isOwned()
const url = getDeleteActivityPubUrl(videoComment.url) const url = getDeleteActivityPubUrl(videoComment.url)
const byActor = videoComment.Account.Actor const byActor = videoComment.isOwned()
? videoComment.Account.Actor
: videoComment.Video.VideoChannel.Account.Actor
const threadParentComments = await VideoCommentModel.listThreadParentComments(videoComment, t) const threadParentComments = await VideoCommentModel.listThreadParentComments(videoComment, t)
const actorsInvolvedInComment = await getActorsInvolvedInVideo(videoComment.Video, t) const actorsInvolvedInComment = await getActorsInvolvedInVideo(videoComment.Video, t)
......
...@@ -105,6 +105,10 @@ enum ScopeNames { ...@@ -105,6 +105,10 @@ enum ScopeNames {
model: VideoChannelModel.unscoped(), model: VideoChannelModel.unscoped(),
required: true, required: true,
include: [ include: [
{
model: ActorModel,
required: true
},
{ {
model: AccountModel, model: AccountModel,
required: true, required: true,
...@@ -208,41 +212,6 @@ export class VideoCommentModel extends Model<VideoCommentModel> { ...@@ -208,41 +212,6 @@ export class VideoCommentModel extends Model<VideoCommentModel> {
}) })
Account: AccountModel Account: AccountModel
@BeforeDestroy
static async sendDeleteIfOwned (instance: VideoCommentModel, options) {
if (!instance.Account || !instance.Account.Actor) {
instance.Account = await instance.$get('Account', {
include: [ ActorModel ],
transaction: options.transaction
}) as AccountModel
}
if (!instance.Video) {
instance.Video = await instance.$get('Video', {
include: [
{
model: VideoChannelModel,
include: [
{
model: AccountModel,
include: [
{
model: ActorModel
}
]
}
]
}
],
transaction: options.transaction
}) as VideoModel
}
if (instance.isOwned()) {
await sendDeleteVideoComment(instance, options.transaction)
}
}
static loadById (id: number, t?: Transaction) { static loadById (id: number, t?: Transaction) {
const query: FindOptions = { const query: FindOptions = {
where: { where: {
...@@ -269,7 +238,7 @@ export class VideoCommentModel extends Model<VideoCommentModel> { ...@@ -269,7 +238,7 @@ export class VideoCommentModel extends Model<VideoCommentModel> {
.findOne(query) .findOne(query)
} }
static loadByUrlAndPopulateAccount (url: string, t?: Transaction) { static loadByUrlAndPopulateAccountAndVideo (url: string, t?: Transaction) {
const query: FindOptions = { const query: FindOptions = {
where: { where: {
url url
...@@ -278,7 +247,7 @@ export class VideoCommentModel extends Model<VideoCommentModel> { ...@@ -278,7 +247,7 @@ export class VideoCommentModel extends Model<VideoCommentModel> {
if (t !== undefined) query.transaction = t if (t !== undefined) query.transaction = t
return VideoCommentModel.scope([ ScopeNames.WITH_ACCOUNT ]).findOne(query) return VideoCommentModel.scope([ ScopeNames.WITH_ACCOUNT, ScopeNames.WITH_VIDEO ]).findOne(query)
} }
static loadByUrlAndPopulateReplyAndVideoUrlAndAccount (url: string, t?: Transaction) { static loadByUrlAndPopulateReplyAndVideoUrlAndAccount (url: string, t?: Transaction) {
......
...@@ -500,20 +500,18 @@ describe('Test multiple servers', function () { ...@@ -500,20 +500,18 @@ describe('Test multiple servers', function () {
it('Should view multiple videos on owned servers', async function () { it('Should view multiple videos on owned servers', async function () {
this.timeout(30000) this.timeout(30000)
const tasks: Promise<any>[] = []
await viewVideo(servers[2].url, localVideosServer3[0])
await viewVideo(servers[2].url, localVideosServer3[0])
await viewVideo(servers[2].url, localVideosServer3[0]) await viewVideo(servers[2].url, localVideosServer3[0])
await viewVideo(servers[2].url, localVideosServer3[1]) await wait(1000)
await Promise.all(tasks)
await waitJobs(servers)
await viewVideo(servers[2].url, localVideosServer3[0]) await viewVideo(servers[2].url, localVideosServer3[0])
await viewVideo(servers[2].url, localVideosServer3[1])
await waitJobs(servers) await wait(1000)
await viewVideo(servers[2].url, localVideosServer3[0]) await Promise.all([
viewVideo(servers[2].url, localVideosServer3[0]),
viewVideo(servers[2].url, localVideosServer3[0])
])
await waitJobs(servers) await waitJobs(servers)
...@@ -894,14 +892,14 @@ describe('Test multiple servers', function () { ...@@ -894,14 +892,14 @@ describe('Test multiple servers', function () {
it('Should delete the thread comments', async function () { it('Should delete the thread comments', async function () {
this.timeout(10000) this.timeout(10000)
const res1 = await getVideoCommentThreads(servers[0].url, videoUUID, 0, 5) const res = await getVideoCommentThreads(servers[ 0 ].url, videoUUID, 0, 5)
const threadId = res1.body.data.find(c => c.text === 'my super first comment').id const threadId = res.body.data.find(c => c.text === 'my super first comment').id
await deleteVideoComment(servers[0].url, servers[0].accessToken, videoUUID, threadId) await deleteVideoComment(servers[ 0 ].url, servers[ 0 ].accessToken, videoUUID, threadId)
await waitJobs(servers) await waitJobs(servers)
}) })
it('Should have the thread comments deleted on other servers too', async function () { it('Should have the threads deleted on other servers too', async function () {
for (const server of servers) { for (const server of servers) {
const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5) const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5)
...@@ -922,6 +920,23 @@ describe('Test multiple servers', function () { ...@@ -922,6 +920,23 @@ describe('Test multiple servers', function () {
} }
}) })
it('Should delete a remote thread by the origin server', async function () {
const res = await getVideoCommentThreads(servers[ 0 ].url, videoUUID, 0, 5)
const threadId = res.body.data.find(c => c.text === 'my super second comment').id
await deleteVideoComment(servers[ 0 ].url, servers[ 0 ].accessToken, videoUUID, threadId)
await waitJobs(servers)
})
it('Should have the threads deleted on other servers too', async function () {
for (const server of servers) {
const res = await getVideoCommentThreads(server.url, videoUUID, 0, 5)
expect(res.body.total).to.equal(0)
expect(res.body.data).to.have.lengthOf(0)
}
})
it('Should disable comments and download', async function () { it('Should disable comments and download', async function () {
this.timeout(20000) this.timeout(20000)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment