Resolve #2017

3 files changed, 114 insertions, 0 deletions

diff --git a/src/queue/processors/delete-drive-files.ts b/src/queue/processors/delete-drive-files.ts
new file mode 100644
index 0000000000..7e76aa73e6
--- /dev/null
+++ b/src/queue/processors/delete-drive-files.ts
@@ -0,0 +1,55 @@
+import * as bq from 'bee-queue';
+import * as mongo from 'mongodb';
+
+import { queueLogger } from '../logger';
+import User from '../../models/user';
+import DriveFile from '../../models/drive-file';
+import deleteFile from '../../services/drive/delete-file';
+
+const logger = queueLogger.createSubLogger('delete-drive-files');
+
+export async function deleteDriveFiles(job: bq.Job, done: any): Promise<void> {
+	logger.info(`Deleting drive files of ${job.data.user._id} ...`);
+
+	const user = await User.findOne({
+		_id: new mongo.ObjectID(job.data.user._id.toString())
+	});
+
+	let deletedCount = 0;
+	let ended = false;
+	let cursor: any = null;
+
+	while (!ended) {
+		const files = await DriveFile.find({
+			userId: user._id,
+			...(cursor ? { _id: { $gt: cursor } } : {})
+		}, {
+			limit: 100,
+			sort: {
+				_id: 1
+			}
+		});
+
+		if (files.length === 0) {
+			ended = true;
+			if (job.reportProgress) job.reportProgress(100);
+			break;
+		}
+
+		cursor = files[files.length - 1]._id;
+
+		for (const file of files) {
+			await deleteFile(file);
+			deletedCount++;
+		}
+
+		const total = await DriveFile.count({
+			userId: user._id,
+		});
+
+		if (job.reportProgress) job.reportProgress(deletedCount / total);
+	}
+
+	logger.succ(`All drive files (${deletedCount}) of ${user._id} has been deleted.`);
+	done();
+}
diff --git a/src/queue/processors/delete-notes.ts b/src/queue/processors/delete-notes.ts
new file mode 100644
index 0000000000..13c6042b16
--- /dev/null
+++ b/src/queue/processors/delete-notes.ts
@@ -0,0 +1,55 @@
+import * as bq from 'bee-queue';
+import * as mongo from 'mongodb';
+
+import { queueLogger } from '../logger';
+import Note from '../../models/note';
+import deleteNote from '../../services/note/delete';
+import User from '../../models/user';
+
+const logger = queueLogger.createSubLogger('delete-notes');
+
+export async function deleteNotes(job: bq.Job, done: any): Promise<void> {
+	logger.info(`Deleting notes of ${job.data.user._id} ...`);
+
+	const user = await User.findOne({
+		_id: new mongo.ObjectID(job.data.user._id.toString())
+	});
+
+	let deletedCount = 0;
+	let ended = false;
+	let cursor: any = null;
+
+	while (!ended) {
+		const notes = await Note.find({
+			userId: user._id,
+			...(cursor ? { _id: { $gt: cursor } } : {})
+		}, {
+			limit: 100,
+			sort: {
+				_id: 1
+			}
+		});
+
+		if (notes.length === 0) {
+			ended = true;
+			if (job.reportProgress) job.reportProgress(100);
+			break;
+		}
+
+		cursor = notes[notes.length - 1]._id;
+
+		for (const note of notes) {
+			await deleteNote(user, note, true);
+			deletedCount++;
+		}
+
+		const total = await Note.count({
+			userId: user._id,
+		});
+
+		if (job.reportProgress) job.reportProgress(deletedCount / total);
+	}
+
+	logger.succ(`All notes (${deletedCount}) of ${user._id} has been deleted.`);
+	done();
+}
diff --git a/src/queue/processors/index.ts b/src/queue/processors/index.ts
index 6869983205..31e87c3f67 100644
--- a/src/queue/processors/index.ts
+++ b/src/queue/processors/index.ts
@@ -1,5 +1,7 @@
 import deliver from './http/deliver';
 import processInbox from './http/process-inbox';
+import { deleteNotes } from './delete-notes';
+import { deleteDriveFiles } from './delete-drive-files';
 import { exportNotes } from './export-notes';
 import { exportFollowing } from './export-following';
 import { exportMute } from './export-mute';
@@ -9,6 +11,8 @@ import { queueLogger } from '../logger';
 const handlers: any = {
 	deliver,
 	processInbox,
+	deleteNotes,
+	deleteDriveFiles,
 	exportNotes,
 	exportFollowing,
 	exportMute,