From df7bb7d356f6364b88b45723b49fadade92dc4c3 Mon Sep 17 00:00:00 2001
From: Slendy <josh@slendy.pw>
Date: Sun, 30 Jan 2022 21:25:53 -0600
Subject: [PATCH 1/4] Added basic search functionality and fixed some bugs

---
 .../Controllers/ResourcesController.cs          |  5 +++++
 ProjectLighthouse/Helpers/WebhookHelper.cs      |  2 +-
 ProjectLighthouse/Pages/LoginForm.cshtml        |  9 +++++----
 ProjectLighthouse/Pages/PhotosPage.cshtml       | 12 ++++++++++--
 ProjectLighthouse/Pages/PhotosPage.cshtml.cs    | 15 ++++++++++-----
 ProjectLighthouse/Pages/RegisterForm.cshtml     | 17 ++++++++++-------
 ProjectLighthouse/Pages/SlotsPage.cshtml        | 12 ++++++++++--
 ProjectLighthouse/Pages/SlotsPage.cshtml.cs     | 16 +++++++++++-----
 ProjectLighthouse/Pages/UsersPage.cshtml        | 12 ++++++++++--
 ProjectLighthouse/Pages/UsersPage.cshtml.cs     | 15 +++++++++------
 10 files changed, 81 insertions(+), 34 deletions(-)

diff --git a/ProjectLighthouse/Controllers/ResourcesController.cs b/ProjectLighthouse/Controllers/ResourcesController.cs
index f9ff9346..47e7f26d 100644
--- a/ProjectLighthouse/Controllers/ResourcesController.cs
+++ b/ProjectLighthouse/Controllers/ResourcesController.cs
@@ -1,4 +1,5 @@
 #nullable enable
