From e592111d1b71a44187e9781844d7ed8a333f7361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beatrice=20Dellac=C3=A0?= <hello@beatrice.wtf>
Date: Sun, 20 Nov 2022 06:13:52 +0100
Subject: [PATCH] Update base JDA version

---
 pom.xml                                                       | 2 +-
 src/main/java/wtf/beatrice/hidekobot/HidekoBot.java           | 3 +--
 .../wtf/beatrice/hidekobot/listeners/MessageListener.java     | 2 +-
 .../java/wtf/beatrice/hidekobot/listeners/MessageLogger.java  | 4 ++--
 .../beatrice/hidekobot/slashcommands/ClearChatCommand.java    | 4 ++--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4c9baf2..d94b454 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>5.0.0-alpha.18</version>
+            <version>5.0.0-alpha.22</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/src/main/java/wtf/beatrice/hidekobot/HidekoBot.java b/src/main/java/wtf/beatrice/hidekobot/HidekoBot.java
index c5b59a1..ca1729e 100644
--- a/src/main/java/wtf/beatrice/hidekobot/HidekoBot.java
+++ b/src/main/java/wtf/beatrice/hidekobot/HidekoBot.java
@@ -11,7 +11,6 @@ import wtf.beatrice.hidekobot.listeners.SlashCommandListener;
 import wtf.beatrice.hidekobot.utils.Logger;
 import wtf.beatrice.hidekobot.utils.SlashCommandsUtil;
 
-import javax.security.auth.login.LoginException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -58,7 +57,7 @@ public class HidekoBot
             );
 
             jda = jdaBuilder.build().awaitReady();
-        } catch (LoginException | InterruptedException e)
+        } catch (Exception e)
         {
             logger.log(e.getMessage()); // print the error message, omit the stack trace.
             shutdown(); // if we failed connecting and authenticating, then quit.
diff --git a/src/main/java/wtf/beatrice/hidekobot/listeners/MessageListener.java b/src/main/java/wtf/beatrice/hidekobot/listeners/MessageListener.java
index 27027c9..35bd062 100644
--- a/src/main/java/wtf/beatrice/hidekobot/listeners/MessageListener.java
+++ b/src/main/java/wtf/beatrice/hidekobot/listeners/MessageListener.java
@@ -1,6 +1,6 @@
 package wtf.beatrice.hidekobot.listeners;
 
-import net.dv8tion.jda.api.entities.MessageChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/wtf/beatrice/hidekobot/listeners/MessageLogger.java b/src/main/java/wtf/beatrice/hidekobot/listeners/MessageLogger.java
index 71bebd6..380e908 100644
--- a/src/main/java/wtf/beatrice/hidekobot/listeners/MessageLogger.java
+++ b/src/main/java/wtf/beatrice/hidekobot/listeners/MessageLogger.java
@@ -1,8 +1,8 @@
 package wtf.beatrice.hidekobot.listeners;
 
 import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.PrivateChannel;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/wtf/beatrice/hidekobot/slashcommands/ClearChatCommand.java b/src/main/java/wtf/beatrice/hidekobot/slashcommands/ClearChatCommand.java
index ffd3b96..4f7141a 100644
--- a/src/main/java/wtf/beatrice/hidekobot/slashcommands/ClearChatCommand.java
+++ b/src/main/java/wtf/beatrice/hidekobot/slashcommands/ClearChatCommand.java
@@ -1,9 +1,9 @@
 package wtf.beatrice.hidekobot.slashcommands;
 
 import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.MessageChannel;
 import net.dv8tion.jda.api.entities.MessageHistory;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.InteractionHook;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;