From 883d842a5f3388d1910c1e33217ad7559d2e0414 Mon Sep 17 00:00:00 2001
From: Presti <dxssucuk@hotmail.com>
Date: Thu, 4 May 2023 11:19:26 +0200
Subject: [PATCH 1/2] Upgrade to JDA 5 Added function to make someone join a
 Guild server via OAuth2

---
 build.gradle                                  |   7 +-
 .../jagrosh/jdautilities/command/Command.java |  16 +--
 .../jdautilities/command/CommandEvent.java    | 112 ++++++++--------
 .../command/impl/CommandClientImpl.java       |  20 +--
 .../commons/utils/FinderUtil.java             | 111 ++++++++--------
 .../commons/waiter/EventWaiter.java           |   8 +-
 .../examples/command/AboutCommand.java        |   2 +-
 .../examples/command/GuildlistCommand.java    |   2 +-
 .../examples/command/RoleinfoCommand.java     |   8 +-
 .../examples/command/ServerinfoCommand.java   |   3 +-
 .../jagrosh/jdautilities/menu/ButtonMenu.java |  83 +++++++-----
 .../com/jagrosh/jdautilities/menu/Menu.java   |   7 +-
 .../jdautilities/menu/OrderedMenu.java        |  65 +++++----
 .../jagrosh/jdautilities/menu/Paginator.java  |  81 ++++++++----
 .../jdautilities/menu/SelectionDialog.java    |  67 ++++++----
 .../jagrosh/jdautilities/menu/Slideshow.java  |  61 ++++++---
 .../jdautilities/oauth2/OAuth2Client.java     |  29 ++++-
 .../oauth2/entities/OAuth2Guild.java          |  23 +++-
 .../oauth2/entities/OAuth2User.java           |  27 +---
 .../entities/impl/OAuth2ClientImpl.java       |  42 ++++--
 .../oauth2/entities/impl/OAuth2GuildImpl.java |  27 ++--
 .../oauth2/entities/impl/OAuth2UserImpl.java  | 123 +++++++++---------
 .../oauth2/requests/OAuth2Action.java         |  13 +-
 .../oauth2/requests/OAuth2Requester.java      |  17 +--
 .../oauth2/requests/OAuth2URL.java            |  23 +++-
 .../session/DefaultSessionController.java     |   6 +-
 .../oauth2/session/SessionData.java           |  10 +-
 .../oauth2/state/DefaultStateController.java  |   6 +-
 28 files changed, 599 insertions(+), 400 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2074d811..78b2f364 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '2.0.2'
 }
 
