fix: cached stats not displaying correctly

Clemintina · Nov 8, 2023 · 9e47dc4 · 9e47dc4
1 parent bd1c38d
commit 9e47dc4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/src/commands/stats/DailyBedwarsStatisticsCommand.ts b/src/commands/stats/DailyBedwarsStatisticsCommand.ts
@@ -33,7 +33,7 @@ class BedwarsStatisticsCommand extends CommandBase {
 					const bblrDifference = formatRatio((bedwars?.beds_broken_bedwars ?? 0) - (cachedBedwars?.beds_broken_bedwars ?? 0), (bedwars?.beds_lost_bedwars ?? 0) - (cachedBedwars?.beds_lost_bedwars ?? 0));
 					const wlrDifference = formatRatio(winsDifference, (bedwars?.losses_bedwars ?? 0) - (cachedBedwars?.losses_bedwars ?? 0));
 
-					const formattedString = `${star}\u272B FKDR: ${fkdrDifference} | BBLR: ${bblrDifference} | WLR: ${wlrDifference} | FK: ${formatNumber(finalsDifference)} | Wins: ${formatNumber(winsDifference)}`;
+					const formattedString = `${star}\u272B FKDR: ${fkdrDifference} | BBLR: ${bblrDifference} | WLR: ${wlrDifference} | FK: ${formatNumber(finalsDifference)} | Wins: ${formatNumber(winsDifference)} | Reset: ${new Date(cachedStats.resetAt).toDateString()}`;
 
 					this.send("bedwars", formattedString, playerStats);
 				}

diff --git a/src/commands/stats/MonthlyBedwarsStatisticsCommand.ts b/src/commands/stats/MonthlyBedwarsStatisticsCommand.ts
@@ -33,7 +33,7 @@ class BedwarsStatisticsCommand extends CommandBase {
 					const bblrDifference = formatRatio((bedwars?.beds_broken_bedwars ?? 0) - (cachedBedwars?.beds_broken_bedwars ?? 0), (bedwars?.beds_lost_bedwars ?? 0) - (cachedBedwars?.beds_lost_bedwars ?? 0));
 					const wlrDifference = formatRatio(winsDifference, (bedwars?.losses_bedwars ?? 0) - (cachedBedwars?.losses_bedwars ?? 0));
 
-					const formattedString = `${star}\u272B FKDR: ${fkdrDifference} | BBLR: ${bblrDifference} | WLR: ${wlrDifference} | FK: ${formatNumber(finalsDifference)} | Wins: ${formatNumber(winsDifference)}`;
+					const formattedString = `${star}\u272B FKDR: ${fkdrDifference} | BBLR: ${bblrDifference} | WLR: ${wlrDifference} | FK: ${formatNumber(finalsDifference)} | Wins: ${formatNumber(winsDifference)} | Reset: ${new Date(cachedStats.resetAt).toDateString()}`;
 
 					this.send("bedwars", formattedString, playerStats);
 				}

diff --git a/src/commands/stats/WeeklyBedwarsStatisticsCommand.ts b/src/commands/stats/WeeklyBedwarsStatisticsCommand.ts
@@ -33,7 +33,7 @@ class BedwarsStatisticsCommand extends CommandBase {
 					const bblrDifference = formatRatio((bedwars?.beds_broken_bedwars ?? 0) - (cachedBedwars?.beds_broken_bedwars ?? 0), (bedwars?.beds_lost_bedwars ?? 0) - (cachedBedwars?.beds_lost_bedwars ?? 0));
 					const wlrDifference = formatRatio(winsDifference, (bedwars?.losses_bedwars ?? 0) - (cachedBedwars?.losses_bedwars ?? 0));
 
-					const formattedString = `${star}\u272B FKDR: ${fkdrDifference} | BBLR: ${bblrDifference} | WLR: ${wlrDifference} | FK: ${formatNumber(finalsDifference)} | Wins: ${formatNumber(winsDifference)}`;
+					const formattedString = `${star}\u272B FKDR: ${fkdrDifference} | BBLR: ${bblrDifference} | WLR: ${wlrDifference} | FK: ${formatNumber(finalsDifference)} | Wins: ${formatNumber(winsDifference)} | Reset: ${new Date(cachedStats.resetAt).toDateString()}`;
 
 					this.send("bedwars", formattedString, playerStats);
 				}

diff --git a/src/util/CommonUtils.ts b/src/util/CommonUtils.ts
@@ -23,8 +23,11 @@ export const getPlayerUuid = async (username: string) => {
 	}
 };
 
-export const formatRatio = (num1: number, num2: number) => {
-	const playerValue = num1 / num2;
+export const formatRatio = (num1: number, num2?: number) => {
+	let playerValue = num1;
+	if (num2) {
+		playerValue = num1 / num2;
+	}
 	let displayValue: number | string = playerValue;
 	if (!isFinite(playerValue)) displayValue = ~~Number((((0 - 18) / 0) * 100).toFixed(2));
 	else if (!Number.isInteger(playerValue)) displayValue = playerValue.toFixed(2);

diff --git a/src/util/SeraphCache.ts b/src/util/SeraphCache.ts
@@ -45,7 +45,12 @@ export class SeraphCache {
 		}
 
 		const { data, status } = await axios.get(`https://cache.seraph.si/seraph/${mode}/${checkedUuid}`, { headers: { ...this.headers } });
-		return data.success && status == 200 ? (data.data as Components.Schemas.Player) : null;
+		if (data.success && status == 200) {
+			data.data.resetAt = data.resetsAt;
+			return data.data as Components.Schemas.Player & { resetAt: string };
+		} else {
+			return null;
+		}
 	};
 
 	public getGuildByPlayer = async (uuid: string) => {