Fix status showing as undefined

grrrr
It is impressive how ugly the grid is, I'll figure out something better later.
2024-10-23 10:52:50 -05:00 · 2024-10-18 00:20:35 -05:00 · 2024-10-17 00:49:42 -05:00 · 2024-10-17 00:45:30 -05:00 · 2024-10-16 10:26:13 -05:00 · 2024-10-16 01:36:15 -05:00
5 changed files with 31 additions and 44 deletions
--- a/overcomplicatedStatuses.js
+++ b/overcomplicatedStatuses.js
@ -3,27 +3,6 @@ const path = require("path"),

 var constants = JSON.parse(fs.readFileSync(path.join(__dirname, 'constants.json')))

-function get_img_url(activity, size = "large_image") {
-    if ("assets" in activity) {
-        var image = activity.assets[size]
-
-        if (image) {
-            if (image.includes("https/")) {
-                return decodeURIComponent('https://' + image.substr(image.indexOf('https/') + 6, image.length))
-            } else if (image.includes("spotify")) {
-                return decodeURIComponent('https://i.scdn.co/image/' + image.substr(image.indexOf('spotify:') + 8, image.length))
-            } else {
-                return decodeURIComponent('https://cdn.discordapp.com/app-assets/' + activity.application_id + "/" + image + ".png")
-            }
-        }
-    }
-
-    if (!image && size == "large_image") {
-
-    }
-    return null
-}
-
 function makeCompat(string="") {
    return string.replaceAll("<", "&lt;").replaceAll(">", "&gt;")
 }
@ -84,7 +63,7 @@ module.exports = {
                }

                function get_img(activity, size = "large_image") {
-                    return "https://cache.violets-purgatory.dev/cached/" + get_img_url(activity, size)
+                    return "https://cache.violets-purgatory.dev/cached/byID/" + activity.id + "?size=" + size + "&url=" + activity.assets[size]
                }

                function activityTime() {
--- a/pageUpdater.js
+++ b/pageUpdater.js
@ -60,7 +60,7 @@ function onlyIfExists(string, check) {
    }
 }

