enhance: コンテンツ削除を制限されていてもアカウントの閉鎖ができるように (MisskeyIO#532)

packages/backend/src/core/DeleteAccountService.ts

@@ -4,38 +4,47 @@
  */
 
 import { Inject, Injectable } from '@nestjs/common';
+import { bindThis } from '@/decorators.js';
+import { DI } from '@/di-symbols.js';
+import type Logger from '@/logger.js';
 import type { UsersRepository } from '@/models/_.js';
+import type { MiUser } from '@/models/User.js';
+import { RoleService } from '@/core/RoleService.js';
 import { QueueService } from '@/core/QueueService.js';
 import { UserSuspendService } from '@/core/UserSuspendService.js';
-import { DI } from '@/di-symbols.js';
-import { bindThis } from '@/decorators.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
+import { LoggerService } from '@/core/LoggerService.js';
 
 @Injectable()
 export class DeleteAccountService {
+	public logger: Logger;
+
 	constructor(
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
 
-		private userSuspendService: UserSuspendService,
+		private roleService: RoleService,
 		private queueService: QueueService,
+		private userSuspendService: UserSuspendService,
 		private globalEventService: GlobalEventService,
+		private loggerService: LoggerService,
 	) {
+		this.logger = this.loggerService.getLogger('delete-account');
 	}
 
 	@bindThis
-	public async deleteAccount(user: {
-		id: string;
-		host: string | null;
-	}): Promise<void> {
+	public async deleteAccount(user: MiUser, soft: boolean, me: MiUser | null): Promise<void> {
+		this.logger.warn(`Delete account requested by ${me ? me.id : 'remote'} for ${user.id} (soft: ${soft})`);
+
 		const _user = await this.usersRepository.findOneByOrFail({ id: user.id });
 		if (_user.isRoot) throw new Error('cannot delete a root account');
 
 		// 物理削除する前にDelete activityを送信する
-		await this.userSuspendService.doPostSuspend(user).catch(e => {});
+		await this.userSuspendService.doPostSuspend(user).catch(err => this.logger.error(err));
 
 		this.queueService.createDeleteAccountJob(user, {
-			soft: false,
+			force: me ? await this.roleService.isModerator(me) : false,
+			soft: soft,
 		});
 
 		await this.usersRepository.update(user.id, {
@@ -44,4 +53,16 @@ export class DeleteAccountService {
 
 		this.globalEventService.publishInternalEvent('userChangeDeletedState', { id: user.id, isDeleted: true });
 	}
+
+	@bindThis
+	public async deleteAllDriveFiles(user: MiUser, me: MiUser | null): Promise<void> {
+		this.logger.warn(`Delete all drive files requested by ${me ? me.id : 'remote'} for ${user.id}`);
+
+		await this.usersRepository.findOneByOrFail({ id: user.id });
+
+		this.queueService.createDeleteAccountJob(user, {
+			force: me ? await this.roleService.isModerator(me) : false,
+			onlyFiles: true,
+		});
+	}
 }

packages/backend/src/core/QueueService.ts

@@ -352,10 +352,12 @@ export class QueueService {
 	}
 
 	@bindThis
-	public createDeleteAccountJob(user: ThinUser, opts: { soft?: boolean; } = {}) {
+	public createDeleteAccountJob(user: ThinUser, opts: { soft?: boolean, force?: boolean, onlyFiles?: boolean } = {}) {
 		return this.dbQueue.add('deleteAccount', {
 			user: { id: user.id },
 			soft: opts.soft,
+			force: opts.force,
+			onlyFiles: opts.onlyFiles,
 		}, {
 			removeOnComplete: true,
 			removeOnFail: true,

packages/backend/src/core/RoleService.ts

@@ -40,6 +40,7 @@ export type RolePolicies = {
 	canCreateContent: boolean;
 	canUpdateContent: boolean;
 	canDeleteContent: boolean;
+	canPurgeAccount: boolean;
 	canUpdateAvatar: boolean;
 	canUpdateBanner: boolean;
 	mentionLimit: number;
@@ -77,6 +78,7 @@ export const DEFAULT_POLICIES: RolePolicies = {
 	canCreateContent: true,
 	canUpdateContent: true,
 	canDeleteContent: true,
+	canPurgeAccount: true,
 	canUpdateAvatar: true,
 	canUpdateBanner: true,
 	mentionLimit: 20,
@@ -353,6 +355,7 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 			canCreateContent: calc('canCreateContent', vs => vs.some(v => v === true)),
 			canUpdateContent: calc('canUpdateContent', vs => vs.some(v => v === true)),
 			canDeleteContent: calc('canDeleteContent', vs => vs.some(v => v === true)),
+			canPurgeAccount: calc('canPurgeAccount', vs => vs.some(v => v === true)),
 			canUpdateAvatar: calc('canUpdateAvatar', vs => vs.some(v => v === true)),
 			canUpdateBanner: calc('canUpdateBanner', vs => vs.some(v => v === true)),
 			mentionLimit: calc('mentionLimit', vs => Math.max(...vs)),

packages/backend/src/core/activitypub/ApInboxService.ts

@@ -487,7 +487,8 @@ export class ApInboxService {
 			return 'skip: already deleted';
 		}
 
-		const job = await this.queueService.createDeleteAccountJob(actor);
+		// リモートから消されたということなので、物理削除する
+		const job = await this.queueService.createDeleteAccountJob(actor, { force: true, soft: false });
 
 		await this.usersRepository.update(actor.id, {
 			isDeleted: true,