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

[backend/services] Include user profile in UserService.GetUserFromQueryAsync

Browse source
This commit is contained in:
Laura Hausmann 2024-02-09 23:30:03 +01:00
parent 920997ec41
commit 33f54f94bd
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Iceshrimp.Backend/Core/Services/UserService.cs
View file

@ -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<User> CreateUserAsync(string uri, string acct) {