-function makeHtmlSafe(str) {
+function makeHtmlSafe(str="") {
    return String(str).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
 }

@ -163,14 +163,14 @@ function highlighter(json, full = true, linkParent = false) {
                            var startContent = element.content.substring(spanStart - 1, termIndex)
                            var endContent = element.content.substring(termIndex + termKey.length, spanEnd)

-                            // if (startContent.includes("(") && !endContent.includes(")")) {
-                            //     spanEnd = element.content.indexOf(")", spanStart) + 1
-                            //     endContent = element.content.substring(termIndex + termKey.length, spanEnd)
-                            // }
-                            // else if (endContent.includes(")") && !startContent.includes("(")) {
-                            //     spanStart = element.content.substring(0, spanStart).lastIndexOf("(")
-                            //     startContent = element.content.substring(spanStart - 1, termIndex)
-                            // }
+                            if (startContent.includes("(") && !endContent.includes(")")) {
+                                spanEnd = element.content.indexOf(")", spanStart) + 1
+                                endContent = element.content.substring(termIndex + termKey.length, spanEnd)
+                            }
+                            else if (endContent.includes(")") && !startContent.includes("(")) {
+                                spanStart = element.content.substring(0, spanStart).lastIndexOf("(")
+                                startContent = element.content.substring(spanStart - 1, termIndex)
+                            }

                            var style = termProps.style || ""
                            var classes = termProps.classes || ""
--- a/static/index.html
+++ b/static/index.html
@ -17,7 +17,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">

-    <title>Violet's EVIL Purgatory</title>
+    <title>Violet's Purgatory</title>

    <meta name="darkreader-lock">

@ -29,10 +29,9 @@

 <body>
    {WEATHER_MODIFIER}
-    <h1 class="animatedTitle">Welcome to <span class="mainTitle noHighlight">Violet's <span class="evil">EVIL</span> Purgatory</span><span class="note">Commit {COMMIT_COUNT}</span></h1>
+    <h1 class="animatedTitle">Welcome to <span class="mainTitle noHighlight">Violet's Purgatory</span><span class="note">Commit {COMMIT_COUNT}</span></h1>
    <main class="animatedMain">
        <p>Make sure to check out this project on <a href="https://git.violets-purgatory.dev/bingus_violet/violets-purgatory">Forgejo</a>!</p>
-         <p class="evil">I know, pretty spooky right</p>
        <hr>
        <div id="card">
            <h2>{Violet}</h2>
@ -54,7 +53,16 @@
 
            <hr>
           <div>
-                <p style="padding: 10px;">Hi, I'm Violet! a<span class="evil">n EVIL</span> 15 year old web and game developer. I make dynamic websites with server-side rendering, so no Javascript needed! I'm currently making games in the Godot Engine, and my dynamic sites in NodeJS.</p>
+                <p style="padding: 10px; padding-bottom: 5px;">Hi, I'm Violet! I'm a 15 year old web developer, making dynamic websites with server-side rendering, so Javascript is never forced! All of my sites are all made with NodeJS, and are self-hosted.</p>
+                    <div class="customStatus">
+                        {CUSTOM_STATUS}
+                    </div>
+            </div>
+        </div>
+        <!-- <p>{RANDOM_QUOTE}</p> -->
+        
+        <h2>Other pages:</h2>
+        <br>
        <div class="linkContainer">
            <a class="chip" href="./socials/">Socials</a>
            <a class="chip" href="./stats">Stats</a>
@ -63,12 +71,6 @@
            <a class="chip" href="./blog">Blog</a>
            <a class="chip" href="https://fs.violets-purgatory.dev">FileShare</a>
        </div>
-                    <div class="customStatus">
-                        {CUSTOM_STATUS}
-                    </div>
-            </div>
-        </div>
-        <p>{RANDOM_QUOTE}</p>

        <div id="activityHtml">
            {ACTIVITIES}
--- a/static/root.css
+++ b/static/root.css
@ -38,6 +38,10 @@ body {
    justify-content: center;
 }

+.linkContainer > .chip {
+    font-size: 1.5rem;
+}
+
 .animatedTitle {
    animation: mainText 2s cubic-bezier(0.075, 0.82, 0.165, 1);
    /* animation-delay: 1s; */
--- a/static/style.css
+++ b/static/style.css
@ -222,6 +222,8 @@ br {
    width: 40%;
    aspect-ratio: 1/1;
    object-fit: cover;
+    /* background: url("/imgs/notFound.png"); */
+    /* background-size: cover; */
 }

 .activity>img:not(.smallimg) {
Author	SHA1	Message	Date
bingus_violet	84abbae868	Fix status showing as undefined	2024-10-23 10:52:50 -05:00
bingus_violet	71822f94b6	grrrr	2024-10-18 00:20:35 -05:00
bingus_violet	a8d0310ce5	It is impressive how ugly the grid is, I'll figure out something better later.	2024-10-17 00:49:42 -05:00
bingus_violet	5a45de7f2a	Testing grid layout again	2024-10-17 00:45:30 -05:00
bingus_violet	f206c666b8	Add URL to headers	2024-10-16 10:26:13 -05:00
bingus_violet	0455275790	Show not found image while loading	2024-10-16 01:36:15 -05:00
bingus_violet	6fc22f35b9	Fix images caching	2024-10-16 01:33:27 -05:00
bingus_violet	424c7f0aed	Update Links section	2024-10-16 01:30:36 -05:00
bingus_violet	08efae73bd	Update to use new ID system	2024-10-16 01:27:53 -05:00
bingus_violet	68108e78ab	Works now ??	2024-10-13 16:01:46 -05:00
bingus_violet	e024247160	Re-enable parenthesis highlighting	2024-10-02 17:10:23 -05:00
bingus_violet	e0b7906f14	Merge branch 'origin' into dev	2024-10-01 12:43:33 -05:00
bingus_violet	8469a9bdfb	Unspook	2024-10-01 11:08:02 -05:00