diff --git a/ProjectLighthouse.Servers.Website/Controllers/Moderator/ModerationRemovalController.cs b/ProjectLighthouse.Servers.Website/Controllers/Moderator/ModerationRemovalController.cs index db437c23..6b17ea79 100644 --- a/ProjectLighthouse.Servers.Website/Controllers/Moderator/ModerationRemovalController.cs +++ b/ProjectLighthouse.Servers.Website/Controllers/Moderator/ModerationRemovalController.cs @@ -42,9 +42,7 @@ public class ModerationRemovalController : ControllerBase Score? score = await this.database.Scores.Include(s => s.Slot).FirstOrDefaultAsync(s => s.ScoreId == id); if (score == null) return null; - if (!user.IsModerator && score.Slot.CreatorId != user.UserId) return null; - - return score; + return user.IsModerator ? score : null; }); } @@ -113,7 +111,7 @@ public class ModerationRemovalController : ControllerBase Photo? photo = await this.database.Photos.Include(p => p.Slot).FirstOrDefaultAsync(p => p.PhotoId == id); if (photo == null) return null; - if (!user.IsModerator && photo.Slot?.CreatorId != user.UserId) return null; + if (!user.IsModerator && photo.CreatorId != user.UserId) return null; return photo; }); diff --git a/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml b/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml index 806e7d8a..73a0b065 100644 --- a/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml +++ b/ProjectLighthouse.Servers.Website/Pages/SlotPage.cshtml @@ -122,7 +122,7 @@ @foreach (Photo photo in Model.Photos) { string width = isMobile ? "sixteen" : "eight"; - bool canDelete = Model.User != null && (Model.User.IsModerator || Model.User.UserId == photo.CreatorId || Model.User.UserId == Model.Slot?.SlotId); + bool canDelete = Model.User != null && (Model.User.IsModerator || Model.User.UserId == photo.CreatorId);
@await photo.ToHtml(Html, ViewData, language, timeZone, canDelete)
@@ -147,7 +147,7 @@ "isMobile", isMobile }, { - "CanDelete", (Model.User?.IsModerator ?? false) || Model.Slot?.CreatorId == Model.User?.UserId + "CanDelete", Model.User?.IsModerator ?? false }, })