📝 Fix bot

Author: Maxlego08

DiscordBot/src/main/java/fr/maxlego08/essentials/bot/DiscordBot.java

@@ -47,42 +47,43 @@ private DiscordBot() {
         this.storageManager.connect(this.configuration);
 
         this.jda = builder.build();
-        this.linkManager.loadCodes();
 
-        this.shutdown();
+        this.addShutdownHook();
+        this.listenForCommands();
     }
 
     public static void main(String[] args) {
         new DiscordBot();
     }
 
-    private void shutdown() {
-        // Add shutdown hook to disconnect the bot
+    private void addShutdownHook() {
+        // Add shutdown hook to ensure proper cleanup
         Runtime.getRuntime().addShutdownHook(new Thread(() -> {
             if (this.jda != null) {
-                this.jda.shutdown();
-                System.out.println("Bot disconnected.");
+                this.jda.shutdownNow();
+                System.out.println("Bot disconnected by shutdown hook.");
             }
         }));
+    }
 
+    private void listenForCommands() {
         // Scanner to listen for "stop" command
         this.scanner = new Scanner(System.in);
-        while (true) {
-            String command = scanner.nextLine();
-            if (command.equalsIgnoreCase("stop")) {
-                if (this.jda != null) {
-                    this.jda.shutdownNow();
-                    System.out.println("Bot stopped by user command.");
+        Thread commandThread = new Thread(() -> {
+            while (true) {
+                String command = scanner.nextLine();
+                if (command.equalsIgnoreCase("stop")) {
+                    if (this.jda != null) {
+                        this.jda.shutdownNow();
+                        System.out.println("Bot stopped by user command.");
+                    }
+                    break;
                 }
-                break;
             }
-        }
-    }
-
-    public void forceShutdown() {
-        this.scanner.close();
-        this.jda.shutdown();
-        System.out.println("Bot disconnected.");
+            scanner.close();
+        });
+        commandThread.setDaemon(true); // Ensures JVM exits when the main thread stops
+        commandThread.start();
     }
 
     public Configuration getConfiguration() {
@@ -102,9 +103,7 @@ public LinkManager getLinkManager() {
     }
 
     public void reload() {
-
         this.configurationManager.loadOrCreateConfig();
         this.configuration.loadConfiguration(configurationManager.getConfig());
-
     }
-}
+}

DiscordBot/src/main/java/fr/maxlego08/essentials/bot/command/CommandManager.java

@@ -4,7 +4,6 @@
 import fr.maxlego08.essentials.bot.DiscordBot;
 import fr.maxlego08.essentials.bot.command.commands.CommandReload;
 import fr.maxlego08.essentials.bot.command.commands.CommandSetLinkMessage;
-import fr.maxlego08.essentials.bot.command.commands.CommandStop;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 
 import java.util.ArrayList;
@@ -24,7 +23,6 @@ public CommandManager(DiscordBot instance) {
 
     public void registerCommands() {
         this.commands.clear();
-        registerCommand("stop", new CommandStop(this), "end");
         registerCommand("setlinkmessage", new CommandSetLinkMessage(this));
         registerCommand("reload", new CommandReload(this));
     }

DiscordBot/src/main/java/fr/maxlego08/essentials/bot/command/commands/CommandStop.java

@@ -14,26 +14,18 @@
 import net.dv8tion.jda.internal.interactions.component.ButtonImpl;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Optional;
+import java.util.UUID;
 
 public class LinkManager extends ListenerAdapter {
 
     public static final String BUTTON_LINK_NAME = "zessentials:link";
     private final DiscordBot instance;
-    private final List<DiscordCodeDTO> codes = new ArrayList<>();
 
     public LinkManager(DiscordBot instance) {
         this.instance = instance;
     }
 
-    public void loadCodes() {
-        var codes = instance.getStorageManager().loadCodes();
-        this.codes.clear();
-        this.codes.addAll(codes);
-    }
-
     public void sendLinkMessage(MessageChannelUnion textChannel) {
 
         EmbedBuilder builder = instance.getConfiguration().getLink().embed().toEmbed();
@@ -81,9 +73,8 @@ private void createCode(ButtonInteractionEvent event, Guild guild, User user) {
                 }
 
                 // Otherwise, we will create one
-                String generatedCode = java.util.UUID.randomUUID().toString().replace("-", "").substring(0, 16);
+                String generatedCode = UUID.randomUUID().toString().replace("-", "").substring(0, 16);
                 DiscordCodeDTO newCode = new DiscordCodeDTO(generatedCode, user.getIdLong(), user.getName());
-                this.codes.add(newCode);
                 replyCode(generatedCode, event);
                 storage.saveCode(newCode);
                 storage.insertLog(DiscordAction.CREATE_CODE, null, null, user.getEffectiveName(), user.getIdLong(), generatedCode);
@@ -114,6 +105,6 @@ private void replyCode(String code, ButtonInteractionEvent event) {
     }
 
     private Optional<DiscordCodeDTO> getCode(long userId) {
-        return this.codes.stream().filter(code -> code.user_id() == userId).findFirst();
+        return this.instance.getStorageManager().getCode(userId);
     }
 }

DiscordBot/src/main/java/fr/maxlego08/essentials/bot/link/LinkManager.java

@@ -11,7 +11,6 @@
 import fr.maxlego08.sarah.RequestHelper;
 import fr.maxlego08.sarah.logger.Logger;
 
-import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.Executor;
@@ -41,10 +40,6 @@ public RequestHelper getRequestHelper() {
         return requestHelper;
     }
 
-    public List<DiscordCodeDTO> loadCodes() {
-        return this.requestHelper.selectAll(Tables.LINK_CODES, DiscordCodeDTO.class);
-    }
-
     public void saveCode(DiscordCodeDTO code) {
         this.executor.execute(() -> this.requestHelper.insert(Tables.LINK_CODES, table -> {
             table.object("code", code.code());
@@ -71,4 +66,8 @@ public void insertLog(DiscordAction action, UUID uniqueId, String minecraftName,
             if (data != null) table.object("data", data);
         }));
     }
+
+    public Optional<DiscordCodeDTO> getCode(long userId) {
+        return this.requestHelper.select(Tables.LINK_CODES, DiscordCodeDTO.class, table -> table.where("user_id", userId)).stream().findFirst();
+    }
 }

DiscordBot/src/main/java/fr/maxlego08/essentials/bot/storage/StorageManager.java

@@ -1,6 +1,10 @@
+# Se bot discord is not a minecraft plugin!
+
+# The token of your Discord Bot
 bot-token: "DISCORD-TOKEN"
 
-guild-id: 0
+# The guild ID of your Discord Server
+guild-id: 511516467615760405
 
 database-configuration:
   # The prefix that will be applied to all tables, if you have several plugins with the same database you must have one.
@@ -16,46 +20,48 @@ database-configuration:
   password: 'secret'
   # Database
   database: zessentials
-  # Enable of not the sql debug mode
+  # Enable of not the SQL debug mode
   debug: false
 
 link:
+
   enable: true
-  replyMessage: "Use the command `/link %code%` to link your account."
+
+  # Allows logs of actions performed by a user
+  log:
+    channel: 1324025378142163025
+    create: "**%name%** (%id%) has just created the code `%code%`."
+    ask: "**%name%** (%id%) has just requested the code `%code%`."
+
+  # Message sent when user interacts with the message
+  messages:
+    code: "Use the command `/link %code%` to link your account."
+    already: "Your account is already linked."
+
+  # Button that the player will have to interact to link his account
   button:
-    name: "Click to link your minecraft account"
+    name: "Click to link your account"
     style: SUCCESS
-    disabled: false
-    # emoji: "U+2795"
+    emoji: "U+2795" # The emoji that will be displayed on the button
 
   embed:
     title:
-      title: "Zessentials"
-      url: "https://zessentials.net" # Ajout de l'URL au titre
-    description: "Check out our website at: https://zessentials.net"
+      title: "Link my account"
+      # url: "https://zessentials.net" # The URL of the title
+    description: "To link your account, follow these steps:\n1. Click the button above.\n2. Run the command in-game to complete the linking of your account."
     color:
       r: 10
       g: 150
       b: 10
-      alpha: 255 # Valeur maximale pour l'alpha (optionnel)
+      alpha: 255 # The alpha value of the color (optional)
     footer:
-      text: "Footer text here"
-      iconUrl: "https://example.com/footer-icon.png" # Optionnel
-    thumbnail:
-      url: "https://example.com/thumbnail.png"
-    image:
-      url: "https://example.com/image.png"
-    author:
-      name: "Author Name"
-      url: "https://authorwebsite.net" # Optionnel
-      iconUrl: "https://example.com/author-icon.png"
-    fields:
-      - name: "Field 1"
-        value: "Value for field 1"
-        inline: true # True pour aligner les champs sur la même ligne
-      - name: "Field 2"
-        value: "Value for field 2"
-        inline: true
-      - name: "Field 3"
-        value: "Value for field 3"
-        inline: false # False pour placer le champ sur une nouvelle ligne
+      text: "zEssentials - 2025"
+      # iconUrl: "https://groupez.dev/storage/images/users/0/0/0/1.png" # Optional
+    # thumbnail:
+      # url: "https://groupez.dev/storage/images/users/0/0/0/1.png"
+    # image:
+      # url: "https://example.com/image.png"
+    # author:
+      # name: "Author Name"
+      # url: "https://authorwebsite.net" # Optional
+      # iconUrl: "https://groupez.dev/storage/images/users/0/0/0/1.png"