From 8f1b1ada84114ef0d7f06408a3830f4ea9ce1d80 Mon Sep 17 00:00:00 2001
From: stringsplit <77242831+nbitzz@users.noreply.github.com>
Date: Sat, 9 Mar 2024 17:22:08 -0800
Subject: [PATCH] Few quick patches

---
 src/server/index.ts                  | 33 ++++++++++++++--------------
 src/server/routes/api/web/preview.ts |  4 +---
 src/svelte/elem/UploadWindow.svelte  | 16 +++++++-------
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/src/server/index.ts b/src/server/index.ts
index 3b2c5ed..3d32eaa 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -85,6 +85,23 @@ const apiRouter = new APIRouter(files)
 apiRouter.loadAPIMethods().then(() => {
     app.route("/", apiRouter.root)
     console.log("API OK!")
+
+    // listen on 3000 or MONOFILE_PORT
+    // moved here to prevent a crash if someone manages to access monofile before api routes are mounted
+    
+    serve(
+        {
+            fetch: app.fetch,
+            port: Number(process.env.MONOFILE_PORT || 3000),
+            serverOptions: {
+                //@ts-ignore
+                requestTimeout: config.requestTimeout
+            }
+        },
+        (info) => {
+            console.log("Web OK!", info.port, info.address)
+        }
+    )
 })
 
 // index, clone
@@ -104,20 +121,4 @@ app.get("/", async (ctx) =>
     file serving
 */
 
-// listen on 3000 or MONOFILE_PORT
-
-serve(
-    {
-        fetch: app.fetch,
-        port: Number(process.env.MONOFILE_PORT || 3000),
-        serverOptions: {
-            //@ts-ignore
-            requestTimeout: config.requestTimeout
-        }
-    },
-    (info) => {
-        console.log("Web OK!", info.port, info.address)
-    }
-)
-
 export default app
\ No newline at end of file
diff --git a/src/server/routes/api/web/preview.ts b/src/server/routes/api/web/preview.ts
index 8370697..052a2cc 100644
--- a/src/server/routes/api/web/preview.ts
+++ b/src/server/routes/api/web/preview.ts
@@ -107,9 +107,7 @@ export default function (files: Files) {
                             : `@${fileOwner?.username || "Deleted User"}`
                     )
             )
-        } else {
-            ServeError(ctx, 404, "file not found")
-        }
+        } else return ServeError(ctx, 404, "file not found")
     })
 
     return router
diff --git a/src/svelte/elem/UploadWindow.svelte b/src/svelte/elem/UploadWindow.svelte
index 28d3c32..8e5c332 100644
--- a/src/svelte/elem/UploadWindow.svelte
+++ b/src/svelte/elem/UploadWindow.svelte
@@ -4,6 +4,7 @@
     import { fade } from "svelte/transition"
     import { circIn, circOut } from "svelte/easing"
     import { serverStats, refresh_stats, account } from "./stores.mjs"
+    import bytes from "bytes"
 
     import AttachmentZone from "./uploader/AttachmentZone.svelte"
 
@@ -213,9 +214,7 @@
                         {upload[1].name}
                         <span style:color="#999999" style:font-weight="400"
                             >{upload[1].type}{@html upload[1].type == "upload"
-                                ? `&nbsp;(${Math.round(
-                                      upload[1].file.size / 1048576
-                                  )}MiB)`
+                                ? `&nbsp;(${bytes(upload[1].file.size)})`
                                 : ""}</span
                         >
                     </h2>
@@ -372,11 +371,12 @@
             >{$serverStats.files || "•••"}</span
         >
         files — Maximum filesize is
-        <span class="number" style:font-weight="600"
-            >{(($serverStats.maxDiscordFileSize || 0) *
-                ($serverStats.maxDiscordFiles || 0)) /
-                1048576 || "•••"}MiB</span
-        >
+        <span class="number" style:font-weight="600">
+            {
+                $serverStats.maxDiscordFiles
+                ? bytes($serverStats.maxDiscordFileSize * $serverStats.maxDiscordFiles)
+                :  "•••"
+            }</span>
         <br />
     </p>
     <p style:color="#999999" style:text-align="center" style:font-size="12px">