Upgrade dependencies and adapt code

HunteRoi · HunteRoi · commit 6aa637d06331 · 2025-09-24T00:38:34.000+02:00
Upgrade DiscordJS, discord-verification, discord-selfrole and discord-temp-channels then adapt code accordingly (ephemeral messages are marked with the flags property, ready event becomes clientReady).

Drop SendGrid in favor of SMTP2Go.

Remove "pin" command.
diff --git a/#.env.development b/#.env.development
@@ -3,4 +3,4 @@ POSTGRES_PASSWORD=
 DATABASE_PORT=5432
 DATABASE_HOST=localhost
 DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${POSTGRES_DB}?schema=public
-SENDGRID_API_KEY=
+SMTP2GO_API_KEY=
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ POSTGRES_PASSWORD=
 DATABASE_PORT=5432
 DATABASE_HOST=localhost
 DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${POSTGRES_DB}?schema=public
-SENDGRID_API_KEY=
+SMTP2GO_API_KEY=
 ```
 An empty copy of this file is available as [#.env.development](./#.env.development).
 
diff --git a/config.development.json b/config.development.json
@@ -145,8 +145,8 @@
     },
     "communicationServiceOptions": {
         "mailData": {
-            "from": "mdpdevti@henallux.be",
-            "templateId": "d-c8892944b4f2417bafece2d7a5b73d1f"
+            "from": "fctienoreplydiscord@henallux.be",
+            "templateId": "9131196"
         }
     }
 }
diff --git a/config.production.json b/config.production.json
@@ -157,8 +157,8 @@
     },
     "communicationServiceOptions": {
         "mailData": {
-            "from": "mdpdevti@henallux.be",
-            "templateId": "d-ae8dfdd7cc9c49f1af6e016ecbb4d856"
+            "from": "fctienoreplydiscord@henallux.be",
+            "templateId": "9131196"
         }
     }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "datadrop",
-	"version": "2.1.0",
+	"version": "2.1.1",
 	"type": "module",
 	"main": "./build/index.js",
 	"scripts": {
@@ -23,20 +23,20 @@
 	},
 	"homepage": "https://github.com/section-IG/DataDrop#readme",
 	"dependencies": {
-		"@dotenvx/dotenvx": "^1.21.1",
+		"@dotenvx/dotenvx": "^1.51.0",
 		"@hunteroi/advanced-logger": "^0.2.0",
-		"@hunteroi/discord-selfrole": "^4.0.4",
-		"@hunteroi/discord-temp-channels": "^3.3.0",
-		"@hunteroi/discord-verification": "^1.5.0",
-		"@sendgrid/mail": "8.1.3",
-		"discord-sync-commands": "^0.3.0",
-		"discord.js": "^14.16.2",
+		"@hunteroi/discord-selfrole": "^4.0.5",
+		"@hunteroi/discord-temp-channels": "^3.3.1",
+		"@hunteroi/discord-verification": "^1.5.2",
+		"smtp2go-nodejs": "^0.3.5",
+		"discord-sync-commands": "^0.5.2",
+		"discord.js": "^14.22.1",
 		"ts-postgres": "1.3.0"
 	},
 	"devDependencies": {
-		"@biomejs/biome": "^1.9.4",
-		"@types/node": "^20.12.7",
-		"tsx": "^4.19.2",
-		"typescript": "^5.4.4"
+		"@biomejs/biome": "^2.2.4",
+		"@types/node": "^24.5.2",
+		"tsx": "^4.20.5",
+		"typescript": "^5.9.2"
 	}
 }
diff --git a/src/commands/admins/announce.ts b/src/commands/admins/announce.ts
@@ -7,6 +7,7 @@ import {
     Colors,
     EmbedBuilder,
     InteractionContextType,
+    MessageFlags,
     PermissionFlagsBits,
     SlashCommandBuilder,
     type TextChannel,
@@ -63,7 +64,7 @@ export default {
                 "Ceci est une preview de l'annonce. Voulez-vous l'envoyer?",
             components: [row],
             embeds: [embed],
-            ephemeral: true,
+            flags: MessageFlags.Ephemeral
         });
 
         try {
diff --git a/src/commands/others/link.ts b/src/commands/others/link.ts
@@ -3,6 +3,7 @@ import {
     ButtonBuilder,
     ButtonStyle,
     type ChatInputCommandInteraction,
+    MessageFlags,
     SlashCommandBuilder,
 } from "discord.js";
 
@@ -25,7 +26,7 @@ export default {
             await interaction.reply({
                 content:
                     "❌ **Oups!** - Tu as déjà lié ton compte Hénallux avec ton compte Discord!",
-                ephemeral: true,
+                flags: MessageFlags.Ephemeral,
             });
             return;
         }
@@ -43,7 +44,7 @@ export default {
         await interaction.reply({
             content: `Pour lier ton compte, rien de plus simple! Il te suffit de cliquer sur le bouton ci-dessous et remplir le formulaire! Tu recevras un code par email qu'il faudra envoyer ici ensuite!\n⚠️ Nous conservons les informations soumises après utilisation. Si tu soumets tes informations, tu acceptes que celles-ci nous soient transmises et que nous les conservions durant toute la durée de ta présence sur le serveur!`,
             components: [buttonComponent],
