wip

1 files changed, 10 insertions, 0 deletions

diff --git a/src/models/user.ts b/src/models/user.ts
index 6155324be8..b56cf03ef8 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -13,6 +13,8 @@ import Favorite, { deleteFavorite } from './favorite';
 import NoteReaction, { deleteNoteReaction } from './note-reaction';
 import MessagingMessage, { deleteMessagingMessage } from './messaging-message';
 import MessagingHistory, { deleteMessagingHistory } from './messaging-history';
+import DriveFile, { deleteDriveFile } from './drive-file';
+import DriveFolder, { deleteDriveFolder } from './drive-folder';
 
 const User = db.get<IUser>('users');
 
@@ -190,6 +192,14 @@ export async function deleteUser(user: string | mongo.ObjectID | IUser) {
 	).map(x => deleteMessagingHistory(x)));
 
 	// このユーザーのDriveFileをすべて削除
+	await Promise.all((
+		await DriveFile.find({ 'metadata.userId': u._id })
+	).map(x => deleteDriveFile(x)));
+
+	// このユーザーのDriveFolderをすべて削除
+	await Promise.all((
+		await DriveFolder.find({ userId: u._id })
+	).map(x => deleteDriveFolder(x)));
 
 	// このユーザーのFollowingをすべて削除