more robust recursive folder check

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

packages/backend/src/core/entities/DriveFolderEntityService.ts

@@ -30,7 +30,8 @@ export class DriveFolderEntityService {
 	public async pack(
 		src: MiDriveFolder['id'] | MiDriveFolder,
 		options?: {
-			detail: boolean
+			detail: boolean,
+			maxDepth: number,
 		},
 	): Promise<Packed<'DriveFolder'>> {
 		const opts = Object.assign({
@@ -55,7 +56,8 @@ export class DriveFolderEntityService {
 
 				...(folder.parentId ? {
 					parent: this.pack(folder.parentId, {
-						detail: true,
+						detail: (options?.maxDepth ? options.maxDepth > 0 : true),
+						maxDepth: options?.maxDepth || 32,
 					}),
 				} : {}),
 			} : {}),

packages/backend/src/server/api/endpoints/drive/folders/update.ts

@@ -32,7 +32,7 @@ export const meta = {
 		},
 
 		recursiveNesting: {
-			message: 'It can not be structured like nesting folders recursively.',
+			message: 'Folders are linked recursively or too deeply.',
 			code: 'RECURSIVE_NESTING',
 			id: 'dbeb024837894013aed44279f9199740',
 		},
@@ -94,7 +94,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					}
 
 					// Check if the circular reference will occur
-					const checkCircle = async (folderId: string): Promise<boolean> => {
+					const checkCircle = async (folderId: string, limit: number = 32): Promise<boolean> => {
+						if (limit <= 0) {
+							return false;
+						}
 						const folder2 = await this.driveFoldersRepository.findOneByOrFail({
 							id: folderId,
 						});
@@ -102,7 +105,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 						if (folder2.id === folder.id) {
 							return true;
 						} else if (folder2.parentId) {
-							return await checkCircle(folder2.parentId);
+							return await checkCircle(folder2.parentId, limit - 1);
 						} else {
 							return false;
 						}

packages/backend/test/e2e/endpoints.ts

@@ -927,14 +927,15 @@ describe('Endpoints', () => {
 			const folderC = (await api('drive/folders/create', {
 				name: 'test',
 			}, alice)).body;
-			await api('drive/folders/update', {
+			assert.ok(folderA.id && folderB.id && folderC.id);
+			assert.strictEqual((await api('drive/folders/update', {
 				folderId: folderB.id,
 				parentId: folderA.id,
-			}, alice);
-			await api('drive/folders/update', {
+			}, alice)).status, 200);
+			assert.strictEqual((await api('drive/folders/update', {
 				folderId: folderC.id,
 				parentId: folderB.id,
-			}, alice);
+			}, alice)).status, 200);
 
 			const res = await api('drive/folders/update', {
 				folderId: folderA.id,