fix: padding edge cases in secsToTimeStr()

Author: Sv443

src/commands/VideoInfo.ts

@@ -240,7 +240,7 @@ export class VideoInfoCmd extends SlashCommand {
     if(typeof duration === "number") {
       embed.addFields({
         name: t("commands.video_info.embedFields.duration"),
-        value: secsToTimeStr(duration, locale, true),
+        value: secsToTimeStr(duration, locale),
         inline: true,
       });
     }

src/lib/text.ts

@@ -130,21 +130,21 @@ export function secsToYtTime(seconds: number) {
 }
 
 /** Returns the passed amount of seconds in a human-readable format */
-export function secsToTimeStr(seconds: number, locale = "en-US", padded = false) {
+export function secsToTimeStr(seconds: number, locale = "en-US", padded = true) {
   const t = tr.use(locale);
 
   const d = Math.floor(seconds / (60 * 60 * 24)),
     h = Math.floor(seconds / (60 * 60)) % 24,
     m = Math.floor(seconds / 60) % 60,
     s = Math.floor(seconds) % 60;
 
-  const pad = (n: number) => padded ? String(n).padStart(2, "0") : n;
+  const pad = (n: number) => padded && n !== 0 ? String(n).padStart(2, "0") : n;
 
   return ([
     [(60 * 60 * 24), `${d}${t("general.time.short.days")}`],
-    [(60 * 60), `${pad(h)}${t("general.time.short.hours")}`],
-    [60, `${pad(m)}${t("general.time.short.minutes")}`],
-    [0, `${pad(s)}${t("general.time.short.seconds")}`],
+    [(60 * 60), `${seconds >= (60 * 60 * 24) ? pad(h) : h}${t("general.time.short.hours")}`],
+    [60, `${seconds >= (60 * 60) ? pad(m) : m}${t("general.time.short.minutes")}`],
+    [0, `${seconds >= 60 ? pad(s) : s}${t("general.time.short.seconds")}`],
   ] as const)
     .filter(([d]) => seconds >= d)
     .map(([, s]) => s)

src/main.ts

@@ -7,7 +7,7 @@ import { initRegistry, registerCommandsForGuild } from "@lib/registry.ts";
 import { autoPlural } from "@lib/text.ts";
 import { envVarEq, getEnvVar } from "@lib/env.ts";
 import { initTranslations } from "@lib/translate.ts";
-import { metChanId, metGuildId, updateMetrics } from "@src/metrics.ts";
+import { metChanId, metGuildId, metUpdInterval, updateMetrics } from "@src/metrics.ts";
 import { GuildConfig } from "@models/GuildConfig.model.ts";
 
 //#region validate env
@@ -60,9 +60,6 @@ async function init() {
 
 //#region intervalChks
 
-const metUpdIvRaw = getEnvVar("METRICS_UPDATE_INTERVAL", "number");
-const metUpdInterval = Math.max(isNaN(metUpdIvRaw) ? 60 : metUpdIvRaw, 1);
-
 const chkGldIntervalRaw = getEnvVar("GUILD_CHECK_INTERVAL", "number");
 const chkGldInterval = Math.max(isNaN(chkGldIntervalRaw) ? 300 : chkGldIntervalRaw, 10);
 

src/metrics.ts

@@ -6,7 +6,7 @@ import { Col } from "@lib/embedify.ts";
 import { getEnvVar } from "@lib/env.ts";
 import { cmdInstances } from "@lib/registry.ts";
 import { em } from "@lib/db.ts";
-import { autoPlural } from "@lib/text.ts";
+import { autoPlural, secsToTimeStr } from "@lib/text.ts";
 import { UserSettings } from "@models/UserSettings.model.ts";
 import pkg from "@root/package.json" with { type: "json" };
 
@@ -15,6 +15,9 @@ import pkg from "@root/package.json" with { type: "json" };
 export const metGuildId = getEnvVar("METRICS_GUILD", "stringOrUndefined");
 export const metChanId = getEnvVar("METRICS_CHANNEL", "stringOrUndefined");
 
+const metUpdIvRaw = getEnvVar("METRICS_UPDATE_INTERVAL", "number");
+export const metUpdInterval = Math.max(isNaN(metUpdIvRaw) ? 60 : metUpdIvRaw, 1);
+
 const initTime = Date.now();
 const commitHash = await getCommitHash(true);
 
@@ -166,12 +169,12 @@ async function useMetricsMsg(metrics: MetricsData) {
   const ebd = new EmbedBuilder()
     .setTitle("Bot metrics:")
     .setFields([
+      { name: "Guilds:", value: `${guildsAmt} ${autoPlural("guild", guildsAmt)}`, inline: true },
       { name: "Users:", value: `${usersAmt} in DB`, inline: true },
-      { name: "Guilds:", value: `${guildsAmt} guilds`, inline: true },
       { name: "Members:", value: `${totalMembersAmt} total\n${uniqueMembersAmt} unique`, inline: true },
       { name: `${autoPlural("Command", cmdsTotal)} (${cmdsTotal}):`, value: `${slashCmdAmt} ${autoPlural("slash command", slashCmdAmt)}\n${ctxCmdAmt} ${autoPlural("context command", ctxCmdAmt)}`, inline: false },
-      { name: "Uptime:", value: `${uptimeStr}\n${time(new Date(initTime), "R")}`, inline: false },
-      { name: "Metrics updated:", value: time(new Date(), "R"), inline: false },
+      { name: "Uptime:", value: `${time(new Date(initTime), "R")}\nTime: ${uptimeStr}`, inline: false },
+      { name: "Metrics updated:", value: `${time(new Date(), "R")}\nInterval: ${secsToTimeStr(metUpdInterval)}`, inline: false },
     ])
     .setFooter({ text: `v${pkg.version} - ${commitHash}` })
     .setColor(Col.Info);
@@ -193,15 +196,7 @@ async function useMetricsMsg(metrics: MetricsData) {
 
 /** Returns the uptime in a human-readable format */
 function getUptime() {
-  const upt = Date.now() - initTime;
-
-  return ([
-    [(1000 * 60 * 60 * 24), `${Math.floor(upt / (1000 * 60 * 60 * 24))}d`],
-    [(1000 * 60 * 60), `${Math.floor(upt / (1000 * 60 * 60)) % 24}h`],
-    [(1000 * 60), `${Math.floor(upt / (1000 * 60)) % 60}m`],
-    [0, `${Math.floor(upt / 1000) % 60}s`],
-  ] as const)
-    .filter(([d]) => upt >= d)
-    .map(([, s]) => s)
-    .join(" ");
+  const upt = Math.floor((Date.now() - initTime) / 1000);
+
+  return secsToTimeStr(upt, "en-US");
 }