-            ephemeral: true,
+            flags: MessageFlags.Ephemeral,
         });
     },
 } as Command;
diff --git a/src/commands/others/pin.ts b/src/commands/others/pin.ts
diff --git a/src/commands/owner/eval.ts b/src/commands/owner/eval.ts
@@ -1,5 +1,6 @@
 ﻿import {
     type ChatInputCommandInteraction,
+    MessageFlags,
     PermissionFlagsBits,
     SlashCommandBuilder,
     codeBlock,
@@ -32,7 +33,7 @@ export default {
             await interaction.reply({
                 content:
                     "❌ **Oups!** - Vous n'êtes pas autorisé à utiliser cette commande.",
-                ephemeral: true,
+                flags: MessageFlags.Ephemeral,
             });
             return;
         }
diff --git a/src/commands/owner/reload.ts b/src/commands/owner/reload.ts
@@ -1,5 +1,6 @@
 import {
     type ChatInputCommandInteraction,
+    MessageFlags,
     PermissionFlagsBits,
     SlashCommandBuilder,
 } from "discord.js";
@@ -24,7 +25,7 @@ export default {
             await interaction.reply({
                 content:
                     "❌ **Oups!** - Vous n'êtes pas autorisé à utiliser cette commande.",
-                ephemeral: true,
+                flags: MessageFlags.Ephemeral,
             });
             return;
         }
@@ -33,7 +34,7 @@ export default {
         await client.reloadConfig();
         await interaction.reply({
             content: "Rechargement de la configuration en cours... 👌",
-            ephemeral: true,
+            flags: MessageFlags.Ephemeral,
         });
     },
 } as Command;
diff --git a/src/commands/owner/restart.ts b/src/commands/owner/restart.ts
@@ -1,5 +1,6 @@
 ﻿import {
     type ChatInputCommandInteraction,
+    MessageFlags,
     PermissionFlagsBits,
     SlashCommandBuilder,
 } from "discord.js";
@@ -24,15 +25,15 @@ export default {
             await interaction.reply({
                 content:
                     "❌ **Oups!** - Vous n'êtes pas autorisé à utiliser cette commande.",
-                ephemeral: true,
+                flags: MessageFlags.Ephemeral,
             });
             return;
         }
 
         client.logger.info("Arrêt en cours...");
         await interaction.reply({
             content: "Arrêt en cours... 👌",
-            ephemeral: true,
+            flags: MessageFlags.Ephemeral,
         });
         process.exit();
     },
