🍕

src/models/drive-file.ts

@@ -84,14 +84,19 @@ export async function deleteDriveFile(driveFile: string | mongo.ObjectID | IDriv
 	// このDriveFileがアバターやバナーに使われていたらそれらのプロパティをnullにする
 	const u = await User.findOne({ _id: d.metadata.userId });
 	if (u) {
-		if (u.avatarId.equals(d._id)) {
+		if (u.avatarId && u.avatarId.equals(d._id)) {
 			await User.update({ _id: u._id }, { $set: { avatarId: null } });
 		}
-		if (u.bannerId.equals(d._id)) {
+		if (u.bannerId && u.bannerId.equals(d._id)) {
 			await User.update({ _id: u._id }, { $set: { bannerId: null } });
 		}
 	}
 
+	// このDriveFileのチャンクをすべて削除
+	await monkDb.get('driveFiles.chunks').remove({
+		files_id: d._id
+	});
+
 	// このDriveFileを削除
 	await DriveFile.remove({
 		_id: d._id

src/models/note.ts

@@ -91,6 +91,8 @@ export async function deleteNote(note: string | mongo.ObjectID | INote) {
 		n = note as INote;
 	}
 
+	console.log(n == null ? `Note: delete skipped ${note}` : `Note: deleting ${n._id}`);
+
 	if (n == null) return;
 
 	// このNoteへの返信をすべて削除
@@ -132,6 +134,8 @@ export async function deleteNote(note: string | mongo.ObjectID | INote) {
 	await Note.remove({
 		_id: n._id
 	});
+
+	console.log(`Note: deleted ${n._id}`);
 }
 
 /**

src/models/user.ts

@@ -155,6 +155,8 @@ export async function deleteUser(user: string | mongo.ObjectID | IUser) {
 		u = user as IUser;
 	}
 
+	console.log(u == null ? `User: delete skipped ${user}` : `User: deleting ${u._id}`);
+
 	if (u == null) return;
 
 	// このユーザーのAccessTokenをすべて削除
@@ -261,6 +263,8 @@ export async function deleteUser(user: string | mongo.ObjectID | IUser) {
 	await User.remove({
 		_id: u._id
 	});
+
+	console.log(`User: deleted ${u._id}`);
 }
 
 /**