Fixed Tag Module and fixed welcome- and leave module

Author: xyzjesper

bun.lock

@@ -29,7 +29,7 @@
     "@top-gg/sdk": "^3.1.6",
     "@types/body-parser": "^1.19.6",
     "@types/js-yaml": "^4.0.9",
-    "axios": "1.11.0",
+    "axios": "1.12.2",
     "body-parser": "^2.2.0",
     "canvacord": "^6.0.2",
     "canvas": "^3.2.0",

package.json

@@ -686,9 +686,9 @@ model Tags {
   UUID                   String   @unique
   TagId                  String   @unique
   TriggerKeywords        String[] // SOON && NEW
-  MessageId              String
+  MessageTemplateId      String?
   IsShlashCommand        Boolean
-  ShlashCommandId        String   @unique
+  ShlashCommandId        String?
   IsTextInputCommand     Boolean
   IsEnabled              Boolean
   PermissionRoleId       String?

prisma/schema.prisma

@@ -314,4 +314,12 @@ export async function initUsersToDatabase(client: ExtendedClient, user: User) {
     } catch (err) {
 
     }
+}
+
+export async function migrateDataBase(client: ExtendedClient) {
+
+    let migrations = 0
+
+    Logger.info(`Loaded ${migrations} migrations for the Database`.magenta)
+
 }

src/helper/databaseHelper.ts

@@ -3,7 +3,7 @@ import {
     ButtonInteraction, ChatInputCommandInteraction, Message, MessageFlags,
     ModalSubmitInteraction
 } from "discord.js";
-import {createCanvas} from "canvas";
+import {createCanvas, loadImage} from "canvas";
 import FormData from "form-data";
 import {Config} from "../main/config.js";
 import axios from "axios";
@@ -12,6 +12,7 @@ import {ExtendedClient} from "../types/client.js";
 import {convertToEmojiPng} from "./emojis.js";
 import fs from "fs";
 import path from "path";
+import {DrawCardOptions} from "../types/drawcardoptions.js";
 
 export function getInteractionData(interaction: ButtonInteraction | ModalSubmitInteraction | AnySelectMenuInteraction, split: number) {
     return interaction.customId.split(":")[split];
@@ -115,4 +116,70 @@ export async function isInDevelopment(
             content: `## ${emoji} ${message}`,
         })
     }
-} 
+}
+
+export async function drawCardCanvas(opts: DrawCardOptions): Promise<Buffer> {
+    const width = 800;
+    const height = 300;
+    const canvas = createCanvas(width, height);
+    const ctx = canvas.getContext("2d");
+
+    const bg = await loadImage(opts.card.background);
+    ctx.drawImage(bg, 0, 0, width, height);
+
+
+    if (opts.card.rounded) {
+        ctx.save();
+        ctx.beginPath();
+        const radius = 25;
+        ctx.moveTo(radius, 0);
+        ctx.lineTo(width - radius, 0);
+        ctx.quadraticCurveTo(width, 0, width, radius);
+        ctx.lineTo(width, height - radius);
+        ctx.quadraticCurveTo(width, height, width - radius, height);
+        ctx.lineTo(radius, height);
+        ctx.quadraticCurveTo(0, height, 0, height - radius);
+        ctx.lineTo(0, radius);
+        ctx.quadraticCurveTo(0, 0, radius, 0);
+        ctx.closePath();
+        ctx.clip();
+        ctx.drawImage(bg, 0, 0, width, height);
+        ctx.restore();
+    }
+
+    if (opts.card.border) {
+        ctx.lineWidth = 6;
+        ctx.strokeStyle = "#555252";
+        ctx.strokeRect(0, 0, width, height);
+    }
+
+    const avatar = await loadImage(opts.avatar.image);
+    const avatarSize = 128;
+    const avatarX = 40;
+    const avatarY = height / 2 - avatarSize / 2;
+
+    ctx.save();
+    ctx.beginPath();
+    ctx.arc(avatarX + avatarSize / 2, avatarY + avatarSize / 2, avatarSize / 2, 0, Math.PI * 2);
+    ctx.closePath();
+    ctx.clip();
+    ctx.drawImage(avatar, avatarX, avatarY, avatarSize, avatarSize);
+    ctx.restore();
+
+    ctx.beginPath();
+    ctx.arc(avatarX + avatarSize / 2, avatarY + avatarSize / 2, avatarSize / 2 + opts.avatar.outlineWidth, 0, Math.PI * 2);
+    ctx.strokeStyle = opts.avatar.outlineColor;
+    ctx.lineWidth = opts.avatar.outlineWidth;
+    ctx.stroke();
+    ctx.fillStyle = opts.text.color;
+    ctx.font = "bold 36px Sans";
+    ctx.fillText(opts.text.title, 200, 100);
+
+    ctx.font = "24px Sans";
+    ctx.fillText(opts.text.subtitle, 200, 150);
+
+    ctx.font = "20px Sans";
+    ctx.fillText(opts.text.text, 200, 200);
+
+    return canvas.toBuffer("image/png");
+}

