From a905c271fb5d18d62e8c916e0a9a75eb08deb155 Mon Sep 17 00:00:00 2001
From: Laura Hausmann <laura@hausmann.dev>
Date: Fri, 1 Mar 2024 02:18:33 +0100
Subject: [PATCH] [backend/core] Fix order of operations on user create

---
 Iceshrimp.Backend/Core/Services/UserService.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Iceshrimp.Backend/Core/Services/UserService.cs b/Iceshrimp.Backend/Core/Services/UserService.cs
index cdc2f4ef..1a586bcf 100644
--- a/Iceshrimp.Backend/Core/Services/UserService.cs
+++ b/Iceshrimp.Backend/Core/Services/UserService.cs
@@ -179,10 +179,8 @@ public class UserService(
 		try
 		{
 			await db.AddRangeAsync(user, profile, publicKey);
-
-			// We need to do this after calling db.Add(Range) to ensure data consistency
-			var processPendingDeletes = await ResolveAvatarAndBanner(user, actor);
 			await db.SaveChangesAsync();
+			var processPendingDeletes = await ResolveAvatarAndBanner(user, actor);
 			await processPendingDeletes();
 			user = await UpdateProfileMentions(user, actor);
 			UpdateUserPinnedNotesInBackground(actor, user);
@@ -404,6 +402,8 @@ public class UserService(
 
 		user.AvatarUrl = avatar?.Url;
 		user.BannerUrl = banner?.Url;
+        
+		await db.SaveChangesAsync();
 
 		return async () =>
 		{