From f6bda95f02b44e5350f7276ced553ad81f87a9e8 Mon Sep 17 00:00:00 2001
From: creations <creations@creations.works>
Date: Sat, 26 Apr 2025 10:11:29 -0400
Subject: [PATCH] move load order again, add url to username to open profile

---
 public/css/index.css |  4 ++++
 public/js/index.js   | 33 +++++++++++++++++----------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/public/css/index.css b/public/css/index.css
index e7c06b1..8820378 100644
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -248,6 +248,10 @@ body {
 	text-align: center;
 	gap: 0.5rem;
 }
+.user-info-inner a {
+	text-decoration: none;
+	color: var(--link-color);
+}
 
 .user-info-inner h1 {
 	font-size: 2rem;
diff --git a/public/js/index.js b/public/js/index.js
index b9235e8..27541b5 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -336,10 +336,10 @@ async function updatePresence(data) {
 		const loadingOverlay = document.getElementById("loading-overlay");
 		if (loadingOverlay) {
 			loadingOverlay.innerHTML = `
-				<div class="error-message">
-					<p>Failed to load user data.</p>
-				</div>
-			`;
+					<div class="error-message">
+						<p>Failed to load user data.</p>
+					</div>
+				`;
 			loadingOverlay.style.opacity = "1";
 			avatarWrapper.classList.add("hidden");
 			avatarImg.classList.add("hidden");
@@ -349,17 +349,6 @@ async function updatePresence(data) {
 		return;
 	}
 
-	if (!badgesLoaded) {
-		loadBadges(userId, {
-			services: [],
-			seperated: true,
-			cache: true,
-			targetId: "badges",
-			serviceOrder: ["discord", "equicord", "reviewdb", "vencord"],
-		});
-		badgesLoaded = true;
-	}
-
 	if (avatarImg && data.discord_user?.avatar) {
 		const newAvatarUrl = `https://cdn.discordapp.com/avatars/${data.discord_user.id}/${data.discord_user.avatar}`;
 		avatarImg.src = newAvatarUrl;
@@ -371,10 +360,11 @@ async function updatePresence(data) {
 			siteIcon.href = newAvatarUrl;
 		}
 	}
+
 	if (usernameEl) {
 		const username =
 			data.discord_user.global_name || data.discord_user.username;
-		usernameEl.textContent = username;
+		usernameEl.innerHTML = `<a href="https://discord.com/users/${data.discord_user.id}" target="_blank" rel="noopener noreferrer">${username}</a>`;
 		document.title = username;
 	}
 
@@ -440,6 +430,17 @@ async function updatePresence(data) {
 		updatedStatusIndicator.className = `status-indicator ${status}`;
 	}
 
+	if (!badgesLoaded) {
+		await loadBadges(userId, {
+			services: [],
+			seperated: true,
+			cache: true,
+			targetId: "badges",
+			serviceOrder: ["discord", "equicord", "reviewdb", "vencord"],
+		});
+		badgesLoaded = true;
+	}
+
 	const custom = data.activities?.find((a) => a.type === 4);
 	updateCustomStatus(custom);