aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-07-30 13:39:20 +0200
committerChocobozzz <me@florianbigard.com>2018-07-30 13:39:20 +0200
commitc5a893d5363ce1fd681751cf48977086a35d5724 (patch)
treebeeb87ea2c8309b43118bc45d48ff09f38b42ea9
parentb7f5b524756e8a30c396ae40a262884766ef6554 (diff)
downloadPeerTube-c5a893d5363ce1fd681751cf48977086a35d5724.tar.gz
PeerTube-c5a893d5363ce1fd681751cf48977086a35d5724.tar.zst
PeerTube-c5a893d5363ce1fd681751cf48977086a35d5724.zip
Revert "Delete actor too when deleting account/video channel"
This reverts commit e04551d796adf69703a41af123207b2624237292. See https://github.com/Chocobozzz/PeerTube/issues/870#issuecomment-408814420
-rw-r--r--server/models/account/account.ts21
-rw-r--r--server/models/activitypub/actor.ts25
-rw-r--r--server/models/video/video-channel.ts30
3 files changed, 34 insertions, 42 deletions
diff --git a/server/models/account/account.ts b/server/models/account/account.ts
index ce0f3f7c5..2eed66fc2 100644
--- a/server/models/account/account.ts
+++ b/server/models/account/account.ts
@@ -16,6 +16,8 @@ import {
16} from 'sequelize-typescript' 16} from 'sequelize-typescript'
17import { Account } from '../../../shared/models/actors' 17import { Account } from '../../../shared/models/actors'
18import { isAccountDescriptionValid } from '../../helpers/custom-validators/accounts' 18import { isAccountDescriptionValid } from '../../helpers/custom-validators/accounts'
19import { logger } from '../../helpers/logger'
20import { sendDeleteActor } from '../../lib/activitypub/send'
19import { ActorModel } from '../activitypub/actor' 21import { ActorModel } from '../activitypub/actor'
20import { ApplicationModel } from '../application/application' 22import { ApplicationModel } from '../application/application'
21import { AvatarModel } from '../avatar/avatar' 23import { AvatarModel } from '../avatar/avatar'
@@ -136,7 +138,12 @@ export class AccountModel extends Model<AccountModel> {
136 instance.Actor = await instance.$get('Actor', { transaction: options.transaction }) as ActorModel 138 instance.Actor = await instance.$get('Actor', { transaction: options.transaction }) as ActorModel
137 } 139 }
138 140
139 return instance.Actor.destroy({ transaction: options.transaction }) 141 if (instance.isOwned()) {
142 logger.debug('Sending delete of actor of account %s.', instance.Actor.url)
143 return sendDeleteActor(instance.Actor, options.transaction)
144 }
145
146 return undefined
140 } 147 }
141 148
142 static load (id: number) { 149 static load (id: number) {
@@ -239,12 +246,12 @@ export class AccountModel extends Model<AccountModel> {
239 } 246 }
240 247
241 return AccountModel.findAndCountAll(query) 248 return AccountModel.findAndCountAll(query)
242 .then(({ rows, count }) => { 249 .then(({ rows, count }) => {
243 return { 250 return {
244 data: rows, 251 data: rows,
245 total: count 252 total: count
246 } 253 }
247 }) 254 })
248 } 255 }
249 256
250 toFormattedJSON (): Account { 257 toFormattedJSON (): Account {
diff --git a/server/models/activitypub/actor.ts b/server/models/activitypub/actor.ts
index f231dba74..267032e2a 100644
--- a/server/models/activitypub/actor.ts
+++ b/server/models/activitypub/actor.ts
@@ -3,7 +3,6 @@ import { extname } from 'path'
3import * as Sequelize from 'sequelize' 3import * as Sequelize from 'sequelize'
4import { 4import {
5 AllowNull, 5 AllowNull,
6 BeforeDestroy,
7 BelongsTo, 6 BelongsTo,
8 Column, 7 Column,
9 CreatedAt, 8 CreatedAt,
@@ -38,8 +37,6 @@ import { ServerModel } from '../server/server'
38import { throwIfNotValid } from '../utils' 37import { throwIfNotValid } from '../utils'
39import { VideoChannelModel } from '../video/video-channel' 38import { VideoChannelModel } from '../video/video-channel'
40import { ActorFollowModel } from './actor-follow' 39import { ActorFollowModel } from './actor-follow'
41import { logger } from '../../helpers/logger'
42import { sendDeleteActor } from '../../lib/activitypub/send'
43 40
44enum ScopeNames { 41enum ScopeNames {
45 FULL = 'FULL' 42 FULL = 'FULL'
@@ -227,28 +224,22 @@ export class ActorModel extends Model<ActorModel> {
227 224
228 @HasOne(() => AccountModel, { 225 @HasOne(() => AccountModel, {
229 foreignKey: { 226 foreignKey: {
230 allowNull: false 227 allowNull: true
231 } 228 },
229 onDelete: 'cascade',
230 hooks: true
232 }) 231 })
233 Account: AccountModel 232 Account: AccountModel
234 233
235 @HasOne(() => VideoChannelModel, { 234 @HasOne(() => VideoChannelModel, {
236 foreignKey: { 235 foreignKey: {
237 allowNull: false 236 allowNull: true
238 } 237 },
238 onDelete: 'cascade',
239 hooks: true
239 }) 240 })
240 VideoChannel: VideoChannelModel 241 VideoChannel: VideoChannelModel
241 242
242 @BeforeDestroy
243 static async sendDeleteIfOwned (instance: ActorModel, options) {
244 if (instance.isOwned()) {
245 logger.debug('Sending delete of actor %s.', instance.url)
246 return sendDeleteActor(instance, options.transaction)
247 }
248
249 return undefined
250 }
251
252 static load (id: number) { 243 static load (id: number) {
253 return ActorModel.unscoped().findById(id) 244 return ActorModel.unscoped().findById(id)
254 } 245 }
diff --git a/server/models/video/video-channel.ts b/server/models/video/video-channel.ts
index 33a19f0ff..6567b00d6 100644
--- a/server/models/video/video-channel.ts
+++ b/server/models/video/video-channel.ts
@@ -1,27 +1,15 @@
1import { 1import {
2 AllowNull, 2 AllowNull, BeforeDestroy, BelongsTo, Column, CreatedAt, DefaultScope, ForeignKey, HasMany, Is, Model, Scopes, Table,
3 BeforeDestroy, 3 UpdatedAt, Default, DataType
4 BelongsTo,
5 Column,
6 CreatedAt,
7 DataType,
8 Default,
9 DefaultScope,
10 ForeignKey,
11 HasMany,
12 Is,
13 Model,
14 Scopes,
15 Table,
16 UpdatedAt
17} from 'sequelize-typescript' 4} from 'sequelize-typescript'
18import { ActivityPubActor } from '../../../shared/models/activitypub' 5import { ActivityPubActor } from '../../../shared/models/activitypub'
19import { VideoChannel } from '../../../shared/models/videos' 6import { VideoChannel } from '../../../shared/models/videos'
20import { 7import {
21 isVideoChannelDescriptionValid, 8 isVideoChannelDescriptionValid, isVideoChannelNameValid,
22 isVideoChannelNameValid,
23 isVideoChannelSupportValid 9 isVideoChannelSupportValid
24} from '../../helpers/custom-validators/video-channels' 10} from '../../helpers/custom-validators/video-channels'
11import { logger } from '../../helpers/logger'
12import { sendDeleteActor } from '../../lib/activitypub/send'
25import { AccountModel } from '../account/account' 13import { AccountModel } from '../account/account'
26import { ActorModel } from '../activitypub/actor' 14import { ActorModel } from '../activitypub/actor'
27import { getSort, throwIfNotValid } from '../utils' 15import { getSort, throwIfNotValid } from '../utils'
@@ -151,7 +139,13 @@ export class VideoChannelModel extends Model<VideoChannelModel> {
151 instance.Actor = await instance.$get('Actor', { transaction: options.transaction }) as ActorModel 139 instance.Actor = await instance.$get('Actor', { transaction: options.transaction }) as ActorModel
152 } 140 }
153 141
154 return instance.Actor.destroy({ transaction: options.transaction }) 142 if (instance.Actor.isOwned()) {
143 logger.debug('Sending delete of actor of video channel %s.', instance.Actor.url)
144
145 return sendDeleteActor(instance.Actor, options.transaction)
146 }
147
148 return undefined
155 } 149 }
156 150
157 static countByAccount (accountId: number) { 151 static countByAccount (accountId: number) {