fix(Hypixel): fixes most apparent issues (PreMiD#7854)

* fix(hypixel): fixes most apparent issues since rewrite is taking longer than expected * chore: update metadata * chore: lint
theusaf · Dec 27, 2023 · 3fedbe2 · 3fedbe2
1 parent c92b245
commit 3fedbe2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 31 deletions.
diff --git a/websites/H/Hypixel/metadata.json b/websites/H/Hypixel/metadata.json
@@ -4,6 +4,12 @@
 		"name": "Bas950",
 		"id": "241278257335500811"
 	},
+	"contributors": [
+		{
+			"name": "veryCrunchy",
+			"id": "576097150359044106"
+		}
+	],
 	"service": "Hypixel",
 	"description": {
 		"en": "Play award winning minecraft games and mini-games with your friends for free. Only on the Hypixel minecraft server!",
@@ -12,7 +18,7 @@
 	},
 	"url": "hypixel.net",
 	"regExp": "([a-z0-9-]+[.])*hypixel[.]net[/]",
-	"version": "1.2.20",
+	"version": "1.2.21",
 	"logo": "https://cdn.rcd.gg/PreMiD/websites/H/Hypixel/assets/logo.png",
 	"thumbnail": "https://cdn.rcd.gg/PreMiD/websites/H/Hypixel/assets/thumbnail.jpg",
 	"color": "#d9992a",

diff --git a/websites/H/Hypixel/presence.ts b/websites/H/Hypixel/presence.ts
@@ -13,17 +13,9 @@ presence.on("UpdateData", async () => {
 	};
 	switch (document.location.hostname) {
 		case "hypixel.net": {
-			title = document.querySelector<HTMLElement>(
-				"#headerFix > div.hypixel_titleWrapper > div > div > h1 > nav > fieldset > span > span > a > span"
-			);
+			title = document.querySelector<HTMLElement>(".p-title  h1.p-title-value");
 			if (document.location.pathname.includes("/threads/")) {
-				title = document.querySelector<HTMLElement>(
-					"#headerFix > div.hypixel_titleWrapper > div > div > h1"
-				);
-				search = document.querySelector(
-					"#headerFix > div.hypixel_titleWrapper > div > div > h1 > nav"
-				);
-				title = title.textContent.replace(search.value, "").replace("»", "");
+				title = title.textContent;
 				presenceData.details = "Forums, viewing thread:";
 				if (title.length > 128)
 					presenceData.state = `${title.substring(0, 125)}...`;
@@ -32,17 +24,8 @@ presence.on("UpdateData", async () => {
 				delete presenceData.smallImageKey;
 				presence.setActivity(presenceData);
 			} else if (document.location.pathname.includes("/forums/")) {
-				title = document.querySelector<HTMLElement>(
-					"#headerFix > div.hypixel_titleWrapper > div > div > h1"
-				);
 				if (title) {
-					title = document.querySelector<HTMLElement>(
-						"#headerFix > div.hypixel_titleWrapper > div > div > h1"
-					);
-					search = document.querySelector(
-						"#headerFix > div.hypixel_titleWrapper > div > div > h1 > nav"
-					);
-					title = title.textContent.replace(search.value, "").replace("»", "");
+					title = title.textContent;
 					presenceData.details = "Forums, viewing category:";
 					presenceData.state = title;
 
@@ -107,8 +90,8 @@ presence.on("UpdateData", async () => {
 					presence.setActivity(presenceData);
 				}
 			} else if (document.location.pathname.includes("/members/")) {
-				user = document.querySelector(
-					"#content > div > div > div.mainContainer_noSidebar > div > div.mainProfileColumn > div > div > h1"
+				user = document.querySelector<HTMLElement>(
+					".p-title h1.p-title-value playerWrapper"
 				);
 				presenceData.details = "Forums, viewing user:";
 				presenceData.state = user.textContent;
@@ -222,11 +205,8 @@ presence.on("UpdateData", async () => {
 
 				presence.setActivity(presenceData);
 			} else if (document.location.pathname.includes("/player/")) {
-				user = document.querySelector(
-					"#headerFix > div.hypixel_titleWrapper.shiftedTitle > div > div > h1 > nav > fieldset > span > span:nth-child(2) > a > span"
-				);
 				presenceData.details = "Players, Viewing:";
-				presenceData.state = user.textContent;
+				presenceData.state = document.location.pathname.split("/").pop();
 
 				delete presenceData.smallImageKey;
 
@@ -316,10 +296,7 @@ presence.on("UpdateData", async () => {
 		case "store.hypixel.net": {
 			title = document.querySelector<HTMLElement>("head > title");
 			presenceData.details = "Store, viewing:";
-			presenceData.state = title.textContent.replace(
-				"Hypixel Server Store | ",
-				""
-			);
+			presenceData.state = title.textContent.replace("Hypixel Store | ", "");
 
 			delete presenceData.smallImageKey;