Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-08-06 20:08:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix null check

Browse source
This commit is contained in:
LumaLivy 2021-11-08 01:18:55 -05:00
commit f625fd2042
1 changed files with 5 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

27
ProjectLighthouse/Controllers/UserController.cs
View file

@ -27,24 +27,8 @@ namespace LBPUnion.ProjectLighthouse.Controllers
public async Task<string> GetSerializedUser(string username) public async Task<string> GetSerializedUser(string username)
{ {
try User? user = await this.database.Users.Include(u => u.Location).FirstOrDefaultAsync(u => u.Username == username);
{ return user?.Serialize();
User user = await this.database.Users.Include(u => u.Location).FirstOrDefaultAsync(u => u.Username == username);
return user.Serialize();
}
catch (NullReferenceException)
{
return null;
}
}
[HttpPost("play/user/{userId}")]
public async Task<IActionResult> Play([FromQuery] bool lbp2)
{
string bodyString = await new StreamReader(this.Request.Body).ReadToEndAsync();
Console.WriteLine(bodyString);
return this.Ok();
} }
[HttpGet("user/{username}")] [HttpGet("user/{username}")]
@ -57,14 +41,13 @@ namespace LBPUnion.ProjectLighthouse.Controllers
[HttpGet("users")] [HttpGet("users")]
public async Task<IActionResult> GetUserAlt([FromQuery] string[] u) public async Task<IActionResult> GetUserAlt([FromQuery] string[] u)
{ {
List<Task<string>> tasks = new(); List<string> tasks = new();
foreach (string userId in u) foreach (string userId in u)
{ {
tasks.Add(this.GetSerializedUser(userId)); tasks.Add(await this.GetSerializedUser(userId));
} }
await Task.WhenAll(tasks).ConfigureAwait(true);
string serialized = tasks.Aggregate(string.Empty, (current, u) => u.Result == null ? current : current + u); string serialized = tasks.Aggregate(string.Empty, (current, u) => u == null ? current : current + u);
return this.Ok(LbpSerializer.StringElement("users", serialized)); return this.Ok(LbpSerializer.StringElement("users", serialized));
} }