Refactor the company id feature.

Author: DeKleineKobini

extension/changelog.json

@@ -16,7 +16,8 @@
 				{ "message": "Update the hardcoded items which we use as fallback.", "contributor": "DeKleineKobini" },
 				{ "message": "Improve background performance.", "contributor": "DeKleineKobini" },
 				{ "message": "Update all company specials to avoid outdated specials being shown.", "contributor": "DeKleineKobini" },
-				{ "message": "Improve the detection which faction id you are currently visiting.", "contributor": "DeKleineKobini" }
+				{ "message": "Improve the detection which faction id you are currently visiting.", "contributor": "DeKleineKobini" },
+				{ "message": "Refactor the company id feature.", "contributor": "DeKleineKobini" }
 			],
 			"removed": []
 		}

extension/scripts/content/company/ttCompany.js

@@ -26,3 +26,38 @@ if (!isOwnCompany) {
 		else if (getHashParameters().get("option") === "stock") triggerCustomListener(EVENT_CHANNELS.COMPANY_STOCK_PAGE);
 	});
 }
+
+async function readCompanyDetails() {
+	if (isOwnCompany && hasAPIData()) {
+		if (userdata.job.company_id) return { id: userdata.job.company_id };
+
+		const userID = userdata.player_id;
+		if (!userID) return null; // ID could not be found
+
+		return { id: await getCompanyIDFromUser(userID) };
+	}
+
+	const params = getHashParameters();
+
+	if (isIntNumber(params.get("ID"))) {
+		return { id: parseInt(params.get("ID")) };
+	}
+
+	if (isIntNumber(params.get("userID")) && hasAPIData()) {
+		return { id: await getCompanyIDFromUser(parseInt(params.get("userID"))) };
+	}
+
+	return null; // ID could not be found
+
+	async function getCompanyIDFromUser(userID) {
+		const cached = ttCache.get("company-id", userID);
+		if (cached) return cached;
+
+		const data = await fetchData("torn", { section: "user", selections: ["profile"], id: userID });
+		const companyID = data.job.company_id;
+
+		void ttCache.set({ [userID]: companyID }, 1 * TO_MILLIS.DAYS, "company-id");
+
+		return companyID;
+	}
+}

extension/scripts/features/company-id/ttCompanyID.js

@@ -17,49 +17,29 @@
 	);
 
 	function initialise() {
-		if (!isOwnCompany)
+		if (!isOwnCompany) {
 			CUSTOM_LISTENERS[EVENT_CHANNELS.COMPANY_EMPLOYEES_PAGE].push(() => {
 				if (!feature.enabled() || !settings.pages.companies.idBesideCompanyName) return;
 
 				addID();
 			});
+		}
 	}
 
 	async function addID() {
 		if (document.getElementById("tt-company-id")) return; // Element has already been added - second check in-case feature reinjects
-		const selector = isOwnCompany ? "div.company-wrap > div.title-black" : "div.company-details-wrap > div.company-details > div.title-black";
-		const [id, container] = await Promise.all([getCompanyID(), requireElement(selector)]);
+
+		const container = await requireElement(
+			isOwnCompany ? "div.company-wrap > div.title-black" : "div.company-details-wrap > div.company-details > div.title-black"
+		);
+
+		const id = await readCompanyDetails();
 		if (!id) throw new Error("Company ID could not be found.");
-		const span = document.newElement({ type: "span", text: ` [${id}]`, id: "tt-company-id" });
-		container.appendChild(span);
+
+		container.appendChild(document.newElement({ type: "span", text: ` [${id}]`, id: "tt-company-id" }));
 	}
 
 	function removeID() {
 		document.findAll("#tt-company-id").forEach((element) => element.remove());
 	}
-
-	async function getCompanyID() {
-		if (isOwnCompany) {
-			if (userdata.job.company_id) return userdata.job.company_id;
-			const userID = userdata.player_id;
-			if (!userID) return null; // ID could not be found
-			return await getCompanyIDFromUser(userID);
-		}
-
-		const hashparams = getHashParameters();
-
-		if (isIntNumber(hashparams.get("ID"))) return parseInt(hashparams.get("ID"));
-		if (isIntNumber(hashparams.get("userID"))) return await getCompanyIDFromUser(parseInt(hashparams.get("userID")));
-
-		return null; // ID could not be found
-
-		async function getCompanyIDFromUser(userID) {
-			const cached = ttCache.get("company-id", userID);
-			if (cached) return cached;
-			const data = await fetchData("torn", { section: "user", selections: ["profile"], id: userID });
-			const companyID = data.job.company_id;
-			ttCache.set({ [userID]: companyID }, 3.5 * TO_MILLIS.DAYS, "company-id");
-			return companyID;
-		}
-	}
 })();