From 5a8755953334a9cfd90f2d5879385337d837d721 Mon Sep 17 00:00:00 2001
From: Bingus_Violet <violetbutagain@gmail.com>
Date: Thu, 16 Nov 2023 19:29:22 -0600
Subject: [PATCH] moar stuff :D

---
 index.js                | 70 ++++++++++++++++++++++++-----------------
 resources/mainPage.html |  9 +++---
 2 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/index.js b/index.js
index ee6970b..94f2a19 100644
--- a/index.js
+++ b/index.js
@@ -1,7 +1,7 @@
 const express = require('express'),
-path = require('path'),
-fs = require('fs'),
-WebSocket = require('ws')
+    path = require('path'),
+    fs = require('fs'),
+    WebSocket = require('ws')
 
 var app = express()
 
@@ -24,34 +24,46 @@ app.listen(PORT, () => {
 app.get("/", (req, res) => {
     var html = fs.readFileSync(mainpage).toString()
 
-    var addedHTML = "<p>"
+    var addedHTML = ""
 
-    if (lanyardData && (lanyardData.spotify != null || lanyardData.activities[0] != undefined)) {
-        addedHTML += `Discord Status: ${lanyardData.spotify || '"' + lanyardData.activities[0].state + '"' || ""}`
-    }
-    
-    var statuses = {
-        "online": {
-            "text": "Online",
-            "color": "rgb(100, 255, 100)"
-        },
-        "dnd": {
-            "text": "DND",
-            "color": "rgb(255, 100, 100)"
-        },
-        "idle": {
-            "text": "Idle",
-            "color": "rgb(255, 255, 75)"
-        },
-        "offline": {
-            "text": "Offline",
-            "color": "rgb(125, 125, 125)"
+    if (lanyardData) {
+        for (let index = 0; index < lanyardData.activities.length; index++) {
+            const activity = lanyardData.activities[index];
+            console.log(activity)
+            if (activity.type == 2) {
+                addedHTML += `<p>Listening to on <span style="color: limegreen">${activity.name}</span>: ${activity.details} (by ${activity.state})</p>`
+            } else if (activity.type == 4) {
+                addedHTML += `<p><em><span style="color: lightgray">"${lanyardData.activities[0].state}"</span> - ${lanyardData.discord_user.display_name} ${new Date(Date.now()).getFullYear()}</em></p>`
+            } else if (activity.type == 0) {
+                addedHTML += `<p>Playing: ${activity.name}</p>`
+            }
         }
-    }
-    var statusData = statuses[lanyardData.discord_status]
 
-    addedHTML += `<br><span style="color: ${statusData.color}">${statusData.text}</span>`
-    addedHTML += `<style>.pfp { border-color: ${statusData.color} !important }</style>`
+        var statuses = {
+            "online": {
+                "text": "Online",
+                "color": "rgb(100, 255, 100)"
+            },
+            "dnd": {
+                "text": "DND",
+                "color": "rgb(255, 100, 100)"
+            },
+            "idle": {
+                "text": "Idle",
+                "color": "rgb(255, 255, 75)"
+            },
+            "offline": {
+                "text": "Offline",
+                "color": "rgb(125, 125, 125)"
+            }
+        }
+        var statusData = statuses[lanyardData.discord_status]
+
+        addedHTML += `<p style="color: ${statusData.color}">${statusData.text}</p>`
+        addedHTML += `<style>.pfp { border-color: ${statusData.color} !important }</style>`
+
+        console.log(lanyardData.activities)
+    }
 
     html = html.replace("{LANYARD}", addedHTML + "</p>")
 
@@ -71,7 +83,7 @@ function beat(dur) {
     }, dur);
 }
 
-lanyard.addEventListener("message", (res)=>{
+lanyard.addEventListener("message", (res) => {
     var data = JSON.parse(res.data)
     if (data.op == 1) {
         beat(data.d.heartbeat_interval)
diff --git a/resources/mainPage.html b/resources/mainPage.html
index e98544a..407f2b3 100644
--- a/resources/mainPage.html
+++ b/resources/mainPage.html
@@ -7,7 +7,7 @@
 
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css"
         integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
-    <link rel="stylesheet" href="./style.css">
+    <link rel="stylesheet" href="/style.css">
 
     <title>Violet's Purgatory</title>
 
@@ -34,16 +34,17 @@
                 <p>Game & web developer</p>
             </div>
             <div class="col-sm-12">
-                <h2>Warning: Not all services are up. Check <a href="/hosted">hosting</a> for more info.</h2>
+                <hr>
+                <p>Warning: Not all services are up. Check <a href="/hosted">hosting</a> for more info.</p>
                 <p class="chip"><a href="/hosted">Stuff i'm hosting!</a></p>
                 <p class="chip"><a href="/socials">Socials</a></p>
                 <p class="chip"><a href="/pronouns">Pronouns</a></p>
                 <br>
-                <p class="d-sm-inline-block d-none">Fediverse: <a rel="me"
+                <!-- <p class="d-sm-inline-block d-none">Fediverse: <a rel="me"
                         href="https://tech.lgbt/@Bingus_Violet">@Bingus_Violet@tech.lgbt</a></p>
                 <p class="d-sm-inline-block d-none" style="border-color: red;">Ko-Fi: <a
                         href="https://ko-fi.com/bingus_violet" style="color: rgb(255, 0, 0)">bingus_violet</a> - Please
-                    donate!</p>
+                    donate!</p> -->
                 {LANYARD}
             </div>
         </div>