From 8469a9bdfb09c7650ad7603bf2bec781d429ed0c Mon Sep 17 00:00:00 2001 From: bingus_violet Date: Tue, 1 Oct 2024 11:08:02 -0500 Subject: [PATCH 01/13] Unspook --- static/index.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/static/index.html b/static/index.html index 8dc42c8..1e82466 100644 --- a/static/index.html +++ b/static/index.html @@ -17,7 +17,7 @@ - Violet's EVIL Purgatory + Violet's Purgatory @@ -29,10 +29,9 @@ {WEATHER_MODIFIER} -

Welcome to Violet's EVIL PurgatoryCommit {COMMIT_COUNT}

+

Welcome to Violet's PurgatoryCommit {COMMIT_COUNT}

Make sure to check out this project on Forgejo!

-

I know, pretty spooky right

{Violet}

@@ -54,7 +53,9 @@
-

Hi, I'm Violet! an EVIL 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.

+

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.

+

Links:

+
Socials Stats From e0242471607a6e43da2899b5657b983de72d9980 Mon Sep 17 00:00:00 2001 From: bingus_violet Date: Wed, 2 Oct 2024 17:10:23 -0500 Subject: [PATCH 02/13] Re-enable parenthesis highlighting --- pageUpdater.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pageUpdater.js b/pageUpdater.js index 36f200d..97fc72b 100644 --- a/pageUpdater.js +++ b/pageUpdater.js @@ -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 || "" From 68108e78ab1884c5167092cd4cbfc8789d82e3ec Mon Sep 17 00:00:00 2001 From: bingus_violet Date: Sun, 13 Oct 2024 16:01:46 -0500 Subject: [PATCH 03/13] Works now ?? --- overcomplicatedStatuses.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/overcomplicatedStatuses.js b/overcomplicatedStatuses.js index 297d542..fac90b3 100644 --- a/overcomplicatedStatuses.js +++ b/overcomplicatedStatuses.js @@ -8,7 +8,9 @@ function get_img_url(activity, size = "large_image") { var image = activity.assets[size] if (image) { - if (image.includes("https/")) { + if (image.includes("mp:external")) { + return ('https://media.discordapp.net/external' + image.substr(image.indexOf('mp:external') + 11, image.length)) + } else 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)) @@ -19,11 +21,14 @@ function get_img_url(activity, size = "large_image") { } if (!image && size == "large_image") { - + if (activity.name in activityImages) { + return decodeURIComponent(activityImages[activity.name]) + } } return null } + function makeCompat(string="") { return string.replaceAll("<", "<").replaceAll(">", ">") } From 08efae73bd257501355a697f370a06a154bdbfbb Mon Sep 17 00:00:00 2001 From: bingus_violet Date: Wed, 16 Oct 2024 01:27:53 -0500 Subject: [PATCH 04/13] Update to use new ID system --- overcomplicatedStatuses.js | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/overcomplicatedStatuses.js b/overcomplicatedStatuses.js index fac90b3..0845159 100644 --- a/overcomplicatedStatuses.js +++ b/overcomplicatedStatuses.js @@ -3,32 +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("mp:external")) { - return ('https://media.discordapp.net/external' + image.substr(image.indexOf('mp:external') + 11, image.length)) - } else 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") { - if (activity.name in activityImages) { - return decodeURIComponent(activityImages[activity.name]) - } - } - return null -} - - function makeCompat(string="") { return string.replaceAll("<", "<").replaceAll(">", ">") } @@ -89,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 } function activityTime() { From 424c7f0aed2b6db16f66be98d073ea5848aa4245 Mon Sep 17 00:00:00 2001 From: bingus_violet Date: Wed, 16 Oct 2024 01:30:36 -0500 Subject: [PATCH 05/13] Update Links section --- static/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/index.html b/static/index.html index 1e82466..abc3e39 100644 --- a/static/index.html +++ b/static/index.html @@ -53,8 +53,8 @@
-

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.

-

Links:

+

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.

+

Other pages:


