diff --git a/Iceshrimp.Backend/Core/Services/UserService.cs b/Iceshrimp.Backend/Core/Services/UserService.cs index cb8b7541..05dfa37b 100644 --- a/Iceshrimp.Backend/Core/Services/UserService.cs +++ b/Iceshrimp.Backend/Core/Services/UserService.cs @@ -39,17 +39,19 @@ public class UserService( if (query.StartsWith("http://") || query.StartsWith("https://")) if (query.StartsWith($"https://{instance.Value.WebDomain}/users/")) { query = query[$"https://{instance.Value.WebDomain}/users/".Length..]; - return await db.Users.FirstOrDefaultAsync(p => p.Id == query) ?? + return await db.Users.IncludeCommonProperties().FirstOrDefaultAsync(p => p.Id == query) ?? throw GracefulException.NotFound("User not found"); } else { - return await db.Users.FirstOrDefaultAsync(p => p.Uri == query); + return await db.Users.IncludeCommonProperties().FirstOrDefaultAsync(p => p.Uri == query); } var tuple = AcctToTuple(query); if (tuple.Host == instance.Value.WebDomain || tuple.Host == instance.Value.AccountDomain) tuple.Host = null; - return await db.Users.FirstOrDefaultAsync(p => p.Username == tuple.Username && p.Host == tuple.Host); + return await db.Users + .IncludeCommonProperties() + .FirstOrDefaultAsync(p => p.Username == tuple.Username && p.Host == tuple.Host); } public async Task CreateUserAsync(string uri, string acct) {