-def versionInfo = [major: '3', minor: '1', revision: '0']
+def versionInfo = [major: '4', minor: '0', revision: '0']
 
 task build {
     group = 'build'
@@ -36,7 +36,7 @@ allprojects {
     version = versionInfo.values().join('.')
 
     ext {
-        jdaVersion = '4.3.0_313'
+        jdaVersion = '5.0.0-beta.8'
         slf4jVersion = '1.7.25'
         okhttpVersion = '3.13.0'
         findbugsVersion = '3.0.2'
@@ -92,9 +92,6 @@ allprojects {
     repositories {
         mavenLocal()
         mavenCentral()
-        maven {
-            url "https://m2.dv8tion.net/releases"
-        }
     }
 
     build {
diff --git a/command/src/main/java/com/jagrosh/jdautilities/command/Command.java b/command/src/main/java/com/jagrosh/jdautilities/command/Command.java
index 40d2ff49..e41fb517 100644
--- a/command/src/main/java/com/jagrosh/jdautilities/command/Command.java
+++ b/command/src/main/java/com/jagrosh/jdautilities/command/Command.java
@@ -20,10 +20,10 @@
 import java.util.function.BiConsumer;
 import java.util.function.Predicate;
 import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.entities.ChannelType;
+import net.dv8tion.jda.api.entities.channel.ChannelType;
 import net.dv8tion.jda.api.entities.GuildVoiceState;
-import net.dv8tion.jda.api.entities.TextChannel;
-import net.dv8tion.jda.api.entities.VoiceChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
 
 /**
  * <h1><b>Commands In JDA-Utilities</b></h1>
@@ -247,7 +247,7 @@ public final void run(CommandEvent event)
                     if(p.name().startsWith("VOICE"))
                     {
                         GuildVoiceState gvc = event.getMember().getVoiceState();
-                        VoiceChannel vc = gvc == null ? null : gvc.getChannel();
+                        VoiceChannel vc = gvc == null ? null : gvc.getChannel().asVoiceChannel();
                         if(vc==null)
                         {
                             terminate(event, event.getClient().getError()+" You must be in a voice channel to use that!");
@@ -354,7 +354,7 @@ public boolean isCommandFor(String input)
     }
 
     /**
-     * Checks whether a command is allowed in a {@link net.dv8tion.jda.api.entities.TextChannel TextChannel}
+     * Checks whether a command is allowed in a {@link net.dv8tion.jda.api.entities.channel.concrete.TextChannel TextChannel}
      * by searching the channel topic for topic tags relating to the command.
      *
      * <p>{-{@link com.jagrosh.jdautilities.command.Command#name name}},
@@ -766,7 +766,7 @@ public enum CooldownScope
         USER("U:%d",""),
 
         /**
-         * Applies the cooldown to the {@link net.dv8tion.jda.api.entities.MessageChannel MessageChannel} the
+         * Applies the cooldown to the {@link net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion MessageChannel} the
          * command is called in.
          *
          * <p>The key for this is generated in the format
@@ -778,7 +778,7 @@ public enum CooldownScope
 
         /**
          * Applies the cooldown to the calling {@link net.dv8tion.jda.api.entities.User User} local to the
-         * {@link net.dv8tion.jda.api.entities.MessageChannel MessageChannel} the command is called in.
+         * {@link net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion MessageChannel} the command is called in.
          *
          * <p>The key for this is generated in the format
          * <ul>
@@ -851,7 +851,7 @@ public enum CooldownScope
          * Applies this cooldown globally.
          *
          * <p>As this implies: the command will be unusable on the instance of JDA in all types of
-         * {@link net.dv8tion.jda.api.entities.MessageChannel MessageChannel}s until the cooldown has ended.
+         * {@link net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion MessageChannel}s until the cooldown has ended.
          *
          * <p>The key for this is {@code <command-name>|globally}
          */
diff --git a/command/src/main/java/com/jagrosh/jdautilities/command/CommandEvent.java b/command/src/main/java/com/jagrosh/jdautilities/command/CommandEvent.java
index a9019cb7..7de283f4 100644
--- a/command/src/main/java/com/jagrosh/jdautilities/command/CommandEvent.java
+++ b/command/src/main/java/com/jagrosh/jdautilities/command/CommandEvent.java
@@ -17,13 +17,21 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.function.Consumer;
 
 import com.jagrosh.jdautilities.command.impl.CommandClientImpl;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.ChannelType;
+import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.exceptions.PermissionException;
+import net.dv8tion.jda.api.utils.FileUpload;
+import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 import net.dv8tion.jda.internal.utils.Checks;
 
 /**
@@ -35,7 +43,7 @@
  * development. There are also "extension" methods for all methods found in MessageReceivedEvent.
  * 
  * <p>Methods with "reply" in their name can be used to instantly send a {@link net.dv8tion.jda.api.entities.Message Message}
- * response to the {@link net.dv8tion.jda.api.entities.MessageChannel MessageChannel} the MessageReceivedEvent was in.
+ * response to the {@link net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion MessageChannel} the MessageReceivedEvent was in.
  * <br>All {@link net.dv8tion.jda.api.requests.RestAction RestAction} returned by sending a response using these
  * methods automatically {@link net.dv8tion.jda.api.requests.RestAction#queue() RestAction#queue()}, and no further developer
  * input is required.
@@ -113,7 +121,7 @@ public CommandClient getClient()
      * contained by this CommandEvent.
      *
      * <p>This method is exposed for those who wish to use linked deletion but may require usage of
-     * {@link net.dv8tion.jda.api.entities.MessageChannel#sendMessage(Message) MessageChannel#sendMessage()}
+     * {@link net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion#sendMessage(CharSequence)} )} MessageChannel#sendMessage()}
      * or for other reasons cannot use the standard {@code reply()} methods.
      *
      * <p>If the Message provided is <b>not</b> from the bot (IE: {@link net.dv8tion.jda.api.entities.SelfUser SelfUser}),
@@ -209,7 +217,7 @@ public void reply(String message, Consumer<Message> success, Consumer<Throwable>
      */
     public void reply(MessageEmbed embed)
     {
-        event.getChannel().sendMessage(embed).queue(m -> {
+        event.getChannel().sendMessageEmbeds(embed).queue(m -> {
             if(event.isFromType(ChannelType.TEXT))
                 linkId(m);
         });
@@ -231,7 +239,7 @@ public void reply(MessageEmbed embed)
      */
     public void reply(MessageEmbed embed, Consumer<Message> success)
     {
-    	event.getChannel().sendMessage(embed).queue(m -> {
+    	event.getChannel().sendMessageEmbeds(embed).queue(m -> {
     	    if(event.isFromType(ChannelType.TEXT))
     	        linkId(m);
     	    success.accept(m);
@@ -256,7 +264,7 @@ public void reply(MessageEmbed embed, Consumer<Message> success)
      */
     public void reply(MessageEmbed embed, Consumer<Message> success, Consumer<Throwable> failure)
     {
-        event.getChannel().sendMessage(embed).queue(m -> {
+        event.getChannel().sendMessageEmbeds(embed).queue(m -> {
             if(event.isFromType(ChannelType.TEXT))
                 linkId(m);
             success.accept(m);
@@ -273,7 +281,7 @@ public void reply(MessageEmbed embed, Consumer<Message> success, Consumer<Throwa
      * @param  message
      *         The Message to reply with
      */
-    public void reply(Message message)
+    public void reply(MessageCreateData message)
     {
         event.getChannel().sendMessage(message).queue(m -> {
             if(event.isFromType(ChannelType.TEXT))
@@ -295,7 +303,7 @@ public void reply(Message message)
      * @param  success
      *         The Consumer to success after sending the Message is sent.
      */
-    public void reply(Message message, Consumer<Message> success)
+    public void reply(MessageCreateData message, Consumer<Message> success)
     {
         event.getChannel().sendMessage(message).queue(m -> {
             if(event.isFromType(ChannelType.TEXT))
@@ -320,7 +328,7 @@ public void reply(Message message, Consumer<Message> success)
      * @param  failure
      *         The Consumer to run if an error occurs when sending the Message.
      */
-    public void reply(Message message, Consumer<Message> success, Consumer<Throwable> failure)
+    public void reply(MessageCreateData message, Consumer<Message> success, Consumer<Throwable> failure)
     {
         event.getChannel().sendMessage(message).queue(m -> {
             if(event.isFromType(ChannelType.TEXT))
@@ -337,7 +345,7 @@ public void reply(Message message, Consumer<Message> success, Consumer<Throwable
      * sending the response as a {@link net.dv8tion.jda.api.entities.Message Message}
      * automatically does {@link net.dv8tion.jda.api.requests.RestAction#queue() RestAction#queue()}.
      * 
-     * <p>This method uses {@link net.dv8tion.jda.api.entities.MessageChannel#sendFile(File, String, net.dv8tion.jda.api.utils.AttachmentOption...) MessageChannel#sendFile(File, String, AttachmentOption...)}
+     * <p>This method uses {@link net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion#sendFiles(Collection)  MessageChannel#sendFile(File, String, AttachmentOption...)}
      * to send the File. For more information on what a bot may send using this, you may find the info in that method.
      * 
      * @param  file
@@ -347,7 +355,7 @@ public void reply(Message message, Consumer<Message> success, Consumer<Throwable
      */
     public void reply(File file, String filename)
     {
-        event.getChannel().sendFile(file, filename).queue();
+        event.getChannel().sendFiles(FileUpload.fromData(file, filename)).queue();
     }
     
     /**
@@ -358,7 +366,7 @@ public void reply(File file, String filename)
      * sending the response as a {@link net.dv8tion.jda.api.entities.Message Message}
      * automatically does {@link net.dv8tion.jda.api.requests.RestAction#queue() RestAction#queue()}.
      * 
-     * <p>This method uses {@link net.dv8tion.jda.api.entities.MessageChannel#sendFile(File, String, net.dv8tion.jda.api.utils.AttachmentOption...) MessageChannel#sendFile(File, String, AttachmentOption...)}
+     * <p>This method uses {@link net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion#sendFiles(Collection) MessageChannel#sendFile(File, String, AttachmentOption...)}
      * to send the File. For more information on what a bot may send using this, you may find the info in that method.
      * 
      * @param  message
@@ -370,7 +378,7 @@ public void reply(File file, String filename)
      */
     public void reply(String message, File file, String filename)
     {
-        event.getChannel().sendFile(file, filename).content(message).queue();
+        event.getChannel().sendFiles(FileUpload.fromData(file, filename)).setContent(message).queue();
     }
     
     /**
@@ -412,7 +420,7 @@ public void replyFormatted(String format, Object... args)
     public void replyOrAlternate(MessageEmbed embed, String alternateMessage)
     {
         try {
-            event.getChannel().sendMessage(embed).queue();
+            event.getChannel().sendMessageEmbeds(embed).queue();
         } catch(PermissionException e) {
             reply(alternateMessage);
         }
@@ -426,7 +434,7 @@ public void replyOrAlternate(MessageEmbed embed, String alternateMessage)
      * sending the response as a {@link net.dv8tion.jda.api.entities.Message Message}
      * automatically does {@link net.dv8tion.jda.api.requests.RestAction#queue() RestAction#queue()}.
      * 
-     * <p>This method uses {@link net.dv8tion.jda.api.entities.MessageChannel#sendFile(File, String, net.dv8tion.jda.api.utils.AttachmentOption...) MessageChannel#sendFile(File, String, AttachmentOption...)}
+     * <p>This method uses {@link net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion#sendFiles(Collection) MessageChannel#sendFile(File, String, AttachmentOption...)}
      * to send the File. For more information on what a bot may send using this, you may find the info in that method.
      * 
      * <p><b>NOTE:</b> This alternate String message can exceed the 2000 character cap, and will 
@@ -449,7 +457,7 @@ public void replyOrAlternate(MessageEmbed embed, String alternateMessage)
     public void replyOrAlternate(String message, File file, String filename, String alternateMessage)
     {
         try {
-            event.getChannel().sendFile(file, filename).content(message).queue();
+            event.getChannel().sendFiles(FileUpload.fromData(file, filename)).setContent(message).queue();
         } catch(Exception e) {
             reply(alternateMessage);
         }
@@ -457,7 +465,7 @@ public void replyOrAlternate(String message, File file, String filename, String
 
     /**
      * Replies with a String message sent to the calling {@link net.dv8tion.jda.api.entities.User User}'s
-     * {@link net.dv8tion.jda.api.entities.PrivateChannel PrivateChannel}.
+     * {@link net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel PrivateChannel}.
      *
      * <p>If the User to be Direct Messaged does not already have a PrivateChannel
      * open to send messages to, this method will automatically open one.
@@ -478,13 +486,13 @@ public void replyInDm(String message)
             reply(message);
         else
         {
-            event.getAuthor().openPrivateChannel().queue(pc -> sendMessage(pc, message));
+            event.getAuthor().openPrivateChannel().queue(pc -> pc.sendMessage(message).queue());
         }
     }
 
     /**
      * Replies with a String message sent to the calling {@link net.dv8tion.jda.api.entities.User User}'s
-     * {@link net.dv8tion.jda.api.entities.PrivateChannel PrivateChannel}.
+     * {@link net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel PrivateChannel}.
      *
      * <p>If the User to be Direct Messaged does not already have a PrivateChannel
      * open to send messages to, this method will automatically open one.
@@ -508,13 +516,13 @@ public void replyInDm(String message, Consumer<Message> success)
             reply(message, success);
         else
         {
-            event.getAuthor().openPrivateChannel().queue(pc -> sendMessage(pc, message, success));
+            event.getAuthor().openPrivateChannel().queue(pc -> pc.sendMessage(message).queue(success));
         }
     }
 
     /**
      * Replies with a String message sent to the calling {@link net.dv8tion.jda.api.entities.User User}'s
-     * {@link net.dv8tion.jda.api.entities.PrivateChannel PrivateChannel}.
+     * {@link net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel PrivateChannel}.
      *
      * <p>If the User to be Direct Messaged does not already have a PrivateChannel
      * open to send messages to, this method will automatically open one.
@@ -540,13 +548,13 @@ public void replyInDm(String message, Consumer<Message> success, Consumer<Throwa
             reply(message, success, failure);
         else
         {
-            event.getAuthor().openPrivateChannel().queue(pc -> sendMessage(pc, message, success, failure), failure);
+            event.getAuthor().openPrivateChannel().queue(pc -> pc.sendMessage(message).queue(success, failure), failure);
         }
     }
 
     /**
      * Replies with a {@link net.dv8tion.jda.api.entities.MessageEmbed MessageEmbed} sent to the
-     * calling {@link net.dv8tion.jda.api.entities.User User}'s {@link net.dv8tion.jda.api.entities.PrivateChannel PrivateChannel}.
+     * calling {@link net.dv8tion.jda.api.entities.User User}'s {@link net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel PrivateChannel}.
      *
      * <p>If the User to be Direct Messaged does not already have a PrivateChannel
      * open to send messages to, this method will automatically open one.
@@ -564,13 +572,13 @@ public void replyInDm(MessageEmbed embed)
             reply(embed);
         else
         {
-            event.getAuthor().openPrivateChannel().queue(pc -> pc.sendMessage(embed).queue());
+            event.getAuthor().openPrivateChannel().queue(pc -> pc.sendMessageEmbeds(embed).queue());
         }
     }
 
     /**
      * Replies with a {@link net.dv8tion.jda.api.entities.MessageEmbed MessageEmbed} sent to the
-     * calling {@link net.dv8tion.jda.api.entities.User User}'s {@link net.dv8tion.jda.api.entities.PrivateChannel PrivateChannel}.
+     * calling {@link net.dv8tion.jda.api.entities.User User}'s {@link net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel PrivateChannel}.
      *
      * <p>If the User to be Direct Messaged does not already have a PrivateChannel
      * open to send messages to, this method will automatically open one.
@@ -588,16 +596,16 @@ public void replyInDm(MessageEmbed embed)
     public void replyInDm(MessageEmbed embed, Consumer<Message> success)
     {
         if(event.isFromType(ChannelType.PRIVATE))
-            getPrivateChannel().sendMessage(embed).queue(success);
+            getPrivateChannel().sendMessageEmbeds(embed).queue(success);
         else
         {
-            event.getAuthor().openPrivateChannel().queue(pc -> pc.sendMessage(embed).queue(success));
+            event.getAuthor().openPrivateChannel().queue(pc -> pc.sendMessageEmbeds(embed).queue(success));
         }
     }
 
     /**
      * Replies with a {@link net.dv8tion.jda.api.entities.MessageEmbed MessageEmbed} sent to the
-     * calling {@link net.dv8tion.jda.api.entities.User User}'s {@link net.dv8tion.jda.api.entities.PrivateChannel PrivateChannel}.
+     * calling {@link net.dv8tion.jda.api.entities.User User}'s {@link net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel PrivateChannel}.
      *
      * <p>If the User to be Direct Messaged does not already have a PrivateChannel
      * open to send messages to, this method will automatically open one.
@@ -617,16 +625,16 @@ public void replyInDm(MessageEmbed embed, Consumer<Message> success)
     public void replyInDm(MessageEmbed embed, Consumer<Message> success, Consumer<Throwable> failure)
     {
         if(event.isFromType(ChannelType.PRIVATE))
-            getPrivateChannel().sendMessage(embed).queue(success, failure);
+            getPrivateChannel().sendMessageEmbeds(embed).queue(success, failure);
         else
         {
-            event.getAuthor().openPrivateChannel().queue(pc -> pc.sendMessage(embed).queue(success, failure), failure);
+            event.getAuthor().openPrivateChannel().queue(pc -> pc.sendMessageEmbeds(embed).queue(success, failure), failure);
         }
     }
 
     /**
      * Replies with a {@link net.dv8tion.jda.api.entities.Message Message} sent to the
-     * calling {@link net.dv8tion.jda.api.entities.User User}'s {@link net.dv8tion.jda.api.entities.PrivateChannel PrivateChannel}.
+     * calling {@link net.dv8tion.jda.api.entities.User User}'s {@link net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel PrivateChannel}.
      *
      * <p>If the User to be Direct Messaged does not already have a PrivateChannel
      * open to send messages to, this method will automatically open one.
@@ -638,7 +646,7 @@ public void replyInDm(MessageEmbed embed, Consumer<Message> success, Consumer<Th
      * @param  message
      *         The Message to reply with
      */
-    public void replyInDm(Message message)
+    public void replyInDm(MessageCreateData message)
     {
         if(event.isFromType(ChannelType.PRIVATE))
             reply(message);
@@ -650,7 +658,7 @@ public void replyInDm(Message message)
 
     /**
      * Replies with a {@link net.dv8tion.jda.api.entities.Message Message} sent to the
-     * calling {@link net.dv8tion.jda.api.entities.User User}'s {@link net.dv8tion.jda.api.entities.PrivateChannel PrivateChannel}.
+     * calling {@link net.dv8tion.jda.api.entities.User User}'s {@link net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel PrivateChannel}.
      *
      * <p>If the User to be Direct Messaged does not already have a PrivateChannel
      * open to send messages to, this method will automatically open one.
@@ -665,7 +673,7 @@ public void replyInDm(Message message)
      * @param  success
      *         The Consumer to queue after sending the Message is sent.
      */
-    public void replyInDm(Message message, Consumer<Message> success)
+    public void replyInDm(MessageCreateData message, Consumer<Message> success)
     {
         if(event.isFromType(ChannelType.PRIVATE))
             getPrivateChannel().sendMessage(message).queue(success);
@@ -677,7 +685,7 @@ public void replyInDm(Message message, Consumer<Message> success)
 
     /**
      * Replies with a {@link net.dv8tion.jda.api.entities.Message Message} sent to the
-     * calling {@link net.dv8tion.jda.api.entities.User User}'s {@link net.dv8tion.jda.api.entities.PrivateChannel PrivateChannel}.
+     * calling {@link net.dv8tion.jda.api.entities.User User}'s {@link net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel PrivateChannel}.
      *
      * <p>If the User to be Direct Messaged does not already have a PrivateChannel
      * open to send messages to, this method will automatically open one.
@@ -694,7 +702,7 @@ public void replyInDm(Message message, Consumer<Message> success)
      * @param  failure
      *         The Consumer to run if an error occurs when sending the Message.
      */
-    public void replyInDm(Message message, Consumer<Message> success, Consumer<Throwable> failure)
+    public void replyInDm(MessageCreateData message, Consumer<Message> success, Consumer<Throwable> failure)
     {
         if(event.isFromType(ChannelType.PRIVATE))
             getPrivateChannel().sendMessage(message).queue(success, failure);
@@ -707,7 +715,7 @@ public void replyInDm(Message message, Consumer<Message> success, Consumer<Throw
     /**
      * Replies with a String message and a {@link java.io.File} with the provided name, or a default 
      * name if left null, and sent to the calling {@link net.dv8tion.jda.api.entities.User User}'s
-     * {@link net.dv8tion.jda.api.entities.PrivateChannel PrivateChannel}.
+     * {@link net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel PrivateChannel}.
      * 
      * <p>If the User to be Direct Messaged does not already have a PrivateChannel
      * open to send messages to, this method will automatically open one.
@@ -716,7 +724,7 @@ public void replyInDm(Message message, Consumer<Message> success, Consumer<Throw
      * sending the response as a {@link net.dv8tion.jda.api.entities.Message Message}
      * automatically does {@link net.dv8tion.jda.api.requests.RestAction#queue() RestAction#queue()}.
      * 
-     * <p>This method uses {@link net.dv8tion.jda.api.entities.MessageChannel#sendFile(File, String, net.dv8tion.jda.api.utils.AttachmentOption...) MessageChannel#sendFile(File, String, AttachmentOption...)}
+     * <p>This method uses {@link net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion#sendFiles(Collection) MessageChannel#sendFile(File, String, AttachmentOption...)}
      * to send the File. For more information on what a bot may send using this, you may find the info in that method.
      * 
      * @param  message
@@ -732,7 +740,7 @@ public void replyInDm(String message, File file, String filename)
             reply(message, file, filename);
         else
         {
-            event.getAuthor().openPrivateChannel().queue(pc -> pc.sendFile(file, filename).content(message).queue());
+            event.getAuthor().openPrivateChannel().queue(pc -> pc.sendFiles(FileUpload.fromData(file, filename)).setContent(message).queue());
         }
     }
     
@@ -907,12 +915,12 @@ private void react(String reaction)
             return;
         try
         {
-            event.getMessage().addReaction(reaction.replaceAll("<a?:(.+):(\\d+)>", "$1:$2")).queue();
+            event.getMessage().addReaction(Emoji.fromFormatted(reaction.replaceAll("<a?:(.+):(\\d+)>", "$1:$2"))).queue();
         }
         catch(PermissionException ignored) {}
     }
     
-    private void sendMessage(MessageChannel chan, String message)
+    private void sendMessage(MessageChannelUnion chan, String message)
     {
         ArrayList<String> messages = splitMessage(message);
         for(int i=0; i<MAX_MESSAGES && i<messages.size(); i++)
@@ -924,7 +932,7 @@ private void sendMessage(MessageChannel chan, String message)
         }
     }
     
-    private void sendMessage(MessageChannel chan, String message, Consumer<Message> success)
+    private void sendMessage(MessageChannelUnion chan, String message, Consumer<Message> success)
     {
         ArrayList<String> messages = splitMessage(message);
         for(int i=0; i<MAX_MESSAGES && i<messages.size(); i++)
@@ -947,7 +955,7 @@ private void sendMessage(MessageChannel chan, String message, Consumer<Message>
         }
     }
 
-    private void sendMessage(MessageChannel chan, String message, Consumer<Message> success, Consumer<Throwable> failure)
+    private void sendMessage(MessageChannelUnion chan, String message, Consumer<Message> success, Consumer<Throwable> failure)
     {
         ArrayList<String> messages = splitMessage(message);
         for(int i = 0; i < MAX_MESSAGES && i < messages.size(); i++)
@@ -1066,19 +1074,19 @@ public User getAuthor()
     }
     
     /**
-     * Gets the {@link net.dv8tion.jda.api.entities.MessageChannel MessageChannel} that the CommandEvent
+     * Gets the {@link net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion MessageChannel} that the CommandEvent
      * was triggered on.
      * 
      * @return The MessageChannel that the CommandEvent was triggered on
      */
-    public MessageChannel getChannel()
+    public MessageChannelUnion getChannel()
     {
         return event.getChannel();
     }
     
     /**
-     * Gets the {@link net.dv8tion.jda.api.entities.ChannelType ChannelType} of the
-     * {@link net.dv8tion.jda.api.entities.MessageChannel MessageChannel} that the CommandEvent was triggered on.
+     * Gets the {@link net.dv8tion.jda.api.entities.channel.ChannelType ChannelType} of the
+     * {@link net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion MessageChannel} that the CommandEvent was triggered on.
      * 
      * @return The ChannelType of the MessageChannel that this CommandEvent was triggered on
      */
@@ -1131,7 +1139,7 @@ public Message getMessage()
     }
     
     /**
-     * Gets the {@link net.dv8tion.jda.api.entities.PrivateChannel PrivateChannel} that this CommandEvent
+     * Gets the {@link net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel PrivateChannel} that this CommandEvent
      * may have taken place on, or {@code null} if it didn't happen on a PrivateChannel.
      * 
      * @return The PrivateChannel that this CommandEvent may have taken place on, or null
@@ -1139,7 +1147,7 @@ public Message getMessage()
      */
     public PrivateChannel getPrivateChannel()
     {
-        return event.getPrivateChannel();
+        return event.getChannel().asPrivateChannel();
     }
     
     /**
@@ -1153,7 +1161,7 @@ public long getResponseNumber()
     }
     
     /**
-     * Gets the {@link net.dv8tion.jda.api.entities.TextChannel TextChannel} that this CommandEvent
+     * Gets the {@link net.dv8tion.jda.api.entities.channel.concrete.TextChannel TextChannel} that this CommandEvent
      * may have taken place on, or {@code null} if it didn't happen on a TextChannel.
      * 
      * @return The TextChannel this CommandEvent may have taken place on, or null
@@ -1161,17 +1169,17 @@ public long getResponseNumber()
      */
     public TextChannel getTextChannel()
     {
-        return event.getTextChannel();
+        return event.getChannel().asTextChannel();
     }
     
     /**
-     * Compares a provided {@link net.dv8tion.jda.api.entities.ChannelType ChannelType} with the one this
+     * Compares a provided {@link net.dv8tion.jda.api.entities.channel.ChannelType ChannelType} with the one this
      * CommandEvent occurred on, returning {@code true} if they are the same ChannelType.
      * 
      * @param  channelType
      *         The ChannelType to compare
      *         
-     * @return {@code true} if the CommandEvent originated from a {@link net.dv8tion.jda.api.entities.MessageChannel}
+     * @return {@code true} if the CommandEvent originated from a {@link net.dv8tion.jda.api.entities.channel.unions.GuildMessageChannelUnion}
      *         of the provided ChannelType, otherwise {@code false}.
      */
     public boolean isFromType(ChannelType channelType)
diff --git a/command/src/main/java/com/jagrosh/jdautilities/command/impl/CommandClientImpl.java b/command/src/main/java/com/jagrosh/jdautilities/command/impl/CommandClientImpl.java
index 77abf63b..ce024689 100644
--- a/command/src/main/java/com/jagrosh/jdautilities/command/impl/CommandClientImpl.java
+++ b/command/src/main/java/com/jagrosh/jdautilities/command/impl/CommandClientImpl.java
@@ -23,13 +23,14 @@
 import net.dv8tion.jda.api.OnlineStatus;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.ChannelType;
 import net.dv8tion.jda.api.events.GenericEvent;
-import net.dv8tion.jda.api.events.ReadyEvent;
-import net.dv8tion.jda.api.events.ShutdownEvent;
+import net.dv8tion.jda.api.events.session.ReadyEvent;
+import net.dv8tion.jda.api.events.session.ShutdownEvent;
 import net.dv8tion.jda.api.events.guild.GuildJoinEvent;
 import net.dv8tion.jda.api.events.guild.GuildLeaveEvent;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
-import net.dv8tion.jda.api.events.message.guild.GuildMessageDeleteEvent;
+import net.dv8tion.jda.api.events.message.MessageDeleteEvent;
 import net.dv8tion.jda.api.hooks.EventListener;
 import net.dv8tion.jda.internal.utils.Checks;
 import okhttp3.*;
@@ -444,8 +445,8 @@ public void onEvent(GenericEvent event)
         if(event instanceof MessageReceivedEvent)
             onMessageReceived((MessageReceivedEvent)event);
 
-        else if(event instanceof GuildMessageDeleteEvent && usesLinkedDeletion())
-            onMessageDelete((GuildMessageDeleteEvent) event);
+        else if(event instanceof MessageDeleteEvent && usesLinkedDeletion())
+            onMessageDelete((MessageDeleteEvent) event);
 
         else if(event instanceof GuildJoinEvent)
         {
@@ -536,7 +537,7 @@ private void onMessageReceived(MessageReceivedEvent event)
                     listener.onCompletedCommand(cevent, null);
                 return; // Help Consumer is done
             }
-            else if(event.isFromType(ChannelType.PRIVATE) || event.getTextChannel().canTalk())
+            else if(event.isFromType(ChannelType.PRIVATE) || event.getChannel().canTalk())
             {
                 String name = parts[0];
                 String args = parts[1]==null ? "" : parts[1];
@@ -655,8 +656,9 @@ else if (jda.getShardManager() != null)
         }
     }
 
-    private void onMessageDelete(GuildMessageDeleteEvent event)
+    private void onMessageDelete(MessageDeleteEvent event)
     {
+        if (!event.isFromGuild()) return;
         // We don't need to cover whether or not this client usesLinkedDeletion() because
         // that is checked in onEvent(Event) before this is even called.
         synchronized(linkMap)
@@ -665,8 +667,8 @@ private void onMessageDelete(GuildMessageDeleteEvent event)
             {
                 Set<Message> messages = linkMap.get(event.getMessageIdLong());
                 if(messages.size()>1 && event.getGuild().getSelfMember()
-                        .hasPermission(event.getChannel(), Permission.MESSAGE_MANAGE))
-                    event.getChannel().deleteMessages(messages).queue(unused -> {}, ignored -> {});
+                        .hasPermission(event.getChannel().asGuildMessageChannel(), Permission.MESSAGE_MANAGE))
+                    event.getChannel().asGuildMessageChannel().deleteMessages(messages).queue(unused -> {}, ignored -> {});
                 else if(messages.size()>0)
                     messages.forEach(m -> m.delete().queue(unused -> {}, ignored -> {}));
             }
diff --git a/commons/src/main/java/com/jagrosh/jdautilities/commons/utils/FinderUtil.java b/commons/src/main/java/com/jagrosh/jdautilities/commons/utils/FinderUtil.java
index 5d78084a..bc935747 100644
--- a/commons/src/main/java/com/jagrosh/jdautilities/commons/utils/FinderUtil.java
+++ b/commons/src/main/java/com/jagrosh/jdautilities/commons/utils/FinderUtil.java
@@ -15,6 +15,11 @@
  */
 package com.jagrosh.jdautilities.commons.utils;
 
+import net.dv8tion.jda.api.entities.channel.concrete.Category;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
+import net.dv8tion.jda.api.entities.emoji.RichCustomEmoji;
 import net.dv8tion.jda.api.sharding.ShardManager;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.*;
@@ -72,7 +77,7 @@ public final class FinderUtil
     public final static Pattern USER_MENTION = Pattern.compile("<@!?(\\d{17,20})>"); // $1 -> ID
     public final static Pattern CHANNEL_MENTION = Pattern.compile("<#(\\d{17,20})>"); // $1 -> ID
     public final static Pattern ROLE_MENTION = Pattern.compile("<@&(\\d{17,20})>"); // $1 -> ID
-    public final static Pattern EMOTE_MENTION = Pattern.compile("<:(.{2,32}):(\\d{17,20})>");
+    public final static Pattern EMOJI_MENTION = Pattern.compile("<:(.{2,32}):(\\d{17,20})>");
 
     /**
      * Queries a provided instance of {@link net.dv8tion.jda.api.JDA JDA} for {@link net.dv8tion.jda.api.entities.User User}s.<p>
@@ -363,7 +368,7 @@ else if((name.toLowerCase().contains(lowerquery) || effName.toLowerCase().contai
 
     /**
      * Queries a provided instance of {@link net.dv8tion.jda.api.JDA JDA} for
-     * {@link net.dv8tion.jda.api.entities.TextChannel TextChannel}s.<p>
+     * {@link net.dv8tion.jda.api.entities.channel.concrete.TextChannel TextChannel}s.<p>
      *
      * If a {@link net.dv8tion.jda.api.sharding.ShardManager ShardManager} is available this will query across that
      * instead of the JDA instance.
@@ -387,7 +392,7 @@ public static List<TextChannel> findTextChannels(String query, JDA jda)
 
     /**
      * Queries a provided instance of {@link net.dv8tion.jda.api.JDA JDA} for
-     * {@link net.dv8tion.jda.api.entities.TextChannel TextChannel}s.<p>
+     * {@link net.dv8tion.jda.api.entities.channel.concrete.TextChannel TextChannel}s.<p>
      *
      * This only queries the instance of JDA, regardless of whether or not a
      * {@link net.dv8tion.jda.api.sharding.ShardManager ShardManager} is available.
@@ -411,7 +416,7 @@ public static List<TextChannel> findShardTextChannels(String query, JDA jda)
 
     /**
      * Queries a provided {@link net.dv8tion.jda.api.entities.Guild Guild} for
-     * {@link net.dv8tion.jda.api.entities.TextChannel TextChannel}s.
+     * {@link net.dv8tion.jda.api.entities.channel.concrete.TextChannel TextChannel}s.
      *
      * <p>The following special case is applied before the standard search is done:
      * <ul>
@@ -496,7 +501,7 @@ else if(name.toLowerCase().contains(lowerquery) && startswith.isEmpty())
 
     /**
      * Queries a provided instance of {@link net.dv8tion.jda.api.JDA JDA} for
-     * {@link net.dv8tion.jda.api.entities.VoiceChannel VoiceChannel}s.<p>
+     * {@link net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel VoiceChannel}s.<p>
      *
      * If a {@link net.dv8tion.jda.api.sharding.ShardManager ShardManager} is available this will query across that
      * instead of the JDA instance.
@@ -517,7 +522,7 @@ public static List<VoiceChannel> findVoiceChannels(String query, JDA jda)
 
     /**
      * Queries a provided instance of {@link net.dv8tion.jda.api.JDA JDA} for
-     * {@link net.dv8tion.jda.api.entities.VoiceChannel VoiceChannel}s.<p>
+     * {@link net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel VoiceChannel}s.<p>
      *
      * This only queries the instance of JDA, regardless of whether or not a
      * {@link net.dv8tion.jda.api.sharding.ShardManager ShardManager} is available.
@@ -538,7 +543,7 @@ public static List<VoiceChannel> findShardVoiceChannels(String query, JDA jda)
 
     /**
      * Queries a provided {@link net.dv8tion.jda.api.entities.Guild Guild} for
-     * {@link net.dv8tion.jda.api.entities.VoiceChannel VoiceChannel}s.
+     * {@link net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel VoiceChannel}s.
      *
      * <p>The standard search does not follow any special cases.
      *
@@ -603,7 +608,7 @@ else if(name.toLowerCase().contains(lowerquery) && startswith.isEmpty())
 
     /**
      * Queries a provided instance of {@link net.dv8tion.jda.api.JDA JDA} for
-     * {@link net.dv8tion.jda.api.entities.Category Categories}.<p>
+     * {@link net.dv8tion.jda.api.entities.channel.concrete.Category Categories}.<p>
      *
      * If a {@link net.dv8tion.jda.api.sharding.ShardManager ShardManager} is available this will query across that
      * instead of the JDA instance.
@@ -624,7 +629,7 @@ public static List<Category> findCategories(String query, JDA jda)
 
     /**
      * Queries a provided instance of {@link net.dv8tion.jda.api.JDA JDA} for
-     * {@link net.dv8tion.jda.api.entities.Category Categories}.<p>
+     * {@link net.dv8tion.jda.api.entities.channel.concrete.Category Categories}.<p>
      *
      * This only queries the instance of JDA, regardless of whether or not a
      * {@link net.dv8tion.jda.api.sharding.ShardManager ShardManager} is available.
@@ -645,7 +650,7 @@ public static List<Category> findShardCategories(String query, JDA jda)
 
     /**
      * Queries a provided {@link net.dv8tion.jda.api.entities.Guild Guild} for
-     * {@link net.dv8tion.jda.api.entities.Category Categories}.
+     * {@link net.dv8tion.jda.api.entities.channel.concrete.Category Categories}.
      *
      * <p>The standard search does not follow any special cases.
      *
@@ -766,16 +771,16 @@ else if(name.toLowerCase().contains(lowerquery) && startswith.isEmpty())
 
     /**
      * Queries a provided instance of {@link net.dv8tion.jda.api.JDA JDA} for
-     * {@link net.dv8tion.jda.api.entities.Emote Emote}s.<p>
+     * {@link net.dv8tion.jda.api.entities.emoji.Emoji Emoji}s.<p>
      *
      * If a {@link net.dv8tion.jda.api.sharding.ShardManager ShardManager} is available this will query across that
      * instead of the JDA instance.
      *
      * <p>The following special case is applied before the standard search is done:
      * <ul>
-     *     <li>Emote Mention: Query provided matches a :emote: mention (more specifically {@literal <:emoteName:emoteID>}).
+     *     <li>Emoji Mention: Query provided matches a :emote: mention (more specifically {@literal <:emoteName:emoteID>}).
      *     <br>Note: This only returns here if the emote is <b>valid</b>. Validity being the ID retrieves a non-null
-     *     Emote and that the {@link net.dv8tion.jda.api.entities.Emote#getName() name} of the Emote is equal to the
+     *     Emoji and that the {@link net.dv8tion.jda.api.entities.emoji.Emoji#getName() name} of the Emoji is equal to the
      *     name found in the query.</li>
      * </ul>
      *
@@ -784,25 +789,25 @@ else if(name.toLowerCase().contains(lowerquery) && startswith.isEmpty())
      * @param  jda
      *         The instance of JDA to search from
      *
-     * @return A possibly-empty {@link java.util.List List} of Emotes found by the query from the provided JDA instance.
+     * @return A possibly-empty {@link java.util.List List} of Emojis found by the query from the provided JDA instance.
      */
-    public static List<Emote> findEmotes(String query, JDA jda)
+    public static List<Emoji> findEmojis(String query, JDA jda)
     {
-        return jdaFindEmotes(query, jda, true);
+        return jdaFindEmojis(query, jda, true);
     }
 
     /**
      * Queries a provided instance of {@link net.dv8tion.jda.api.JDA JDA} for
-     * {@link net.dv8tion.jda.api.entities.Emote Emote}s.<p>
+     * {@link net.dv8tion.jda.api.entities.emoji.Emoji Emoji}s.<p>
      *
      * This only queries the instance of JDA, regardless of whether or not a
      * {@link net.dv8tion.jda.api.sharding.ShardManager ShardManager} is available.
      *
      * <p>The following special case is applied before the standard search is done:
      * <ul>
-     *     <li>Emote Mention: Query provided matches a :emote: mention (more specifically {@literal <:emoteName:emoteID>}).
+     *     <li>Emoji Mention: Query provided matches a :emote: mention (more specifically {@literal <:emoteName:emoteID>}).
      *     <br>Note: This only returns here if the emote is <b>valid</b>. Validity being the ID retrieves a non-null
-     *     Emote and that the {@link net.dv8tion.jda.api.entities.Emote#getName() name} of the Emote is equal to the
+     *     Emoji and that the {@link net.dv8tion.jda.api.entities.emoji.Emoji#getName() name} of the Emoji is equal to the
      *     name found in the query.</li>
      * </ul>
      *
@@ -811,22 +816,22 @@ public static List<Emote> findEmotes(String query, JDA jda)
      * @param  jda
      *         The instance of JDA to search from
      *
-     * @return A possibly-empty {@link java.util.List List} of Emotes found by the query from the provided JDA instance.
+     * @return A possibly-empty {@link java.util.List List} of Emojis found by the query from the provided JDA instance.
      */
-    public static List<Emote> findShardEmotes(String query, JDA jda)
+    public static List<Emoji> findShardEmojis(String query, JDA jda)
     {
-        return jdaFindEmotes(query, jda, false);
+        return jdaFindEmojis(query, jda, false);
     }
 
     /**
      * Queries a provided {@link net.dv8tion.jda.api.entities.Guild Guild} for
-     * {@link net.dv8tion.jda.api.entities.Emote Emote}s.
+     * {@link net.dv8tion.jda.api.entities.emoji.Emoji Emoji}s.
      *
      * <p>The following special case is applied before the standard search is done:
      * <ul>
-     *     <li>Emote Mention: Query provided matches a :emote: mention (more specifically {@literal <:emoteName:emoteID>}).
+     *     <li>Emoji Mention: Query provided matches a :emote: mention (more specifically {@literal <:emoteName:emoteID>}).
      *     <br>Note: This only returns here if the emote is <b>valid</b>. Validity being the ID retrieves a non-null
-     *     Emote and that the {@link net.dv8tion.jda.api.entities.Emote#getName() name} of the Emote is equal to the
+     *     Emoji and that the {@link net.dv8tion.jda.api.entities.emoji.Emoji#getName() name} of the Emoji is equal to the
      *     name found in the query.</li>
      * </ul>
      *
@@ -835,59 +840,59 @@ public static List<Emote> findShardEmotes(String query, JDA jda)
      * @param  guild
      *         The Guild to search from
      *
-     * @return A possibly-empty {@link java.util.List List} of Emotes found by the query from the provided Guild.
+     * @return A possibly-empty {@link java.util.List List} of Emojis found by the query from the provided Guild.
      */
-    public static List<Emote> findEmotes(String query, Guild guild)
+    public static List<Emoji> findEmojis(String query, Guild guild)
     {
-        Matcher mentionMatcher = EMOTE_MENTION.matcher(query);
+        Matcher mentionMatcher = EMOJI_MENTION.matcher(query);
         if(DISCORD_ID.matcher(query).matches())
         {
-            Emote emote = guild.getEmoteById(query);
-            if(emote != null)
-                return Collections.singletonList(emote);
+            Emoji Emoji = guild.getEmojiById(query);
+            if(Emoji != null)
+                return Collections.singletonList(Emoji);
         }
         else if(mentionMatcher.matches())
         {
-            String emoteName = mentionMatcher.group(1);
-            String emoteId = mentionMatcher.group(2);
-            Emote emote = guild.getEmoteById(emoteId);
-            if(emote != null && emote.getName().equals(emoteName))
-                return Collections.singletonList(emote);
+            String EmojiName = mentionMatcher.group(1);
+            String EmojiId = mentionMatcher.group(2);
+            Emoji Emoji = guild.getEmojiById(EmojiId);
+            if(Emoji != null && Emoji.getName().equals(EmojiName))
+                return Collections.singletonList(Emoji);
         }
 
-        return genericEmoteSearch(query, guild.getEmoteCache());
+        return genericEmojiSearch(query, guild.getEmojiCache());
     }
 
-    private static List<Emote> jdaFindEmotes(String query, JDA jda, boolean useShardManager)
+    private static List<Emoji> jdaFindEmojis(String query, JDA jda, boolean useShardManager)
     {
-        Matcher mentionMatcher = EMOTE_MENTION.matcher(query);
+        Matcher mentionMatcher = EMOJI_MENTION.matcher(query);
 
         ShardManager manager = useShardManager? jda.getShardManager() : null;
 
         if(DISCORD_ID.matcher(query).matches())
         {
-            Emote emote = manager != null? manager.getEmoteById(query) : jda.getEmoteById(query);
-            if(emote != null)
-                return Collections.singletonList(emote);
+            Emoji Emoji = manager != null? manager.getEmojiById(query) : jda.getEmojiById(query);
+            if(Emoji != null)
+                return Collections.singletonList(Emoji);
         }
         else if(mentionMatcher.matches())
         {
-            String emoteName = mentionMatcher.group(1);
-            String emoteId = mentionMatcher.group(2);
-            Emote emote = manager != null? manager.getEmoteById(emoteId) : jda.getEmoteById(emoteId);
-            if(emote != null && emote.getName().equals(emoteName))
-                return Collections.singletonList(emote);
+            String EmojiName = mentionMatcher.group(1);
+            String EmojiId = mentionMatcher.group(2);
+            Emoji Emoji = manager != null? manager.getEmojiById(EmojiId) : jda.getEmojiById(EmojiId);
+            if(Emoji != null && Emoji.getName().equals(EmojiName))
+                return Collections.singletonList(Emoji);
         }
 
-        return genericEmoteSearch(query, jda.getEmoteCache());
+        return genericEmojiSearch(query, jda.getEmojiCache());
     }
 
-    private static List<Emote> genericEmoteSearch(String query, SnowflakeCacheView<Emote> cache)
+    private static List<Emoji> genericEmojiSearch(String query, SnowflakeCacheView<RichCustomEmoji> cache)
     {
-        ArrayList<Emote> exact = new ArrayList<>();
-        ArrayList<Emote> wrongcase = new ArrayList<>();
-        ArrayList<Emote> startswith = new ArrayList<>();
-        ArrayList<Emote> contains = new ArrayList<>();
+        ArrayList<Emoji> exact = new ArrayList<>();
+        ArrayList<Emoji> wrongcase = new ArrayList<>();
+        ArrayList<Emoji> startswith = new ArrayList<>();
+        ArrayList<Emoji> contains = new ArrayList<>();
         String lowerquery = query.toLowerCase();
         cache.forEach(emote -> {
             String name = emote.getName();
diff --git a/commons/src/main/java/com/jagrosh/jdautilities/commons/waiter/EventWaiter.java b/commons/src/main/java/com/jagrosh/jdautilities/commons/waiter/EventWaiter.java
index ef8de743..11b9d8a3 100644
--- a/commons/src/main/java/com/jagrosh/jdautilities/commons/waiter/EventWaiter.java
+++ b/commons/src/main/java/com/jagrosh/jdautilities/commons/waiter/EventWaiter.java
@@ -17,7 +17,7 @@
 
 import net.dv8tion.jda.api.events.Event;
 import net.dv8tion.jda.api.events.GenericEvent;
-import net.dv8tion.jda.api.events.ShutdownEvent;
+import net.dv8tion.jda.api.events.session.ShutdownEvent;
 import net.dv8tion.jda.api.hooks.EventListener;
 import net.dv8tion.jda.api.hooks.SubscribeEvent;
 import net.dv8tion.jda.internal.utils.Checks;
@@ -44,7 +44,7 @@
  * {@link java.util.concurrent.ScheduledExecutorService Executor}, and thus a proper
  * shutdown of said executor. The default constructor for an EventWaiter sets up a
  * working, "live", EventWaiter whose shutdown is triggered via JDA firing a
- * {@link net.dv8tion.jda.api.events.ShutdownEvent ShutdownEvent}.
+ * {@link net.dv8tion.jda.api.events.session.ShutdownEvent ShutdownEvent}.
  * <br>A more "shutdown adaptable" constructor allows the provision of a
  * {@code ScheduledExecutorService} and a choice of how exactly shutdown will be handled
  * (see {@link EventWaiter#EventWaiter(ScheduledExecutorService, boolean)} for more details).
@@ -81,7 +81,7 @@ public EventWaiter()
      * <p>{@code shutdownAutomatically} is required to be manually specified by developers as a way of
      * verifying a contract that the developer will conform to the behavior of the newly generated EventWaiter:
      * <ul>
-     *     <li>If {@code true}, shutdown is handled when a {@link net.dv8tion.jda.api.events.ShutdownEvent ShutdownEvent}
+     *     <li>If {@code true}, shutdown is handled when a {@link net.dv8tion.jda.api.events.session.ShutdownEvent ShutdownEvent}
      *     is fired. This means that any external functions of the provided Executor is now impossible and any externally
      *     queued tasks are lost if they have yet to be run.</li>
      *     <li>If {@code false}, shutdown is now placed as a responsibility of the developer, and no attempt will be
@@ -97,7 +97,7 @@ public EventWaiter()
      *         The ScheduledExecutorService to use for this EventWaiter's threadpool.
      * @param  shutdownAutomatically
      *         Whether or not the {@code threadpool} will shutdown automatically when a
-     *         {@link net.dv8tion.jda.api.events.ShutdownEvent ShutdownEvent} is fired.
+     *         {@link net.dv8tion.jda.api.events.session.ShutdownEvent ShutdownEvent} is fired.
      *
      * @throws java.lang.IllegalArgumentException
      *         If the threadpool provided is {@code null} or
diff --git a/examples/src/main/java/com/jagrosh/jdautilities/examples/command/AboutCommand.java b/examples/src/main/java/com/jagrosh/jdautilities/examples/command/AboutCommand.java
index cc6c04aa..97cbe1bc 100644
--- a/examples/src/main/java/com/jagrosh/jdautilities/examples/command/AboutCommand.java
+++ b/examples/src/main/java/com/jagrosh/jdautilities/examples/command/AboutCommand.java
@@ -21,7 +21,7 @@
 import com.jagrosh.jdautilities.doc.standard.CommandInfo;
 import com.jagrosh.jdautilities.examples.doc.Author;
 import net.dv8tion.jda.api.entities.ApplicationInfo;
-import net.dv8tion.jda.api.entities.ChannelType;
+import net.dv8tion.jda.api.entities.channel.ChannelType;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.JDAInfo;
 import net.dv8tion.jda.api.Permission;
diff --git a/examples/src/main/java/com/jagrosh/jdautilities/examples/command/GuildlistCommand.java b/examples/src/main/java/com/jagrosh/jdautilities/examples/command/GuildlistCommand.java
index 7297f510..78f857db 100644
--- a/examples/src/main/java/com/jagrosh/jdautilities/examples/command/GuildlistCommand.java
+++ b/examples/src/main/java/com/jagrosh/jdautilities/examples/command/GuildlistCommand.java
@@ -26,7 +26,7 @@
 import com.jagrosh.jdautilities.menu.Paginator;
 import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
 import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.entities.ChannelType;
+import net.dv8tion.jda.api.entities.channel.ChannelType;
 import net.dv8tion.jda.api.exceptions.PermissionException;
 
 /**
diff --git a/examples/src/main/java/com/jagrosh/jdautilities/examples/command/RoleinfoCommand.java b/examples/src/main/java/com/jagrosh/jdautilities/examples/command/RoleinfoCommand.java
index fb0a2f07..0af1c8f4 100644
--- a/examples/src/main/java/com/jagrosh/jdautilities/examples/command/RoleinfoCommand.java
+++ b/examples/src/main/java/com/jagrosh/jdautilities/examples/command/RoleinfoCommand.java
@@ -22,10 +22,10 @@
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.MessageBuilder;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Role;
+import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
 
 /**
  *
@@ -96,9 +96,9 @@ else if(found.size()>1)
         if(list.size() * 24 <= 2048-desr.length())
             list.forEach(m -> desr.append("<@").append(m.getUser().getId()).append("> "));
         
-        event.reply(new MessageBuilder()
-                .append(title)
-                .setEmbed(new EmbedBuilder()
+        event.reply(new MessageCreateBuilder()
+                .setContent(title)
+                .setEmbeds(new EmbedBuilder()
                         .setDescription(desr.toString().trim())
                         .setColor(role.getColor()).build())
                 .build());
diff --git a/examples/src/main/java/com/jagrosh/jdautilities/examples/command/ServerinfoCommand.java b/examples/src/main/java/com/jagrosh/jdautilities/examples/command/ServerinfoCommand.java
index 9a4d70a4..f707ae11 100644
--- a/examples/src/main/java/com/jagrosh/jdautilities/examples/command/ServerinfoCommand.java
+++ b/examples/src/main/java/com/jagrosh/jdautilities/examples/command/ServerinfoCommand.java
@@ -21,6 +21,7 @@
 import net.dv8tion.jda.api.*;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
 
 /**
  *
@@ -75,6 +76,6 @@ protected void execute(CommandEvent event)
             builder.setThumbnail(guild.getIconUrl());
         builder.setColor(owner == null ? null : owner.getColor());
         builder.setDescription(str);
-        event.reply(new MessageBuilder().append(title).setEmbed(builder.build()).build());
+        event.reply(new MessageCreateBuilder().setContent(title).setEmbeds(builder.build()).build());
     }
 }
diff --git a/menu/src/main/java/com/jagrosh/jdautilities/menu/ButtonMenu.java b/menu/src/main/java/com/jagrosh/jdautilities/menu/ButtonMenu.java
index ed2a768b..f3bbff31 100644
--- a/menu/src/main/java/com/jagrosh/jdautilities/menu/ButtonMenu.java
+++ b/menu/src/main/java/com/jagrosh/jdautilities/menu/ButtonMenu.java
@@ -24,15 +24,17 @@
 
 import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.MessageBuilder;
-import net.dv8tion.jda.api.entities.Emote;
 import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.MessageChannel;
-import net.dv8tion.jda.api.entities.MessageReaction.ReactionEmote;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
 import net.dv8tion.jda.api.requests.RestAction;
+import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
+import net.dv8tion.jda.api.utils.messages.MessageCreateData;
+import net.dv8tion.jda.api.utils.messages.MessageEditBuilder;
+import net.dv8tion.jda.api.utils.messages.MessageEditData;
 import net.dv8tion.jda.internal.utils.Checks;
 
 /**
@@ -48,11 +50,11 @@ public class ButtonMenu extends Menu
     private final String text;
     private final String description;
     private final List<String> choices;
-    private final Consumer<ReactionEmote> action;
+    private final Consumer<Emoji> action;
     private final Consumer<Message> finalAction;
     
     ButtonMenu(EventWaiter waiter, Set<User> users, Set<Role> roles, long timeout, TimeUnit unit,
-               Color color, String text, String description, List<String> choices, Consumer<ReactionEmote> action, Consumer<Message> finalAction)
+               Color color, String text, String description, List<String> choices, Consumer<Emoji> action, Consumer<Message> finalAction)
     {
         super(waiter, users, roles, timeout, unit);
         this.color = color;
@@ -65,15 +67,15 @@ public class ButtonMenu extends Menu
 
     /**
      * Shows the ButtonMenu as a new {@link net.dv8tion.jda.api.entities.Message Message}
-     * in the provided {@link net.dv8tion.jda.api.entities.MessageChannel MessageChannel}.
+     * in the provided {@link net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion MessageChannel}.
      * 
      * @param  channel
      *         The MessageChannel to send the new Message to
      */
     @Override
-    public void display(MessageChannel channel)
+    public void display(MessageChannelUnion channel)
     {
-        initialize(channel.sendMessage(getMessage()));
+        initialize(channel.sendMessage(getMessageCreate()));
     }
 
     /**
@@ -97,16 +99,16 @@ private void initialize(RestAction<Message> ra)
             for(int i=0; i<choices.size(); i++)
             {
                 // Get the emote to display.
-                Emote emote;
+                Emoji emote;
                 try {
-                    emote = m.getJDA().getEmoteById(choices.get(i));
+                    emote = m.getJDA().getEmojiById(choices.get(i));
                 } catch(Exception e) {
                     emote = null;
                 }
                 // If the emote is null that means that it might be an emoji.
                 // If it's neither, that's on the developer and we'll let it
                 // throw an error when we queue a rest action.
-                RestAction<Void> r = emote==null ? m.addReaction(choices.get(i)) : m.addReaction(emote);
+                RestAction<Void> r = emote==null ? m.addReaction(Emoji.fromFormatted(choices.get(i))) : m.addReaction(emote);
                 if(i+1<choices.size())
                     r.queue(); // If there is still more reactions to add we delay using the EventWaiter
                 else
@@ -121,9 +123,7 @@ private void initialize(RestAction<Message> ra)
 
                             // If the reaction is an Emote we get the Snowflake,
                             // otherwise we get the unicode value.
-                            String re = event.getReaction().getReactionEmote().isEmote()
-                                ? event.getReaction().getReactionEmote().getId()
-                                : event.getReaction().getReactionEmote().getName();
+                            String re = event.getReaction().getEmoji().getAsReactionCode();
 
                             // If the value we got is not registered as a button to
                             // the ButtonMenu being displayed we return false.
@@ -138,7 +138,7 @@ private void initialize(RestAction<Message> ra)
                             // is fired and processed above.
 
                             // Preform the specified action with the ReactionEmote
-                            action.accept(event.getReaction().getReactionEmote());
+                            action.accept(event.getReaction().getEmoji());
                             finalAction.accept(m);
                         }, timeout, unit, () -> finalAction.accept(m));
                     });
@@ -148,13 +148,24 @@ private void initialize(RestAction<Message> ra)
     }
 
     // Generates a ButtonMenu message
-    private Message getMessage()
+    private MessageCreateData getMessageCreate()
     {
-        MessageBuilder mbuilder = new MessageBuilder();
+        MessageCreateBuilder mbuilder = new MessageCreateBuilder();
         if(text!=null)
-            mbuilder.append(text);
+            mbuilder.setContent(text);
         if(description!=null)
-            mbuilder.setEmbed(new EmbedBuilder().setColor(color).setDescription(description).build());
+            mbuilder.setEmbeds(new EmbedBuilder().setColor(color).setDescription(description).build());
+        return mbuilder.build();
+    }
+
+    // Generates a ButtonMenu message
+    private MessageEditData getMessage()
+    {
+        MessageEditBuilder mbuilder = new MessageEditBuilder();
+        if(text!=null)
+            mbuilder.setContent(text);
+        if(description!=null)
+            mbuilder.setEmbeds(new EmbedBuilder().setColor(color).setDescription(description).build());
         return mbuilder.build();
     }
 
@@ -170,7 +181,7 @@ public static class Builder extends Menu.Builder<Builder, ButtonMenu>
         private String text;
         private String description;
         private final List<String> choices = new LinkedList<>();
-        private Consumer<ReactionEmote> action;
+        private Consumer<Emoji> action;
         private Consumer<Message> finalAction = (m) -> {};
 
         /**
@@ -253,7 +264,7 @@ public Builder setDescription(String description)
          *
          * @return This builder
          */
-        public Builder setAction(Consumer<ReactionEmote> action)
+        public Builder setAction(Consumer<Emoji> action)
         {
             this.action = action;
             return this;
@@ -280,8 +291,8 @@ public Builder setFinalAction(Consumer<Message> finalAction)
         /**
          * Adds a single String unicode emoji as a button choice.
          *
-         * <p>Any non-unicode {@link net.dv8tion.jda.api.entities.Emote Emote} should be
-         * added using {@link ButtonMenu.Builder#addChoice(Emote)
+         * <p>Any non-unicode {@link net.dv8tion.jda.api.entities.emoji.Emoji Emote} should be
+         * added using {@link ButtonMenu.Builder#addChoice(Emoji)
          * ButtonMenu.Builder#addChoice(Emote)}.
          *
          * @param  emoji
@@ -296,7 +307,7 @@ public Builder addChoice(String emoji)
         }
 
         /**
-         * Adds a single custom {@link net.dv8tion.jda.api.entities.Emote Emote} as button choices.
+         * Adds a single custom {@link net.dv8tion.jda.api.entities.emoji.Emoji  Emote} as button choices.
          *
          * <p>Any regular unicode emojis should be added using {@link
          * ButtonMenu.Builder#addChoice(String)
@@ -307,16 +318,16 @@ public Builder addChoice(String emoji)
          *
          * @return This builder
          */
-        public Builder addChoice(Emote emote)
+        public Builder addChoice(Emoji emote)
         {
-            return addChoice(emote.getId());
+            return addChoice(emote.getFormatted());
         }
 
         /**
          * Adds String unicode emojis as button choices.
          *
-         * <p>Any non-unicode {@link net.dv8tion.jda.api.entities.Emote Emote}s should be
-         * added using {@link ButtonMenu.Builder#addChoices(Emote...)
+         * <p>Any non-unicode {@link net.dv8tion.jda.api.entities.emoji.Emoji  Emote}s should be
+         * added using {@link ButtonMenu.Builder#addChoices(Emoji...)
          * ButtonMenu.Builder#addChoices(Emote...)}.
          *
          * @param  emojis
@@ -332,7 +343,7 @@ public Builder addChoices(String... emojis)
         }
 
         /**
-         * Adds custom {@link net.dv8tion.jda.api.entities.Emote Emote}s as button choices.
+         * Adds custom {@link net.dv8tion.jda.api.entities.emoji.Emoji  Emote}s as button choices.
          *
          * <p>Any regular unicode emojis should be added using {@link
          * ButtonMenu.Builder#addChoices(String...)
@@ -343,9 +354,9 @@ public Builder addChoices(String... emojis)
          *
          * @return This builder
          */
-        public Builder addChoices(Emote... emotes)
+        public Builder addChoices(Emoji... emotes)
         {
-            for(Emote emote : emotes)
+            for(Emoji emote : emotes)
                 addChoice(emote);
             return this;
         }
@@ -353,8 +364,8 @@ public Builder addChoices(Emote... emotes)
         /**
          * Sets the String unicode emojis as button choices.
          *
-         * <p>Any non-unicode {@link net.dv8tion.jda.api.entities.Emote Emote}s should be
-         * set using {@link ButtonMenu.Builder#setChoices(Emote...)
+         * <p>Any non-unicode {@link net.dv8tion.jda.api.entities.emoji.Emoji  Emote}s should be
+         * set using {@link ButtonMenu.Builder#setChoices(Emoji...)
          * ButtonMenu.Builder#setChoices(Emote...)}.
          *
          * @param  emojis
@@ -369,7 +380,7 @@ public Builder setChoices(String... emojis)
         }
 
         /**
-         * Sets the {@link net.dv8tion.jda.api.entities.Emote Emote}s as button choices.
+         * Sets the {@link net.dv8tion.jda.api.entities.emoji.Emoji  Emote}s as button choices.
          *
          * <p>Any regular unicode emojis should be set using {@link
          * ButtonMenu.Builder#setChoices(String...)
@@ -380,7 +391,7 @@ public Builder setChoices(String... emojis)
          *
          * @return This builder
          */
-        public Builder setChoices(Emote... emotes)
+        public Builder setChoices(Emoji... emotes)
         {
             this.choices.clear();
             return addChoices(emotes);
diff --git a/menu/src/main/java/com/jagrosh/jdautilities/menu/Menu.java b/menu/src/main/java/com/jagrosh/jdautilities/menu/Menu.java
index 5fd8b39c..bb6f8600 100644
--- a/menu/src/main/java/com/jagrosh/jdautilities/menu/Menu.java
+++ b/menu/src/main/java/com/jagrosh/jdautilities/menu/Menu.java
@@ -22,6 +22,7 @@
 
 import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 
 import javax.annotation.Nullable;
 
@@ -31,7 +32,7 @@
  * or key-phrases.
  *
  * <p>Classes extending this are able to take a provided {@link net.dv8tion.jda.api.entities.Message Message}
- * or {@link net.dv8tion.jda.api.entities.MessageChannel MessageChannel} and display a visualized "Menu"
+ * or {@link net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion MessageChannel} and display a visualized "Menu"
  * as or in it.
  *
  * <p>The JDA-Utilities default implementations of this superclass typically handle input through
@@ -71,12 +72,12 @@ protected Menu(EventWaiter waiter, Set<User> users, Set<Role> roles, long timeou
     }
     
     /**
-     * Displays this Menu in a {@link net.dv8tion.jda.api.entities.MessageChannel MessageChannel}.
+     * Displays this Menu in a {@link net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion MessageChannel}.
      * 
      * @param  channel
      *         The MessageChannel to display this Menu in
      */
-    public abstract void display(MessageChannel channel);
+    public abstract void display(MessageChannelUnion channel);
     
     /**
      * Displays this Menu as a designated {@link net.dv8tion.jda.api.entities.Message Message}.
diff --git a/menu/src/main/java/com/jagrosh/jdautilities/menu/OrderedMenu.java b/menu/src/main/java/com/jagrosh/jdautilities/menu/OrderedMenu.java
index 52e138f7..1fc2655c 100644
--- a/menu/src/main/java/com/jagrosh/jdautilities/menu/OrderedMenu.java
+++ b/menu/src/main/java/com/jagrosh/jdautilities/menu/OrderedMenu.java
@@ -25,19 +25,23 @@
 
 import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.MessageBuilder;
 import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.entities.ChannelType;
 import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.MessageChannel;
 import net.dv8tion.jda.api.entities.Role;
-import net.dv8tion.jda.api.entities.TextChannel;
 import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.channel.ChannelType;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.message.GenericMessageEvent;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
 import net.dv8tion.jda.api.exceptions.PermissionException;
 import net.dv8tion.jda.api.requests.RestAction;
+import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
+import net.dv8tion.jda.api.utils.messages.MessageCreateData;
+import net.dv8tion.jda.api.utils.messages.MessageEditBuilder;
+import net.dv8tion.jda.api.utils.messages.MessageEditData;
 import net.dv8tion.jda.internal.utils.Checks;
 
 /**
@@ -89,7 +93,7 @@ public class OrderedMenu extends Menu
 
     /**
      * Shows the OrderedMenu as a new {@link net.dv8tion.jda.api.entities.Message Message}
-     * in the provided {@link net.dv8tion.jda.api.entities.MessageChannel MessageChannel}.
+     * in the provided {@link net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion MessageChannel}.
      * 
      * @param  channel
      *         The MessageChannel to send the new Message to
@@ -97,24 +101,24 @@ public class OrderedMenu extends Menu
      * @throws java.lang.IllegalArgumentException
      *         If <b>all</b> of the following are violated simultaneously:
      *         <ul>
-     *             <li>Being sent to a {@link net.dv8tion.jda.api.entities.TextChannel TextChannel}.</li>
+     *             <li>Being sent to a {@link net.dv8tion.jda.api.entities.channel.concrete.TextChannel TextChannel}.</li>
      *             <li>This OrderedMenu does not allow typed input.</li>
      *             <li>The bot doesn't have {@link net.dv8tion.jda.api.Permission#MESSAGE_ADD_REACTION
      *             Permission.MESSAGE_ADD_REACTION} in the channel this menu is being sent to.</li>
      *         </ul>
      */
     @Override
-    public void display(MessageChannel channel)
+    public void display(MessageChannelUnion channel)
     {
         // This check is basically for whether or not the menu can even display.
         // Is from text channel
         // Does not allow typed input
         // Does not have permission to add reactions
-        if(channel.getType()==ChannelType.TEXT
+        if(channel.getType()== ChannelType.TEXT
                 && !allowTypedInput
                 && !((TextChannel)channel).getGuild().getSelfMember().hasPermission((TextChannel) channel, Permission.MESSAGE_ADD_REACTION))
             throw new PermissionException("Must be able to add reactions if not allowing typed input!");
-        initialize(channel.sendMessage(getMessage()));
+        initialize(channel.sendMessage(getMessageCreate()));
     }
 
     /**
@@ -127,7 +131,7 @@ public void display(MessageChannel channel)
      * @throws java.lang.IllegalArgumentException
      *         If <b>all</b> of the following are violated simultaneously:
      *         <ul>
-     *             <li>Being sent to a {@link net.dv8tion.jda.api.entities.TextChannel TextChannel}.</li>
+     *             <li>Being sent to a {@link net.dv8tion.jda.api.entities.channel.concrete.TextChannel TextChannel}.</li>
      *             <li>This OrderedMenu does not allow typed input.</li>
      *             <li>The bot doesn't have {@link net.dv8tion.jda.api.Permission#MESSAGE_ADD_REACTION
      *             Permission.MESSAGE_ADD_REACTION} in the channel this menu is being sent to.</li>
@@ -142,7 +146,7 @@ public void display(Message message)
         // Does not have permission to add reactions
         if(message.getChannelType() == ChannelType.TEXT
                 && !allowTypedInput 
-                && !message.getGuild().getSelfMember().hasPermission(message.getTextChannel(), Permission.MESSAGE_ADD_REACTION))
+                && !message.getGuild().getSelfMember().hasPermission(message.getGuildChannel(), Permission.MESSAGE_ADD_REACTION))
             throw new PermissionException("Must be able to add reactions if not allowing typed input!");
         initialize(message.editMessage(getMessage()));
     }
@@ -163,11 +167,11 @@ private void initialize(RestAction<Message> ra)
                 {
                     // If this is not the last run of this loop
                     if(i < choices.size()-1)
-                        m.addReaction(getEmoji(i)).queue();
+                        m.addReaction(Emoji.fromUnicode(getEmoji(i))).queue();
                     // If this is the last run of this loop
                     else 
                     {
-                        RestAction<Void> re = m.addReaction(getEmoji(i));
+                        RestAction<Void> re = m.addReaction(Emoji.fromUnicode(getEmoji(i)));
                         // If we're using the cancel function we want
                         // to add a "step" so we queue the last emoji being
                         // added and then make the RestAction to start waiting
@@ -175,7 +179,7 @@ private void initialize(RestAction<Message> ra)
                         if(useCancel)
                         {
                             re.queue(); // queue the last emoji
-                            re = m.addReaction(CANCEL);
+                            re = m.addReaction(Emoji.fromUnicode(CANCEL));
                         }
                         // queue the last emoji or the cancel button
                         re.queue(v -> {
@@ -219,13 +223,13 @@ private void waitGeneric(Message m)
             {
                 MessageReactionAddEvent event = (MessageReactionAddEvent)e;
                 // Process which reaction it is
-                if(event.getReaction().getReactionEmote().getName().equals(CANCEL))
+                if(event.getReaction().getEmoji().getName().equals(CANCEL))
                     cancel.accept(m);
                 else
                     // The int provided in the success consumer is not indexed from 0 to number of choices - 1,
                     // but from 1 to number of choices. So the first choice will correspond to 1, the second
                     // choice to 2, etc.
-                    action.accept(m, getNumber(event.getReaction().getReactionEmote().getName()));
+                    action.accept(m, getNumber(event.getReaction().getEmoji().getName()));
             }
             // If it's a valid MessageReceivedEvent
             else if (e instanceof MessageReceivedEvent)
@@ -249,26 +253,39 @@ private void waitReactionOnly(Message m)
             return isValidReaction(m, e);
         }, e -> {
             m.delete().queue();
-            if(e.getReaction().getReactionEmote().getName().equals(CANCEL))
+            if(e.getReaction().getEmoji().getName().equals(CANCEL))
                 cancel.accept(m);
             else
                 // The int provided in the success consumer is not indexed from 0 to number of choices - 1,
                 // but from 1 to number of choices. So the first choice will correspond to 1, the second
                 // choice to 2, etc.
-                action.accept(m, getNumber(e.getReaction().getReactionEmote().getName()));
+                action.accept(m, getNumber(e.getReaction().getEmoji().getName()));
         }, timeout, unit, () -> cancel.accept(m));
     }
 
     // This is where the displayed message for the OrderedMenu is built.
-    private Message getMessage()
+    private MessageCreateData getMessageCreate()
     {
-        MessageBuilder mbuilder = new MessageBuilder();
+        MessageCreateBuilder mbuilder = new MessageCreateBuilder();
         if(text!=null)
-            mbuilder.append(text);
+            mbuilder.setContent(text);
         StringBuilder sb = new StringBuilder();
         for(int i=0; i<choices.size(); i++)
             sb.append("\n").append(getEmoji(i)).append(" ").append(choices.get(i));
-        mbuilder.setEmbed(new EmbedBuilder().setColor(color)
+        mbuilder.setEmbeds(new EmbedBuilder().setColor(color)
+                .setDescription(description==null ? sb.toString() : description+sb.toString()).build());
+        return mbuilder.build();
+    }
+
+    private MessageEditData getMessage()
+    {
+        MessageEditBuilder mbuilder = new MessageEditBuilder();
+        if(text!=null)
+            mbuilder.setContent(text);
+        StringBuilder sb = new StringBuilder();
+        for(int i=0; i<choices.size(); i++)
+            sb.append("\n").append(getEmoji(i)).append(" ").append(choices.get(i));
+        mbuilder.setEmbeds(new EmbedBuilder().setColor(color)
                 .setDescription(description==null ? sb.toString() : description+sb.toString()).build());
         return mbuilder.build();
     }
@@ -282,10 +299,10 @@ private boolean isValidReaction(Message m, MessageReactionAddEvent e)
         if(!isValidUser(e.getUser(), e.isFromGuild() ? e.getGuild() : null))
             return false;
         // The reaction is the cancel reaction
-        if(e.getReaction().getReactionEmote().getName().equals(CANCEL))
+        if(e.getReaction().getEmoji().getName().equals(CANCEL))
             return true;
 
-        int num = getNumber(e.getReaction().getReactionEmote().getName());
+        int num = getNumber(e.getReaction().getEmoji().getName());
         return !(num<0 || num>choices.size());
     }
     
diff --git a/menu/src/main/java/com/jagrosh/jdautilities/menu/Paginator.java b/menu/src/main/java/com/jagrosh/jdautilities/menu/Paginator.java
index c6489ba8..ae8e4eb9 100644
--- a/menu/src/main/java/com/jagrosh/jdautilities/menu/Paginator.java
+++ b/menu/src/main/java/com/jagrosh/jdautilities/menu/Paginator.java
@@ -26,16 +26,17 @@
 
 import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.MessageBuilder;
 import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.MessageChannel;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.message.GenericMessageEvent;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
 import net.dv8tion.jda.api.exceptions.PermissionException;
 import net.dv8tion.jda.api.requests.RestAction;
+import net.dv8tion.jda.api.utils.messages.*;
 import net.dv8tion.jda.internal.utils.Checks;
 
 /**
@@ -106,17 +107,17 @@ public class Paginator extends Menu
 
     /**
      * Begins pagination on page 1 as a new {@link net.dv8tion.jda.api.entities.Message Message}
-     * in the provided {@link net.dv8tion.jda.api.entities.MessageChannel MessageChannel}.
+     * in the provided {@link net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion MessageChannel}.
      *
      * <p>Starting on another page is available via {@link
-     * Paginator#paginate(MessageChannel, int)
-     * Paginator#paginate(MessageChannel, int)}.
+     * Paginator#paginate(MessageChannelUnion, int)
+     * Paginator#paginate(MessageChannelUnion, int)}.
      * 
      * @param  channel
      *         The MessageChannel to send the new Message to
      */
     @Override
-    public void display(MessageChannel channel)
+    public void display(MessageChannelUnion channel)
     {
         paginate(channel, 1);
     }
@@ -139,7 +140,7 @@ public void display(Message message)
     
     /**
      * Begins pagination as a new {@link net.dv8tion.jda.api.entities.Message Message}
-     * in the provided {@link net.dv8tion.jda.api.entities.MessageChannel MessageChannel}, starting
+     * in the provided {@link net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion MessageChannel}, starting
      * on whatever page number is provided.
      * 
      * @param  channel
@@ -147,13 +148,13 @@ public void display(Message message)
      * @param  pageNum
      *         The page number to begin on
      */
-    public void paginate(MessageChannel channel, int pageNum)
+    public void paginate(MessageChannelUnion channel, int pageNum)
     {
         if(pageNum<1)
             pageNum = 1;
         else if (pageNum>pages)
             pageNum = pages;
-        Message msg = renderPage(pageNum);
+        MessageCreateData msg = renderPageCreate(pageNum);
         initialize(channel.sendMessage(msg), pageNum);
     }
     
@@ -173,7 +174,7 @@ public void paginate(Message message, int pageNum)
             pageNum = 1;
         else if (pageNum>pages)
             pageNum = pages;
-        Message msg = renderPage(pageNum);
+        MessageEditData msg = renderPage(pageNum);
         initialize(message.editMessage(msg), pageNum);
     }
     
@@ -183,18 +184,18 @@ private void initialize(RestAction<Message> action, int pageNum)
             if(pages > 1)
             {
                 if(bulkSkipNumber > 1)
-                    m.addReaction(BIG_LEFT).queue();
-                m.addReaction(LEFT).queue();
-                m.addReaction(STOP).queue();
+                    m.addReaction(Emoji.fromUnicode(BIG_LEFT)).queue();
+                m.addReaction(Emoji.fromUnicode(LEFT)).queue();
+                m.addReaction(Emoji.fromUnicode(STOP)).queue();
                 if(bulkSkipNumber > 1)
-                    m.addReaction(RIGHT).queue();
-                m.addReaction(bulkSkipNumber > 1? BIG_RIGHT : RIGHT)
+                    m.addReaction(Emoji.fromUnicode(RIGHT)).queue();
+                m.addReaction(bulkSkipNumber > 1? Emoji.fromUnicode(BIG_RIGHT) : Emoji.fromUnicode(RIGHT))
                  .queue(v -> pagination(m, pageNum), t -> pagination(m, pageNum));
             }
             else if(waitOnSinglePage)
             {
                 // Go straight to without text-input because only one page is available
-                m.addReaction(STOP).queue(
+                m.addReaction(Emoji.fromUnicode(STOP)).queue(
                     v -> paginationWithoutTextInput(m, pageNum),
                     t -> paginationWithoutTextInput(m, pageNum)
                 );
@@ -287,7 +288,7 @@ private boolean checkReaction(MessageReactionAddEvent event, long messageId)
     {
         if(event.getMessageIdLong() != messageId)
             return false;
-        switch(event.getReactionEmote().getName())
+        switch(event.getReaction().getEmoji().getName())
         {
             // LEFT, STOP, RIGHT, BIG_LEFT, BIG_RIGHT all fall-through to
             // return if the User is valid or not. If none trip, this defaults
@@ -308,7 +309,7 @@ private boolean checkReaction(MessageReactionAddEvent event, long messageId)
     private void handleMessageReactionAddAction(MessageReactionAddEvent event, Message message, int pageNum)
     {
         int newPageNum = pageNum;
-        switch(event.getReaction().getReactionEmote().getName())
+        switch(event.getReaction().getEmoji().getName())
         {
             case LEFT:
                 if(newPageNum == 1 && wrapPageEnds)
@@ -356,10 +357,44 @@ private void handleMessageReactionAddAction(MessageReactionAddEvent event, Messa
         int n = newPageNum;
         message.editMessage(renderPage(newPageNum)).queue(m -> pagination(m, n));
     }
-    
-    private Message renderPage(int pageNum)
+
+    private MessageEditData renderPage(int pageNum)
+    {
+        MessageEditBuilder mbuilder = new MessageEditBuilder();
+        EmbedBuilder ebuilder = new EmbedBuilder();
+        int start = (pageNum-1)*itemsPerPage;
+        int end = strings.size() < pageNum*itemsPerPage ? strings.size() : pageNum*itemsPerPage;
+        if(columns == 1)
+        {
+            StringBuilder sbuilder = new StringBuilder();
+            for(int i=start; i<end; i++)
+                sbuilder.append("\n").append(numberItems ? "`"+(i+1)+".` " : "").append(strings.get(i));
+            ebuilder.setDescription(sbuilder.toString());
+        }
+        else
+        {
+            int per = (int)Math.ceil((double)(end-start)/columns);
+            for(int k=0; k<columns; k++)
+            {
+                StringBuilder strbuilder = new StringBuilder();
+                for(int i=start+k*per; i<end && i<start+(k+1)*per; i++)
+                    strbuilder.append("\n").append(numberItems ? (i+1)+". " : "").append(strings.get(i));
+                ebuilder.addField("", strbuilder.toString(), true);
+            }
+        }
+
+        ebuilder.setColor(color.apply(pageNum, pages));
+        if(showPageNumbers)
+            ebuilder.setFooter("Page "+pageNum+"/"+pages, null);
+        mbuilder.setEmbeds(ebuilder.build());
+        if(text!=null)
+            mbuilder.setContent(text.apply(pageNum, pages));
+        return mbuilder.build();
+    }
+
+    private MessageCreateData renderPageCreate(int pageNum)
     {
-        MessageBuilder mbuilder = new MessageBuilder();
+        MessageCreateBuilder mbuilder = new MessageCreateBuilder();
         EmbedBuilder ebuilder = new EmbedBuilder();
         int start = (pageNum-1)*itemsPerPage;
         int end = strings.size() < pageNum*itemsPerPage ? strings.size() : pageNum*itemsPerPage;
@@ -385,9 +420,9 @@ private Message renderPage(int pageNum)
         ebuilder.setColor(color.apply(pageNum, pages));
         if(showPageNumbers)
             ebuilder.setFooter("Page "+pageNum+"/"+pages, null);
-        mbuilder.setEmbed(ebuilder.build());
+        mbuilder.setEmbeds(ebuilder.build());
         if(text!=null)
-            mbuilder.append(text.apply(pageNum, pages));
+            mbuilder.setContent(text.apply(pageNum, pages));
         return mbuilder.build();
     }
 
diff --git a/menu/src/main/java/com/jagrosh/jdautilities/menu/SelectionDialog.java b/menu/src/main/java/com/jagrosh/jdautilities/menu/SelectionDialog.java
index ee988ef8..e45f28ef 100644
--- a/menu/src/main/java/com/jagrosh/jdautilities/menu/SelectionDialog.java
+++ b/menu/src/main/java/com/jagrosh/jdautilities/menu/SelectionDialog.java
@@ -27,14 +27,18 @@
 
 import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.MessageBuilder;
 import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.MessageChannel;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
 import net.dv8tion.jda.api.exceptions.PermissionException;
 import net.dv8tion.jda.api.requests.RestAction;
+import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
+import net.dv8tion.jda.api.utils.messages.MessageCreateData;
+import net.dv8tion.jda.api.utils.messages.MessageEditBuilder;
+import net.dv8tion.jda.api.utils.messages.MessageEditData;
 import net.dv8tion.jda.internal.utils.Checks;
 
 /**
@@ -95,14 +99,14 @@ public class SelectionDialog extends Menu
 
     /**
      * Shows the SelectionDialog as a new {@link net.dv8tion.jda.api.entities.Message Message}
-     * in the provided {@link net.dv8tion.jda.api.entities.MessageChannel MessageChannel}, starting with
+     * in the provided {@link net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion MessageChannel}, starting with
      * the first selection.
      * 
      * @param  channel
      *         The MessageChannel to send the new Message to
      */
     @Override
-    public void display(MessageChannel channel)
+    public void display(MessageChannelUnion channel)
     {
         showDialog(channel, 1);
     }
@@ -122,7 +126,7 @@ public void display(Message message)
     
     /**
      * Shows the SelectionDialog as a new {@link net.dv8tion.jda.api.entities.Message Message}
-     * in the provided {@link net.dv8tion.jda.api.entities.MessageChannel MessageChannel}, starting with
+     * in the provided {@link net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion MessageChannel}, starting with
      * the number selection provided.
      * 
      * @param  channel
@@ -130,13 +134,13 @@ public void display(Message message)
      * @param  selection
      *         The number selection to start on
      */
-    public void showDialog(MessageChannel channel, int selection)
+    public void showDialog(MessageChannelUnion channel, int selection)
     {
         if(selection<1)
             selection = 1;
         else if(selection>choices.size())
             selection = choices.size();
-        Message msg = render(selection);
+        MessageCreateData msg = renderCreate(selection);
         initialize(channel.sendMessage(msg), selection);
     }
     
@@ -156,7 +160,7 @@ public void showDialog(Message message, int selection)
             selection = 1;
         else if(selection>choices.size())
             selection = choices.size();
-        Message msg = render(selection);
+        MessageEditData msg = render(selection);
         initialize(message.editMessage(msg), selection);
     }
     
@@ -165,15 +169,15 @@ private void initialize(RestAction<Message> action, int selection)
         action.queue(m -> {
             if(choices.size()>1)
             {
-                m.addReaction(UP).queue();
-                m.addReaction(SELECT).queue();
-                m.addReaction(CANCEL).queue();
-                m.addReaction(DOWN).queue(v -> selectionDialog(m, selection), v -> selectionDialog(m, selection));
+                m.addReaction(Emoji.fromUnicode(UP)).queue();
+                m.addReaction(Emoji.fromUnicode(SELECT)).queue();
+                m.addReaction(Emoji.fromUnicode(CANCEL)).queue();
+                m.addReaction(Emoji.fromUnicode(DOWN)).queue(v -> selectionDialog(m, selection), v -> selectionDialog(m, selection));
             }
             else
             {
-                m.addReaction(SELECT).queue();
-                m.addReaction(CANCEL).queue(v -> selectionDialog(m, selection), v -> selectionDialog(m, selection));
+                m.addReaction(Emoji.fromUnicode(SELECT)).queue();
+                m.addReaction(Emoji.fromUnicode(CANCEL)).queue(v -> selectionDialog(m, selection), v -> selectionDialog(m, selection));
             }
         });
     }
@@ -183,15 +187,15 @@ private void selectionDialog(Message message, int selection)
         waiter.waitForEvent(MessageReactionAddEvent.class, event -> {
             if(!event.getMessageId().equals(message.getId()))
                 return false;
-            if(!(UP.equals(event.getReaction().getReactionEmote().getName())
-                    || DOWN.equals(event.getReaction().getReactionEmote().getName())
-                    || CANCEL.equals(event.getReaction().getReactionEmote().getName())
-                    || SELECT.equals(event.getReaction().getReactionEmote().getName())))
+            if(!(UP.equals(event.getReaction().getEmoji().getName())
+                    || DOWN.equals(event.getReaction().getEmoji().getName())
+                    || CANCEL.equals(event.getReaction().getEmoji().getName())
+                    || SELECT.equals(event.getReaction().getEmoji().getName())))
                 return false;
             return isValidUser(event.getUser(), event.isFromGuild() ? event.getGuild() : null);
         }, event -> {
             int newSelection = selection;
-            switch(event.getReaction().getReactionEmote().getName())
+            switch(event.getReaction().getEmoji().getName())
             {
                 case UP:
                     if(newSelection>1)
@@ -223,7 +227,7 @@ else if(loop)
         }, timeout, unit, () -> cancel.accept(message));
     }
     
-    private Message render(int selection)
+    private MessageCreateData renderCreate(int selection)
     {
         StringBuilder sbuilder = new StringBuilder();
         for(int i=0; i<choices.size(); i++)
@@ -231,11 +235,28 @@ private Message render(int selection)
                 sbuilder.append("\n").append(leftEnd).append(choices.get(i)).append(rightEnd);
             else
                 sbuilder.append("\n").append(defaultLeft).append(choices.get(i)).append(defaultRight);
-        MessageBuilder mbuilder = new MessageBuilder();
+        MessageCreateBuilder mbuilder = new MessageCreateBuilder();
         String content = text.apply(selection);
         if(content!=null)
-            mbuilder.append(content);
-        return mbuilder.setEmbed(new EmbedBuilder()
+            mbuilder.setContent(content);
+        return mbuilder.setEmbeds(new EmbedBuilder()
+                .setColor(color.apply(selection))
+                .setDescription(sbuilder.toString())
+                .build()).build();
+    }
+    private MessageEditData render(int selection)
+    {
+        StringBuilder sbuilder = new StringBuilder();
+        for(int i=0; i<choices.size(); i++)
+            if(i+1==selection)
+                sbuilder.append("\n").append(leftEnd).append(choices.get(i)).append(rightEnd);
+            else
+                sbuilder.append("\n").append(defaultLeft).append(choices.get(i)).append(defaultRight);
+        MessageEditBuilder mbuilder = new MessageEditBuilder();
+        String content = text.apply(selection);
+        if(content!=null)
+            mbuilder.setContent(content);
+        return mbuilder.setEmbeds(new EmbedBuilder()
                 .setColor(color.apply(selection))
                 .setDescription(sbuilder.toString())
                 .build()).build();
diff --git a/menu/src/main/java/com/jagrosh/jdautilities/menu/Slideshow.java b/menu/src/main/java/com/jagrosh/jdautilities/menu/Slideshow.java
index 6125cbea..9f59dac1 100644
--- a/menu/src/main/java/com/jagrosh/jdautilities/menu/Slideshow.java
+++ b/menu/src/main/java/com/jagrosh/jdautilities/menu/Slideshow.java
@@ -26,16 +26,20 @@
 
 import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.MessageBuilder;
 import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.MessageChannel;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.message.GenericMessageEvent;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
 import net.dv8tion.jda.api.exceptions.PermissionException;
 import net.dv8tion.jda.api.requests.RestAction;
+import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
+import net.dv8tion.jda.api.utils.messages.MessageCreateData;
+import net.dv8tion.jda.api.utils.messages.MessageEditBuilder;
+import net.dv8tion.jda.api.utils.messages.MessageEditData;
 import net.dv8tion.jda.internal.utils.Checks;
 
 /**
@@ -94,13 +98,13 @@ public class Slideshow extends Menu
 
     /**
      * Begins pagination on page 1 as a new {@link net.dv8tion.jda.api.entities.Message Message}
-     * in the provided {@link net.dv8tion.jda.api.entities.MessageChannel MessageChannel}.
+     * in the provided {@link net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion MessageChannel}.
      * 
      * @param  channel
      *         The MessageChannel to send the new Message to
      */
     @Override
-    public void display(MessageChannel channel)
+    public void display(MessageChannelUnion channel)
     {
         paginate(channel, 1);
     }
@@ -120,7 +124,7 @@ public void display(Message message)
     
     /**
      * Begins pagination as a new {@link net.dv8tion.jda.api.entities.Message Message}
-     * in the provided {@link net.dv8tion.jda.api.entities.MessageChannel MessageChannel}, starting
+     * in the provided {@link net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion MessageChannel}, starting
      * on whatever page number is provided.
      * 
      * @param  channel
@@ -128,13 +132,13 @@ public void display(Message message)
      * @param  pageNum
      *         The page number to begin on
      */
-    public void paginate(MessageChannel channel, int pageNum)
+    public void paginate(MessageChannelUnion channel, int pageNum)
     {
         if(pageNum<1)
             pageNum = 1;
         else if (pageNum>urls.size())
             pageNum = urls.size();
-        Message msg = renderPage(pageNum);
+        MessageCreateData msg = renderPageCreate(pageNum);
         initialize(channel.sendMessage(msg), pageNum);
     }
     
@@ -154,7 +158,7 @@ public void paginate(Message message, int pageNum)
             pageNum = 1;
         else if (pageNum>urls.size())
             pageNum = urls.size();
-        Message msg = renderPage(pageNum);
+        MessageEditData msg = renderPage(pageNum);
         initialize(message.editMessage(msg), pageNum);
     }
     
@@ -164,17 +168,17 @@ private void initialize(RestAction<Message> action, int pageNum)
             if(urls.size()>1)
             {
                 if(bulkSkipNumber > 1)
-                    m.addReaction(BIG_LEFT).queue();
-                m.addReaction(LEFT).queue();
-                m.addReaction(STOP).queue();
+                    m.addReaction(Emoji.fromUnicode(BIG_LEFT)).queue();
+                m.addReaction(Emoji.fromUnicode(LEFT)).queue();
+                m.addReaction(Emoji.fromUnicode(STOP)).queue();
                 if(bulkSkipNumber > 1)
-                    m.addReaction(RIGHT).queue();
-                m.addReaction(bulkSkipNumber > 1? BIG_RIGHT : RIGHT)
+                    m.addReaction(Emoji.fromUnicode(RIGHT)).queue();
+                m.addReaction(bulkSkipNumber > 1? Emoji.fromUnicode(BIG_RIGHT) : Emoji.fromUnicode(RIGHT))
                  .queue(v -> pagination(m, pageNum), t -> pagination(m, pageNum));
             }
             else if(waitOnSinglePage)
             {
-                m.addReaction(STOP).queue(v -> pagination(m, pageNum), t -> pagination(m, pageNum));
+                m.addReaction(Emoji.fromUnicode(STOP)).queue(v -> pagination(m, pageNum), t -> pagination(m, pageNum));
             }
             else
             {
@@ -265,7 +269,7 @@ private boolean checkReaction(MessageReactionAddEvent event, long messageId)
     {
         if(event.getMessageIdLong() != messageId)
             return false;
-        switch(event.getReactionEmote().getName())
+        switch(event.getReaction().getEmoji().getName())
         {
             // LEFT, STOP, RIGHT, BIG_LEFT, BIG_RIGHT all fall-through to
             // return if the User is valid or not. If none trip, this defaults
@@ -287,7 +291,7 @@ private void handleMessageReactionAddAction(MessageReactionAddEvent event, Messa
     {
         int newPageNum = pageNum;
         int pages = urls.size();
-        switch(event.getReaction().getReactionEmote().getName())
+        switch(event.getReaction().getEmoji().getName())
         {
             case LEFT:
                 if(newPageNum == 1 && wrapPageEnds)
@@ -336,18 +340,33 @@ private void handleMessageReactionAddAction(MessageReactionAddEvent event, Messa
         message.editMessage(renderPage(newPageNum)).queue(m -> pagination(m, n));
     }
     
-    private Message renderPage(int pageNum)
+    private MessageCreateData renderPageCreate(int pageNum)
     {
-        MessageBuilder mbuilder = new MessageBuilder();
+        MessageCreateBuilder mbuilder = new MessageCreateBuilder();
         EmbedBuilder ebuilder = new EmbedBuilder();
         ebuilder.setImage(urls.get(pageNum-1));
         ebuilder.setColor(color.apply(pageNum, urls.size()));
         ebuilder.setDescription(description.apply(pageNum, urls.size()));
         if(showPageNumbers)
             ebuilder.setFooter("Image "+pageNum+"/"+urls.size(), null);
-        mbuilder.setEmbed(ebuilder.build());
+        mbuilder.setEmbeds(ebuilder.build());
         if(text!=null)
-            mbuilder.append(text.apply(pageNum, urls.size()));
+            mbuilder.setContent(text.apply(pageNum, urls.size()));
+        return mbuilder.build();
+    }
+
+    private MessageEditData renderPage(int pageNum)
+    {
+        MessageEditBuilder mbuilder = new MessageEditBuilder();
+        EmbedBuilder ebuilder = new EmbedBuilder();
+        ebuilder.setImage(urls.get(pageNum-1));
+        ebuilder.setColor(color.apply(pageNum, urls.size()));
+        ebuilder.setDescription(description.apply(pageNum, urls.size()));
+        if(showPageNumbers)
+            ebuilder.setFooter("Image "+pageNum+"/"+urls.size(), null);
+        mbuilder.setEmbeds(ebuilder.build());
+        if(text!=null)
+            mbuilder.setContent(text.apply(pageNum, urls.size()));
         return mbuilder.build();
     }
 
@@ -626,7 +645,7 @@ public Builder allowTextInput(boolean allowTextInput)
         /**
          * Sets the {@link com.jagrosh.jdautilities.menu.Slideshow Slideshow} to traverse
          * left or right when a provided text input is sent in the form of a Message to
-         * the {@link net.dv8tion.jda.api.entities.GuildChannel GuildChannel} the menu is displayed in.
+         * the {@link net.dv8tion.jda.api.entities.channel.unions.GuildChannelUnion GuildChannel} the menu is displayed in.
          *
          * <p>If one or both these parameters are provided {@code null} this resets
          * both of them and they will no longer be available when the Slideshow is built.
diff --git a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/OAuth2Client.java b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/OAuth2Client.java
index 81a782de..8273b495 100644
--- a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/OAuth2Client.java
+++ b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/OAuth2Client.java
@@ -23,6 +23,7 @@
 import com.jagrosh.jdautilities.oauth2.session.SessionController;
 import com.jagrosh.jdautilities.oauth2.exceptions.InvalidStateException;
 import com.jagrosh.jdautilities.oauth2.state.StateController;
+import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.internal.utils.Checks;
 import okhttp3.OkHttpClient;
 
@@ -127,6 +128,28 @@ public interface OAuth2Client
     @CheckReturnValue
     OAuth2Action<List<OAuth2Guild>> getGuilds(Session session);
 
+    /**
+     * For the love of god and my sanity being broken, because I worked on this for 2 weeks. I am not going to document it now.
+     *
+     * @param  user
+     *         The User that should join the given Guild.
+     *
+     * @param guild
+     *        The Guild the User should join.
+     *
+     * @param botAuthorizationToken
+     *        The bot's authorization token.
+     *
+     * @return A {@link com.jagrosh.jdautilities.oauth2.requests.OAuth2Action OAuth2Action} for
+     *         the OAuth2Guilds to be retrieved.
+     *
+     * @throws com.jagrosh.jdautilities.oauth2.exceptions.MissingScopeException
+     *         If the provided Session does not have the 'guilds' scope.
+     */
+    @CheckReturnValue
+    OAuth2Action<OAuth2User> joinGuild(OAuth2User user, Guild guild, String botAuthorizationToken);
+
+
     /**
      * Gets the client ID for this OAuth2Client.
      *
@@ -153,7 +176,7 @@ public interface OAuth2Client
      *
      * @return The client's SessionController.
      */
-    SessionController getSessionController();
+    SessionController<?> getSessionController();
 
     /**
      * Builder for creating OAuth2Client instances.
@@ -165,7 +188,7 @@ class Builder
     {
         private long clientId = -1;
         private String clientSecret;
-        private SessionController sessionController;
+        private SessionController<?> sessionController;
         private StateController stateController;
         private OkHttpClient client;
 
@@ -225,7 +248,7 @@ public Builder setClientSecret(String clientSecret)
          *
          * @return This builder.
          */
-        public Builder setSessionController(SessionController sessionController)
+        public Builder setSessionController(SessionController<?> sessionController)
         {
             this.sessionController = sessionController;
             return this;
diff --git a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/entities/OAuth2Guild.java b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/entities/OAuth2Guild.java
index c763c1ce..d9a697e2 100644
--- a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/entities/OAuth2Guild.java
+++ b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/entities/OAuth2Guild.java
@@ -16,11 +16,12 @@
 package com.jagrosh.jdautilities.oauth2.entities;
 
 import com.jagrosh.jdautilities.oauth2.OAuth2Client;
+import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.ISnowflake;
+import net.dv8tion.jda.api.sharding.ShardManager;
 
 import java.util.EnumSet;
-import java.util.List;
 
 /**
  * OAuth2 representation of a Discord Server/Guild.
@@ -33,6 +34,24 @@
  */
 public interface OAuth2Guild extends ISnowflake
 {
+    /**
+     * Check if the Bot is on the Guild.
+     *
+     * @param jda The {@link JDA} that should be used.
+     *
+     * @return true, if the bot is on the Guild | false, if not.
+     */
+    boolean botJoined(JDA jda);
+
+    /**
+     * Check if the Bot is on the Guild.
+     *
+     * @param shardManager The {@link ShardManager} that should be used.
+     *
+     * @return true, if the bot is on the Guild | false, if not.
+     */
+    boolean botJoined(ShardManager shardManager);
+
     /**
      * Gets the underlying {@link com.jagrosh.jdautilities.oauth2.OAuth2Client OAuth2Client}
      * that created this OAuth2Guild.
@@ -67,7 +86,7 @@ public interface OAuth2Guild extends ISnowflake
      *
      * @return The Session User's raw permission value for the Guild.
      */
-    int getPermissionsRaw();
+    long getPermissionsRaw();
 
     /**
      * Gets the Session User's {@link net.dv8tion.jda.api.Permission Permissions} for the Guild.
diff --git a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/entities/OAuth2User.java b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/entities/OAuth2User.java
index b9b26600..31720fb4 100644
--- a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/entities/OAuth2User.java
+++ b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/entities/OAuth2User.java
@@ -22,6 +22,7 @@
 import net.dv8tion.jda.api.entities.IMentionable;
 import net.dv8tion.jda.api.entities.ISnowflake;
 import net.dv8tion.jda.api.entities.User;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * OAuth2 representation of a Discord User.
@@ -54,7 +55,7 @@ public interface OAuth2User extends ISnowflake, IMentionable
      *
      * @return The user's Snowflake ID as a String.
      */
-    String getId();
+    @NotNull @Override String getId();
 
     /**
      * Gets the user's Snowflake ID as a {@code long}.
@@ -146,35 +147,13 @@ public interface OAuth2User extends ISnowflake, IMentionable
      */
     String getEffectiveAvatarUrl();
 
-    /**
-     * Gets whether or not this user is a bot.
-     *
-     * <p>While, at the time of writing this documentation, bots cannot
-     * authenticate applications, there may be a time in the future
-     * where they have such an ability.
-     *
-     * @return {@code false}
-     *
-     * @deprecated
-     *         Due to the nature of OAuth2 at this moment, bots are not
-     *         allowed to use the various urls provided.
-     *         <br>This method is scheduled for removal upon merging it
-     *         with <code>master</code> in JDA-Utilities 2.2
-     */
-    @Deprecated
-    default boolean isBot()
-    {
-        // Note: the code here has not changed from it's implementation.
-        return false;
-    }
-
     /**
      * Gets the user as a discord formatted mention:
      * <br>{@code <@SNOWFLAKE_ID> }
      *
      * @return A discord formatted mention of this user.
      */
-    String getAsMention();
+    @NotNull String getAsMention();
 
     /**
      * Gets the corresponding {@link net.dv8tion.jda.api.entities.User JDA User}
diff --git a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/entities/impl/OAuth2ClientImpl.java b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/entities/impl/OAuth2ClientImpl.java
index d430ffe8..7e075cce 100644
--- a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/entities/impl/OAuth2ClientImpl.java
+++ b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/entities/impl/OAuth2ClientImpl.java
@@ -30,17 +30,16 @@
 import com.jagrosh.jdautilities.oauth2.session.SessionData;
 import com.jagrosh.jdautilities.oauth2.state.DefaultStateController;
 import com.jagrosh.jdautilities.oauth2.state.StateController;
+import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.exceptions.HttpException;
-import net.dv8tion.jda.internal.requests.Method;
+import net.dv8tion.jda.api.requests.Method;
 import net.dv8tion.jda.internal.utils.Checks;
 import net.dv8tion.jda.internal.utils.EncodingUtil;
 import net.dv8tion.jda.internal.utils.IOUtil;
-import net.dv8tion.jda.internal.utils.JDALogger;
 import okhttp3.*;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.json.JSONTokener;
-import org.slf4j.Logger;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -54,16 +53,14 @@
  */
 public class OAuth2ClientImpl implements OAuth2Client
 {
-    private static final Logger LOG = JDALogger.getLog(OAuth2Client.class);
-    
     private final long clientId;
     private final String clientSecret;
-    private final SessionController sessionController;
+    private final SessionController<?> sessionController;
     private final StateController stateController;
     private final OkHttpClient httpClient;
     private final OAuth2Requester requester;
 
-    public OAuth2ClientImpl(long clientId, String clientSecret, SessionController sessionController,
+    public OAuth2ClientImpl(long clientId, String clientSecret, SessionController<?> sessionController,
                             StateController stateController, OkHttpClient httpClient)
     {
         Checks.check(clientId >= 0, "Invalid Client ID");
@@ -188,13 +185,42 @@ protected List<OAuth2Guild> handle(Response response) throws IOException
                     obj = body.getJSONObject(i);
                     list.add(new OAuth2GuildImpl(OAuth2ClientImpl.this, obj.getLong("id"),
                         obj.getString("name"), obj.optString("icon", null), obj.getBoolean("owner"),
-                        obj.getInt("permissions")));
+                        obj.getLong("permissions")));
                 }
                 return list;
             }
         };
     }
 
+    @Override
+    public OAuth2Action<OAuth2User> joinGuild(OAuth2User user, Guild guild, String botAuthorizationToken)
+    {
+        if(!Scope.contains(user.getSession().getScopes(), Scope.GUILDS_JOIN))
+            throw new MissingScopeException("Join a Guild from a Session", Scope.GUILDS_JOIN);
+
+        return new OAuth2Action<OAuth2User>(this, Method.PUT, OAuth2URL.GUILD_JOIN.compile(guild.getId(), user.getId())) {
+            @Override
+            protected Headers getHeaders() {
+                return Headers.of("Authorization", "Bot " + botAuthorizationToken, "Content-Type", "application/json");
+            }
+
+            @Override
+            protected RequestBody getBody() {
+                return RequestBody.create(new JSONObject()
+                    .append("access_token", user.getSession().getAccessToken()).toString(),
+                    MediaType.parse("application/json"));
+            }
+
+            @Override
+            protected OAuth2User handle(Response response) throws IOException {
+                if (!response.isSuccessful())
+                    throw failure(response);
+
+                return user;
+            }
+        };
+    }
+
     @Override
     public long getId()
     {
diff --git a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/entities/impl/OAuth2GuildImpl.java b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/entities/impl/OAuth2GuildImpl.java
index f0dce737..d0c493e2 100644
--- a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/entities/impl/OAuth2GuildImpl.java
+++ b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/entities/impl/OAuth2GuildImpl.java
@@ -17,7 +17,9 @@
 
 import com.jagrosh.jdautilities.oauth2.OAuth2Client;
 import com.jagrosh.jdautilities.oauth2.entities.OAuth2Guild;
+import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.sharding.ShardManager;
 
 import java.util.EnumSet;
 
@@ -28,12 +30,13 @@
 public class OAuth2GuildImpl implements OAuth2Guild
 {
     private final OAuth2Client client;
-    private final long id;
-    private final String name, icon;
+    private final long id,
+            permissions;
+    private final String name,
+            icon;
     private final boolean owner;
-    private final int permissions;
     
-    public OAuth2GuildImpl(OAuth2Client client, long id, String name, String icon, boolean owner, int permissions)
+    public OAuth2GuildImpl(OAuth2Client client, long id, String name, String icon, boolean owner, long permissions)
     {
         this.client = client;
         this.id = id;
@@ -43,6 +46,12 @@ public OAuth2GuildImpl(OAuth2Client client, long id, String name, String icon, b
         this.permissions = permissions;
     }
 
+    @Override
+    public boolean botJoined(JDA jda) { return jda.getGuildById(getIdLong()) != null; }
+
+    @Override
+    public boolean botJoined(ShardManager shardManager) { return shardManager.getGuildById(getIdLong()) != null; }
+
     @Override
     public OAuth2Client getClient()
     {
@@ -70,11 +79,11 @@ public String getIconId()
     @Override
     public String getIconUrl()
     {
-        return icon == null ? null : "https://cdn.discordapp.com/icons/" + id + "/" + icon + ".png";
+        return icon == null ? "https://i0.wp.com/www.alphr.com/wp-content/uploads/2019/02/Discord-Spoiler-Tag-Featured.jpg?resize=1200%2C1080&ssl=1" : "https://cdn.discordapp.com/icons/" + id + "/" + icon + ".png";
     }
     
     @Override
-    public int getPermissionsRaw()
+    public long getPermissionsRaw()
     {
         return permissions;
     }
@@ -98,13 +107,13 @@ public boolean hasPermission(Permission... perms)
             return true;
 
         long adminPermRaw = Permission.ADMINISTRATOR.getRawValue();
-        int permissions = getPermissionsRaw();
+        long permissionsRaw = getPermissionsRaw();
 
-        if ((permissions & adminPermRaw) == adminPermRaw)
+        if ((permissionsRaw & adminPermRaw) == adminPermRaw)
             return true;
 
         long checkPermsRaw = Permission.getRaw(perms);
 
-        return (permissions & checkPermsRaw) == checkPermsRaw;
+        return (permissionsRaw & checkPermsRaw) == checkPermsRaw;
     }
 }
diff --git a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/entities/impl/OAuth2UserImpl.java b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/entities/impl/OAuth2UserImpl.java
index 80bf9316..301dc9af 100644
--- a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/entities/impl/OAuth2UserImpl.java
+++ b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/entities/impl/OAuth2UserImpl.java
@@ -23,22 +23,31 @@
 import net.dv8tion.jda.api.sharding.ShardManager;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.User;
+import org.jetbrains.annotations.NotNull;
 
 /**
- *
  * @author John Grosh (john.a.grosh@gmail.com)
  */
-public class OAuth2UserImpl implements OAuth2User
-{
+public class OAuth2UserImpl implements OAuth2User {
     private final OAuth2Client client;
     private final Session session;
     private final long id;
-    private final String name, discriminator, avatar, email;
-    private final boolean verified, mfaEnabled;
-
-    public OAuth2UserImpl(OAuth2Client client, Session session, long id, String name, String discriminator,
-                          String avatar, String email, boolean verified, boolean mfaEnabled)
-    {
+    private final String name,
+            discriminator,
+            avatar,
+            email;
+    private final boolean verified,
+            mfaEnabled;
+
+    public OAuth2UserImpl(OAuth2Client client,
+                          Session session,
+                          long id,
+                          String name,
+                          String discriminator,
+                          String avatar,
+                          String email,
+                          boolean verified,
+                          boolean mfaEnabled) {
         this.client = client;
         this.session = session;
         this.id = id;
@@ -51,136 +60,122 @@ public OAuth2UserImpl(OAuth2Client client, Session session, long id, String name
     }
 
     @Override
-    public OAuth2Client getClient()
-    {
+    public OAuth2Client getClient() {
         return client;
     }
 
     @Override
-    public Session getSession()
-    {
+    public Session getSession() {
         return session;
     }
 
     @Override
-    public String getId()
-    {
+    public @NotNull String getId() {
         return Long.toUnsignedString(id);
     }
 
     @Override
-    public long getIdLong()
-    {
+    public long getIdLong() {
         return id;
     }
 
     @Override
-    public String getName()
-    {
+    public String getName() {
         return name;
     }
 
     @Override
-    public String getEmail()
-    {
-        if(Scope.contains(getSession().getScopes(), Scope.EMAIL))
+    public String getEmail() {
+        if (Scope.contains(getSession().getScopes(), Scope.EMAIL))
             throw new MissingScopeException("get email for user", Scope.EMAIL);
         return email;
     }
-    
+
     @Override
-    public boolean isVerified()
-    {
+    public boolean isVerified() {
         return verified;
     }
-    
+
     @Override
-    public boolean isMfaEnabled()
-    {
+    public boolean isMfaEnabled() {
         return mfaEnabled;
     }
 
     @Override
-    public String getDiscriminator()
-    {
+    public String getDiscriminator() {
         return discriminator;
     }
 
     @Override
-    public String getAvatarId()
-    {
+    public String getAvatarId() {
         return avatar;
     }
 
     @Override
-    public String getAvatarUrl()
-    {
-        return getAvatarId() == null ? null : "https://cdn.discordapp.com/avatars/" + getId() + "/" + getAvatarId()
-            + (getAvatarId().startsWith("a_") ? ".gif" : ".png");
+    public String getAvatarUrl() {
+        if (getAvatarId() == null) {
+            return null;
+        }
+        if (getAvatarId().startsWith("a_")) {
+            return "https://cdn.discordapp.com/avatars/" + getId() + "/" + getAvatarId() + ".gif";
+        }
+
+        return "https://cdn.discordapp.com/avatars/" + getId() + "/" + getAvatarId() + ".png";
     }
 
     @Override
-    public String getDefaultAvatarId()
-    {
+    public String getDefaultAvatarId() {
         return DEFAULT_AVATARS[Integer.parseInt(getDiscriminator()) % DEFAULT_AVATARS.length];
     }
 
     @Override
-    public String getDefaultAvatarUrl()
-    {
+    public String getDefaultAvatarUrl() {
         return "https://discord.com/assets/" + getDefaultAvatarId() + ".png";
     }
 
     @Override
-    public String getEffectiveAvatarUrl()
-    {
+    public String getEffectiveAvatarUrl() {
         return getAvatarUrl() == null ? getDefaultAvatarUrl() : getAvatarUrl();
     }
 
     @Override
-    public String getAsMention()
-    {
+    public @NotNull String getAsMention() {
         return "<@" + id + '>';
     }
-    
+
     @Override
-    public User getJDAUser(JDA jda)
-    {
+    public User getJDAUser(JDA jda) {
         return jda.getUserById(id);
     }
-    
+
     @Override
-    public User getJDAUser(ShardManager shardManager)
-    {
+    public User getJDAUser(ShardManager shardManager) {
         return shardManager.getUserById(id);
     }
-    
+
     @Override
-    public boolean equals(Object o)
-    {
+    public boolean equals(Object o) {
         if (!(o instanceof OAuth2UserImpl))
             return false;
         OAuth2UserImpl oUser = (OAuth2UserImpl) o;
         return this == oUser || this.id == oUser.id;
     }
-    
+
     @Override
-    public int hashCode()
-    {
+    public int hashCode() {
         return Long.hashCode(id);
     }
 
     @Override
-    public String toString()
-    {
+    public String toString() {
         return "U:" + getName() + '(' + id + ')';
     }
 
-    private static final String[] DEFAULT_AVATARS = new String[] {
-        "6debd47ed13483642cf09e832ed0bc1b",
-        "322c936a8c8be1b803cd94861bdfa868",
-        "dd4dbc0016779df1378e7812eabaa04d",
-        "0e291f67c9274a1abdddeb3fd919cbaa",
-        "1cbd08c76f8af6dddce02c5138971129"
+    private static final String[] DEFAULT_AVATARS = new String[]{
+            "6debd47ed13483642cf09e832ed0bc1b",
+            "322c936a8c8be1b803cd94861bdfa868",
+            "dd4dbc0016779df1378e7812eabaa04d",
+            "0e291f67c9274a1abdddeb3fd919cbaa",
+            "1cbd08c76f8af6dddce02c5138971129"
     };
 }
diff --git a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/requests/OAuth2Action.java b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/requests/OAuth2Action.java
index a5c3bec1..dfd761f2 100644
--- a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/requests/OAuth2Action.java
+++ b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/requests/OAuth2Action.java
@@ -16,7 +16,7 @@
 package com.jagrosh.jdautilities.oauth2.requests;
 
 import com.jagrosh.jdautilities.oauth2.entities.impl.OAuth2ClientImpl;
-import net.dv8tion.jda.internal.requests.Method;
+import net.dv8tion.jda.api.requests.Method;
 import net.dv8tion.jda.internal.utils.Checks;
 import okhttp3.Headers;
 import okhttp3.Request;
@@ -39,16 +39,14 @@
  */
 public abstract class OAuth2Action<T>
 {
-    protected static final Consumer DEFAULT_SUCCESS = t -> {};
-    protected static final Consumer<Throwable> DEFAULT_FAILURE = t -> {
-        OAuth2Requester.LOGGER.error("Requester encountered an error while processing response!", t);
-    };
+    protected final Consumer<T> DEFAULT_SUCCESS = t -> {};
+    protected static final Consumer<Throwable> DEFAULT_FAILURE = t -> OAuth2Requester.LOGGER.error("Requester encountered an error while processing response!", t);
 
     protected final OAuth2ClientImpl client;
     protected final Method method;
     protected final String url;
 
-    public OAuth2Action(OAuth2ClientImpl client, Method method, String url)
+    protected OAuth2Action(OAuth2ClientImpl client, Method method, String url)
     {
         Checks.notNull(client, "OAuth2Client");
         Checks.notNull(method, "Request method");
@@ -81,6 +79,9 @@ protected Request buildRequest()
             case POST:
                 builder.post(getBody());
                 break;
+            case PUT:
+                builder.put(getBody());
+                break;
             default:
                 throw new IllegalArgumentException(method.name() + " requests are not supported!");
         }
diff --git a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/requests/OAuth2Requester.java b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/requests/OAuth2Requester.java
index 42a78cfc..d87d78c5 100644
--- a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/requests/OAuth2Requester.java
+++ b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/requests/OAuth2Requester.java
@@ -18,6 +18,7 @@
 import com.jagrosh.jdautilities.commons.JDAUtilitiesInfo;
 import net.dv8tion.jda.internal.utils.JDALogger;
 import okhttp3.*;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 
 import java.io.IOException;
@@ -57,21 +58,21 @@ public void onResponse(Call call, Response response)
                         if(value != null)
                             success.accept(value);
                     }
-                    catch(Throwable t)
+                    catch(Exception ex)
                     {
-                        LOGGER.error("OAuth2Action success callback threw an exception!", t);
+                        LOGGER.error("OAuth2Action success callback threw an exception!", ex);
                     }
                 }
-                catch(Throwable t)
+                catch(Exception ex)
                 {
                     // Handle end-user exception differently
                     try
                     {
-                        failure.accept(t);
+                        failure.accept(ex);
                     }
-                    catch(Throwable t1)
+                    catch(Exception ex1)
                     {
-                        LOGGER.error("OAuth2Action success callback threw an exception!", t1);
+                        LOGGER.error("OAuth2Action success callback threw an exception!", ex1);
                     }
                 }
                 finally
@@ -81,7 +82,7 @@ public void onResponse(Call call, Response response)
             }
 
             @Override
-            public void onFailure(Call call, IOException e)
+            public void onFailure(@NotNull Call call, @NotNull IOException e)
             {
                 LOGGER.error("Requester encountered an error when submitting a request!", e);
             }
@@ -98,7 +99,7 @@ <T> T submitSync(OAuth2Action<T> request) throws IOException
         }
     }
 
-    private static void logSuccessfulRequest(OAuth2Action request)
+    private static void logSuccessfulRequest(OAuth2Action<?> request)
     {
         LOGGER.debug("Got a response for {} - {}\nHeaders: {}", request.getMethod(),
             request.getUrl(), request.getHeaders());
diff --git a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/requests/OAuth2URL.java b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/requests/OAuth2URL.java
index 87314239..23d049f0 100644
--- a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/requests/OAuth2URL.java
+++ b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/requests/OAuth2URL.java
@@ -38,7 +38,8 @@ public enum OAuth2URL
         "client_secret=%s",
         "scope=%s"),
     CURRENT_USER("/users/@me"),
-    CURRENT_USER_GUILDS("/users/@me/guilds");
+    CURRENT_USER_GUILDS("/users/@me/guilds"),
+    GUILD_JOIN("/guilds/%guild_id%/members/%user_id%");
 
     public static final String BASE_API_URL = String.format("https://discord.com/api/v%d", OAuth2Client.DISCORD_REST_VERSION);
 
@@ -62,7 +63,7 @@ public enum OAuth2URL
                 b.append(queryParams[i]);
             }
 
-            this.formattableRoute = route + b.toString();
+            this.formattableRoute = route + b;
             this.queryParams = b.toString();
         }
         else
@@ -93,6 +94,22 @@ public String getRouteWithBaseUrl()
 
     public String compile(Object... values)
     {
-        return BASE_API_URL + (hasQueryParams? String.format(formattableRoute, values) : formattableRoute);
+        if (hasQueryParams) {
+            return BASE_API_URL + String.format(formattableRoute, values);
+        } else {
+            String formatted = formattableRoute;
+
+            // TODO find a better way to do this.
+
+            if (formatted.contains("%guild_id%") && values.length >= 1) {
+                formatted = formatted.replace("%guild_id%", (String)values[0]);
+            }
+
+            if (formatted.contains("%user_id%") && values.length >= 2) {
+                formatted = formatted.replace("%user_id%", (String)values[1]);
+            }
+
+            return BASE_API_URL + formatted;
+        }
     }
 }
diff --git a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/session/DefaultSessionController.java b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/session/DefaultSessionController.java
index 1ff4ea1b..3ebcd474 100644
--- a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/session/DefaultSessionController.java
+++ b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/session/DefaultSessionController.java
@@ -43,9 +43,11 @@ public DefaultSession createSession(SessionData data)
         return created;
     }
 
-    public class DefaultSession implements Session
+    public static class DefaultSession implements Session
     {
-        private final String accessToken, refreshToken, tokenType;
+        private final String accessToken,
+                refreshToken,
+                tokenType;
         private final OffsetDateTime expiration;
         private final Scope[] scopes;
         
diff --git a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/session/SessionData.java b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/session/SessionData.java
index 6a0fe93d..503c1034 100644
--- a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/session/SessionData.java
+++ b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/session/SessionData.java
@@ -28,7 +28,10 @@
  */
 public class SessionData
 {
-    private final String identifier, accessToken, refreshToken, tokenType;
+    private final String identifier,
+            accessToken,
+            refreshToken,
+            tokenType;
     private final OffsetDateTime expiration;
     private final Scope[] scopes;
 
@@ -120,4 +123,9 @@ public String toString()
             getIdentifier(), getAccessToken(), getRefreshToken(), getTokenType(),
             getExpiration().format(DateTimeFormatter.RFC_1123_DATE_TIME));
     }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
 }
diff --git a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/state/DefaultStateController.java b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/state/DefaultStateController.java
index ad4f4268..eb8f1814 100644
--- a/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/state/DefaultStateController.java
+++ b/oauth2/src/main/java/com/jagrosh/jdautilities/oauth2/state/DefaultStateController.java
@@ -15,6 +15,7 @@
  */
 package com.jagrosh.jdautilities.oauth2.state;
 
+import java.security.SecureRandom;
 import java.util.HashMap;
 
 /**
@@ -24,8 +25,9 @@
  */
 public class DefaultStateController implements StateController
 {
-    private final static String CHARACTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+    private static final String CHARACTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
     private final HashMap<String,String> states = new HashMap<>();
+    private static final SecureRandom secureRandom = new SecureRandom();
     
     @Override
     public String generateNewState(String redirectUri)
@@ -45,7 +47,7 @@ private static String randomState()
     {
         StringBuilder sb = new StringBuilder();
         for(int i = 0; i < 10; i++)
-            sb.append(CHARACTERS.charAt((int)(Math.random()*CHARACTERS.length())));
+            sb.append(CHARACTERS.charAt(((int) (secureRandom.nextDouble() * CHARACTERS.length()))));
         return sb.toString();
     }
 }

From fdbc29847544bddd9bd63f8398c5ef0b89fa7c9e Mon Sep 17 00:00:00 2001
From: Presti <dxssucuk@hotmail.com>
Date: Thu, 4 May 2023 11:31:33 +0200
Subject: [PATCH 2/2] CVE mitigation

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 78b2f364..6dfc5517 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,10 +37,10 @@ allprojects {
 
     ext {
         jdaVersion = '5.0.0-beta.8'
-        slf4jVersion = '1.7.25'
+        slf4jVersion = '2.0.7'
         okhttpVersion = '3.13.0'
         findbugsVersion = '3.0.2'
-        jsonVersion = '20160810'
+        jsonVersion = '20230227'
         junitVersion = '4.13.1' // TODO Move to junit 5?
 
         dependencies {