diff --git a/src/commands/utility/mdn.ts b/src/commands/utility/mdn.ts
@@ -134,7 +134,7 @@ export default {
         client: DatadropClient,
         interaction: ChatInputCommandInteraction,
     ) {
-        await interaction.deferReply({ ephemeral: false });
+        await interaction.deferReply();
 
         const cleanQuery = interaction.options.getString("query", true).trim();
         const searchUrl = `${MDN_URL}${cleanQuery}/index.json`;
diff --git a/src/config.ts b/src/config.ts
@@ -52,7 +52,7 @@ export async function readConfig(): Promise<Configuration> {
             version: `${environment}-v${packageInfo.version}`,
         };
         config.communicationServiceOptions.apiKey =
-            process.env.SENDGRID_API_KEY;
+            process.env.SMTP2GO_API_KEY;
 
         return config;
     } catch (err: unknown) {
diff --git a/src/datadrop.ts b/src/datadrop.ts
@@ -34,7 +34,7 @@ import {
     VerificationManager,
     VerificationManagerEvents,
 } from "@hunteroi/discord-verification";
-import { SendGridService } from "@hunteroi/discord-verification/lib/services/SendGridService.js";
+import { SMTP2GoService } from "@hunteroi/discord-verification/lib/services/SMTP2GoService.js";
 
 import { readConfig } from "./config.js";
 import { getErrorMessage, readFilesFrom } from "./helpers.js";
@@ -75,7 +75,7 @@ export class DatadropClient extends Client {
         this.tempChannelsManager = new TempChannelsManager(this);
 
         this.database = new PostgresDatabaseService(this.logger);
-        const communicationService = new SendGridService(
+        const communicationService = new SMTP2GoService(
             config.communicationServiceOptions,
         );
         this.verificationManager = new VerificationManager(
diff --git a/src/events/clientReady.ts b/src/events/clientReady.ts
@@ -9,10 +9,10 @@ import type { Event } from "../models/Event.js";
 export default {
     name: Events.ClientReady,
     once: true,
-    execute: ready,
+    execute: clientReady,
 } as Event;
 
-async function ready(client: DatadropClient) {
+async function clientReady(client: DatadropClient) {
     const { config } = client;
     await registerRolesChannels(client, config);
     await registerDynamicChannels(client, config);
diff --git a/src/events/interactionCreate.ts b/src/events/interactionCreate.ts
@@ -7,7 +7,10 @@ import {
     type ChatInputCommandInteraction,
     Events,
     type Interaction,
+    InteractionEditReplyOptions,
+    InteractionReplyOptions,
     type MessageContextMenuCommandInteraction,
+    MessageFlags,
     ModalBuilder,
     type ModalSubmitInteraction,
     type RepliableInteraction,
@@ -45,7 +48,7 @@ async function interactionCreate(
     ) {
         await interaction.reply({
             content: "Ce message ne t'était assurément pas destiné!",
-            ephemeral: true,
+            flags: MessageFlags.Ephemeral,
         });
     }
 }
@@ -75,7 +78,7 @@ async function handleVerificationModalSubmission(
     client: DatadropClient,
     interaction: ModalSubmitInteraction,
 ) {
-    await interaction.deferReply({ ephemeral: true });
+    await interaction.deferReply({ flags: MessageFlags.Ephemeral });
 
     if (await isAlreadyVerified(client, interaction)) return;
 
@@ -112,13 +115,13 @@ async function isAlreadyVerified(
     const userFromDatabase = await client.database.read(interaction.user.id);
     if (userFromDatabase?.activatedCode) {
         if (interaction.isRepliable()) {
-            const replyOptions = {
+            const replyOptions: InteractionReplyOptions = {
                 content:
                     "Tu as déjà lié ton compte Hénallux avec ton compte Discord!",
-                ephemeral: true,
+                flags: MessageFlags.Ephemeral,
             };
             if (interaction.deferred) {
-                await interaction.editReply(replyOptions);
+                await interaction.editReply(replyOptions as InteractionEditReplyOptions);
             } else if (interaction.replied) {
                 await interaction.followUp(replyOptions);
             } else {
@@ -223,7 +226,7 @@ async function showVerificationButton(
         .setCustomId(`lacb${interaction.user.id}`)
         .setDisabled(
             content.includes(client.errorMessage) ||
-                content.includes(client.activeAccountMessage),
+            content.includes(client.activeAccountMessage),
         );
     const buttonComponent = new ActionRowBuilder<ButtonBuilder>().addComponents(
         linkAccountButton,
diff --git a/src/models/Configuration.ts b/src/models/Configuration.ts
@@ -1,6 +1,6 @@
 import type { Snowflake } from "discord.js";
 
-import type { SendGridOptions } from "@hunteroi/discord-verification/lib/services/SendGridService.js";
+import type { SMTP2GoOptions } from "@hunteroi/discord-verification/lib/services/SMTP2GoService.js";
 
 export interface SpecialRoleConfiguration {
     roleid: Snowflake;
@@ -59,5 +59,5 @@ export interface Configuration {
 
     announce: AnnounceConfiguration;
 
-    communicationServiceOptions: SendGridOptions;
+    communicationServiceOptions: SMTP2GoOptions;
 }
diff --git a/src/services/CommandHandler.ts b/src/services/CommandHandler.ts
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -145,8 +145,8 @@`
`145`	`145`	`},`
`146`	`146`	`"communicationServiceOptions": {`
`147`	`147`	`"mailData": {`
`148`		`- "from": "mdpdevti@henallux.be",`
`149`		`- "templateId": "d-c8892944b4f2417bafece2d7a5b73d1f"`
	`148`	`+ "from": "fctienoreplydiscord@henallux.be",`
	`149`	`+ "templateId": "9131196"`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -157,8 +157,8 @@`
`157`	`157`	`},`
`158`	`158`	`"communicationServiceOptions": {`
`159`	`159`	`"mailData": {`
`160`		`- "from": "mdpdevti@henallux.be",`
`161`		`- "templateId": "d-ae8dfdd7cc9c49f1af6e016ecbb4d856"`
	`160`	`+ "from": "fctienoreplydiscord@henallux.be",`
	`161`	`+ "templateId": "9131196"`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`	`}`