Show days in popup status, if not zero.

Mephiles · Jun 15, 2024 · 8a830a5 · 8a830a5
1 parent ba87b25
commit 8a830a5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/extension/changelog.json b/extension/changelog.json
@@ -5,7 +5,11 @@
 		"date": false,
 		"logs": {
 			"features": [{ "message": "Added bounty filter in Abroad People Filter.", "contributor": "TheFoxMan" }],
-			"fixes": [{ "message": "Fixed Trade Open Chat.", "contributor": "TheFoxMan" }],
+			"fixes": [
+				{ "message": "Fixed Trade Open Chat.", "contributor": "TheFoxMan" },
+				{ "message": "Fixed no notifications.", "contributor": "TheFoxMan" },
+				{ "message": "Show days(if present) in popup for Jail and Hospital status.", "contributor": "TheFoxMan" }
+			],
 			"changes": [],
 			"removed": []
 		}

diff --git a/extension/pages/popup/popup.js b/extension/pages/popup/popup.js
@@ -430,9 +430,9 @@ async function setupDashboard() {
 		if (!status.dataset.until) return;
 
 		if (status.classList.contains("jail")) {
-			status.textContent = `Jailed for ${formatTime({ milliseconds: status.dataset.until - current }, { type: "timer" })}`;
+			status.textContent = `Jailed for ${formatTime({ milliseconds: status.dataset.until - current }, { type: "timer", showDays: true, short: true })}`;
 		} else if (status.classList.contains("hospital")) {
-			status.textContent = `Hospitalized for ${formatTime({ milliseconds: status.dataset.until - current }, { type: "timer" })}`;
+			status.textContent = `Hospitalized for ${formatTime({ milliseconds: status.dataset.until - current }, { type: "timer", showDays: true, short: true })}`;
 		}
 	}
 

diff --git a/extension/scripts/global/functions/formatting.js b/extension/scripts/global/functions/formatting.js
@@ -145,7 +145,10 @@ function formatTime(time = {}, options = {}) {
 			parts.push(date.getUTCMinutes());
 			if (!options.hideSeconds) parts.push(date.getUTCSeconds());
 
-			return parts.map((p) => toMultipleDigits(p, 2)).join(":");
+			let timerText = parts.map((p) => toMultipleDigits(p, 2)).join(":");
+			if (options.short && options.showDays && timerText.startsWith("00:")) timerText = timerText.slice(3);
+
+			return timerText;
 		case "wordTimer":
 			date = new Date(millis);