src/helper/utilityHelper.ts

@@ -3,7 +3,7 @@ import {PrismaClient} from "../prisma/index.js";
 import {LoggingAction} from "../enums/loggingTypes.js";
 import {Logger} from "./logger.js";
 import colors from "colors"
-import {initGuildsToDatabase, setupDisBotConfig} from "../helper/databaseHelper.js";
+import {initGuildsToDatabase, migrateDataBase, setupDisBotConfig} from "../helper/databaseHelper.js";
 import {Config} from "./config.js";
 import * as process from "node:process";
 
@@ -37,6 +37,7 @@ export async function connectToDatabase(client: ExtendedClient) {
 export async function initDataToDatabase(client: ExtendedClient) {
 
     try {
+        await migrateDataBase(client)
         await initGuildsToDatabase(client)
         await setupDisBotConfig(client)
 

src/main/database.ts

@@ -1,98 +1,98 @@
-import { ChannelType, InteractionContextType, PermissionsBitField, SlashCommandBuilder } from "discord.js";
+import {ChannelType, InteractionContextType, PermissionsBitField, SlashCommandBuilder} from "discord.js";
 
 export default {
-  help: {
-    name: 'Leave',
-    description: 'Leave Steup',
-    usage: '/leave',
-    examples: [],
-    aliases: [],
-    docsLink: 'https://docs.disbot.app/docs/commands/leave'
-  },
-  data: new SlashCommandBuilder()
-    .setName("leave")
-    .setDescription("Leave Steup")
-    .setDescriptionLocalizations({ de: "Leave System Setup" })
-    .setContexts(InteractionContextType.Guild)
-    .setDefaultMemberPermissions(PermissionsBitField.Flags.ManageGuild)
+    help: {
+        name: 'Leave',
+        description: 'Leave Steup',
+        usage: '/leave',
+        examples: [],
+        aliases: [],
+        docsLink: 'https://docs.disbot.app/docs/commands/leave'
+    },
+    data: new SlashCommandBuilder()
+        .setName("leave")
+        .setDescription("Leave Steup")
+        .setDescriptionLocalizations({de: "Leave System Setup"})
+        .setContexts(InteractionContextType.Guild)
+        .setDefaultMemberPermissions(PermissionsBitField.Flags.ManageGuild)
 
-    .addSubcommand((subCommand) =>
-      subCommand
-        .setName("message")
-        .setDescription("Use a Message for the Leave System")
-        .setDescriptionLocalizations({
-          de: "Nutze eine Nachricht für das Leave System"
-        })
+        .addSubcommand((subCommand) =>
+            subCommand
+                .setName("message")
+                .setDescription("Use a Message for the Leave System")
+                .setDescriptionLocalizations({
+                    de: "Nutze eine Nachricht für das Leave System"
+                })
 
-        .addChannelOption((options) =>
-          options
-            .setName("channel")
-            .setDescription("Set the Leave Channel")
-            .setDescriptionLocalizations({ de: "Setze den Leave Channel" })
-            .addChannelTypes(
-              ChannelType.GuildText,
-              ChannelType.GuildAnnouncement
-            )
-            .setRequired(true)
+                .addChannelOption((options) =>
+                    options
+                        .setName("channel")
+                        .setDescription("Set the Leave Channel")
+                        .setDescriptionLocalizations({de: "Setze den Leave Channel"})
+                        .addChannelTypes(
+                            ChannelType.GuildText,
+                            ChannelType.GuildAnnouncement
+                        )
+                        .setRequired(true)
+                )
         )
-    )
-    .addSubcommand((subCommand) =>
-      subCommand
-        .setName("image")
-        .setDescription("OoO, This Command is currently disabled because we are re-coding the image generation")
-        .setDescriptionLocalizations({
-          de: "OoO, This Command is currently disabled because we are re-coding the image generation"
-        })
+        .addSubcommand((subCommand) =>
+            subCommand
+                .setName("image")
+                .setDescription("Create a Image to your welcome message")
+                .setDescriptionLocalizations({
+                    de: "Erstelle ein Image zu deiner Willkommens nachricht"
+                })
 
-        .addChannelOption((options) =>
-          options
-            .setName("channel")
-            .setDescription("Set the Willkommen Channel")
-            .setDescriptionLocalizations({ de: "Setze den Willkommen Channel" })
-            .addChannelTypes(
-              ChannelType.GuildText,
-              ChannelType.GuildAnnouncement
-            )
-            .setRequired(true)
+                .addChannelOption((options) =>
+                    options
+                        .setName("channel")
+                        .setDescription("Set the Willkommen Channel")
+                        .setDescriptionLocalizations({de: "Setze den Willkommen Channel"})
+                        .addChannelTypes(
+                            ChannelType.GuildText,
+                            ChannelType.GuildAnnouncement
+                        )
+                        .setRequired(true)
+                )
         )
-    )
 
-    .addSubcommand((subCommand) =>
-      subCommand
-        .setName("remove")
-        .setDescription("Remove the Messages from the Database.")
-        .setDescriptionLocalizations({
-          de: "Entferne die Nachrichten aus der Datenbank."
-        })
-    )
+        .addSubcommand((subCommand) =>
+            subCommand
+                .setName("remove")
+                .setDescription("Remove the Messages from the Database.")
+                .setDescriptionLocalizations({
+                    de: "Entferne die Nachrichten aus der Datenbank."
+                })
+        )
 
-    .addSubcommand((subCommand) =>
-      subCommand
-        .setName("toggle")
-        .setDescription("Toggle Leave System")
-        .setDescriptionLocalizations({
-          de: "Schalte Leave System aus/an"
-        })
-        .addStringOption((option) =>
-          option
-            .setName("toggle")
-            .setDescription("Toggle Leave System")
-            .setDescriptionLocalizations({
-              de: "Schalte Leave System aus/an"
-            })
-            .setRequired(true)
-            .addChoices(
-              {
-                name: "✅ Activate the System",
-                value: "on",
-                name_localizations: { de: "✅ Aktiviere das System" }
-              },
-              {
-                name: "❌ Deactivate the System",
-                value: "off",
-                name_localizations: { de: "❌ Deaktiviere das System" }
-              }
-            )
+        .addSubcommand((subCommand) =>
+            subCommand
+                .setName("toggle")
+                .setDescription("Toggle Leave System")
+                .setDescriptionLocalizations({
+                    de: "Schalte Leave System aus/an"
+                })
+                .addStringOption((option) =>
+                    option
+                        .setName("toggle")
+                        .setDescription("Toggle Leave System")
+                        .setDescriptionLocalizations({
+                            de: "Schalte Leave System aus/an"
+                        })
+                        .setRequired(true)
+                        .addChoices(
+                            {
+                                name: "✅ Activate the System",
+                                value: "on",
+                                name_localizations: {de: "✅ Aktiviere das System"}
+                            },
+                            {
+                                name: "❌ Deactivate the System",
+                                value: "off",
+                                name_localizations: {de: "❌ Deaktiviere das System"}
+                            }
+                        )
+                )
         )
-    )
 };

src/modules/leave/commands/leave.ts

@@ -10,6 +10,7 @@ import {
 import {ExtendedClient} from "../../../types/client.js";
 import {drawCard, LinearGradient} from "discord-welcome-card";
 import {database} from "../../../main/database.js";
+import {drawCardCanvas} from "../../../helper/utilityHelper.js";
 
 export default {
     name: Events.GuildMemberRemove,
@@ -70,7 +71,7 @@ export default {
 
         let imageBuffer = null;
         if (data.Image) {
-            imageBuffer = await drawCard({
+            imageBuffer = await drawCardCanvas({
                 theme: (data.ImageData?.Theme as "dark" | "circuit" | "code") ?? "dark",
                 text: {
                     title: replaceVars(data.ImageData?.Title) ?? "Goodbye!",
@@ -83,28 +84,20 @@ export default {
                 avatar: {
                     image: member.displayAvatarURL({extension: "png"}),
                     outlineWidth: 5,
-                    outlineColor: new LinearGradient({
-                        col: data.ImageData?.Gradient?.split(",")[0] ?? "#fff",
-                        off: 0,
-                        offset: 1,
-                        color: data.ImageData?.Gradient?.split(",")[1] ?? "#000"
-                    })
+                    outlineColor: data.ImageData?.Gradient?.split(",")[0] ?? "#fff"
                 },
                 card: {
-                    background: data.ImageData?.Background ?? "https://i.imgur.com/kjEQRRI.png",
+                    background: data.ImageData?.Background ?? "https://cdn.xyzhub.link/u/czdZgx.png",
                     blur: 1,
                     border: true,
                     rounded: true
                 }
             });
         }
-
-        const payload: Parameters<TextChannel["send"]>[0] = {};
-        if (embedJson) payload.embeds = [new EmbedBuilder(embedJson)];
-        if (content) payload.content = content;
-        if (imageBuffer) payload.files = [imageBuffer];
-
-        if (Object.keys(payload).length === 0) return;
-        await channel.send(payload);
+        await channel.send({
+            content: content ? content : "ㅤ",
+            embeds: embedJson ? [new EmbedBuilder(embedJson)] : [],
+            files: imageBuffer ? [new AttachmentBuilder(imageBuffer)] : []
+        });
     }
 };