From 8ce1d4d6a31779826796ac17781c51cfb5294e32 Mon Sep 17 00:00:00 2001
From: "Acid Chicken (硫酸鶏)" <root@acid-chicken.com>
Date: Tue, 26 Mar 2019 22:24:14 +0900
Subject: Fix #4576 (#4579)

* Update update.ts

* Update api.ts
---
 src/server/api/endpoints/drive/folders/update.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/server/api/endpoints/drive')

diff --git a/src/server/api/endpoints/drive/folders/update.ts b/src/server/api/endpoints/drive/folders/update.ts
index 1dc0e63878..a1ee2669f0 100644
--- a/src/server/api/endpoints/drive/folders/update.ts
+++ b/src/server/api/endpoints/drive/folders/update.ts
@@ -83,7 +83,9 @@ export default define(meta, async (ps, user) => {
 	if (ps.name) folder.name = ps.name;
 
 	if (ps.parentId !== undefined) {
-		if (ps.parentId === null) {
+		if (ps.parentId.equals(folder._id)) {
+			throw new ApiError(meta.errors.recursiveNesting);
+		} else if (ps.parentId === null) {
 			folder.parentId = null;
 		} else {
 			// Get parent folder
-- 
cgit v1.2.3-freya