Smtp mailing service

#.env

@@ -5,4 +5,5 @@ POSTGRES_PASSWORD=
 DATABASE_PORT=5432
 DATABASE_HOST=localhost
 NODE_ENV=development
-SENDGRID_API_KEY=
+SMTP_USER=
+SMTP_PASS=

config.development.json

@@ -144,9 +144,13 @@
         "emote": "📢"
     },
     "communicationServiceOptions": {
-        "mailData": {
-            "from": "mdpdevti@henallux.be",
-            "templateId": "d-c8892944b4f2417bafece2d7a5b73d1f"
-        }
+        "from": "noreply-discord@henallux.be",
+        "port": 587,
+        "host": "smtp.office365.com",
+        "tls": {
+            "rejectUnauthorized": false
+        },
+        "debug": true,
+        "logger": true
     }
 }

config.production.json

@@ -152,9 +152,11 @@
         "emote": "📢"
     },
     "communicationServiceOptions": {
-        "mailData": {
-            "from": "mdpdevti@henallux.be",
-            "templateId": "d-ae8dfdd7cc9c49f1af6e016ecbb4d856"
+        "from": "noreply-discord@henallux.be",
+        "port": 587,
+        "host": "smtp.office365.com",
+        "tls": {
+            "rejectUnauthorized": false
         }
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datadrop",
-	"version": "2.0.0",
+	"version": "2.0.1",
 	"type": "module",
 	"main": "./build/index.js",
 	"scripts": {
@@ -26,15 +26,16 @@
 		"@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",
 		"dotenv": "^16.4.5",
+		"nodemailer": "^6.9.1",
 		"ts-postgres": "1.3.0"
 	},
 	"devDependencies": {
 		"@biomejs/biome": "^1.9.4",
 		"@types/node": "^20.12.7",
+		"@types/nodemailer": "^6.4.7",
 		"typescript": "^5.4.4"
 	}
 }

scripts/deploy-commands.cjs

@@ -3,6 +3,7 @@ const { Client, Collection, REST, Routes } = require("discord.js");
 const path = require("node:path");
 const fsp = require("node:fs/promises");
 const synchronizeSlashCommands = require("discord-sync-commands");
+
 const { botId: botProdId } = require("../config.production.json");
 const { guildId, botId: botDevId } = require("../config.development.json");
 

src/commands/admins/announce.ts

@@ -13,7 +13,7 @@ import {
 } from "discord.js";
 
 import type { DatadropClient } from "../../datadrop.js";
-import type { Command } from "../../models/Command.js";
+import type { Command } from "../../models/index.js";
 
 export default {
     data: new SlashCommandBuilder()

src/commands/others/link.ts

@@ -7,7 +7,7 @@ import {
 } from "discord.js";
 
 import type { DatadropClient } from "../../datadrop.js";
-import type { Command } from "../../models/Command.js";
+import type { Command } from "../../models/index.js";
 
 export default {
     data: new SlashCommandBuilder()

src/commands/others/pin.ts

@@ -6,12 +6,12 @@
 } from "discord.js";
 
 import type { DatadropClient } from "../../datadrop.js";
-import type { Command } from "../../models/Command.js";
+import type { Command } from "../../models/index.js";
 
 export default {
     data: new ContextMenuCommandBuilder()
         .setName("(Dés)Épingler le message")
         .setType(ApplicationCommandType.Message)
         .setContexts(InteractionContextType.Guild),
 
     async execute(

src/commands/owner/eval.ts

@@ -7,7 +7,7 @@
 
 import type { DatadropClient } from "../../datadrop.js";
 import { clean } from "../../helpers.js";
-import type { Command } from "../../models/Command.js";
+import type { Command } from "../../models/index.js";
 
 export default {
     data: new SlashCommandBuilder()

src/commands/owner/reload.ts

@@ -5,7 +5,7 @@ import {
 } from "discord.js";
 
 import type { DatadropClient } from "../../datadrop.js";
-import type { Command } from "../../models/Command.js";
+import type { Command } from "../../models/index.js";
 
 export default {
     data: new SlashCommandBuilder()

src/commands/owner/restart.ts

@@ -5,7 +5,7 @@
 } from "discord.js";
 
 import type { DatadropClient } from "../../datadrop.js";
-import type { Command } from "../../models/Command.js";
+import type { Command } from "../../models/index.js";
 
 export default {
     data: new SlashCommandBuilder()

src/commands/utility/email.ts

@@ -5,7 +5,7 @@ import {
 } from "discord.js";
 
 import type { DatadropClient } from "../../datadrop.js";
-import type { Command } from "../../models/Command.js";
+import type { Command } from "../../models/index.js";
 
 const people = [
     {

src/commands/utility/ping.ts

@@ -4,7 +4,7 @@ import {
 } from "discord.js";
 
 import type { DatadropClient } from "../../datadrop.js";
-import type { Command } from "../../models/Command.js";
+import type { Command } from "../../models/index.js";
 
 export default {
     data: new SlashCommandBuilder().setName("ping").setDescription("Pong!"),

src/config.ts

@@ -29,8 +29,10 @@ const defaultConfig: Configuration = {
     tutor: { roleid: "", emote: "" },
     announce: { roleid: "", emote: "", channelid: "" },
     communicationServiceOptions: {
-        apiKey: "",
-        mailData: { from: "", templateId: "" },
+        auth: { user: "", pass: "" },
+        from: "",
+        port: 587,
+        host: "",
     },
 };
 
@@ -51,8 +53,10 @@ export async function readConfig(): Promise<Configuration> {
             ...json,
             version: `${environment}-v${packageInfo.version}`,
         };
-        config.communicationServiceOptions.apiKey =
-            process.env.SENDGRID_API_KEY;
+        config.communicationServiceOptions.auth = {
+            user: process.env.SMTP_USER,
+            pass: process.env.SMTP_PASS,
+        };
 
         return config;
     } catch (err: unknown) {

src/datadrop.ts

@@ -34,16 +34,17 @@ import {
     VerificationManager,
     VerificationManagerEvents,
 } from "@hunteroi/discord-verification";
-import { SendGridService } from "@hunteroi/discord-verification/lib/services/SendGridService.js";
 
 import { readConfig } from "./config.js";
 import { getErrorMessage, readFilesFrom } from "./helpers.js";
-import type { Command } from "./models/Command.js";
-import type { Configuration } from "./models/Configuration.js";
-import type { Event } from "./models/Event.js";
-import type { IDatabaseService } from "./models/IDatabaseService.js";
-import type { User } from "./models/User.js";
-import PostgresDatabaseService from "./services/PostgresDatabaseService.js";
+import type {
+    Command,
+    Configuration,
+    Event,
+    IDatabaseService,
+    User,
+} from "./models/index.js";
+import { PostgresDatabaseService, SMTPService } from "./services/index.js";
 
 export class DatadropClient extends Client {
     #config: Configuration;
@@ -75,7 +76,7 @@ export class DatadropClient extends Client {
         this.tempChannelsManager = new TempChannelsManager(this);
 
         this.database = new PostgresDatabaseService(this.logger);
-        const communicationService = new SendGridService(
+        const communicationService = new SMTPService(
             config.communicationServiceOptions,
         );
         this.verificationManager = new VerificationManager(

src/events/error.ts

@@ -0,0 +1,7 @@
+import type { DatadropClient } from "../datadrop.js";
+
+export default async function error(client: DatadropClient, error: Error) {
+    client.logger.error(
+        `${error.name}: ${error.message}\n${error.cause}\n${error.stack}`,
+    );
+}

src/events/guildMemberAdd.ts

@@ -8,8 +8,7 @@ import {
 } from "discord.js";
 
 import type { DatadropClient } from "../datadrop.js";
-import type { AnnounceConfiguration } from "../models/Configuration.js";
-import type { Event } from "../models/Event.js";
+import type { AnnounceConfiguration, Event } from "../models/index.js";
 
 export default {
     name: Events.GuildMemberAdd,

src/events/guildMemberRemove.ts

@@ -1,7 +1,7 @@
 import { Events, type GuildMember } from "discord.js";
 
 import type { DatadropClient } from "../datadrop.js";
-import type { Event } from "../models/Event.js";
+import type { Event } from "../models/index.js";
 
 export default {
     name: Events.GuildMemberRemove,

src/events/interactionCreate.ts

@@ -16,7 +16,7 @@ import {
 } from "discord.js";
 
 import type { DatadropClient } from "../datadrop.js";
-import type { Event } from "../models/Event.js";
+import type { Event } from "../models/index.js";
 import { CommandHandler } from "../services/CommandHandler.js";
 
 export default {

src/events/ready.ts

@@ -3,8 +3,7 @@ import { ButtonStyle, Events, Role, bold, roleMention } from "discord.js";
 import type { RoleToEmojiData } from "@hunteroi/discord-selfrole";
 
 import type { DatadropClient } from "../datadrop.js";
-import type { Configuration } from "../models/Configuration.js";
-import type { Event } from "../models/Event.js";
+import type { Configuration, Event } from "../models/index.js";
 
 export default {
     name: Events.ClientReady,

src/helpers.ts

@@ -1,5 +1,6 @@
 import * as fsp from "node:fs/promises";
 import * as path from "node:path";
+
 import { ConsoleLogger, type DefaultLogger } from "@hunteroi/advanced-logger";
 
 const console = new ConsoleLogger();

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 { SMTPServiceOptions } from "../services/SMTPService.js";
 
 export interface SpecialRoleConfiguration {
     roleid: Snowflake;
@@ -59,5 +59,5 @@ export interface Configuration {
 
     announce: AnnounceConfiguration;
 
-    communicationServiceOptions: SendGridOptions;
+    communicationServiceOptions: SMTPServiceOptions;
 }

src/models/Event.ts

@@ -1,4 +1,5 @@
 import type { ClientEvents } from "discord.js";
+
 import type { DatadropClient } from "../datadrop.js";
 
 export interface Event {

src/models/index.ts

@@ -0,0 +1,23 @@
+import { Command } from "./Command.js";
+import {
+    AnnounceConfiguration,
+    Configuration,
+    GroupConfiguration,
+    SpecialRoleConfiguration,
+    YearConfiguration,
+} from "./Configuration.js";
+import { Event } from "./Event.js";
+import { IDatabaseService } from "./IDatabaseService.js";
+import { User } from "./User.js";
+
+export {
+    Command,
+    SpecialRoleConfiguration,
+    GroupConfiguration,
+    YearConfiguration,
+    AnnounceConfiguration,
+    Configuration,
+    Event,
+    IDatabaseService,
+    User,
+};

src/services/PostgresDatabaseService.ts

@@ -8,8 +8,7 @@ import {
 
 import type { ConsoleLogger } from "@hunteroi/advanced-logger";
 
-import type { IDatabaseService } from "../models/IDatabaseService.js";
-import type { User } from "../models/User.js";
+import type { IDatabaseService, User } from "../models/index.js";
 
 export default class PostgresDatabaseService implements IDatabaseService {
     readonly #logger: ConsoleLogger;
@@ -206,7 +205,7 @@ export default class PostgresDatabaseService implements IDatabaseService {
     async #runMigrations(): Promise<void> {
         await this.#runMigration("User soft delete", async () => {
             await this.#database.query(
-                "ALTER TABLE Users ADD IF NOT EXISTS isDeleted timestamp;",
+                "ALTER TABLE Users ADD COLUMN IF NOT EXISTS isDeleted timestamp;",
             );
         });
     }
@@ -216,8 +215,10 @@ export default class PostgresDatabaseService implements IDatabaseService {
             "SELECT * FROM Migrations WHERE name = $1",
             [name],
         );
-        const migration = [...result].pop();
-        if (!migration) {
+        this.#logger.verbose(
+            `Running migration "${name}" with pre-query returning ${JSON.stringify(result)}`,
+        );
+        if (result && result.rows.length === 0) {
             await this.#database.query(
                 "INSERT INTO Migrations (name) VALUES($1);",
                 [name],

src/services/SMTPService.ts

@@ -0,0 +1,26 @@
+import { createTransport } from "nodemailer";
+import type SMTPTransport from "nodemailer/lib/smtp-transport";
+
+import type { ISenderAPI, SenderAPIData } from "@hunteroi/discord-verification";
+
+export type SMTPServiceOptions = SMTPTransport.Options;
+
+export default class SMTPService implements ISenderAPI {
+    #options: SMTPServiceOptions;
+
+    constructor(options: SMTPServiceOptions) {
+        this.#options = options;
+    }
+
+    async send({ name, code, ...data }: SenderAPIData): Promise<void> {
+        const transporter = createTransport(this.#options);
+        await transporter.verify();
+        await transporter.sendMail({
+            from: this.#options.from,
+            to: data.to,
+            subject: "Code d'Authentification Discord",
+            text: `Hello ${name}! Ton code est ${code}. A plus tard o/`,
+            html: `<p>Hello ${name}!</p><p>Ton code est ${code}.</p><p>A plus tard o/</p>`,
+        });
+    }
+}

src/services/index.ts

@@ -0,0 +1,4 @@
+import PostgresDatabaseService from "./PostgresDatabaseService.js";
+import SMTPService from "./SMTPService.js";
+
+export { PostgresDatabaseService, SMTPService };