From abd5578be485847122e504dbea7681f2d30302aa Mon Sep 17 00:00:00 2001
From: Teriuihi <teriuihi@alttd.com>
Date: Fri, 9 Aug 2024 23:00:55 +0200
Subject: [PATCH] Fix Bot class and update CheckLinkSync constants

Removed unused imports and redundant methods in Bot.java for cleaner code. Updated CheckLinkSync.java to use new constants from BotConfig.DISCORD.
---
 .../java/com/alttd/proxydiscordlink/bot/Bot.java | 16 +---------------
 .../bot/tasks/CheckLinkSync.java                 |  2 +-
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/alttd/proxydiscordlink/bot/Bot.java b/src/main/java/com/alttd/proxydiscordlink/bot/Bot.java
index ee22729..17c1c54 100644
--- a/src/main/java/com/alttd/proxydiscordlink/bot/Bot.java
+++ b/src/main/java/com/alttd/proxydiscordlink/bot/Bot.java
@@ -1,12 +1,9 @@
 package com.alttd.proxydiscordlink.bot;
 
 import com.alttd.proxydiscordlink.JDAListener;
-import com.alttd.proxydiscordlink.bot.commandManager.CommandManager;
 import com.alttd.proxydiscordlink.DiscordLink;
-import com.alttd.proxydiscordlink.bot.listeners.DiscordMessageListener;
 import com.alttd.proxydiscordlink.bot.listeners.DiscordRoleListener;
 import com.alttd.proxydiscordlink.bot.tasks.CheckLinkSync;
-import com.alttd.proxydiscordlink.bot.tasks.CheckLinkSync;
 import com.alttd.proxydiscordlink.config.BotConfig;
 import com.alttd.proxydiscordlink.util.ALogger;
 import net.dv8tion.jda.api.EmbedBuilder;
@@ -20,16 +17,13 @@ import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.exceptions.HierarchyException;
 import net.dv8tion.jda.api.exceptions.InsufficientPermissionException;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
-import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import net.dv8tion.jda.api.requests.GatewayIntent;
 import net.dv8tion.jda.api.utils.MemberCachePolicy;
 import org.jetbrains.annotations.Nullable;
 
-import javax.security.auth.login.LoginException;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 public class Bot {
     private JDA jda = null;
@@ -45,16 +39,12 @@ public class Bot {
             jda.setAutoReconnect(true);
             jda.awaitReady();
             jda.addEventListener(
-                    new DiscordMessageListener(),
                     new DiscordRoleListener(),
-                    new JDAListener(jda)));
-            DiscordCommand.loadCommands();
+                    new JDAListener(jda));
             DiscordLink.getPlugin().getProxy().getScheduler().buildTask(DiscordLink.getPlugin(), new CheckLinkSync())
                     .delay(120, TimeUnit.SECONDS)
                     .repeat(12, TimeUnit.HOURS)
                     .schedule();
-        } catch (LoginException e) {
-            jda = null;
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
@@ -265,8 +255,4 @@ public class Bot {
 
         return guild.getMembers().stream().filter(member -> member.getRoles().contains(role)).toList();
     }
-
-    public void addListener(ListenerAdapter listenerAdapter) {
-        jda.addEventListener(listenerAdapter);
-    }
 }
diff --git a/src/main/java/com/alttd/proxydiscordlink/bot/tasks/CheckLinkSync.java b/src/main/java/com/alttd/proxydiscordlink/bot/tasks/CheckLinkSync.java
index dcfc2f8..69410a0 100644
--- a/src/main/java/com/alttd/proxydiscordlink/bot/tasks/CheckLinkSync.java
+++ b/src/main/java/com/alttd/proxydiscordlink/bot/tasks/CheckLinkSync.java
@@ -23,7 +23,7 @@ public class CheckLinkSync implements Runnable {
 
     @Override
     public void run() {
-        List<Member> members = bot.getMembersWithRole(BotConfig.GUILD_ID, BotConfig.LINKED_ROLE_ID);
+        List<Member> members = bot.getMembersWithRole(BotConfig.DISCORD.GUILD_ID, BotConfig.DISCORD.LINKED_ROLE_ID);
         HashSet<Long> dbIdSet = plugin.getDatabase().getLinkedUsers();
         HashSet<Long> membersIdSet = members.stream().map(Member::getIdLong).collect(Collectors.toCollection(HashSet::new));