From a5cdc305aa9371b4dc186b45cf7431c6b997e4c3 Mon Sep 17 00:00:00 2001
From: 00Fjongl <65314359+00Fjongl@users.noreply.github.com>
Date: Mon, 8 Jul 2024 12:54:35 -0500
Subject: [PATCH 1/2] Reverting to the old logic to implement a 404 page in
 place of where it would crash.

---
 src/server.mjs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/server.mjs b/src/server.mjs
index 93f32601..04ffd5f8 100644
--- a/src/server.mjs
+++ b/src/server.mjs
@@ -94,10 +94,13 @@ app.use(helmet({
 //  Query strings like /?j are converted into paths like /views/hidden.html
 //  back here. Which query string converts to what is defined in routes.mjs.
 router.get('/', async (req, res) => res.send(paintSource(loadTemplates(tryReadFile(
-//      Return the index page if the query is not found, as there is no
-//      undefined page in routes.mjs. Also sets it as the default page.
-        path.join(__dirname, 'views', pages[Object.keys(req.query)[0]] || pages.index)
-    )))));
+    path.join(__dirname,
+        'views',
+//      Return the error page if the query is not found, as there is no
+//      undefined page in routes.mjs. Also set index as the default page.
+        '/?'.indexOf(req.url) ? pages[Object.keys(req.query)[0]] || text404 : pages.index
+    )
+)))));
 
 
 app.use(router);

From 9b1a9aee47b8f2aaebf64d76a69cef23368b894f Mon Sep 17 00:00:00 2001
From: 00Fjongl <65314359+00Fjongl@users.noreply.github.com>
Date: Mon, 8 Jul 2024 13:12:06 -0500
Subject: [PATCH 2/2] Properly routed the error page.

---
 src/server.mjs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/server.mjs b/src/server.mjs
index 0fb2500c..a872936a 100644
--- a/src/server.mjs
+++ b/src/server.mjs
@@ -105,7 +105,7 @@ router.get("/", async (req, res) =>
                         'views',
 //  Return the error page if the query is not found, as there is no
 //  undefined page in routes.mjs. Also set index as the default page.
-                        '/?'.indexOf(req.url) ? pages[Object.keys(req.query)[0]] || text404 : pages.index
+                        '/?'.indexOf(req.url) ? pages[Object.keys(req.query)[0]] || 'error.html' : pages.index
                     )
                 )
             )
@@ -122,6 +122,7 @@ app.use("/baremux/", express.static(baremuxPath));
 
 app.disable("x-powered-by");
 
+//  Redundant code since 404 is handled elsewhere; left here as insurance.
 app.use((req, res) => {
   res.status(404).send(paintSource(loadTemplates(text404)));
 });