Delete actor too when deleting account/video channel

pull/837/head
Chocobozzz 2018-07-30 11:33:58 +02:00
parent e20015d744
commit e04551d796
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 42 additions and 34 deletions

View File

@ -16,8 +16,6 @@ import {
} from 'sequelize-typescript'
import { Account } from '../../../shared/models/actors'
import { isAccountDescriptionValid } from '../../helpers/custom-validators/accounts'
import { logger } from '../../helpers/logger'
import { sendDeleteActor } from '../../lib/activitypub/send'
import { ActorModel } from '../activitypub/actor'
import { ApplicationModel } from '../application/application'
import { AvatarModel } from '../avatar/avatar'
@ -138,12 +136,7 @@ export class AccountModel extends Model<AccountModel> {
instance.Actor = await instance.$get('Actor', { transaction: options.transaction }) as ActorModel
}
if (instance.isOwned()) {
logger.debug('Sending delete of actor of account %s.', instance.Actor.url)
return sendDeleteActor(instance.Actor, options.transaction)
}
return undefined
return instance.Actor.destroy({ transaction: options.transaction })
}
static load (id: number) {
@ -246,12 +239,12 @@ export class AccountModel extends Model<AccountModel> {
}
return AccountModel.findAndCountAll(query)
.then(({ rows, count }) => {
return {
data: rows,
total: count
}
})
.then(({ rows, count }) => {
return {
data: rows,
total: count
}
})
}
toFormattedJSON (): Account {

View File

@ -3,6 +3,7 @@ import { extname } from 'path'
import * as Sequelize from 'sequelize'
import {
AllowNull,
BeforeDestroy,
BelongsTo,
Column,
CreatedAt,
@ -37,6 +38,8 @@ import { ServerModel } from '../server/server'
import { throwIfNotValid } from '../utils'
import { VideoChannelModel } from '../video/video-channel'
import { ActorFollowModel } from './actor-follow'
import { logger } from '../../helpers/logger'
import { sendDeleteActor } from '../../lib/activitypub/send'
enum ScopeNames {
FULL = 'FULL'
@ -224,22 +227,28 @@ export class ActorModel extends Model<ActorModel> {
@HasOne(() => AccountModel, {
foreignKey: {
allowNull: true
},
onDelete: 'cascade',
hooks: true
allowNull: false
}
})
Account: AccountModel
@HasOne(() => VideoChannelModel, {
foreignKey: {
allowNull: true
},
onDelete: 'cascade',
hooks: true
allowNull: false
}
})
VideoChannel: VideoChannelModel
@BeforeDestroy
static async sendDeleteIfOwned (instance: ActorModel, options) {
if (instance.isOwned()) {
logger.debug('Sending delete of actor %s.', instance.url)
return sendDeleteActor(instance, options.transaction)
}
return undefined
}
static load (id: number) {
return ActorModel.unscoped().findById(id)
}

View File

@ -1,15 +1,27 @@
import {
AllowNull, BeforeDestroy, BelongsTo, Column, CreatedAt, DefaultScope, ForeignKey, HasMany, Is, Model, Scopes, Table,
UpdatedAt, Default, DataType
AllowNull,
BeforeDestroy,
BelongsTo,
Column,
CreatedAt,
DataType,
Default,
DefaultScope,
ForeignKey,
HasMany,
Is,
Model,
Scopes,
Table,
UpdatedAt
} from 'sequelize-typescript'
import { ActivityPubActor } from '../../../shared/models/activitypub'
import { VideoChannel } from '../../../shared/models/videos'
import {
isVideoChannelDescriptionValid, isVideoChannelNameValid,
isVideoChannelDescriptionValid,
isVideoChannelNameValid,
isVideoChannelSupportValid
} from '../../helpers/custom-validators/video-channels'
import { logger } from '../../helpers/logger'
import { sendDeleteActor } from '../../lib/activitypub/send'
import { AccountModel } from '../account/account'
import { ActorModel } from '../activitypub/actor'
import { getSort, throwIfNotValid } from '../utils'
@ -139,13 +151,7 @@ export class VideoChannelModel extends Model<VideoChannelModel> {
instance.Actor = await instance.$get('Actor', { transaction: options.transaction }) as ActorModel
}
if (instance.Actor.isOwned()) {
logger.debug('Sending delete of actor of video channel %s.', instance.Actor.url)
return sendDeleteActor(instance.Actor, options.transaction)
}
return undefined
return instance.Actor.destroy({ transaction: options.transaction })
}
static countByAccount (accountId: number) {