Add status command

Author: BenjammingKirby

package-lock.json

@@ -17,7 +17,6 @@
   "dependencies": {
     "@discordjs/builders": "^0.8.2",
     "@discordjs/rest": "^0.1.0-canary.0",
-    "date-fns": "^2.27.0",
     "discord-api-types": "^0.25.2",
     "discord.js": "^13.3.1",
     "discord.js-docs": "github:BenjammingKirby/discord.js-docs#typescriptRewrite",

package.json

@@ -2,7 +2,7 @@
 import { Command } from "../../interfaces";
 import { SlashCommandBuilder } from "@discordjs/builders";
 import Doc, { sources } from "discord.js-docs";
-import { checkEmbedLimits } from "../../utils/embedUtils";
+import { checkEmbedLimits } from "../../utils/EmbedUtils";
 
 const supportedBranches = Object.keys(sources).map(
     (branch) => [capitalize(branch), branch] as [string, string]

src/commands/docs/djs.ts

@@ -1,45 +1,44 @@
-import { intervalToDuration } from "date-fns";
 import { Formatters, MessageEmbed } from "discord.js";
 import type { Message } from "discord.js";
+import { intervalToDuration, intervalObjToStr } from "../utils/DateUtils";
 
 export async function messageHandler(message: Message<true>) {
-    const clientUser = message.client.user;
-    // The regex for the bot's mention
-    const mentionRegex = new RegExp(`<@!?${clientUser.id}>`);
+    try {
+        const clientUser = message.client.user;
+        // The regex for the bot's mention
+        const mentionRegex = new RegExp(`<@!?${clientUser.id}>`);
 
-    if (message.content.trim().match(mentionRegex)) {
-        const pkgJSONPath = "../../package.json";
-        const pkgJSON = await import(pkgJSONPath);
-        const { version, description, dependencies } = pkgJSON;
+        if (message.content.trim().match(mentionRegex)) {
+            const pkgJSONPath = "../../package.json";
+            const pkgJSON = await import(pkgJSONPath);
+            const { version, description, dependencies } = pkgJSON;
 
-        const uptime = intervalToDuration({
-            start: new Date().getTime() - message.client.uptime,
-            end: new Date().getTime(),
-        });
+            const uptime = intervalToDuration(Date.now() - message.client.uptime, Date.now());
+            const statusEmbed = new MessageEmbed()
+                .setTitle(`${clientUser.username} (v${version})`)
+                .setURL("https://github.com/the-programmers-hangout/tph-docs-bot/")
+                .setColor(0xd250c7)
+                .setDescription(description)
+                .setThumbnail(clientUser.displayAvatarURL({ dynamic: true, format: "png", size: 4096 }))
+                .addField(
+                    "Currently Supported Docs",
+                    ["discord.js", "Javascript (mdn)"].map((str) => `\`${str}\``).join(", "),
+                )
+                .addField("Dependencies", Formatters.codeBlock("json", JSON.stringify(dependencies, undefined, 4)))
+                .addField("Uptime", `${intervalObjToStr(uptime)}` || "Just turned on")
+                .addField("Ping", message.client.ws.ping + "ms", true)
+                .addField("Source", "[Github](https://github.com/the-programmers-hangout/tph-docs-bot/)", true)
+                .addField(
+                    "Contributors",
+                    "[Link](https://github.com/the-programmers-hangout/tph-docs-bot/graphs/contributors)",
+                    true,
+                );
 
-        const statusEmbed = new MessageEmbed()
-            .setTitle(`${clientUser.tag} ${version}`)
-            .setURL("https://github.com/the-programmers-hangout/tph-docs-bot/")
-            .setColor(0x90ee90)
-            .setDescription(description)
-            .addField(
-                "Currently Supported Docs",
-                ["discord.js", "Javascript (mdn)"].map((str) => `\`${str}\``).join(", "),
-            )
-            .addField("Dependencies", Formatters.codeBlock("json", JSON.stringify(dependencies, undefined, 4)))
-            .addField(
-                "Uptime",
-                `${uptime.months} months, ${uptime.days} days, ${uptime.hours} hours, ${uptime.minutes} minutes, ${uptime.seconds} seconds`,
-            )
-            .addField("Ping", message.client.ws.ping + "ms", true)
-            .addField("Source", "[github](https://github.com/the-programmers-hangout/tph-docs-bot/)", true)
-            .addField(
-                "Contributors",
-                "[link](https://github.com/the-programmers-hangout/tph-docs-bot/graphs/contributors)",
-                true,
-            );
-
-        message.reply({ embeds: [statusEmbed] }).catch(console.error);
+            await message.reply({ embeds: [statusEmbed] });
+        }
+    } catch (e) {
+        console.error(e);
     }
+
     return;
 }

src/handlers/MessageHandler.ts

@@ -0,0 +1,51 @@
+const toSecondsConverterConstant = {
+    month: 30 * 24 * 60 * 60,
+    day: 24 * 60 * 60,
+    hour: 60 * 60,
+    minute: 60,
+    second: 1,
+};
+type formats = keyof typeof toSecondsConverterConstant;
+export function intervalToDuration(start: number | Date, end: number | Date = Date.now()) {
+    const intervalObj = {
+        month: 0,
+        day: 0,
+        hour: 0,
+        minute: 0,
+        second: 0,
+    };
+    const startDate = new Date(start).getTime() / 1000;
+    const endDate = new Date(end).getTime() / 1000;
+    const interval = Math.round(endDate - startDate);
+    // Months
+    const remainingDays = intervalToFormat(interval, "month", intervalObj);
+    // Days
+    const remainingHours = intervalToFormat(remainingDays, "day", intervalObj);
+    // Hours
+    const remainingMinutes = intervalToFormat(remainingHours, "hour", intervalObj);
+    // Minutes
+    const remainingSeconds = intervalToFormat(remainingMinutes, "minute", intervalObj);
+    // Seconds
+    intervalToFormat(remainingSeconds, "second", intervalObj);
+
+    return intervalObj;
+}
+function intervalToFormat(int: number, format: formats, intervalObj: Record<formats, number>): number {
+    const value = Math.floor(int / toSecondsConverterConstant[format]);
+    const remaining = value === 0 ? int : int - value * toSecondsConverterConstant[format];
+    intervalObj[format] = value;
+    return remaining;
+}
+export function intervalObjToStr(int: Record<formats, number> | number | Date) {
+    if (typeof int === "number" || int instanceof Date) int = intervalToDuration(int);
+
+    const formatStr = (format: formats) => {
+        const amount = int[format];
+        return amount ? `${amount} ${format}${amount === 1 ? "" : "s"}` : "";
+    };
+    return (["month", "day", "hour", "minute", "second"] as formats[]).reduce((acc, format) => {
+        const formatted = formatStr(format);
+        if (!acc) return formatted;
+        return formatted ? acc + ", " + formatted : acc;
+    }, "");
+}