Merge pull request #129 from ApocalypseCalculator/develop

Fix Notifs and Update Dependencies
ApocalypseCalculator · Mar 24, 2023 · 407a8bb · 407a8bb
2 parents 29dc14c + b6eb995
commit 407a8bb
Show file tree

Hide file tree

Showing 3 changed files with 216 additions and 170 deletions.
diff --git a/notif.js b/notif.js
@@ -21,11 +21,11 @@ module.exports.sendNotif = (name, id, hostname, ip, size) => {
                         inline: true
                     }, {
                         name: "Access URL",
-                        value: `[Click me](https://${hostname}/uploads/${id}/${encodeURIComponent(name)})`,
+                        value: `[Click me](https://${hostname}/uploads/?fileid=${id})`,
                         inline: true
                     }, {
                         name: "File Size",
-                        value: `${size}`,
+                        value: `${formatSize(parseInt(size))}`,
                         inline: true
                     }, {
                         name: "Uploader IP",
@@ -43,4 +43,18 @@ module.exports.sendNotif = (name, id, hostname, ip, size) => {
             resolve();
         }
     })
-}
+}
+
+function formatSize(number) {
+    if (number >= 1024 * 1024) {
+        let mbSize = number / (1024 * 1024);
+        return `${mbSize.toFixed(1)}`.replace(/\B(?=(\d{3})+(?!\d))/g, ",") + "MB";
+    }
+    else if (number >= 1024) {
+        let kbSize = number / (1024);
+        return `${kbSize.toFixed(1)}KB`;
+    }
+    else {
+        return `${number}B`;
+    }
+}