From b31a5ba0df5584f40e3d66a3ae212930bee30c61 Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Fri, 16 Sep 2022 18:57:45 +0200 Subject: [PATCH] Moved RequestManager.init to the onReady listener --- src/main/java/com/alttd/AltitudeBot.java | 20 ------------------- .../java/com/alttd/listeners/JDAListener.java | 2 +- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/src/main/java/com/alttd/AltitudeBot.java b/src/main/java/com/alttd/AltitudeBot.java index 62ac4c1..1927481 100644 --- a/src/main/java/com/alttd/AltitudeBot.java +++ b/src/main/java/com/alttd/AltitudeBot.java @@ -6,19 +6,13 @@ import com.alttd.console.ConsoleCommandManager; import com.alttd.database.Database; import com.alttd.database.DatabaseTables; import com.alttd.listeners.JDAListener; -import com.alttd.request.RequestManager; import com.alttd.util.Logger; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.JDABuilder; -import net.dv8tion.jda.api.OnlineStatus; -import net.dv8tion.jda.api.entities.Activity; -import javax.security.auth.login.LoginException; import java.io.File; import java.net.URISyntaxException; -import static java.lang.System.exit; - public class AltitudeBot { private JDA jda; @@ -38,21 +32,8 @@ public class AltitudeBot { initConfigs(); ConsoleCommandManager.startConsoleCommands(jda); jda = JDABuilder.createDefault(SettingsConfig.TOKEN).build(); - try { - jda = JDABuilder.createDefault(SettingsConfig.TOKEN).build().awaitReady(); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } DatabaseTables.createTables(Database.getDatabase().getConnection()); ConsoleCommandManager.startConsoleCommands(jda); - try { - jda.getPresence().setPresence( - OnlineStatus.valueOf(SettingsConfig.STATUS), - Activity.listening(SettingsConfig.ACTIVITY)); - } catch (IllegalArgumentException e) { - Logger.exception(e); - } - RequestManager.init(); // try { // jda.getPresence().setPresence( // OnlineStatus.valueOf(SettingsConfig.STATUS), @@ -61,7 +42,6 @@ public class AltitudeBot { // Logger.exception(e); // } initListeners(); - //TODO init permissionManager } private void initListeners() { diff --git a/src/main/java/com/alttd/listeners/JDAListener.java b/src/main/java/com/alttd/listeners/JDAListener.java index 67ec41b..ee7bb99 100644 --- a/src/main/java/com/alttd/listeners/JDAListener.java +++ b/src/main/java/com/alttd/listeners/JDAListener.java @@ -10,7 +10,6 @@ import net.dv8tion.jda.api.events.ReadyEvent; import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import net.dv8tion.jda.api.events.interaction.component.SelectMenuInteractionEvent; -import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; import org.jetbrains.annotations.NotNull; @@ -29,6 +28,7 @@ public class JDAListener extends ListenerAdapter { ModalManager modalManager = new ModalManager(buttonManager); CommandManager commandManager = new CommandManager(jda, modalManager); jda.addEventListener(buttonManager, modalManager, commandManager); +// RequestManager.init(); } @Override