From 3bafb0ec7c43c144107054c4c554f45f840620a9 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Thu, 9 Jan 2025 07:54:07 +0100 Subject: [PATCH] [backend/federation] Improve UserResolver uri/acct mismatch error message --- .../Core/Federation/ActivityPub/UserResolver.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Iceshrimp.Backend/Core/Federation/ActivityPub/UserResolver.cs b/Iceshrimp.Backend/Core/Federation/ActivityPub/UserResolver.cs index 3b71302c..584f3735 100644 --- a/Iceshrimp.Backend/Core/Federation/ActivityPub/UserResolver.cs +++ b/Iceshrimp.Backend/Core/Federation/ActivityPub/UserResolver.cs @@ -366,7 +366,11 @@ public class UserResolver( { user = await userSvc.GetUserFromQueryAsync(new Uri(acct), allowUrl: false); if (user != null && user.Uri != uri && !flags.HasFlag(ResolveFlags.Acct)) - return GracefulException.BadRequest($"User with acct {acct} is known, but Acct flag is not set"); + return GracefulException.BadRequest($"User with acct {acct} is known, but Acct flag is not set." + + $"This likely means that the domain was reused without" + + $"preserving user data, and a user that previously existed" + + $"was recreated with a new URI. To fix this, have your instance" + + $"administrator delete the old user from the database."); } // @formatter:off