From c108954662a81e0df0e251396ac94a9e8331ddf0 Mon Sep 17 00:00:00 2001 From: Noah Stolk <31079637+NoahStolk@users.noreply.github.com> Date: Sat, 7 Sep 2024 20:51:49 +0200 Subject: [PATCH] Fix warnings --- .../Services/CustomLeaderboardService.cs | 197 +++++++++--------- .../Services/ModService.cs | 4 +- .../Services/PlayerService.cs | 4 +- .../Commands/CustomEntries/UploadRequest.cs | 2 +- .../WebApplicationBuilderExtensions.cs | 3 +- .../DdInfoDiscordBot/DiscordBotService.cs | 2 +- .../DdInfoDiscordBot/DiscordColors.cs | 2 +- .../DiscordServerConstants.cs | 12 +- .../DiscordLogFlushBackgroundService.cs | 2 +- .../LeaderboardHistoryBackgroundService.cs | 2 +- .../Services/BackgroundServiceMonitor.cs | 2 +- .../CustomLeaderboardHighscoreLogger.cs | 4 +- .../Utils/HistoryUtils.cs | 2 +- 13 files changed, 120 insertions(+), 118 deletions(-) diff --git a/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/CustomLeaderboardService.cs b/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/CustomLeaderboardService.cs index 16de9b22c..3e70befa2 100644 --- a/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/CustomLeaderboardService.cs +++ b/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/CustomLeaderboardService.cs @@ -7,6 +7,7 @@ using DevilDaggersInfo.Web.Server.Domain.Admin.Exceptions; using DevilDaggersInfo.Web.Server.Domain.Entities; using DevilDaggersInfo.Web.Server.Domain.Entities.Enums; +using DevilDaggersInfo.Web.Server.Domain.Entities.Values; using DevilDaggersInfo.Web.Server.Domain.Exceptions; using DevilDaggersInfo.Web.Server.Domain.Extensions; using DevilDaggersInfo.Web.Server.Domain.Utils; @@ -101,54 +102,54 @@ await ValidateCustomLeaderboardAsync( Devil = GetDaggerValue(addCustomLeaderboard.RankSorting, addCustomLeaderboard.Daggers.Devil), Leviathan = GetDaggerValue(addCustomLeaderboard.RankSorting, addCustomLeaderboard.Daggers.Leviathan), IsFeatured = addCustomLeaderboard.IsFeatured, - GemsCollectedCriteria = new() { Operator = addCustomLeaderboard.GemsCollectedCriteria.Operator.ToDomain(), Expression = gemsCollectedExpression }, - GemsDespawnedCriteria = new() { Operator = addCustomLeaderboard.GemsDespawnedCriteria.Operator.ToDomain(), Expression = gemsDespawnedCriteriaExpression }, - GemsEatenCriteria = new() { Operator = addCustomLeaderboard.GemsEatenCriteria.Operator.ToDomain(), Expression = gemsEatenCriteriaExpression }, - EnemiesKilledCriteria = new() { Operator = addCustomLeaderboard.EnemiesKilledCriteria.Operator.ToDomain(), Expression = enemiesKilledCriteriaExpression }, - DaggersFiredCriteria = new() { Operator = addCustomLeaderboard.DaggersFiredCriteria.Operator.ToDomain(), Expression = daggersFiredCriteriaExpression }, - DaggersHitCriteria = new() { Operator = addCustomLeaderboard.DaggersHitCriteria.Operator.ToDomain(), Expression = daggersHitCriteriaExpression }, - HomingStoredCriteria = new() { Operator = addCustomLeaderboard.HomingStoredCriteria.Operator.ToDomain(), Expression = homingStoredCriteriaExpression }, - HomingEatenCriteria = new() { Operator = addCustomLeaderboard.HomingEatenCriteria.Operator.ToDomain(), Expression = homingEatenCriteriaExpression }, - DeathTypeCriteria = new() { Operator = addCustomLeaderboard.DeathTypeCriteria.Operator.ToDomain(), Expression = deathTypeCriteriaExpression }, - TimeCriteria = new() { Operator = addCustomLeaderboard.TimeCriteria.Operator.ToDomain(), Expression = timeCriteriaExpression }, - LevelUpTime2Criteria = new() { Operator = addCustomLeaderboard.LevelUpTime2Criteria.Operator.ToDomain(), Expression = levelUpTime2CriteriaExpression }, - LevelUpTime3Criteria = new() { Operator = addCustomLeaderboard.LevelUpTime3Criteria.Operator.ToDomain(), Expression = levelUpTime3CriteriaExpression }, - LevelUpTime4Criteria = new() { Operator = addCustomLeaderboard.LevelUpTime4Criteria.Operator.ToDomain(), Expression = levelUpTime4CriteriaExpression }, - EnemiesAliveCriteria = new() { Operator = addCustomLeaderboard.EnemiesAliveCriteria.Operator.ToDomain(), Expression = enemiesAliveCriteriaExpression }, - Skull1KillsCriteria = new() { Operator = addCustomLeaderboard.Skull1KillsCriteria.Operator.ToDomain(), Expression = skull1KillCountCriteriaExpression }, - Skull2KillsCriteria = new() { Operator = addCustomLeaderboard.Skull2KillsCriteria.Operator.ToDomain(), Expression = skull2KillCountCriteriaExpression }, - Skull3KillsCriteria = new() { Operator = addCustomLeaderboard.Skull3KillsCriteria.Operator.ToDomain(), Expression = skull3KillCountCriteriaExpression }, - Skull4KillsCriteria = new() { Operator = addCustomLeaderboard.Skull4KillsCriteria.Operator.ToDomain(), Expression = skull4KillCountCriteriaExpression }, - SpiderlingKillsCriteria = new() { Operator = addCustomLeaderboard.SpiderlingKillsCriteria.Operator.ToDomain(), Expression = spiderlingKillCountCriteriaExpression }, - SpiderEggKillsCriteria = new() { Operator = addCustomLeaderboard.SpiderEggKillsCriteria.Operator.ToDomain(), Expression = spiderEggKillCountCriteriaExpression }, - Squid1KillsCriteria = new() { Operator = addCustomLeaderboard.Squid1KillsCriteria.Operator.ToDomain(), Expression = squid1KillCountCriteriaExpression }, - Squid2KillsCriteria = new() { Operator = addCustomLeaderboard.Squid2KillsCriteria.Operator.ToDomain(), Expression = squid2KillCountCriteriaExpression }, - Squid3KillsCriteria = new() { Operator = addCustomLeaderboard.Squid3KillsCriteria.Operator.ToDomain(), Expression = squid3KillCountCriteriaExpression }, - CentipedeKillsCriteria = new() { Operator = addCustomLeaderboard.CentipedeKillsCriteria.Operator.ToDomain(), Expression = centipedeKillCountCriteriaExpression }, - GigapedeKillsCriteria = new() { Operator = addCustomLeaderboard.GigapedeKillsCriteria.Operator.ToDomain(), Expression = gigapedeKillCountCriteriaExpression }, - GhostpedeKillsCriteria = new() { Operator = addCustomLeaderboard.GhostpedeKillsCriteria.Operator.ToDomain(), Expression = ghostpedeKillsCountCriteriaExpression }, - Spider1KillsCriteria = new() { Operator = addCustomLeaderboard.Spider1KillsCriteria.Operator.ToDomain(), Expression = spider1KillCountCriteriaExpression }, - Spider2KillsCriteria = new() { Operator = addCustomLeaderboard.Spider2KillsCriteria.Operator.ToDomain(), Expression = spider2KillCountCriteriaExpression }, - LeviathanKillsCriteria = new() { Operator = addCustomLeaderboard.LeviathanKillsCriteria.Operator.ToDomain(), Expression = leviathanKillCountCriteriaExpression }, - OrbKillsCriteria = new() { Operator = addCustomLeaderboard.OrbKillsCriteria.Operator.ToDomain(), Expression = orbKillCountCriteriaExpression }, - ThornKillsCriteria = new() { Operator = addCustomLeaderboard.ThornKillsCriteria.Operator.ToDomain(), Expression = thornKillCountCriteriaExpression }, - Skull1sAliveCriteria = new() { Operator = addCustomLeaderboard.Skull1sAliveCriteria.Operator.ToDomain(), Expression = skull1AliveCountCriteriaExpression }, - Skull2sAliveCriteria = new() { Operator = addCustomLeaderboard.Skull2sAliveCriteria.Operator.ToDomain(), Expression = skull2AliveCountCriteriaExpression }, - Skull3sAliveCriteria = new() { Operator = addCustomLeaderboard.Skull3sAliveCriteria.Operator.ToDomain(), Expression = skull3AliveCountCriteriaExpression }, - Skull4sAliveCriteria = new() { Operator = addCustomLeaderboard.Skull4sAliveCriteria.Operator.ToDomain(), Expression = skull4AliveCountCriteriaExpression }, - SpiderlingsAliveCriteria = new() { Operator = addCustomLeaderboard.SpiderlingsAliveCriteria.Operator.ToDomain(), Expression = spiderlingAliveCountCriteriaExpression }, - SpiderEggsAliveCriteria = new() { Operator = addCustomLeaderboard.SpiderEggsAliveCriteria.Operator.ToDomain(), Expression = spiderEggAliveCountCriteriaExpression }, - Squid1sAliveCriteria = new() { Operator = addCustomLeaderboard.Squid1sAliveCriteria.Operator.ToDomain(), Expression = squid1AliveCountCriteriaExpression }, - Squid2sAliveCriteria = new() { Operator = addCustomLeaderboard.Squid2sAliveCriteria.Operator.ToDomain(), Expression = squid2AliveCountCriteriaExpression }, - Squid3sAliveCriteria = new() { Operator = addCustomLeaderboard.Squid3sAliveCriteria.Operator.ToDomain(), Expression = squid3AliveCountCriteriaExpression }, - CentipedesAliveCriteria = new() { Operator = addCustomLeaderboard.CentipedesAliveCriteria.Operator.ToDomain(), Expression = centipedeAliveCountCriteriaExpression }, - GigapedesAliveCriteria = new() { Operator = addCustomLeaderboard.GigapedesAliveCriteria.Operator.ToDomain(), Expression = gigapedeAliveCountCriteriaExpression }, - GhostpedesAliveCriteria = new() { Operator = addCustomLeaderboard.GhostpedesAliveCriteria.Operator.ToDomain(), Expression = ghostpedeAliveCountCriteriaExpression }, - Spider1sAliveCriteria = new() { Operator = addCustomLeaderboard.Spider1sAliveCriteria.Operator.ToDomain(), Expression = spider1AliveCountCriteriaExpression }, - Spider2sAliveCriteria = new() { Operator = addCustomLeaderboard.Spider2sAliveCriteria.Operator.ToDomain(), Expression = spider2AliveCountCriteriaExpression }, - LeviathansAliveCriteria = new() { Operator = addCustomLeaderboard.LeviathansAliveCriteria.Operator.ToDomain(), Expression = leviathanAliveCountCriteriaExpression }, - OrbsAliveCriteria = new() { Operator = addCustomLeaderboard.OrbsAliveCriteria.Operator.ToDomain(), Expression = orbAliveCountCriteriaExpression }, - ThornsAliveCriteria = new() { Operator = addCustomLeaderboard.ThornsAliveCriteria.Operator.ToDomain(), Expression = thornAliveCountCriteriaExpression }, + GemsCollectedCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.GemsCollectedCriteria.Operator.ToDomain(), Expression = gemsCollectedExpression }, + GemsDespawnedCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.GemsDespawnedCriteria.Operator.ToDomain(), Expression = gemsDespawnedCriteriaExpression }, + GemsEatenCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.GemsEatenCriteria.Operator.ToDomain(), Expression = gemsEatenCriteriaExpression }, + EnemiesKilledCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.EnemiesKilledCriteria.Operator.ToDomain(), Expression = enemiesKilledCriteriaExpression }, + DaggersFiredCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.DaggersFiredCriteria.Operator.ToDomain(), Expression = daggersFiredCriteriaExpression }, + DaggersHitCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.DaggersHitCriteria.Operator.ToDomain(), Expression = daggersHitCriteriaExpression }, + HomingStoredCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.HomingStoredCriteria.Operator.ToDomain(), Expression = homingStoredCriteriaExpression }, + HomingEatenCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.HomingEatenCriteria.Operator.ToDomain(), Expression = homingEatenCriteriaExpression }, + DeathTypeCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.DeathTypeCriteria.Operator.ToDomain(), Expression = deathTypeCriteriaExpression }, + TimeCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.TimeCriteria.Operator.ToDomain(), Expression = timeCriteriaExpression }, + LevelUpTime2Criteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.LevelUpTime2Criteria.Operator.ToDomain(), Expression = levelUpTime2CriteriaExpression }, + LevelUpTime3Criteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.LevelUpTime3Criteria.Operator.ToDomain(), Expression = levelUpTime3CriteriaExpression }, + LevelUpTime4Criteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.LevelUpTime4Criteria.Operator.ToDomain(), Expression = levelUpTime4CriteriaExpression }, + EnemiesAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.EnemiesAliveCriteria.Operator.ToDomain(), Expression = enemiesAliveCriteriaExpression }, + Skull1KillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.Skull1KillsCriteria.Operator.ToDomain(), Expression = skull1KillCountCriteriaExpression }, + Skull2KillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.Skull2KillsCriteria.Operator.ToDomain(), Expression = skull2KillCountCriteriaExpression }, + Skull3KillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.Skull3KillsCriteria.Operator.ToDomain(), Expression = skull3KillCountCriteriaExpression }, + Skull4KillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.Skull4KillsCriteria.Operator.ToDomain(), Expression = skull4KillCountCriteriaExpression }, + SpiderlingKillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.SpiderlingKillsCriteria.Operator.ToDomain(), Expression = spiderlingKillCountCriteriaExpression }, + SpiderEggKillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.SpiderEggKillsCriteria.Operator.ToDomain(), Expression = spiderEggKillCountCriteriaExpression }, + Squid1KillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.Squid1KillsCriteria.Operator.ToDomain(), Expression = squid1KillCountCriteriaExpression }, + Squid2KillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.Squid2KillsCriteria.Operator.ToDomain(), Expression = squid2KillCountCriteriaExpression }, + Squid3KillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.Squid3KillsCriteria.Operator.ToDomain(), Expression = squid3KillCountCriteriaExpression }, + CentipedeKillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.CentipedeKillsCriteria.Operator.ToDomain(), Expression = centipedeKillCountCriteriaExpression }, + GigapedeKillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.GigapedeKillsCriteria.Operator.ToDomain(), Expression = gigapedeKillCountCriteriaExpression }, + GhostpedeKillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.GhostpedeKillsCriteria.Operator.ToDomain(), Expression = ghostpedeKillsCountCriteriaExpression }, + Spider1KillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.Spider1KillsCriteria.Operator.ToDomain(), Expression = spider1KillCountCriteriaExpression }, + Spider2KillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.Spider2KillsCriteria.Operator.ToDomain(), Expression = spider2KillCountCriteriaExpression }, + LeviathanKillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.LeviathanKillsCriteria.Operator.ToDomain(), Expression = leviathanKillCountCriteriaExpression }, + OrbKillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.OrbKillsCriteria.Operator.ToDomain(), Expression = orbKillCountCriteriaExpression }, + ThornKillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.ThornKillsCriteria.Operator.ToDomain(), Expression = thornKillCountCriteriaExpression }, + Skull1sAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.Skull1sAliveCriteria.Operator.ToDomain(), Expression = skull1AliveCountCriteriaExpression }, + Skull2sAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.Skull2sAliveCriteria.Operator.ToDomain(), Expression = skull2AliveCountCriteriaExpression }, + Skull3sAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.Skull3sAliveCriteria.Operator.ToDomain(), Expression = skull3AliveCountCriteriaExpression }, + Skull4sAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.Skull4sAliveCriteria.Operator.ToDomain(), Expression = skull4AliveCountCriteriaExpression }, + SpiderlingsAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.SpiderlingsAliveCriteria.Operator.ToDomain(), Expression = spiderlingAliveCountCriteriaExpression }, + SpiderEggsAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.SpiderEggsAliveCriteria.Operator.ToDomain(), Expression = spiderEggAliveCountCriteriaExpression }, + Squid1sAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.Squid1sAliveCriteria.Operator.ToDomain(), Expression = squid1AliveCountCriteriaExpression }, + Squid2sAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.Squid2sAliveCriteria.Operator.ToDomain(), Expression = squid2AliveCountCriteriaExpression }, + Squid3sAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.Squid3sAliveCriteria.Operator.ToDomain(), Expression = squid3AliveCountCriteriaExpression }, + CentipedesAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.CentipedesAliveCriteria.Operator.ToDomain(), Expression = centipedeAliveCountCriteriaExpression }, + GigapedesAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.GigapedesAliveCriteria.Operator.ToDomain(), Expression = gigapedeAliveCountCriteriaExpression }, + GhostpedesAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.GhostpedesAliveCriteria.Operator.ToDomain(), Expression = ghostpedeAliveCountCriteriaExpression }, + Spider1sAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.Spider1sAliveCriteria.Operator.ToDomain(), Expression = spider1AliveCountCriteriaExpression }, + Spider2sAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.Spider2sAliveCriteria.Operator.ToDomain(), Expression = spider2AliveCountCriteriaExpression }, + LeviathansAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.LeviathansAliveCriteria.Operator.ToDomain(), Expression = leviathanAliveCountCriteriaExpression }, + OrbsAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.OrbsAliveCriteria.Operator.ToDomain(), Expression = orbAliveCountCriteriaExpression }, + ThornsAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = addCustomLeaderboard.ThornsAliveCriteria.Operator.ToDomain(), Expression = thornAliveCountCriteriaExpression }, }; _dbContext.CustomLeaderboards.Add(customLeaderboard); await _dbContext.SaveChangesAsync(); @@ -156,7 +157,7 @@ await ValidateCustomLeaderboardAsync( public async Task EditCustomLeaderboardAsync(int id, ApiSpec.Admin.CustomLeaderboards.EditCustomLeaderboard editCustomLeaderboard) { - CustomLeaderboardEntity? customLeaderboard = _dbContext.CustomLeaderboards.FirstOrDefault(cl => cl.Id == id); + CustomLeaderboardEntity? customLeaderboard = await _dbContext.CustomLeaderboards.FirstOrDefaultAsync(cl => cl.Id == id); if (customLeaderboard == null) throw new NotFoundException($"Custom leaderboard with ID '{id}' does not exist."); @@ -336,61 +337,61 @@ await ValidateCustomLeaderboardAsync( customLeaderboard.Devil = GetDaggerValue(editCustomLeaderboard.RankSorting, editCustomLeaderboard.Daggers.Devil); customLeaderboard.Leviathan = GetDaggerValue(editCustomLeaderboard.RankSorting, editCustomLeaderboard.Daggers.Leviathan); customLeaderboard.IsFeatured = editCustomLeaderboard.IsFeatured; - customLeaderboard.GemsCollectedCriteria = new() { Operator = editCustomLeaderboard.GemsCollectedCriteria.Operator.ToDomain(), Expression = gemsCollectedExpression }; - customLeaderboard.GemsDespawnedCriteria = new() { Operator = editCustomLeaderboard.GemsDespawnedCriteria.Operator.ToDomain(), Expression = gemsDespawnedCriteriaExpression }; - customLeaderboard.GemsEatenCriteria = new() { Operator = editCustomLeaderboard.GemsEatenCriteria.Operator.ToDomain(), Expression = gemsEatenCriteriaExpression }; - customLeaderboard.EnemiesKilledCriteria = new() { Operator = editCustomLeaderboard.EnemiesKilledCriteria.Operator.ToDomain(), Expression = enemiesKilledCriteriaExpression }; - customLeaderboard.DaggersFiredCriteria = new() { Operator = editCustomLeaderboard.DaggersFiredCriteria.Operator.ToDomain(), Expression = daggersFiredCriteriaExpression }; - customLeaderboard.DaggersHitCriteria = new() { Operator = editCustomLeaderboard.DaggersHitCriteria.Operator.ToDomain(), Expression = daggersHitCriteriaExpression }; - customLeaderboard.HomingStoredCriteria = new() { Operator = editCustomLeaderboard.HomingStoredCriteria.Operator.ToDomain(), Expression = homingStoredCriteriaExpression }; - customLeaderboard.HomingEatenCriteria = new() { Operator = editCustomLeaderboard.HomingEatenCriteria.Operator.ToDomain(), Expression = homingEatenCriteriaExpression }; - customLeaderboard.DeathTypeCriteria = new() { Operator = editCustomLeaderboard.DeathTypeCriteria.Operator.ToDomain(), Expression = deathTypeCriteriaExpression }; - customLeaderboard.TimeCriteria = new() { Operator = editCustomLeaderboard.TimeCriteria.Operator.ToDomain(), Expression = timeCriteriaExpression }; - customLeaderboard.LevelUpTime2Criteria = new() { Operator = editCustomLeaderboard.LevelUpTime2Criteria.Operator.ToDomain(), Expression = levelUpTime2CriteriaExpression }; - customLeaderboard.LevelUpTime3Criteria = new() { Operator = editCustomLeaderboard.LevelUpTime3Criteria.Operator.ToDomain(), Expression = levelUpTime3CriteriaExpression }; - customLeaderboard.LevelUpTime4Criteria = new() { Operator = editCustomLeaderboard.LevelUpTime4Criteria.Operator.ToDomain(), Expression = levelUpTime4CriteriaExpression }; - customLeaderboard.EnemiesAliveCriteria = new() { Operator = editCustomLeaderboard.EnemiesAliveCriteria.Operator.ToDomain(), Expression = enemiesAliveCriteriaExpression }; - customLeaderboard.Skull1KillsCriteria = new() { Operator = editCustomLeaderboard.Skull1KillsCriteria.Operator.ToDomain(), Expression = skull1KillCountCriteriaExpression }; - customLeaderboard.Skull2KillsCriteria = new() { Operator = editCustomLeaderboard.Skull2KillsCriteria.Operator.ToDomain(), Expression = skull2KillCountCriteriaExpression }; - customLeaderboard.Skull3KillsCriteria = new() { Operator = editCustomLeaderboard.Skull3KillsCriteria.Operator.ToDomain(), Expression = skull3KillCountCriteriaExpression }; - customLeaderboard.Skull4KillsCriteria = new() { Operator = editCustomLeaderboard.Skull4KillsCriteria.Operator.ToDomain(), Expression = skull4KillCountCriteriaExpression }; - customLeaderboard.SpiderlingKillsCriteria = new() { Operator = editCustomLeaderboard.SpiderlingKillsCriteria.Operator.ToDomain(), Expression = spiderlingKillCountCriteriaExpression }; - customLeaderboard.SpiderEggKillsCriteria = new() { Operator = editCustomLeaderboard.SpiderEggKillsCriteria.Operator.ToDomain(), Expression = spiderEggKillCountCriteriaExpression }; - customLeaderboard.Squid1KillsCriteria = new() { Operator = editCustomLeaderboard.Squid1KillsCriteria.Operator.ToDomain(), Expression = squid1KillCountCriteriaExpression }; - customLeaderboard.Squid2KillsCriteria = new() { Operator = editCustomLeaderboard.Squid2KillsCriteria.Operator.ToDomain(), Expression = squid2KillCountCriteriaExpression }; - customLeaderboard.Squid3KillsCriteria = new() { Operator = editCustomLeaderboard.Squid3KillsCriteria.Operator.ToDomain(), Expression = squid3KillCountCriteriaExpression }; - customLeaderboard.CentipedeKillsCriteria = new() { Operator = editCustomLeaderboard.CentipedeKillsCriteria.Operator.ToDomain(), Expression = centipedeKillCountCriteriaExpression }; - customLeaderboard.GigapedeKillsCriteria = new() { Operator = editCustomLeaderboard.GigapedeKillsCriteria.Operator.ToDomain(), Expression = gigapedeKillCountCriteriaExpression }; - customLeaderboard.GhostpedeKillsCriteria = new() { Operator = editCustomLeaderboard.GhostpedeKillsCriteria.Operator.ToDomain(), Expression = ghostpedeKillCountCriteriaExpression }; - customLeaderboard.Spider1KillsCriteria = new() { Operator = editCustomLeaderboard.Spider1KillsCriteria.Operator.ToDomain(), Expression = spider1KillCountCriteriaExpression }; - customLeaderboard.Spider2KillsCriteria = new() { Operator = editCustomLeaderboard.Spider2KillsCriteria.Operator.ToDomain(), Expression = spider2KillCountCriteriaExpression }; - customLeaderboard.LeviathanKillsCriteria = new() { Operator = editCustomLeaderboard.LeviathanKillsCriteria.Operator.ToDomain(), Expression = leviathanKillCountCriteriaExpression }; - customLeaderboard.OrbKillsCriteria = new() { Operator = editCustomLeaderboard.OrbKillsCriteria.Operator.ToDomain(), Expression = orbKillCountCriteriaExpression }; - customLeaderboard.ThornKillsCriteria = new() { Operator = editCustomLeaderboard.ThornKillsCriteria.Operator.ToDomain(), Expression = thornKillCountCriteriaExpression }; - customLeaderboard.Skull1sAliveCriteria = new() { Operator = editCustomLeaderboard.Skull1sAliveCriteria.Operator.ToDomain(), Expression = skull1AliveCountCriteriaExpression }; - customLeaderboard.Skull2sAliveCriteria = new() { Operator = editCustomLeaderboard.Skull2sAliveCriteria.Operator.ToDomain(), Expression = skull2AliveCountCriteriaExpression }; - customLeaderboard.Skull3sAliveCriteria = new() { Operator = editCustomLeaderboard.Skull3sAliveCriteria.Operator.ToDomain(), Expression = skull3AliveCountCriteriaExpression }; - customLeaderboard.Skull4sAliveCriteria = new() { Operator = editCustomLeaderboard.Skull4sAliveCriteria.Operator.ToDomain(), Expression = skull4AliveCountCriteriaExpression }; - customLeaderboard.SpiderlingsAliveCriteria = new() { Operator = editCustomLeaderboard.SpiderlingsAliveCriteria.Operator.ToDomain(), Expression = spiderlingAliveCountCriteriaExpression }; - customLeaderboard.SpiderEggsAliveCriteria = new() { Operator = editCustomLeaderboard.SpiderEggsAliveCriteria.Operator.ToDomain(), Expression = spiderEggAliveCountCriteriaExpression }; - customLeaderboard.Squid1sAliveCriteria = new() { Operator = editCustomLeaderboard.Squid1sAliveCriteria.Operator.ToDomain(), Expression = squid1AliveCountCriteriaExpression }; - customLeaderboard.Squid2sAliveCriteria = new() { Operator = editCustomLeaderboard.Squid2sAliveCriteria.Operator.ToDomain(), Expression = squid2AliveCountCriteriaExpression }; - customLeaderboard.Squid3sAliveCriteria = new() { Operator = editCustomLeaderboard.Squid3sAliveCriteria.Operator.ToDomain(), Expression = squid3AliveCountCriteriaExpression }; - customLeaderboard.CentipedesAliveCriteria = new() { Operator = editCustomLeaderboard.CentipedesAliveCriteria.Operator.ToDomain(), Expression = centipedeAliveCountCriteriaExpression }; - customLeaderboard.GigapedesAliveCriteria = new() { Operator = editCustomLeaderboard.GigapedesAliveCriteria.Operator.ToDomain(), Expression = gigapedeAliveCountCriteriaExpression }; - customLeaderboard.GhostpedesAliveCriteria = new() { Operator = editCustomLeaderboard.GhostpedesAliveCriteria.Operator.ToDomain(), Expression = ghostpedeAliveCountCriteriaExpression }; - customLeaderboard.Spider1sAliveCriteria = new() { Operator = editCustomLeaderboard.Spider1sAliveCriteria.Operator.ToDomain(), Expression = spider1AliveCountCriteriaExpression }; - customLeaderboard.Spider2sAliveCriteria = new() { Operator = editCustomLeaderboard.Spider2sAliveCriteria.Operator.ToDomain(), Expression = spider2AliveCountCriteriaExpression }; - customLeaderboard.LeviathansAliveCriteria = new() { Operator = editCustomLeaderboard.LeviathansAliveCriteria.Operator.ToDomain(), Expression = leviathanAliveCountCriteriaExpression }; - customLeaderboard.OrbsAliveCriteria = new() { Operator = editCustomLeaderboard.OrbsAliveCriteria.Operator.ToDomain(), Expression = orbAliveCountCriteriaExpression }; - customLeaderboard.ThornsAliveCriteria = new() { Operator = editCustomLeaderboard.ThornsAliveCriteria.Operator.ToDomain(), Expression = thornAliveCountCriteriaExpression }; + customLeaderboard.GemsCollectedCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.GemsCollectedCriteria.Operator.ToDomain(), Expression = gemsCollectedExpression }; + customLeaderboard.GemsDespawnedCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.GemsDespawnedCriteria.Operator.ToDomain(), Expression = gemsDespawnedCriteriaExpression }; + customLeaderboard.GemsEatenCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.GemsEatenCriteria.Operator.ToDomain(), Expression = gemsEatenCriteriaExpression }; + customLeaderboard.EnemiesKilledCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.EnemiesKilledCriteria.Operator.ToDomain(), Expression = enemiesKilledCriteriaExpression }; + customLeaderboard.DaggersFiredCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.DaggersFiredCriteria.Operator.ToDomain(), Expression = daggersFiredCriteriaExpression }; + customLeaderboard.DaggersHitCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.DaggersHitCriteria.Operator.ToDomain(), Expression = daggersHitCriteriaExpression }; + customLeaderboard.HomingStoredCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.HomingStoredCriteria.Operator.ToDomain(), Expression = homingStoredCriteriaExpression }; + customLeaderboard.HomingEatenCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.HomingEatenCriteria.Operator.ToDomain(), Expression = homingEatenCriteriaExpression }; + customLeaderboard.DeathTypeCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.DeathTypeCriteria.Operator.ToDomain(), Expression = deathTypeCriteriaExpression }; + customLeaderboard.TimeCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.TimeCriteria.Operator.ToDomain(), Expression = timeCriteriaExpression }; + customLeaderboard.LevelUpTime2Criteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.LevelUpTime2Criteria.Operator.ToDomain(), Expression = levelUpTime2CriteriaExpression }; + customLeaderboard.LevelUpTime3Criteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.LevelUpTime3Criteria.Operator.ToDomain(), Expression = levelUpTime3CriteriaExpression }; + customLeaderboard.LevelUpTime4Criteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.LevelUpTime4Criteria.Operator.ToDomain(), Expression = levelUpTime4CriteriaExpression }; + customLeaderboard.EnemiesAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.EnemiesAliveCriteria.Operator.ToDomain(), Expression = enemiesAliveCriteriaExpression }; + customLeaderboard.Skull1KillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.Skull1KillsCriteria.Operator.ToDomain(), Expression = skull1KillCountCriteriaExpression }; + customLeaderboard.Skull2KillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.Skull2KillsCriteria.Operator.ToDomain(), Expression = skull2KillCountCriteriaExpression }; + customLeaderboard.Skull3KillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.Skull3KillsCriteria.Operator.ToDomain(), Expression = skull3KillCountCriteriaExpression }; + customLeaderboard.Skull4KillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.Skull4KillsCriteria.Operator.ToDomain(), Expression = skull4KillCountCriteriaExpression }; + customLeaderboard.SpiderlingKillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.SpiderlingKillsCriteria.Operator.ToDomain(), Expression = spiderlingKillCountCriteriaExpression }; + customLeaderboard.SpiderEggKillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.SpiderEggKillsCriteria.Operator.ToDomain(), Expression = spiderEggKillCountCriteriaExpression }; + customLeaderboard.Squid1KillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.Squid1KillsCriteria.Operator.ToDomain(), Expression = squid1KillCountCriteriaExpression }; + customLeaderboard.Squid2KillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.Squid2KillsCriteria.Operator.ToDomain(), Expression = squid2KillCountCriteriaExpression }; + customLeaderboard.Squid3KillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.Squid3KillsCriteria.Operator.ToDomain(), Expression = squid3KillCountCriteriaExpression }; + customLeaderboard.CentipedeKillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.CentipedeKillsCriteria.Operator.ToDomain(), Expression = centipedeKillCountCriteriaExpression }; + customLeaderboard.GigapedeKillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.GigapedeKillsCriteria.Operator.ToDomain(), Expression = gigapedeKillCountCriteriaExpression }; + customLeaderboard.GhostpedeKillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.GhostpedeKillsCriteria.Operator.ToDomain(), Expression = ghostpedeKillCountCriteriaExpression }; + customLeaderboard.Spider1KillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.Spider1KillsCriteria.Operator.ToDomain(), Expression = spider1KillCountCriteriaExpression }; + customLeaderboard.Spider2KillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.Spider2KillsCriteria.Operator.ToDomain(), Expression = spider2KillCountCriteriaExpression }; + customLeaderboard.LeviathanKillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.LeviathanKillsCriteria.Operator.ToDomain(), Expression = leviathanKillCountCriteriaExpression }; + customLeaderboard.OrbKillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.OrbKillsCriteria.Operator.ToDomain(), Expression = orbKillCountCriteriaExpression }; + customLeaderboard.ThornKillsCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.ThornKillsCriteria.Operator.ToDomain(), Expression = thornKillCountCriteriaExpression }; + customLeaderboard.Skull1sAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.Skull1sAliveCriteria.Operator.ToDomain(), Expression = skull1AliveCountCriteriaExpression }; + customLeaderboard.Skull2sAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.Skull2sAliveCriteria.Operator.ToDomain(), Expression = skull2AliveCountCriteriaExpression }; + customLeaderboard.Skull3sAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.Skull3sAliveCriteria.Operator.ToDomain(), Expression = skull3AliveCountCriteriaExpression }; + customLeaderboard.Skull4sAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.Skull4sAliveCriteria.Operator.ToDomain(), Expression = skull4AliveCountCriteriaExpression }; + customLeaderboard.SpiderlingsAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.SpiderlingsAliveCriteria.Operator.ToDomain(), Expression = spiderlingAliveCountCriteriaExpression }; + customLeaderboard.SpiderEggsAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.SpiderEggsAliveCriteria.Operator.ToDomain(), Expression = spiderEggAliveCountCriteriaExpression }; + customLeaderboard.Squid1sAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.Squid1sAliveCriteria.Operator.ToDomain(), Expression = squid1AliveCountCriteriaExpression }; + customLeaderboard.Squid2sAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.Squid2sAliveCriteria.Operator.ToDomain(), Expression = squid2AliveCountCriteriaExpression }; + customLeaderboard.Squid3sAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.Squid3sAliveCriteria.Operator.ToDomain(), Expression = squid3AliveCountCriteriaExpression }; + customLeaderboard.CentipedesAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.CentipedesAliveCriteria.Operator.ToDomain(), Expression = centipedeAliveCountCriteriaExpression }; + customLeaderboard.GigapedesAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.GigapedesAliveCriteria.Operator.ToDomain(), Expression = gigapedeAliveCountCriteriaExpression }; + customLeaderboard.GhostpedesAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.GhostpedesAliveCriteria.Operator.ToDomain(), Expression = ghostpedeAliveCountCriteriaExpression }; + customLeaderboard.Spider1sAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.Spider1sAliveCriteria.Operator.ToDomain(), Expression = spider1AliveCountCriteriaExpression }; + customLeaderboard.Spider2sAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.Spider2sAliveCriteria.Operator.ToDomain(), Expression = spider2AliveCountCriteriaExpression }; + customLeaderboard.LeviathansAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.LeviathansAliveCriteria.Operator.ToDomain(), Expression = leviathanAliveCountCriteriaExpression }; + customLeaderboard.OrbsAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.OrbsAliveCriteria.Operator.ToDomain(), Expression = orbAliveCountCriteriaExpression }; + customLeaderboard.ThornsAliveCriteria = new CustomLeaderboardCriteriaEntityValue { Operator = editCustomLeaderboard.ThornsAliveCriteria.Operator.ToDomain(), Expression = thornAliveCountCriteriaExpression }; await _dbContext.SaveChangesAsync(); } public async Task DeleteCustomLeaderboardAsync(int id) { - CustomLeaderboardEntity? customLeaderboard = _dbContext.CustomLeaderboards.FirstOrDefault(cl => cl.Id == id); + CustomLeaderboardEntity? customLeaderboard = await _dbContext.CustomLeaderboards.FirstOrDefaultAsync(cl => cl.Id == id); if (customLeaderboard == null) throw new NotFoundException($"Custom leaderboard with ID '{id}' does not exist."); diff --git a/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/ModService.cs b/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/ModService.cs index b74ab0dd6..263dec83a 100644 --- a/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/ModService.cs +++ b/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/ModService.cs @@ -72,9 +72,9 @@ public async Task EditModAsync(int id, ApiSpec.Admin.Mods.EditMod editMod) throw new AdminDomainException($"Player with ID '{playerId}' does not exist."); } - ModEntity? mod = _dbContext.Mods + ModEntity? mod = await _dbContext.Mods .Include(m => m.PlayerMods) - .FirstOrDefault(m => m.Id == id); + .FirstOrDefaultAsync(m => m.Id == id); if (mod == null) throw new NotFoundException($"Mod with ID '{id}' does not exist."); diff --git a/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/PlayerService.cs b/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/PlayerService.cs index 5a2451980..2076541d0 100644 --- a/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/PlayerService.cs +++ b/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/PlayerService.cs @@ -101,9 +101,9 @@ public async Task EditPlayerAsync(int id, ApiSpec.Admin.Players.EditPlayer editP throw new AdminDomainException($"Mod with ID '{modId}' does not exist."); } - PlayerEntity? player = _dbContext.Players + PlayerEntity? player = await _dbContext.Players .Include(p => p.PlayerMods) - .FirstOrDefault(p => p.Id == id); + .FirstOrDefaultAsync(p => p.Id == id); if (player == null) throw new NotFoundException($"Player with ID '{id}' does not exist."); diff --git a/src/DevilDaggersInfo.Web.Server.Domain/Commands/CustomEntries/UploadRequest.cs b/src/DevilDaggersInfo.Web.Server.Domain/Commands/CustomEntries/UploadRequest.cs index 364d66581..b633ec549 100644 --- a/src/DevilDaggersInfo.Web.Server.Domain/Commands/CustomEntries/UploadRequest.cs +++ b/src/DevilDaggersInfo.Web.Server.Domain/Commands/CustomEntries/UploadRequest.cs @@ -208,7 +208,7 @@ public int GetFinalHomingValue() public TargetCollection CreateTargetCollection() { - return new() + return new TargetCollection { GemsCollected = GemsCollected, GemsDespawned = GemsDespawned, diff --git a/src/DevilDaggersInfo.Web.Server/Extensions/WebApplicationBuilderExtensions.cs b/src/DevilDaggersInfo.Web.Server/Extensions/WebApplicationBuilderExtensions.cs index f4fd6f9d9..7d0986c4a 100644 --- a/src/DevilDaggersInfo.Web.Server/Extensions/WebApplicationBuilderExtensions.cs +++ b/src/DevilDaggersInfo.Web.Server/Extensions/WebApplicationBuilderExtensions.cs @@ -1,5 +1,6 @@ using DevilDaggersInfo.Web.Server.NSwag; using NJsonSchema; +using NSwag; namespace DevilDaggersInfo.Web.Server.Extensions; @@ -22,7 +23,7 @@ public static void AddSwaggerDocument(this WebApplicationBuilder builder, string { document.Info.Title = $"DevilDaggers.info API ({apiNamespace.ToUpper()})"; document.Info.Description = description; - document.Info.Contact = new() + document.Info.Contact = new OpenApiContact { Name = "Noah Stolk", Url = "//noahstolk.com/", }; diff --git a/src/DevilDaggersInfo.Web.Server/HostedServices/DdInfoDiscordBot/DiscordBotService.cs b/src/DevilDaggersInfo.Web.Server/HostedServices/DdInfoDiscordBot/DiscordBotService.cs index 074bfd59e..c3b0a6587 100644 --- a/src/DevilDaggersInfo.Web.Server/HostedServices/DdInfoDiscordBot/DiscordBotService.cs +++ b/src/DevilDaggersInfo.Web.Server/HostedServices/DdInfoDiscordBot/DiscordBotService.cs @@ -21,7 +21,7 @@ public DiscordBotService(IOptions discordBotOptions, IWebHostEnv public async Task StartAsync(CancellationToken cancellationToken) { - _client = new(new() + _client = new DiscordClient(new DiscordConfiguration { Token = _discordBotOptions.Value.BotToken, TokenType = TokenType.Bot, diff --git a/src/DevilDaggersInfo.Web.Server/HostedServices/DdInfoDiscordBot/DiscordColors.cs b/src/DevilDaggersInfo.Web.Server/HostedServices/DdInfoDiscordBot/DiscordColors.cs index b233d1319..7e3e0568e 100644 --- a/src/DevilDaggersInfo.Web.Server/HostedServices/DdInfoDiscordBot/DiscordColors.cs +++ b/src/DevilDaggersInfo.Web.Server/HostedServices/DdInfoDiscordBot/DiscordColors.cs @@ -15,6 +15,6 @@ public static class DiscordColors private static DiscordColor ToDiscordColor(Color color) { - return new(color.R, color.G, color.B); + return new DiscordColor(color.R, color.G, color.B); } } diff --git a/src/DevilDaggersInfo.Web.Server/HostedServices/DdInfoDiscordBot/DiscordServerConstants.cs b/src/DevilDaggersInfo.Web.Server/HostedServices/DdInfoDiscordBot/DiscordServerConstants.cs index 08a5cb462..3d2c7c1e8 100644 --- a/src/DevilDaggersInfo.Web.Server/HostedServices/DdInfoDiscordBot/DiscordServerConstants.cs +++ b/src/DevilDaggersInfo.Web.Server/HostedServices/DdInfoDiscordBot/DiscordServerConstants.cs @@ -9,12 +9,12 @@ public static class DiscordServerConstants private static readonly Dictionary _channels = new() { - { Channel.MaintainersAuditLog, new(975077254046580828) }, - { Channel.MonitoringCustomLeaderboardValid, new(975077530732208148) }, - { Channel.MonitoringCustomLeaderboardInvalid, new(975077543575175228) }, - { Channel.MonitoringLog, new(975077324468920421) }, - { Channel.MonitoringTest, new(TestChannelId) }, - { Channel.CustomLeaderboards, new(578316107836817418) }, + { Channel.MaintainersAuditLog, new ChannelWrapper(975077254046580828) }, + { Channel.MonitoringCustomLeaderboardValid, new ChannelWrapper(975077530732208148) }, + { Channel.MonitoringCustomLeaderboardInvalid, new ChannelWrapper(975077543575175228) }, + { Channel.MonitoringLog, new ChannelWrapper(975077324468920421) }, + { Channel.MonitoringTest, new ChannelWrapper(TestChannelId) }, + { Channel.CustomLeaderboards, new ChannelWrapper(578316107836817418) }, }; /// diff --git a/src/DevilDaggersInfo.Web.Server/HostedServices/DiscordLogFlushBackgroundService.cs b/src/DevilDaggersInfo.Web.Server/HostedServices/DiscordLogFlushBackgroundService.cs index 466ed927a..48b5684b5 100644 --- a/src/DevilDaggersInfo.Web.Server/HostedServices/DiscordLogFlushBackgroundService.cs +++ b/src/DevilDaggersInfo.Web.Server/HostedServices/DiscordLogFlushBackgroundService.cs @@ -90,7 +90,7 @@ private async Task LogHighscore(CustomLeaderboardHighscoreLog highscoreLog) Title = highscoreLog.Message, Color = highscoreLog.Dagger.GetDiscordColor(), Url = $"https://devildaggers.info/custom/leaderboard/{highscoreLog.CustomLeaderboardId}", - Thumbnail = new() + Thumbnail = new DiscordEmbedBuilder.EmbedThumbnail { Url = $"https://devildaggers.info/images/icons/discord-bot/{thumbnailImage}", Height = 32, diff --git a/src/DevilDaggersInfo.Web.Server/HostedServices/LeaderboardHistoryBackgroundService.cs b/src/DevilDaggersInfo.Web.Server/HostedServices/LeaderboardHistoryBackgroundService.cs index fc4368a89..889901046 100644 --- a/src/DevilDaggersInfo.Web.Server/HostedServices/LeaderboardHistoryBackgroundService.cs +++ b/src/DevilDaggersInfo.Web.Server/HostedServices/LeaderboardHistoryBackgroundService.cs @@ -85,7 +85,7 @@ private bool HistoryFileExistsForDate(DateTime dateTime) private static LeaderboardHistory ConvertToHistoryModel(IDdLeaderboardService.LeaderboardResponse leaderboard, List entries) { - return new() + return new LeaderboardHistory { DaggersFiredGlobal = leaderboard.DaggersFiredGlobal, DaggersHitGlobal = leaderboard.DaggersHitGlobal, diff --git a/src/DevilDaggersInfo.Web.Server/Services/BackgroundServiceMonitor.cs b/src/DevilDaggersInfo.Web.Server/Services/BackgroundServiceMonitor.cs index 1271e07a8..e2db095c5 100644 --- a/src/DevilDaggersInfo.Web.Server/Services/BackgroundServiceMonitor.cs +++ b/src/DevilDaggersInfo.Web.Server/Services/BackgroundServiceMonitor.cs @@ -9,7 +9,7 @@ public class BackgroundServiceMonitor public void Register(string name, TimeSpan interval) { - _backgroundServiceLogs.Add(new(name, interval)); + _backgroundServiceLogs.Add(new BackgroundServiceLog(name, interval)); } public void Update(string name, DateTime lastExecuted) diff --git a/src/DevilDaggersInfo.Web.Server/Services/CustomLeaderboardHighscoreLogger.cs b/src/DevilDaggersInfo.Web.Server/Services/CustomLeaderboardHighscoreLogger.cs index f97e59c45..3ca0527ab 100644 --- a/src/DevilDaggersInfo.Web.Server/Services/CustomLeaderboardHighscoreLogger.cs +++ b/src/DevilDaggersInfo.Web.Server/Services/CustomLeaderboardHighscoreLogger.cs @@ -31,7 +31,7 @@ public void LogNewScore( CustomLeaderboardDagger dagger = customLeaderboard.DaggerFromStat(customEntry) ?? CustomLeaderboardDagger.Silver; string scoreField = GetScoreFieldName(customLeaderboard.RankSorting); string scoreValue = GetFormattedScoreValue(customLeaderboard.RankSorting, customEntry); - _highscoreLogs.Add(new() + _highscoreLogs.Add(new CustomLeaderboardHighscoreLog { RankValue = $"{rank}/{totalPlayers}", Dagger = dagger, @@ -61,7 +61,7 @@ public void LogHighscore( string scoreValue = GetFormattedScoreValue(customLeaderboard.RankSorting, customEntry); string message = $"`{playerName}` just got {GetScoreMessageText(customLeaderboard.RankSorting, customEntry)} on the `{spawnsetName}` leaderboard!"; - _highscoreLogs.Add(new() + _highscoreLogs.Add(new CustomLeaderboardHighscoreLog { RankValue = $"{rank}/{totalPlayers}", Dagger = dagger, diff --git a/src/DevilDaggersInfo.Web.Server/Utils/HistoryUtils.cs b/src/DevilDaggersInfo.Web.Server/Utils/HistoryUtils.cs index e701af448..a3e62c508 100644 --- a/src/DevilDaggersInfo.Web.Server/Utils/HistoryUtils.cs +++ b/src/DevilDaggersInfo.Web.Server/Utils/HistoryUtils.cs @@ -10,6 +10,6 @@ public static DateTime HistoryFileNameToDateTime(string dateString) int hour = int.Parse(dateString[8..10]); int minute = int.Parse(dateString[10..12]); - return new(year, month, day, hour, minute, 0, DateTimeKind.Utc); + return new DateTime(year, month, day, hour, minute, 0, DateTimeKind.Utc); } }