import { ActivityDelete } from '../../../../shared/models/activitypub'
import { retryTransactionWrapper } from '../../../helpers/database-utils'
import { logger } from '../../../helpers/logger'
-import { sequelizeTypescript } from '../../../initializers'
-import { AccountModel } from '../../../models/account/account'
-import { ActorModel } from '../../../models/activitypub/actor'
+import { sequelizeTypescript } from '../../../initializers/database'
+import { ActorModel } from '../../../models/actor/actor'
import { VideoModel } from '../../../models/video/video'
-import { VideoChannelModel } from '../../../models/video/video-channel'
import { VideoCommentModel } from '../../../models/video/video-comment'
-import { getOrCreateActorAndServerAndModel } from '../actor'
+import { VideoPlaylistModel } from '../../../models/video/video-playlist'
+import { APProcessorOptions } from '../../../types/activitypub-processor.model'
+import {
+ MAccountActor,
+ MActor,
+ MActorFull,
+ MActorSignature,
+ MChannelAccountActor,
+ MChannelActor,
+ MCommentOwnerVideo
+} from '../../../types/models'
+import { forwardVideoRelatedActivity } from '../send/shared/send-utils'
+
+async function processDeleteActivity (options: APProcessorOptions<ActivityDelete>) {
+ const { activity, byActor } = options
-async function processDeleteActivity (activity: ActivityDelete) {
const objectUrl = typeof activity.object === 'string' ? activity.object : activity.object.id
if (activity.actor === objectUrl) {
- let actor = await ActorModel.loadByUrl(activity.actor)
- if (!actor) return
+ // We need more attributes (all the account and channel)
+ const byActorFull = await ActorModel.loadByUrlAndPopulateAccountAndChannel(byActor.url)
- if (actor.type === 'Person') {
- if (!actor.Account) throw new Error('Actor ' + actor.url + ' is a person but we cannot find it in database.')
+ if (byActorFull.type === 'Person') {
+ if (!byActorFull.Account) throw new Error('Actor ' + byActorFull.url + ' is a person but we cannot find it in database.')
- actor.Account.Actor = await actor.Account.$get('Actor') as ActorModel
- return processDeleteAccount(actor.Account)
- } else if (actor.type === 'Group') {
- if (!actor.VideoChannel) throw new Error('Actor ' + actor.url + ' is a group but we cannot find it in database.')
+ const accountToDelete = byActorFull.Account as MAccountActor
+ accountToDelete.Actor = byActorFull
- actor.VideoChannel.Actor = await actor.VideoChannel.$get('Actor') as ActorModel
- return processDeleteVideoChannel(actor.VideoChannel)
+ return retryTransactionWrapper(processDeleteAccount, accountToDelete)
+ } else if (byActorFull.type === 'Group') {
+ if (!byActorFull.VideoChannel) throw new Error('Actor ' + byActorFull.url + ' is a group but we cannot find it in database.')
+
+ const channelToDelete = byActorFull.VideoChannel as MChannelAccountActor & { Actor: MActorFull }
+ channelToDelete.Actor = byActorFull
+ return retryTransactionWrapper(processDeleteVideoChannel, channelToDelete)
}
}
- const actor = await getOrCreateActorAndServerAndModel(activity.actor)
{
- const videoCommentInstance = await VideoCommentModel.loadByUrlAndPopulateAccount(objectUrl)
+ const videoCommentInstance = await VideoCommentModel.loadByUrlAndPopulateAccountAndVideo(objectUrl)
if (videoCommentInstance) {
- return processDeleteVideoComment(actor, videoCommentInstance)
+ return retryTransactionWrapper(processDeleteVideoComment, byActor, videoCommentInstance, activity)
}
}
{
const videoInstance = await VideoModel.loadByUrlAndPopulateAccount(objectUrl)
if (videoInstance) {
- return processDeleteVideo(actor, videoInstance)
+ if (videoInstance.isOwned()) throw new Error(`Remote instance cannot delete owned video ${videoInstance.url}.`)
+
+ return retryTransactionWrapper(processDeleteVideo, byActor, videoInstance)
+ }
+ }
+
+ {
+ const videoPlaylist = await VideoPlaylistModel.loadByUrlAndPopulateAccount(objectUrl)
+ if (videoPlaylist) {
+ if (videoPlaylist.isOwned()) throw new Error(`Remote instance cannot delete owned playlist ${videoPlaylist.url}.`)
+
+ return retryTransactionWrapper(processDeleteVideoPlaylist, byActor, videoPlaylist)
}
}
- return
+ return undefined
}
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
-async function processDeleteVideo (actor: ActorModel, videoToDelete: VideoModel) {
- const options = {
- arguments: [ actor, videoToDelete ],
- errorMessage: 'Cannot remove the remote video with many retries.'
- }
-
- await retryTransactionWrapper(deleteRemoteVideo, options)
-}
-
-async function deleteRemoteVideo (actor: ActorModel, videoToDelete: VideoModel) {
+async function processDeleteVideo (actor: MActor, videoToDelete: VideoModel) {
logger.debug('Removing remote video "%s".', videoToDelete.uuid)
await sequelizeTypescript.transaction(async t => {
logger.info('Remote video with uuid %s removed.', videoToDelete.uuid)
}
-async function processDeleteAccount (accountToRemove: AccountModel) {
- const options = {
- arguments: [ accountToRemove ],
- errorMessage: 'Cannot remove the remote account with many retries.'
- }
+async function processDeleteVideoPlaylist (actor: MActor, playlistToDelete: VideoPlaylistModel) {
+ logger.debug('Removing remote video playlist "%s".', playlistToDelete.uuid)
+
+ await sequelizeTypescript.transaction(async t => {
+ if (playlistToDelete.OwnerAccount.Actor.id !== actor.id) {
+ throw new Error('Account ' + actor.url + ' does not own video playlist ' + playlistToDelete.url)
+ }
- await retryTransactionWrapper(deleteRemoteAccount, options)
+ await playlistToDelete.destroy({ transaction: t })
+ })
+
+ logger.info('Remote video playlist with uuid %s removed.', playlistToDelete.uuid)
}
-async function deleteRemoteAccount (accountToRemove: AccountModel) {
- logger.debug('Removing remote account "%s".', accountToRemove.Actor.uuid)
+async function processDeleteAccount (accountToRemove: MAccountActor) {
+ logger.debug('Removing remote account "%s".', accountToRemove.Actor.url)
await sequelizeTypescript.transaction(async t => {
await accountToRemove.destroy({ transaction: t })
})
- logger.info('Remote account with uuid %s removed.', accountToRemove.Actor.uuid)
+ logger.info('Remote account %s removed.', accountToRemove.Actor.url)
}
-async function processDeleteVideoChannel (videoChannelToRemove: VideoChannelModel) {
- const options = {
- arguments: [ videoChannelToRemove ],
- errorMessage: 'Cannot remove the remote video channel with many retries.'
- }
-
- await retryTransactionWrapper(deleteRemoteVideoChannel, options)
-}
-
-async function deleteRemoteVideoChannel (videoChannelToRemove: VideoChannelModel) {
- logger.debug('Removing remote video channel "%s".', videoChannelToRemove.Actor.uuid)
+async function processDeleteVideoChannel (videoChannelToRemove: MChannelActor) {
+ logger.debug('Removing remote video channel "%s".', videoChannelToRemove.Actor.url)
await sequelizeTypescript.transaction(async t => {
await videoChannelToRemove.destroy({ transaction: t })
})
- logger.info('Remote video channel with uuid %s removed.', videoChannelToRemove.Actor.uuid)
+ logger.info('Remote video channel %s removed.', videoChannelToRemove.Actor.url)
}
-async function processDeleteVideoComment (actor: ActorModel, videoComment: VideoCommentModel) {
- const options = {
- arguments: [ actor, videoComment ],
- errorMessage: 'Cannot remove the remote video comment with many retries.'
- }
-
- await retryTransactionWrapper(deleteRemoteVideoComment, options)
-}
+function processDeleteVideoComment (byActor: MActorSignature, videoComment: MCommentOwnerVideo, activity: ActivityDelete) {
+ // Already deleted
+ if (videoComment.isDeleted()) return Promise.resolve()
-function deleteRemoteVideoComment (actor: ActorModel, videoComment: VideoCommentModel) {
logger.debug('Removing remote video comment "%s".', videoComment.url)
return sequelizeTypescript.transaction(async t => {
- await videoComment.destroy({ transaction: t })
+ 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} or video ${videoComment.Video.url}`)
+ }
+
+ videoComment.markAsDeleted()
+
+ await videoComment.save({ transaction: t })
+
+ if (videoComment.Video.isOwned()) {
+ // Don't resend the activity to the sender
+ const exceptions = [ byActor ]
+ await forwardVideoRelatedActivity(activity, t, exceptions, videoComment.Video)
+ }
logger.info('Remote video comment %s removed.', videoComment.url)
})
projects / github / Chocobozzz / PeerTube.git / blobdiff