Merge pull request #65 from Chiissu/dev

0.3.1... the quickest patch ever

Author: MrSerge01

bun.lock

@@ -6,4 +6,3 @@ services:
     volumes:
       - ./data.db:/app/data.db
       - ./.env:/app/.env
-

docker-compose.yml

@@ -5,7 +5,7 @@
     "The Sokora team",
     "The GitHub contributors"
   ],
-  "version": "0.3",
+  "version": "0.3.1",
   "main": "./src/index.ts",
   "type": "module",
   "scripts": {
@@ -19,15 +19,14 @@
     "@top-gg/sdk": "^3.1.6",
     "chart.js": "^4.5.0",
     "chartjs-node-canvas": "^5.0.0",
-    "discord.js": "^14.21.0",
+    "discord.js": "^14.22.1",
+    "enhanced-ms": "^4.1.0",
     "mathjs": "^14.6.0",
-    "ms": "^2.1.3",
-    "node-vibrant": "^3.2.1-alpha.1",
-    "sharp": "^0.33.5"
+    "node-vibrant": "^4.0.3",
+    "sharp": "^0.34.3"
   },
   "devDependencies": {
     "@eslint/js": "^9.33.0",
-    "@types/ms": "^0.7.34",
     "@typescript-eslint/eslint-plugin": "^8.40.0",
     "@typescript-eslint/parser": "^8.40.0",
     "bun-types": "^1.2.20",

package.json

@@ -1,10 +1,11 @@
 import { Api } from "@top-gg/sdk";
 import { Chart, registerables } from "chart.js";
-import { getUserSettingsTable } from "database/userSettings";
+import { getUserSettingsTable, setUserSetting } from "database/userSettings";
 import { ActivityType, Client, Partials } from "discord.js";
+import { errorEmbed } from "embeds/errorEmbed";
+import ms from "enhanced-ms";
 import { registerGuildCommands } from "handlers/commands";
 import { loadAuditEvents, loadEasterEggs, loadEvents } from "handlers/events";
-import ms from "ms";
 import { rescheduleUnbans } from "utils/unbanScheduler";
 
 export const client = new Client({
@@ -13,6 +14,7 @@ export const client = new Client({
   },
   partials: [Partials.Message, Partials.Reaction, Partials.User],
   intents: [
+    "DirectMessages",
     "Guilds",
     "GuildMembers",
     "GuildMessages",
@@ -24,32 +26,48 @@ export const client = new Client({
   ],
 });
 
-export const subscribedUsers = new Set(
-  (await getUserSettingsTable("topgg", "remind"))?.filter(i => i.value == "1").map(i => i.userID),
-);
+client.once("clientReady", async () => {
+  if (process.env.TOPGG_TOKEN)
+    setInterval(async () => {
+      const topgg = new Api(process.env.TOPGG_TOKEN!);
+      try {
+        await topgg.postStats({
+          serverCount: (await client.guilds.fetch()).size,
+        });
+        console.log("Posted statistics to top.gg!");
+      } catch (error) {
+        console.error(`Failed to start top.gg autoposter: ${error}`);
+      }
 
-client.once("ready", async () => {
-  if (process.env.TOPGG_TOKEN) {
-    const topgg = new Api(process.env.TOPGG_TOKEN!);
-    try {
-      await topgg.postStats({
-        serverCount: (await client.guilds.fetch()).size,
-      });
-      console.log("Posted statistics to top.gg!");
-    } catch (error) {
-      console.error(`Failed to start top.gg autoposter: ${error}`);
-    }
+      const users = client.users;
+      const subscribedUsers = new Set(
+        (await getUserSettingsTable("topgg", "remind"))
+          ?.filter(i => i.value == "1")
+          .map(i => i.userID),
+      );
 
-    setInterval(async () => {
       for (const user of subscribedUsers) {
-        if (await topgg.hasVoted(user)) continue;
-        await client.users.send(
-          JSON.parse(user),
-          "Reminder that **you can vote for Sokora** on [top.gg](https://top.gg/bot/873918300726394960/vote) - go vote!!",
-        );
+        try {
+          if (await topgg.hasVoted(user)) continue;
+          const dmChannel = await (await users.fetch(JSON.parse(user))).createDM();
+          if (!dmChannel || !dmChannel.isSendable()) continue;
+
+          await dmChannel.send(
+            "Reminder that **you can vote for Sokora** on [top.gg](https://top.gg/bot/873918300726394960/vote) - go vote!!",
+          );
+        } catch (error) {
+          await errorEmbed({
+            client,
+            error,
+            title: "top.gg reminding error.",
+            log: true,
+            forward: true,
+            fileName: "bot.ts",
+          });
+          await setUserSetting(user, "topgg", "remind", false);
+        }
       }
-    }, ms("3h"));
-  }
+    }, ms("6h"));
 
   await Promise.all([
     loadEvents(client),

src/bot.ts

@@ -67,5 +67,5 @@ export async function run(interaction: ChatInputCommandInteraction) {
       .setStyle(ButtonStyle.Link),
   );
 
-  await interaction.reply({ embeds: [embed], components: [row] });
+  await interaction.reply({ embeds: [embed], components: [row], flags: "Ephemeral" });
 }

src/commands/about.ts

@@ -22,5 +22,5 @@ export async function run(interaction: ChatInputCommandInteraction) {
     .setFooter({ text: replace("(madeWith)") })
     .setColor(await colorize({ user, avatar, hue: 270 }));
 
-  await interaction.reply({ embeds: [embed] });
+  await interaction.reply({ embeds: [embed], flags: "Ephemeral" });
 }

src/commands/changelog.ts

@@ -28,5 +28,5 @@ export async function run(interaction: ChatInputCommandInteraction) {
     .setFooter({ text: replace("(madeWith)") })
     .setColor(await colorize({ user, avatar, hue: 270 }));
 
-  await interaction.reply({ embeds: [embed] });
+  await interaction.reply({ embeds: [embed], flags: "Ephemeral" });
 }

src/commands/credits.ts

@@ -58,5 +58,5 @@ export async function run(interaction: ChatInputCommandInteraction) {
       },
     ]);
 
-  await interaction.reply({ embeds: [embed] });
+  await interaction.reply({ embeds: [embed], flags: "Ephemeral" });
 }

src/commands/help/variables.ts

@@ -2,7 +2,7 @@ import { getSetting } from "database/settings";
 import { SlashCommandSubcommandBuilder, type ChatInputCommandInteraction } from "discord.js";
 import { errorEmbed } from "embeds/errorEmbed";
 import { errorCheck, modEmbed } from "embeds/modEmbed";
-import ms from "ms";
+import ms from "enhanced-ms";
 import { scheduleUnban } from "utils/unbanScheduler";
 
 export const data = new SlashCommandSubcommandBuilder()
@@ -66,7 +66,7 @@ export async function run(interaction: ChatInputCommandInteraction) {
         interaction,
         user,
         action: "Banned",
-        duration,
+        duration: duration ? ms(duration) : undefined,
         dm: true,
         dbAction: "BAN",
         expiresAt: duration ? ms(duration) : undefined,

src/commands/moderation/ban.ts

@@ -17,7 +17,7 @@ import {
   type ChatInputCommandInteraction,
 } from "discord.js";
 import { errorEmbed } from "embeds/errorEmbed";
-import ms from "ms";
+import ms from "enhanced-ms";
 import { client } from "src/bot";
 import { capitalize } from "utils/capitalize";
 import { genColor } from "utils/colorGen";
@@ -62,8 +62,7 @@ async function generateEmbed(params: {
     ];
 
     if (!user) val.unshift(`**User**: <@${c.user}>`);
-    if (c.expiresAt)
-      val.push(`**Duration**: ${ms(ms(Number(c.expiresAt).toString()), { long: true })}`);
+    if (c.expiresAt) val.push(`**Duration**: ${ms(Number(c.expiresAt), "fullPrecision")}`);
 
     return {
       name: `${actionsEmojis[c.type as ModType]} • ${capitalize(c.type.toLowerCase())} #${c.id}`,