feat: add truncate account notes, drives

This commit is contained in:
ZerglingGo 2023-12-02 18:15:40 +09:00
parent d217543bbb
commit 7cb0800f93
No known key found for this signature in database
GPG key ID: 3919613C1147B4BF
14 changed files with 330 additions and 0 deletions

9
locales/index.d.ts vendored
View file

@ -876,6 +876,7 @@ export interface Locale {
"ffVisibilityDescription": string;
"continueThread": string;
"deleteAccountConfirm": string;
"truncateAccountConfirm": string;
"incorrectPassword": string;
"voteConfirm": string;
"hide": string;
@ -921,6 +922,7 @@ export interface Locale {
"isSystemAccount": string;
"typeToConfirm": string;
"deleteAccount": string;
"truncateAccount": string;
"document": string;
"numberOfPageCache": string;
"numberOfPageCacheDescription": string;
@ -1740,6 +1742,13 @@ export interface Locale {
"started": string;
"inProgress": string;
};
"_accountTruncate": {
"accountDelete": string;
"mayTakeTime": string;
"requestAccountTruncate": string;
"started": string;
"inProgress": string;
};
"_ad": {
"back": string;
"reduceFrequencyOfThisAd": string;

View file

@ -873,6 +873,7 @@ ffVisibility: "つながりの公開範囲"
ffVisibilityDescription: "自分のフォロー/フォロワー情報の公開範囲を設定できます。"
continueThread: "さらにスレッドを見る"
deleteAccountConfirm: "アカウントが削除されます。よろしいですか?"
truncateAccountConfirm: "ダイレクトとピン留めされたノート、関連ドライブのファイルを除くすべてのノートとドライブのファイルが削除されます。続行しますか?"
incorrectPassword: "パスワードが間違っています。"
voteConfirm: "「{choice}」に投票しますか?"
hide: "隠す"
@ -918,6 +919,7 @@ requireAdminForView: "閲覧するには管理者アカウントでログイン
isSystemAccount: "システムにより自動で作成・管理されているアカウントです。"
typeToConfirm: "この操作を行うには {x} と入力してください"
deleteAccount: "アカウント削除"
truncateAccount: "アカウント整理"
document: "ドキュメント"
numberOfPageCache: "ページキャッシュ数"
numberOfPageCacheDescription: "多くすると利便性が向上しますが、負荷とメモリ使用量が増えます。"
@ -1647,6 +1649,13 @@ _accountDelete:
started: "削除処理が開始されました。"
inProgress: "削除が進行中"
_accountTruncate:
accountDelete: "アカウントの整理"
mayTakeTime: "アカウントの整理は負荷のかかる処理であるため、作成したコンテンツの数やアップロードしたファイルの数が多いと完了までに時間がかかることがあります。"
requestAccountTruncate: "アカウント整理をリクエスト"
started: "整理処理が開始されました。"
inProgress: "整理が進行中"
_ad:
back: "戻る"
reduceFrequencyOfThisAd: "この広告の表示頻度を下げる"

View file

@ -875,6 +875,7 @@ ffVisibility: "내 인맥의 공개 범위"
ffVisibilityDescription: "나의 팔로우와 팔로워 정보에 대한 공개 범위를 설정할 수 있습니다."
continueThread: "이 글타래 이어서 보기"
deleteAccountConfirm: "계정이 삭제되고 되돌릴 수 없게 됩니다. 계속하시겠습니까? "
truncateAccountConfirm: "다이렉트와 고정된 노트, 관련된 파일을 제외한 모든 노트와 파일이 삭제됩니다. 계속하시겠습니까? "
incorrectPassword: "비밀번호가 올바르지 않습니다."
voteConfirm: "\"{choice}\"에 투표하시겠습니까?"
hide: "숨기기"
@ -920,6 +921,7 @@ requireAdminForView: "열람하려면 관리자 계정으로 로그인해야 합
isSystemAccount: "시스템에 의해 자동으로 생성되어 관리되는 계정입니다."
typeToConfirm: "계속하시려면 {x} 을 입력하세요"
deleteAccount: "계정 삭제"
truncateAccount: "계정 청소"
document: "문서"
numberOfPageCache: "페이지 캐시 수"
numberOfPageCacheDescription: "숫자가 클 수록 편리성이 높아지지만, 시스템 자원과 메모리를 더 많이 사용합니다."
@ -1632,6 +1634,12 @@ _accountDelete:
requestAccountDelete: "계정 삭제 요청"
started: "삭제 작업이 시작되었습니다."
inProgress: "삭제 진행 중"
_accountTruncate:
accountTruncate: "계정 청소"
mayTakeTime: "계정 청소는 서버에 부하를 가하기 때문에, 작성한 콘텐츠나 업로드한 파일의 수가 많으면 완료까지 시간이 걸릴 수 있습니다."
requestAccountTruncate: "계정 청소 요청"
started: "청소 작업이 시작되었습니다."
inProgress: "청소 진행 중"
_ad:
back: "뒤로"
reduceFrequencyOfThisAd: "이 광고의 표시 빈도 낮추기"

View file

@ -16,6 +16,7 @@ import { CaptchaService } from './CaptchaService.js';
import { CreateSystemUserService } from './CreateSystemUserService.js';
import { CustomEmojiService } from './CustomEmojiService.js';
import { DeleteAccountService } from './DeleteAccountService.js';
import { TruncateAccountService } from './TruncateAccountService.js';
import { DownloadService } from './DownloadService.js';
import { DriveService } from './DriveService.js';
import { EmailService } from './EmailService.js';
@ -149,6 +150,7 @@ const $CaptchaService: Provider = { provide: 'CaptchaService', useExisting: Capt
const $CreateSystemUserService: Provider = { provide: 'CreateSystemUserService', useExisting: CreateSystemUserService };
const $CustomEmojiService: Provider = { provide: 'CustomEmojiService', useExisting: CustomEmojiService };
const $DeleteAccountService: Provider = { provide: 'DeleteAccountService', useExisting: DeleteAccountService };
const $TruncateAccountService: Provider = { provide: 'TruncateAccountService', useExisting: TruncateAccountService };
const $DownloadService: Provider = { provide: 'DownloadService', useExisting: DownloadService };
const $DriveService: Provider = { provide: 'DriveService', useExisting: DriveService };
const $EmailService: Provider = { provide: 'EmailService', useExisting: EmailService };
@ -286,6 +288,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
CreateSystemUserService,
CustomEmojiService,
DeleteAccountService,
TruncateAccountService,
DownloadService,
DriveService,
EmailService,
@ -416,6 +419,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
$CreateSystemUserService,
$CustomEmojiService,
$DeleteAccountService,
$TruncateAccountService,
$DownloadService,
$DriveService,
$EmailService,
@ -547,6 +551,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
CreateSystemUserService,
CustomEmojiService,
DeleteAccountService,
TruncateAccountService,
DownloadService,
DriveService,
EmailService,
@ -676,6 +681,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
$CreateSystemUserService,
$CustomEmojiService,
$DeleteAccountService,
$TruncateAccountService,
$DownloadService,
$DriveService,
$EmailService,

View file

@ -342,6 +342,16 @@ export class QueueService {
});
}
@bindThis
public createTruncateAccountJob(user: ThinUser, opts = {}) {
return this.dbQueue.add('truncateAccount', {
user: { id: user.id },
}, {
removeOnComplete: true,
removeOnFail: true,
});
}
@bindThis
public createFollowJob(followings: { from: ThinUser, to: ThinUser, requestId?: string, silent?: boolean, withReplies?: boolean }[]) {
const jobs = followings.map(rel => this.generateRelationshipJobData('follow', rel));

View file

@ -0,0 +1,33 @@
/*
* SPDX-FileCopyrightText: syuilo and other misskey contributors
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { Inject, Injectable } from '@nestjs/common';
import type { UsersRepository } from '@/models/_.js';
import { QueueService } from '@/core/QueueService.js';
import { DI } from '@/di-symbols.js';
import { bindThis } from '@/decorators.js';
@Injectable()
export class TruncateAccountService {
constructor(
@Inject(DI.usersRepository)
private usersRepository: UsersRepository,
private queueService: QueueService,
) {
}
@bindThis
public async truncateAccount(user: {
id: string;
host: string | null;
}): Promise<void> {
const _user = await this.usersRepository.findOneByOrFail({ id: user.id });
this.queueService.createTruncateAccountJob(user, {
soft: false,
});
}
}

View file

@ -17,6 +17,7 @@ import { CleanChartsProcessorService } from './processors/CleanChartsProcessorSe
import { CleanProcessorService } from './processors/CleanProcessorService.js';
import { CleanRemoteFilesProcessorService } from './processors/CleanRemoteFilesProcessorService.js';
import { DeleteAccountProcessorService } from './processors/DeleteAccountProcessorService.js';
import { TruncateAccountProcessorService } from './processors/TruncateAccountProcessorService.js';
import { DeleteDriveFilesProcessorService } from './processors/DeleteDriveFilesProcessorService.js';
import { DeleteFileProcessorService } from './processors/DeleteFileProcessorService.js';
import { ExportBlockingProcessorService } from './processors/ExportBlockingProcessorService.js';
@ -66,6 +67,7 @@ import { RelationshipProcessorService } from './processors/RelationshipProcessor
ImportCustomEmojisProcessorService,
ImportAntennasProcessorService,
DeleteAccountProcessorService,
TruncateAccountProcessorService,
DeleteFileProcessorService,
CleanRemoteFilesProcessorService,
RelationshipProcessorService,

View file

@ -28,6 +28,7 @@ import { ImportUserListsProcessorService } from './processors/ImportUserListsPro
import { ImportCustomEmojisProcessorService } from './processors/ImportCustomEmojisProcessorService.js';
import { ImportAntennasProcessorService } from './processors/ImportAntennasProcessorService.js';
import { DeleteAccountProcessorService } from './processors/DeleteAccountProcessorService.js';
import { TruncateAccountProcessorService } from './processors/TruncateAccountProcessorService.js';
import { ExportFavoritesProcessorService } from './processors/ExportFavoritesProcessorService.js';
import { CleanRemoteFilesProcessorService } from './processors/CleanRemoteFilesProcessorService.js';
import { DeleteFileProcessorService } from './processors/DeleteFileProcessorService.js';
@ -104,6 +105,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
private importCustomEmojisProcessorService: ImportCustomEmojisProcessorService,
private importAntennasProcessorService: ImportAntennasProcessorService,
private deleteAccountProcessorService: DeleteAccountProcessorService,
private truncateAccountProcessorService: TruncateAccountProcessorService,
private deleteFileProcessorService: DeleteFileProcessorService,
private cleanRemoteFilesProcessorService: CleanRemoteFilesProcessorService,
private relationshipProcessorService: RelationshipProcessorService,
@ -179,6 +181,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
case 'importCustomEmojis': return this.importCustomEmojisProcessorService.process(job);
case 'importAntennas': return this.importAntennasProcessorService.process(job);
case 'deleteAccount': return this.deleteAccountProcessorService.process(job);
case 'truncateAccount': return this.truncateAccountProcessorService.process(job);
default: throw new Error(`unrecognized job type ${job.name} for db`);
}
}, {

View file

@ -0,0 +1,136 @@
/*
* SPDX-FileCopyrightText: syuilo and other misskey contributors
* SPDX-License-Identifier: AGPL-3.0-only
*/
import { Inject, Injectable } from '@nestjs/common';
import { And, In, MoreThan, Not } from 'typeorm';
import { DI } from '@/di-symbols.js';
import type { DriveFilesRepository, NotesRepository, UserNotePiningsRepository, UsersRepository } from '@/models/_.js';
import type Logger from '@/logger.js';
import { DriveService } from '@/core/DriveService.js';
import type { MiDriveFile } from '@/models/DriveFile.js';
import type { MiNote } from '@/models/Note.js';
import { bindThis } from '@/decorators.js';
import { NoteDeleteService } from '@/core/NoteDeleteService.js';
import { QueueLoggerService } from '../QueueLoggerService.js';
import type * as Bull from 'bullmq';
import type { DbUserTruncateJobData } from '../types.js';
@Injectable()
export class TruncateAccountProcessorService {
private logger: Logger;
constructor(
@Inject(DI.usersRepository)
private usersRepository: UsersRepository,
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
@Inject(DI.userNotePiningsRepository)
private userNotePiningsRepository: UserNotePiningsRepository,
@Inject(DI.driveFilesRepository)
private driveFilesRepository: DriveFilesRepository,
private driveService: DriveService,
private queueLoggerService: QueueLoggerService,
private noteDeleteService: NoteDeleteService,
) {
this.logger = this.queueLoggerService.logger.createSubLogger('truncate-account');
}
@bindThis
public async process(job: Bull.Job<DbUserTruncateJobData>): Promise<string | void> {
this.logger.info(`Truncate notes and drives account of ${job.data.user.id} ...`);
const user = await this.usersRepository.findOneBy({ id: job.data.user.id });
if (user == null) {
return;
}
const pinings = await this.userNotePiningsRepository.findBy({ userId: user.id });
const piningNoteIds = pinings.map(pining => pining.noteId); // pining.note always undefined (bug?)
const specifiedNotes = await this.notesRepository.findBy({
userId: user.id,
visibility: Not(In(['public', 'home', 'followers'])),
});
const specifiedNoteIds = specifiedNotes.map(note => note.id);
const keepFileIds = (await Promise.all([...piningNoteIds, ...specifiedNoteIds].map(async (noteId) => {
const note = await this.notesRepository.findOneBy({ id: noteId });
return note?.fileIds;
}))).flat().filter((fileId) => fileId !== undefined);
{ // Delete notes
let cursor: MiNote['id'] | null = null;
while (true) {
const notes = await this.notesRepository.find({
where: {
userId: user.id,
...(cursor ? {
id: And(Not(In([...piningNoteIds, ...specifiedNoteIds])), MoreThan(cursor)),
} : {
id: Not(In([...piningNoteIds, ...specifiedNoteIds])),
}),
},
take: 100,
order: {
id: 1,
},
}) as MiNote[];
if (notes.length === 0) {
break;
}
cursor = notes.at(-1)?.id ?? null;
await Promise.all(notes.map((note) => {
return this.noteDeleteService.delete(user, note, false, user);
}));
}
this.logger.succ('All of notes deleted');
}
{ // Delete files
let cursor: MiDriveFile['id'] | null = null;
while (true) {
const files = await this.driveFilesRepository.find({
where: {
userId: user.id,
...(cursor ? {
id: And(Not(In(keepFileIds)), MoreThan(cursor)),
} : {
id: Not(In(keepFileIds)),
}),
},
take: 10,
order: {
id: 1,
},
}) as MiDriveFile[];
if (files.length === 0) {
break;
}
cursor = files.at(-1)?.id ?? null;
for (const file of files) {
await this.driveService.deleteFileSync(file);
}
}
this.logger.succ('All of files deleted');
}
return 'Account notes and drives are truncated';
}
}

View file

@ -56,6 +56,7 @@ export type DbJobMap = {
importUserLists: DbUserImportJobData;
importCustomEmojis: DbUserImportJobData;
deleteAccount: DbUserDeleteJobData;
truncateAccount: DbUserTruncateJobData;
}
export type DbJobDataWithUser = {
@ -77,6 +78,10 @@ export type DbUserDeleteJobData = {
soft?: boolean;
};
export type DbUserTruncateJobData = {
user: ThinUser;
};
export type DbUserImportJobData = {
user: ThinUser;
fileId: MiDriveFile['id'];

View file

@ -202,6 +202,7 @@ import * as ep___i_authorizedApps from './endpoints/i/authorized-apps.js';
import * as ep___i_claimAchievement from './endpoints/i/claim-achievement.js';
import * as ep___i_changePassword from './endpoints/i/change-password.js';
import * as ep___i_deleteAccount from './endpoints/i/delete-account.js';
import * as ep___i_truncateAccount from './endpoints/i/truncate-account.js';
import * as ep___i_exportBlocking from './endpoints/i/export-blocking.js';
import * as ep___i_exportFollowing from './endpoints/i/export-following.js';
import * as ep___i_exportMute from './endpoints/i/export-mute.js';
@ -562,6 +563,7 @@ const $i_authorizedApps: Provider = { provide: 'ep:i/authorized-apps', useClass:
const $i_claimAchievement: Provider = { provide: 'ep:i/claim-achievement', useClass: ep___i_claimAchievement.default };
const $i_changePassword: Provider = { provide: 'ep:i/change-password', useClass: ep___i_changePassword.default };
const $i_deleteAccount: Provider = { provide: 'ep:i/delete-account', useClass: ep___i_deleteAccount.default };
const $i_truncateAccount: Provider = { provide: 'ep:i/truncate-account', useClass: ep___i_truncateAccount.default };
const $i_exportBlocking: Provider = { provide: 'ep:i/export-blocking', useClass: ep___i_exportBlocking.default };
const $i_exportFollowing: Provider = { provide: 'ep:i/export-following', useClass: ep___i_exportFollowing.default };
const $i_exportMute: Provider = { provide: 'ep:i/export-mute', useClass: ep___i_exportMute.default };
@ -926,6 +928,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
$i_claimAchievement,
$i_changePassword,
$i_deleteAccount,
$i_truncateAccount,
$i_exportBlocking,
$i_exportFollowing,
$i_exportMute,
@ -1284,6 +1287,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
$i_claimAchievement,
$i_changePassword,
$i_deleteAccount,
$i_truncateAccount,
$i_exportBlocking,
$i_exportFollowing,
$i_exportMute,

View file

@ -202,6 +202,7 @@ import * as ep___i_authorizedApps from './endpoints/i/authorized-apps.js';
import * as ep___i_claimAchievement from './endpoints/i/claim-achievement.js';
import * as ep___i_changePassword from './endpoints/i/change-password.js';
import * as ep___i_deleteAccount from './endpoints/i/delete-account.js';
import * as ep___i_truncateAccount from './endpoints/i/truncate-account.js';
import * as ep___i_exportBlocking from './endpoints/i/export-blocking.js';
import * as ep___i_exportFollowing from './endpoints/i/export-following.js';
import * as ep___i_exportMute from './endpoints/i/export-mute.js';
@ -560,6 +561,7 @@ const eps = [
['i/claim-achievement', ep___i_claimAchievement],
['i/change-password', ep___i_changePassword],
['i/delete-account', ep___i_deleteAccount],
['i/truncate-account', ep___i_truncateAccount],
['i/export-blocking', ep___i_exportBlocking],
['i/export-following', ep___i_exportFollowing],
['i/export-mute', ep___i_exportMute],

View file

@ -0,0 +1,70 @@
/*
* SPDX-FileCopyrightText: syuilo and other misskey contributors
* SPDX-License-Identifier: AGPL-3.0-only
*/
import bcrypt from 'bcryptjs';
import { Inject, Injectable } from '@nestjs/common';
import type { UsersRepository, UserProfilesRepository } from '@/models/_.js';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { TruncateAccountService } from '@/core/TruncateAccountService.js';
import { DI } from '@/di-symbols.js';
import { UserAuthService } from '@/core/UserAuthService.js';
export const meta = {
requireCredential: true,
secure: true,
} as const;
export const paramDef = {
type: 'object',
properties: {
password: { type: 'string' },
token: { type: 'string', nullable: true },
},
required: ['password'],
} as const;
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
constructor(
@Inject(DI.usersRepository)
private usersRepository: UsersRepository,
@Inject(DI.userProfilesRepository)
private userProfilesRepository: UserProfilesRepository,
private userAuthService: UserAuthService,
private truncateAccountService: TruncateAccountService,
) {
super(meta, paramDef, async (ps, me) => {
const token = ps.token;
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: me.id });
if (profile.twoFactorEnabled) {
if (token == null) {
throw new Error('authentication failed');
}
try {
await this.userAuthService.twoFactorAuthenticate(profile, token);
} catch (e) {
throw new Error('authentication failed');
}
}
const userDetailed = await this.usersRepository.findOneByOrFail({ id: me.id });
if (userDetailed.isDeleted) {
return;
}
const passwordMatched = await bcrypt.compare(ps.password, profile.password!);
if (!passwordMatched) {
throw new Error('incorrect password');
}
await this.truncateAccountService.truncateAccount(me);
});
}
}

View file

@ -46,6 +46,17 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
</MkFolder>
<MkFolder>
<template #icon><i class="ti ti-recycle"></i></template>
<template #label>{{ i18n.ts.truncateAccount }}</template>
<div class="_gaps_m">
<FormInfo warn>{{ i18n.ts._accountTruncate.mayTakeTime }}</FormInfo>
<MkButton v-if="!$i.isDeleted" danger @click="truncateAccount">{{ i18n.ts._accountTruncate.requestAccountTruncate }}</MkButton>
<MkButton v-else disabled>{{ i18n.ts._accountTruncate.inProgress }}</MkButton>
</div>
</MkFolder>
<MkFolder>
<template #icon><i class="ti ti-flask"></i></template>
<template #label>{{ i18n.ts.experimentalFeatures }}</template>
@ -137,6 +148,28 @@ async function deleteAccount() {
await signout();
}
async function truncateAccount() {
{
const { canceled } = await os.confirm({
type: 'warning',
text: i18n.ts.truncateAccountConfirm,
});
if (canceled) return;
}
const auth = await os.authenticateDialog();
if (auth.canceled) return;
await os.apiWithDialog('i/truncate-account', {
password: auth.result.password,
token: auth.result.token,
});
await os.alert({
title: i18n.ts._accountTruncate.started,
});
}
async function reloadAsk() {
const { canceled } = await os.confirm({
type: 'info',