From 4684425e874962925fa081371ea92407827a5d91 Mon Sep 17 00:00:00 2001
From: Laura Hausmann <laura@hausmann.dev>
Date: Thu, 4 Jul 2024 01:23:56 +0200
Subject: [PATCH] [backend/core] Fix sporadic
 GetOrCreateSystemUserAndKeypairAsync failures when another instances'
 instance.actor is contained in the change tracker

---
 Iceshrimp.Backend/Core/Services/SystemUserService.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Iceshrimp.Backend/Core/Services/SystemUserService.cs b/Iceshrimp.Backend/Core/Services/SystemUserService.cs
index bbd3a0c4..10e756df 100644
--- a/Iceshrimp.Backend/Core/Services/SystemUserService.cs
+++ b/Iceshrimp.Backend/Core/Services/SystemUserService.cs
@@ -48,7 +48,8 @@ public class SystemUserService(ILogger<SystemUserService> logger, DatabaseContex
 	{
 		var user = db.ChangeTracker
 		             .Entries<User>()
-		             .FirstOrDefault(p => p.Entity.UsernameLower == username.ToLowerInvariant())
+		             .FirstOrDefault(p => p.Entity.Host == null &&
+		                                  p.Entity.UsernameLower == username.ToLowerInvariant())
 		             ?.Entity;
 
 		user ??= await db.Users.FirstOrDefaultAsync(p => p.UsernameLower == username.ToLowerInvariant() &&