Socials From 6fc22f35b9424405515cd1bfcde582c5b5d33b16 Mon Sep 17 00:00:00 2001 From: bingus_violet Date: Wed, 16 Oct 2024 01:33:27 -0500 Subject: [PATCH 06/13] Fix images caching --- overcomplicatedStatuses.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overcomplicatedStatuses.js b/overcomplicatedStatuses.js index 0845159..366e415 100644 --- a/overcomplicatedStatuses.js +++ b/overcomplicatedStatuses.js @@ -63,7 +63,7 @@ module.exports = { } function get_img(activity, size = "large_image") { - return "https://cache.violets-purgatory.dev/cached/byID/" + activity.id + "?size=" + size + return "https://cache.violets-purgatory.dev/cached/byID/" + activity.id + "?size=" + size + "&t=" + Date.now() } function activityTime() { From 0455275790c98a81f0c54c2049c6c55394b2bd8b Mon Sep 17 00:00:00 2001 From: bingus_violet Date: Wed, 16 Oct 2024 01:36:15 -0500 Subject: [PATCH 07/13] Show not found image while loading --- static/style.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/static/style.css b/static/style.css index 98293f8..47e7c1f 100644 --- 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) { From f206c666b85e62f52eb760817af59838970eb0bc Mon Sep 17 00:00:00 2001 From: bingus_violet Date: Wed, 16 Oct 2024 10:26:13 -0500 Subject: [PATCH 08/13] Add URL to headers --- overcomplicatedStatuses.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overcomplicatedStatuses.js b/overcomplicatedStatuses.js index 366e415..d9601b6 100644 --- a/overcomplicatedStatuses.js +++ b/overcomplicatedStatuses.js @@ -63,7 +63,7 @@ module.exports = { } function get_img(activity, size = "large_image") { - return "https://cache.violets-purgatory.dev/cached/byID/" + activity.id + "?size=" + size + "&t=" + Date.now() + return "https://cache.violets-purgatory.dev/cached/byID/" + activity.id + "?size=" + size + "&url=" + activity.assets[size] } function activityTime() { From 5a45de7f2ae64faf9a4a2e2c45eb54182e34c959 Mon Sep 17 00:00:00 2001 From: bingus_violet Date: Thu, 17 Oct 2024 00:45:30 -0500 Subject: [PATCH 09/13] Testing grid layout again --- static/index.html | 23 ++++++++++++----------- static/root.css | 10 +++++++--- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/static/index.html b/static/index.html index abc3e39..a305d23 100644 --- a/static/index.html +++ b/static/index.html @@ -54,23 +54,24 @@

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.

-

Other pages:

-
-
- Socials - Stats - Nerd FAQ - {BRANCH_NAME} site - Blog - FileShare -
{CUSTOM_STATUS}
-

{RANDOM_QUOTE}

+ +

Other pages:

+
+
+ Socials + Stats + Nerd FAQ + {BRANCH_NAME} site + Blog + FileShare +
+
{ACTIVITIES}
diff --git a/static/root.css b/static/root.css index ba911d8..4781955 100644 --- a/static/root.css +++ b/static/root.css @@ -31,13 +31,17 @@ body { } .linkContainer { - display: flex; - flex-wrap: wrap; - max-width: 385px; + display: grid; + grid-template-columns: 1fr 1fr 1fr; + max-width: 500px; margin: auto; 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; */ From a8d0310ce574ea619147a184c304a6858dc5bb5c Mon Sep 17 00:00:00 2001 From: bingus_violet Date: Thu, 17 Oct 2024 00:49:42 -0500 Subject: [PATCH 10/13] It is impressive how ugly the grid is, I'll figure out something better later. --- static/root.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/static/root.css b/static/root.css index 4781955..8bb063e 100644 --- a/static/root.css +++ b/static/root.css @@ -31,9 +31,9 @@ body { } .linkContainer { - display: grid; - grid-template-columns: 1fr 1fr 1fr; - max-width: 500px; + display: flex; + flex-wrap: wrap; + max-width: 385px; margin: auto; justify-content: center; } From 71822f94b6e37e38360a3a09cb47676ccedcaee3 Mon Sep 17 00:00:00 2001 From: bingus_violet Date: Fri, 18 Oct 2024 00:20:35 -0500 Subject: [PATCH 11/13] grrrr --- static/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/style.css b/static/style.css index 47e7c1f..58afb91 100644 --- a/static/style.css +++ b/static/style.css @@ -222,8 +222,8 @@ br { width: 40%; aspect-ratio: 1/1; object-fit: cover; - background: url("/imgs/notFound.png"); - background-size: cover; + /* background: url("/imgs/notFound.png"); */ + /* background-size: cover; */ } .activity>img:not(.smallimg) { From 84abbae868ffeea8052d629204d26195d3ea524a Mon Sep 17 00:00:00 2001 From: bingus_violet Date: Wed, 23 Oct 2024 10:52:50 -0500 Subject: [PATCH 12/13] Fix status showing as undefined --- pageUpdater.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pageUpdater.js b/pageUpdater.js index 97fc72b..67ddf71 100644 --- 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, '&').replace(//g, '>').replace(/"/g, '"'); } From 6f4feb2d15a695bcd92a11fbfd2e76d08f26432c Mon Sep 17 00:00:00 2001 From: bingus_violet Date: Mon, 11 Nov 2024 02:08:01 -0600 Subject: [PATCH 13/13] Yea just put it back I give up --- static/index.html | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/static/index.html b/static/index.html index a305d23..47f9eed 100644 --- a/static/index.html +++ b/static/index.html @@ -54,14 +54,8 @@

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.

-
- {CUSTOM_STATUS} -
-
-
- - -

Other pages:

+ +

Links:


Socials @@ -70,7 +64,14 @@ {BRANCH_NAME} site Blog FileShare +
+
+ {CUSTOM_STATUS} +
+
+
+

{RANDOM_QUOTE}

{ACTIVITIES}