+using System;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -56,6 +57,10 @@ public class ResourcesController : ControllerBase
     {
         string path = $"png/{hash}.png";
 
+        if (!IOFile.Exists("png"))
+        {
+             FileHelper.EnsureDirectoryCreated(Path.Combine(Environment.CurrentDirectory, "png"));
+        }
         if (IOFile.Exists(path))
         {
             return this.File(IOFile.OpenRead(path), "image/png");
diff --git a/ProjectLighthouse/Helpers/WebhookHelper.cs b/ProjectLighthouse/Helpers/WebhookHelper.cs
index c624fc45..9d0ea1c2 100644
--- a/ProjectLighthouse/Helpers/WebhookHelper.cs
+++ b/ProjectLighthouse/Helpers/WebhookHelper.cs
@@ -7,7 +7,7 @@ namespace LBPUnion.ProjectLighthouse.Helpers;
 
 public static class WebhookHelper
 {
-    private static readonly DiscordWebhookClient client = new(ServerSettings.Instance.DiscordWebhookUrl);
+    private static readonly DiscordWebhookClient client = (ServerSettings.Instance.DiscordWebhookEnabled ? new DiscordWebhookClient(ServerSettings.Instance.DiscordWebhookUrl) : null);
     public static readonly Color UnionColor = new(0, 140, 255);
 
     public static Task SendWebhook(EmbedBuilder builder) => SendWebhook(builder.Build());
diff --git a/ProjectLighthouse/Pages/LoginForm.cshtml b/ProjectLighthouse/Pages/LoginForm.cshtml
index ede86b66..b04b21bc 100644
--- a/ProjectLighthouse/Pages/LoginForm.cshtml
+++ b/ProjectLighthouse/Pages/LoginForm.cshtml
@@ -11,9 +11,9 @@
 
 <script>
     function onSubmit(form) {
-        const password = form['password'];
-        
-        password.value = sha256(password.value);
+        const passwordHashed = document.getElementById("password");
+        const passwordOriginal = document.getElementById("password-original");
+        passwordHashed.value = sha256(passwordOriginal.value);
         
         return true;
     }
@@ -43,7 +43,8 @@
     <div class="field">
         <label>Password</label>
         <div class="ui left icon input">
-            <input type="password" name="password" id="password" placeholder="Password">
+            <input type="password" id="password-original" placeholder="Password">
+            <input type="hidden" name="password" id="password">
             <i class="lock icon"></i>
         </div>
     </div>
diff --git a/ProjectLighthouse/Pages/PhotosPage.cshtml b/ProjectLighthouse/Pages/PhotosPage.cshtml
index 86e16661..cf46f3bf 100644
--- a/ProjectLighthouse/Pages/PhotosPage.cshtml
+++ b/ProjectLighthouse/Pages/PhotosPage.cshtml
@@ -9,6 +9,14 @@
 
 <p>There are @Model.PhotoCount total photos!</p>
 
+<form action="/photos/0">
+    <div class="ui icon input">
+        <input type="text" name="name" placeholder="Search photos..." value="@Model.SearchValue">
+        <i class="search icon"></i>
+    </div>
+</form>
+<div class="ui divider"></div>
+
 @foreach (Photo photo in Model.Photos)
 {
     <div class="ui segment">
@@ -18,10 +26,10 @@
 
 @if (Model.PageNumber != 0)
 {
-    <a href="/photos/@(Model.PageNumber - 1)">Previous Page</a>
+    <a href="/photos/@(Model.PageNumber - 1)@(Model.SearchValue.Length == 0 ? "" : "?name=" + Model.SearchValue)">Previous Page</a>
 }
 @(Model.PageNumber + 1) / @(Model.PageAmount)
 @if (Model.PageNumber < Model.PageAmount - 1)
 {
-    <a href="/photos/@(Model.PageNumber + 1)">Next Page</a>
+    <a href="/photos/@(Model.PageNumber + 1)@(Model.SearchValue.Length == 0 ? "" : "?name=" + Model.SearchValue)">Next Page</a>
 }
\ No newline at end of file
diff --git a/ProjectLighthouse/Pages/PhotosPage.cshtml.cs b/ProjectLighthouse/Pages/PhotosPage.cshtml.cs
index b483fc2c..db32f928 100644
--- a/ProjectLighthouse/Pages/PhotosPage.cshtml.cs
+++ b/ProjectLighthouse/Pages/PhotosPage.cshtml.cs
@@ -22,20 +22,25 @@ public class PhotosPage : BaseLayout
     public int PhotoCount;
 
     public List<Photo> Photos;
+
+    public string SearchValue;
     public PhotosPage([NotNull] Database database) : base(database)
     {}
 
-    public async Task<IActionResult> OnGet([FromRoute] int pageNumber)
+    public async Task<IActionResult> OnGet([FromRoute] int pageNumber, [FromQuery] string name)
     {
-        this.PhotoCount = await StatisticsHelper.PhotoCount();
+        if (string.IsNullOrWhiteSpace(name)) name = "";
 
+        this.PhotoCount = await this.Database.Photos.CountAsync(p => p.Creator.Username.Contains(name) || p.PhotoSubjectCollection.Contains(name));
+
+        this.SearchValue = name;
         this.PageNumber = pageNumber;
-        this.PageAmount = (int)Math.Ceiling((double)this.PhotoCount / ServerStatics.PageSize);
+        this.PageAmount = Math.Max(1, (int)Math.Ceiling((double)this.PhotoCount / ServerStatics.PageSize));
 
         if (this.PageNumber < 0 || this.PageNumber >= this.PageAmount) return this.Redirect($"/photos/{Math.Clamp(this.PageNumber, 0, this.PageAmount - 1)}");
 
-        this.Photos = await this.Database.Photos.Include
-                (p => p.Creator)
+        this.Photos = await this.Database.Photos.Where
+                (p => p.Creator.Username.Contains(name) || p.PhotoSubjectCollection.Contains(name))
             .OrderByDescending(p => p.Timestamp)
             .Skip(pageNumber * ServerStatics.PageSize)
             .Take(ServerStatics.PageSize)
diff --git a/ProjectLighthouse/Pages/RegisterForm.cshtml b/ProjectLighthouse/Pages/RegisterForm.cshtml
index 2b0d05ba..ba179e51 100644
--- a/ProjectLighthouse/Pages/RegisterForm.cshtml
+++ b/ProjectLighthouse/Pages/RegisterForm.cshtml
@@ -10,11 +10,12 @@
 
 <script>
     function onSubmit(form) {
-        const password = form['password'];
-        const confirmPassword = form['confirmPassword'];
-        
-        password.value = sha256(password.value);
-        confirmPassword.value = sha256(confirmPassword.value);
+        const passwordInput = document.getElementById("password");
+        const confirmPasswordInput = document.getElementById("confirmPassword");
+        const password = document.getElementById("password-submit");
+        const confirmPassword = document.getElementById("confirm-submit");
+        password.value = sha256(passwordInput.value);
+        confirmPassword.value = sha256(confirmPasswordInput.value);
         
         return true;
     }
@@ -44,7 +45,8 @@
     <div class="field">
         <label>Password</label>
         <div class="ui left icon input">
-            <input type="password" name="password" id="password" placeholder="Password">
+            <input type="password" id="password" placeholder="Password">
+            <input type="hidden" name="password" id="password-submit">
             <i class="lock icon"></i>
         </div>
     </div>
@@ -52,7 +54,8 @@
     <div class="field">
         <label>Confirm Password</label>
         <div class="ui left icon input">
-            <input type="password" name="confirmPassword" id="confirmPassword" placeholder="Confirm Password">
+            <input type="password" id="confirmPassword" placeholder="Confirm Password">
+            <input type="hidden" name="confirmPassword" id="confirm-submit">
             <i class="lock icon"></i>
         </div>
     </div>
diff --git a/ProjectLighthouse/Pages/SlotsPage.cshtml b/ProjectLighthouse/Pages/SlotsPage.cshtml
index c3aa545c..610838ea 100644
--- a/ProjectLighthouse/Pages/SlotsPage.cshtml
+++ b/ProjectLighthouse/Pages/SlotsPage.cshtml
@@ -10,6 +10,14 @@
 
 <p>There are @Model.SlotCount total levels!</p>
 
+<form action="/slots/0">
+    <div class="ui icon input">
+        <input type="text" name="name" placeholder="Search levels..." value="@Model.SearchValue">
+        <i class="search icon"></i>
+    </div>
+</form>
+<div class="ui divider"></div>
+
 @foreach (Slot slot in Model.Slots)
 {
     bool isMobile = Model.Request.IsMobile();
@@ -34,10 +42,10 @@
 
 @if (Model.PageNumber != 0)
 {
-    <a href="/slots/@(Model.PageNumber - 1)">Previous Page</a>
+    <a href="/slots/@(Model.PageNumber - 1)@(Model.SearchValue.Length == 0 ? "" : "?name=" + Model.SearchValue)">Previous Page</a>
 }
 @(Model.PageNumber + 1) / @(Model.PageAmount)
 @if (Model.PageNumber < Model.PageAmount - 1)
 {
-    <a href="/slots/@(Model.PageNumber + 1)">Next Page</a>
+    <a href="/slots/@(Model.PageNumber + 1)@(Model.SearchValue.Length == 0 ? "" : "?name=" + Model.SearchValue)">Next Page</a>
 }
\ No newline at end of file
diff --git a/ProjectLighthouse/Pages/SlotsPage.cshtml.cs b/ProjectLighthouse/Pages/SlotsPage.cshtml.cs
index e4d84fa8..33bfb673 100644
--- a/ProjectLighthouse/Pages/SlotsPage.cshtml.cs
+++ b/ProjectLighthouse/Pages/SlotsPage.cshtml.cs
@@ -22,20 +22,26 @@ public class SlotsPage : BaseLayout
     public int SlotCount;
 
     public List<Slot> Slots;
+
+    public string SearchValue;
+
     public SlotsPage([NotNull] Database database) : base(database)
     {}
 
-    public async Task<IActionResult> OnGet([FromRoute] int pageNumber)
+    public async Task<IActionResult> OnGet([FromRoute] int pageNumber, [FromQuery] string name)
     {
-        this.SlotCount = await StatisticsHelper.SlotCount();
+        if (string.IsNullOrWhiteSpace(name)) name = "";
 
+        this.SlotCount = await this.Database.Slots.CountAsync(p => p.Name.Contains(name));
+
+        this.SearchValue = name;
         this.PageNumber = pageNumber;
-        this.PageAmount = (int)Math.Ceiling((double)this.SlotCount / ServerStatics.PageSize);
+        this.PageAmount = Math.Max(1, (int) Math.Ceiling((double) this.SlotCount / ServerStatics.PageSize));
 
         if (this.PageNumber < 0 || this.PageNumber >= this.PageAmount) return this.Redirect($"/slots/{Math.Clamp(this.PageNumber, 0, this.PageAmount - 1)}");
 
-        this.Slots = await this.Database.Slots.Include
-                (p => p.Creator)
+        this.Slots = await this.Database.Slots.Where
+                (p => p.Name.Contains(name))
             .OrderByDescending(p => p.FirstUploaded)
             .Skip(pageNumber * ServerStatics.PageSize)
             .Take(ServerStatics.PageSize)
diff --git a/ProjectLighthouse/Pages/UsersPage.cshtml b/ProjectLighthouse/Pages/UsersPage.cshtml
index 3e3ab35f..ea6ae9ec 100644
--- a/ProjectLighthouse/Pages/UsersPage.cshtml
+++ b/ProjectLighthouse/Pages/UsersPage.cshtml
@@ -9,6 +9,14 @@
 }
 
 <p>There are @Model.UserCount total users.</p>
+                                   
+<form action="/users/0">
+    <div class="ui icon input">
+        <input type="text" name="name" placeholder="Search users..." value="@Model.SearchValue">
+        <i class="search icon"></i>
+    </div>
+</form>
+<div class="ui divider"></div>
 
 @foreach (User user in Model.Users)
 {
@@ -28,10 +36,10 @@
 
 @if (Model.PageNumber != 0)
 {
-    <a href="/users/@(Model.PageNumber - 1)">Previous Page</a>
+    <a href="/users/@(Model.PageNumber - 1)@(Model.SearchValue.Length == 0 ? "" : "?name=" + Model.SearchValue)">Previous Page</a>
 }
 @(Model.PageNumber + 1) / @(Model.PageAmount)
 @if (Model.PageNumber < Model.PageAmount - 1)
 {
-    <a href="/users/@(Model.PageNumber + 1)">Next Page</a>
+    <a href="/users/@(Model.PageNumber + 1)@(Model.SearchValue.Length == 0 ? "" : "?name=" + Model.SearchValue)">Next Page</a>
 }
\ No newline at end of file
diff --git a/ProjectLighthouse/Pages/UsersPage.cshtml.cs b/ProjectLighthouse/Pages/UsersPage.cshtml.cs
index d5125384..45f12a17 100644
--- a/ProjectLighthouse/Pages/UsersPage.cshtml.cs
+++ b/ProjectLighthouse/Pages/UsersPage.cshtml.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
-using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Settings;
@@ -22,20 +21,24 @@ public class UsersPage : BaseLayout
 
     public List<User> Users;
 
+    public string SearchValue;
+
     public UsersPage([NotNull] Database database) : base(database)
     {}
 
-    public async Task<IActionResult> OnGet([FromRoute] int pageNumber)
+    public async Task<IActionResult> OnGet([FromRoute] int pageNumber, [FromQuery] string name)
     {
-        this.UserCount = await StatisticsHelper.UserCount();
+        if (string.IsNullOrWhiteSpace(name)) name = "";
 
+        this.UserCount = await this.Database.Users.CountAsync(u => !u.Banned && u.Username.Contains(name));
+
+        this.SearchValue = name;
         this.PageNumber = pageNumber;
-        this.PageAmount = (int)Math.Ceiling((double)this.UserCount / ServerStatics.PageSize);
-
+        this.PageAmount = Math.Max(1, (int)Math.Ceiling((double)this.UserCount / ServerStatics.PageSize));
         if (this.PageNumber < 0 || this.PageNumber >= this.PageAmount) return this.Redirect($"/users/{Math.Clamp(this.PageNumber, 0, this.PageAmount - 1)}");
 
         this.Users = await this.Database.Users.Where
-                (u => !u.Banned)
+                (u => !u.Banned && u.Username.Contains(name))
             .OrderByDescending(b => b.UserId)
             .Skip(pageNumber * ServerStatics.PageSize)
             .Take(ServerStatics.PageSize)

From 32acd054f4338c0b62f7040e3374b931302482ca Mon Sep 17 00:00:00 2001
From: Slendy <josh@slendy.pw>
Date: Sun, 30 Jan 2022 23:06:05 -0600
Subject: [PATCH 2/4] Make suggested changes

---
 ProjectLighthouse/Controllers/ResourcesController.cs |  4 ----
 ProjectLighthouse/Pages/LoginForm.cshtml             | 11 ++++++-----
 ProjectLighthouse/Pages/PhotosPage.cshtml.cs         |  3 ++-
 ProjectLighthouse/Pages/RegisterForm.cshtml          |  8 ++++----
 ProjectLighthouse/Pages/SlotsPage.cshtml.cs          |  3 ++-
 ProjectLighthouse/Pages/UsersPage.cshtml.cs          |  4 +++-
 ProjectLighthouse/Program.cs                         |  1 +
 7 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/ProjectLighthouse/Controllers/ResourcesController.cs b/ProjectLighthouse/Controllers/ResourcesController.cs
index 47e7f26d..48e17903 100644
--- a/ProjectLighthouse/Controllers/ResourcesController.cs
+++ b/ProjectLighthouse/Controllers/ResourcesController.cs
@@ -57,10 +57,6 @@ public class ResourcesController : ControllerBase
     {
         string path = $"png/{hash}.png";
 
-        if (!IOFile.Exists("png"))
-        {
-             FileHelper.EnsureDirectoryCreated(Path.Combine(Environment.CurrentDirectory, "png"));
-        }
         if (IOFile.Exists(path))
         {
             return this.File(IOFile.OpenRead(path), "image/png");
diff --git a/ProjectLighthouse/Pages/LoginForm.cshtml b/ProjectLighthouse/Pages/LoginForm.cshtml
index b04b21bc..53e672df 100644
--- a/ProjectLighthouse/Pages/LoginForm.cshtml
+++ b/ProjectLighthouse/Pages/LoginForm.cshtml
@@ -11,9 +11,10 @@
 
 <script>
     function onSubmit(form) {
-        const passwordHashed = document.getElementById("password");
-        const passwordOriginal = document.getElementById("password-original");
-        passwordHashed.value = sha256(passwordOriginal.value);
+        const passwordInput = document.getElementById("password");
+        const passwordSubmit = document.getElementById("password-submit");
+        
+        passwordSubmit.value = sha256(passwordInput);
         
         return true;
     }
@@ -43,8 +44,8 @@
     <div class="field">
         <label>Password</label>
         <div class="ui left icon input">
-            <input type="password" id="password-original" placeholder="Password">
-            <input type="hidden" name="password" id="password">
+            <input type="password" id="password" placeholder="Password">
+            <input type="hidden" id="password-submit" name="password">
             <i class="lock icon"></i>
         </div>
     </div>
diff --git a/ProjectLighthouse/Pages/PhotosPage.cshtml.cs b/ProjectLighthouse/Pages/PhotosPage.cshtml.cs
index db32f928..b6c6efca 100644
--- a/ProjectLighthouse/Pages/PhotosPage.cshtml.cs
+++ b/ProjectLighthouse/Pages/PhotosPage.cshtml.cs
@@ -1,3 +1,4 @@
+#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -27,7 +28,7 @@ public class PhotosPage : BaseLayout
     public PhotosPage([NotNull] Database database) : base(database)
     {}
 
-    public async Task<IActionResult> OnGet([FromRoute] int pageNumber, [FromQuery] string name)
+    public async Task<IActionResult> OnGet([FromRoute] int pageNumber, [FromQuery] string? name)
     {
         if (string.IsNullOrWhiteSpace(name)) name = "";
 
diff --git a/ProjectLighthouse/Pages/RegisterForm.cshtml b/ProjectLighthouse/Pages/RegisterForm.cshtml
index ba179e51..67b3a05a 100644
--- a/ProjectLighthouse/Pages/RegisterForm.cshtml
+++ b/ProjectLighthouse/Pages/RegisterForm.cshtml
@@ -12,10 +12,10 @@
     function onSubmit(form) {
         const passwordInput = document.getElementById("password");
         const confirmPasswordInput = document.getElementById("confirmPassword");
-        const password = document.getElementById("password-submit");
-        const confirmPassword = document.getElementById("confirm-submit");
-        password.value = sha256(passwordInput.value);
-        confirmPassword.value = sha256(confirmPasswordInput.value);
+        const passwordSubmit = document.getElementById("password-submit");
+        const confirmPasswordSubmit = document.getElementById("confirm-submit");
+        passwordSubmit.value = sha256(passwordInput.value);
+        confirmPasswordSubmit.value = sha256(confirmPasswordInput.value);
         
         return true;
     }
diff --git a/ProjectLighthouse/Pages/SlotsPage.cshtml.cs b/ProjectLighthouse/Pages/SlotsPage.cshtml.cs
index 33bfb673..3ee865f1 100644
--- a/ProjectLighthouse/Pages/SlotsPage.cshtml.cs
+++ b/ProjectLighthouse/Pages/SlotsPage.cshtml.cs
@@ -1,3 +1,4 @@
+#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -28,7 +29,7 @@ public class SlotsPage : BaseLayout
     public SlotsPage([NotNull] Database database) : base(database)
     {}
 
-    public async Task<IActionResult> OnGet([FromRoute] int pageNumber, [FromQuery] string name)
+    public async Task<IActionResult> OnGet([FromRoute] int pageNumber, [FromQuery] string? name)
     {
         if (string.IsNullOrWhiteSpace(name)) name = "";
 
diff --git a/ProjectLighthouse/Pages/UsersPage.cshtml.cs b/ProjectLighthouse/Pages/UsersPage.cshtml.cs
index 45f12a17..9290033c 100644
--- a/ProjectLighthouse/Pages/UsersPage.cshtml.cs
+++ b/ProjectLighthouse/Pages/UsersPage.cshtml.cs
@@ -1,3 +1,4 @@
+#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -26,7 +27,7 @@ public class UsersPage : BaseLayout
     public UsersPage([NotNull] Database database) : base(database)
     {}
 
-    public async Task<IActionResult> OnGet([FromRoute] int pageNumber, [FromQuery] string name)
+    public async Task<IActionResult> OnGet([FromRoute] int pageNumber, [FromQuery] string? name)
     {
         if (string.IsNullOrWhiteSpace(name)) name = "";
 
@@ -35,6 +36,7 @@ public class UsersPage : BaseLayout
         this.SearchValue = name;
         this.PageNumber = pageNumber;
         this.PageAmount = Math.Max(1, (int)Math.Ceiling((double)this.UserCount / ServerStatics.PageSize));
+
         if (this.PageNumber < 0 || this.PageNumber >= this.PageAmount) return this.Redirect($"/users/{Math.Clamp(this.PageNumber, 0, this.PageAmount - 1)}");
 
         this.Users = await this.Database.Users.Where
diff --git a/ProjectLighthouse/Program.cs b/ProjectLighthouse/Program.cs
index 9c06c834..687d76db 100644
--- a/ProjectLighthouse/Program.cs
+++ b/ProjectLighthouse/Program.cs
@@ -82,6 +82,7 @@ public static class Program
             return;
         }
 
+        FileHelper.EnsureDirectoryCreated(Path.Combine(Environment.CurrentDirectory, "png"));
         if (Directory.Exists("r"))
         {
             Logger.Log

From 8de0903ceefcddb0a9ea378a5ee230dfe16fd16b Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Mon, 31 Jan 2022 00:21:53 -0500
Subject: [PATCH 3/4] Include creator in photos db call

---
 ProjectLighthouse/Pages/PhotosPage.cshtml.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ProjectLighthouse/Pages/PhotosPage.cshtml.cs b/ProjectLighthouse/Pages/PhotosPage.cshtml.cs
index b6c6efca..f3e7983f 100644
--- a/ProjectLighthouse/Pages/PhotosPage.cshtml.cs
+++ b/ProjectLighthouse/Pages/PhotosPage.cshtml.cs
@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
-using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Pages.Layouts;
 using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Settings;
@@ -40,8 +39,9 @@ public class PhotosPage : BaseLayout
 
         if (this.PageNumber < 0 || this.PageNumber >= this.PageAmount) return this.Redirect($"/photos/{Math.Clamp(this.PageNumber, 0, this.PageAmount - 1)}");
 
-        this.Photos = await this.Database.Photos.Where
-                (p => p.Creator.Username.Contains(name) || p.PhotoSubjectCollection.Contains(name))
+        this.Photos = await this.Database.Photos.Include
+                (p => p.Creator)
+            .Where(p => p.Creator.Username.Contains(name) || p.PhotoSubjectCollection.Contains(name))
             .OrderByDescending(p => p.Timestamp)
             .Skip(pageNumber * ServerStatics.PageSize)
             .Take(ServerStatics.PageSize)

From fc41243d362abcc997f02565c60458f1c0aac425 Mon Sep 17 00:00:00 2001
From: Slendy <josh@slendy.pw>
Date: Mon, 31 Jan 2022 18:59:07 -0600
Subject: [PATCH 4/4] Uhh oops

---
 ProjectLighthouse/Pages/LoginForm.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ProjectLighthouse/Pages/LoginForm.cshtml b/ProjectLighthouse/Pages/LoginForm.cshtml
index 53e672df..2e5494a4 100644
--- a/ProjectLighthouse/Pages/LoginForm.cshtml
+++ b/ProjectLighthouse/Pages/LoginForm.cshtml
@@ -14,7 +14,7 @@
         const passwordInput = document.getElementById("password");
         const passwordSubmit = document.getElementById("password-submit");
         
-        passwordSubmit.value = sha256(passwordInput);
+        passwordSubmit.value = sha256(passwordInput.value);
         
         return true;
     }