notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[backend/api] Improve DriveFolder existing check

Browse source
This commit is contained in:
pancakes 2024-12-30 23:58:00 +10:00 • committed by Laura Hausmann
parent d8192bb37d
commit 72800a68e8
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Iceshrimp.Backend/Controllers/Web/DriveController.cs
View file

@ -363,11 +363,11 @@ public class DriveController(
var existing = await db.DriveFolders var existing = await db.DriveFolders
#pragma warning disable CA1862 #pragma warning disable CA1862
.FirstOrDefaultAsync(p => p.Name.ToLower() == name.Trim().ToLower() .AnyAsync(p => p.Name.ToLower() == name.Trim().ToLower()
#pragma warning restore CA1862 #pragma warning restore CA1862
&& p.ParentId == folder.ParentId && p.ParentId == folder.ParentId
&& p.UserId == user.Id); && p.UserId == user.Id);
if (existing != null) if (existing)
throw GracefulException.Conflict("A folder with this name already exists"); throw GracefulException.Conflict("A folder with this name already exists");
folder.Name = name.Trim(); folder.Name = name.Trim();
@ -429,10 +429,12 @@ public class DriveController(
} }
var existing = await db.DriveFolders var existing = await db.DriveFolders
.FirstOrDefaultAsync(p => p.Name == folder.Name #pragma warning disable CA1862
.AnyAsync(p => p.Name.ToLower() == folder.Name.ToLower()
#pragma warning restore CA1862
&& p.ParentId == request.FolderId && p.ParentId == request.FolderId
&& p.UserId == user.Id); && p.UserId == user.Id);
if (existing != null) if (existing)
throw GracefulException.Conflict("A folder with this name already exists in the new parent folder"); throw GracefulException.Conflict("A folder with this name already exists in the new parent folder");
folder.ParentId = request.FolderId; folder.ParentId = request.FolderId;