From 9253c332aaf84e0d85fee022fc83bc6c53f2d1ba Mon Sep 17 00:00:00 2001 From: jvyden Date: Tue, 8 Feb 2022 13:38:18 -0500 Subject: [PATCH] Update EntityFramework to 6.0.2 --- .../ProjectLighthouse.Tests.GameApiTests.csproj | 4 ++-- .../ProjectLighthouse.Tests.WebsiteTests.csproj | 4 ++-- ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj | 4 ++-- .../Controllers/GameApi/Slots/ReviewController.cs | 6 +++--- ProjectLighthouse/ProjectLighthouse.csproj | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ProjectLighthouse.Tests.GameApiTests/ProjectLighthouse.Tests.GameApiTests.csproj b/ProjectLighthouse.Tests.GameApiTests/ProjectLighthouse.Tests.GameApiTests.csproj index 13bb480f..b41b9102 100644 --- a/ProjectLighthouse.Tests.GameApiTests/ProjectLighthouse.Tests.GameApiTests.csproj +++ b/ProjectLighthouse.Tests.GameApiTests/ProjectLighthouse.Tests.GameApiTests.csproj @@ -9,8 +9,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/ProjectLighthouse.Tests.WebsiteTests/ProjectLighthouse.Tests.WebsiteTests.csproj b/ProjectLighthouse.Tests.WebsiteTests/ProjectLighthouse.Tests.WebsiteTests.csproj index 1ea2b728..ff0847fb 100644 --- a/ProjectLighthouse.Tests.WebsiteTests/ProjectLighthouse.Tests.WebsiteTests.csproj +++ b/ProjectLighthouse.Tests.WebsiteTests/ProjectLighthouse.Tests.WebsiteTests.csproj @@ -9,8 +9,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj b/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj index e839e583..f9693564 100644 --- a/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj +++ b/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj @@ -14,8 +14,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/ProjectLighthouse/Controllers/GameApi/Slots/ReviewController.cs b/ProjectLighthouse/Controllers/GameApi/Slots/ReviewController.cs index 6389d02f..e7ad7d7f 100644 --- a/ProjectLighthouse/Controllers/GameApi/Slots/ReviewController.cs +++ b/ProjectLighthouse/Controllers/GameApi/Slots/ReviewController.cs @@ -74,7 +74,7 @@ public class ReviewController : ControllerBase this.database.RatedLevels.Add(ratedLevel); } - ratedLevel.Rating = Math.Max(Math.Min(1, rating), -1); + ratedLevel.Rating = Math.Clamp(rating, -1, 1); Review? review = await this.database.Reviews.FirstOrDefaultAsync(r => r.SlotId == slotId && r.ReviewerId == user.UserId); if (review != null) review.Thumb = ratedLevel.Rating; @@ -161,12 +161,12 @@ public class ReviewController : ControllerBase yourReview = new Review(); yourReview.ReviewerId = user.UserId; yourReview.Reviewer = user; - yourReview.Thumb = ratedLevel?.Rating == null ? 0 : ratedLevel.Rating; + yourReview.Thumb = ratedLevel?.Rating ?? 0; yourReview.Slot = slot; yourReview.SlotId = slotId; yourReview.Deleted = false; yourReview.DeletedBy = DeletedBy.None; - yourReview.Text = "You haven't reviewed this level yet. Edit this blank review to upload one!"; + yourReview.Text = "You haven't reviewed this level yet. Edit this to write one!"; yourReview.LabelCollection = ""; yourReview.Timestamp = TimeHelper.UnixTimeMilliseconds(); } diff --git a/ProjectLighthouse/ProjectLighthouse.csproj b/ProjectLighthouse/ProjectLighthouse.csproj index 9a761aff..8b36bb8b 100644 --- a/ProjectLighthouse/ProjectLighthouse.csproj +++ b/ProjectLighthouse/ProjectLighthouse.csproj @@ -18,10 +18,10 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive