From 2316f058a5606e403d6f25cd78339b70f20cf944 Mon Sep 17 00:00:00 2001
From: Austin Keener <keeneraustin@yahoo.com>
Date: Sat, 14 May 2022 14:21:44 -0400
Subject: [PATCH 01/17] First pass on new union types

---
 .../jda/api/entities/ChannelField.java        |  6 +-
 .../net/dv8tion/jda/api/entities/Guild.java   |  9 +-
 .../jda/api/entities/GuildMessageChannel.java |  5 +-
 ...ageChannel.java => IWebhookContainer.java} | 67 +++++---------
 .../net/dv8tion/jda/api/entities/Member.java  |  7 +-
 .../net/dv8tion/jda/api/entities/Message.java |  6 +-
 .../jda/api/entities/MessageHistory.java      |  5 +-
 .../jda/api/entities/MessageReaction.java     | 13 +--
 .../jda/api/entities/MessageReference.java    |  5 +-
 .../dv8tion/jda/api/entities/NewsChannel.java |  4 +-
 .../jda/api/entities/StageChannel.java        |  2 +-
 .../api/entities/StandardGuildChannel.java    | 52 +++++++++++
 .../entities/StandardGuildMessageChannel.java | 69 ++++++++++++++
 .../dv8tion/jda/api/entities/TextChannel.java |  6 +-
 .../jda/api/entities/ThreadChannel.java       |  8 +-
 .../jda/api/entities/VoiceChannel.java        |  2 +-
 .../net/dv8tion/jda/api/entities/Webhook.java | 12 ++-
 .../unions/DefaultGuildChannelUnion.java      | 38 ++++++++
 .../unions/GuildMessageChannelUnion.java      | 44 +++++++++
 .../channel/unions/IThreadContainerUnion.java | 41 +++++++++
 .../unions/IWebhookContainerUnion.java        | 41 +++++++++
 .../channel/unions/MessageChannelUnion.java   | 40 +++++++++
 .../unions/StandardGuildChannelUnion.java     | 38 ++++++++
 .../MessageContextInteractionEvent.java       |  6 +-
 .../command/SlashCommandInteractionEvent.java |  5 +-
 ...enericComponentInteractionCreateEvent.java |  8 +-
 .../events/message/GenericMessageEvent.java   | 10 ++-
 .../message/MessageBulkDeleteEvent.java       |  5 +-
 .../jda/api/events/user/UserTypingEvent.java  |  5 +-
 .../jda/api/interactions/Interaction.java     |  5 +-
 .../interactions/commands/OptionMapping.java  |  5 +-
 .../commands/SlashCommandInteraction.java     | 10 +--
 .../context/MessageContextInteraction.java    | 10 +--
 .../components/ComponentInteraction.java      |  3 +-
 .../jda/api/managers/WebhookManager.java      | 12 ++-
 .../channel/concrete/NewsChannelManager.java  |  4 +-
 .../channel/concrete/StageChannelManager.java |  6 +-
 .../channel/concrete/TextChannelManager.java  |  4 +-
 .../channel/concrete/VoiceChannelManager.java |  6 +-
 .../StandardGuildChannelManager.java          | 44 +++++++++
 ...> StandardGuildMessageChannelManager.java} | 32 +++----
 .../requests/restaction/MessageAction.java    |  3 +-
 .../requests/restaction/WebhookAction.java    |  6 +-
 .../pagination/MessagePaginationAction.java   |  3 +-
 .../ThreadChannelPaginationAction.java        |  3 +-
 .../entities/AbstractChannelImpl.java         | 67 ++++++++++++++
 .../internal/entities/AbstractMessage.java    |  6 +-
 .../AbstractStandardGuildChannelImpl.java     | 73 +++++++++++++++
 ...stractStandardGuildMessageChannelImpl.java | 77 ++++++++++++++++
 .../jda/internal/entities/EntityBuilder.java  |  7 +-
 .../jda/internal/entities/GuildImpl.java      |  5 +-
 .../jda/internal/entities/MemberImpl.java     |  5 +-
 .../internal/entities/NewsChannelImpl.java    | 89 ++----------------
 .../internal/entities/ReceivedMessage.java    | 10 ++-
 .../internal/entities/StageChannelImpl.java   | 53 ++---------
 .../internal/entities/TextChannelImpl.java    | 90 ++-----------------
 .../internal/entities/ThreadChannelImpl.java  |  5 +-
 .../internal/entities/VoiceChannelImpl.java   | 50 ++---------
 .../jda/internal/entities/WebhookImpl.java    | 18 ++--
 .../attribute/IThreadContainerMixin.java      |  6 +-
 .../IWebhookContainerMixin.java}              | 34 ++-----
 .../middleman/GuildMessageChannelMixin.java   |  7 +-
 .../middleman/MessageChannelMixin.java        | 55 ++++++------
 .../middleman/StandardGuildChannelMixin.java  | 34 +++++++
 .../StandardGuildMessageChannelMixin.java     | 48 ++++++++++
 .../CommandInteractionPayloadImpl.java        |  6 +-
 .../MessageContextInteractionImpl.java        |  6 +-
 .../command/SlashCommandInteractionImpl.java  |  6 +-
 .../component/ComponentInteractionImpl.java   |  6 +-
 .../internal/managers/WebhookManagerImpl.java | 10 +--
 .../restaction/MessageActionImpl.java         |  5 +-
 .../restaction/WebhookActionImpl.java         | 11 +--
 .../MessagePaginationActionImpl.java          |  5 +-
 .../ThreadChannelPaginationActionImpl.java    |  5 +-
 74 files changed, 998 insertions(+), 516 deletions(-)
 rename src/main/java/net/dv8tion/jda/api/entities/{BaseGuildMessageChannel.java => IWebhookContainer.java} (73%)
 create mode 100644 src/main/java/net/dv8tion/jda/api/entities/StandardGuildChannel.java
 create mode 100644 src/main/java/net/dv8tion/jda/api/entities/StandardGuildMessageChannel.java
 create mode 100644 src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java
 create mode 100644 src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildMessageChannelUnion.java
 create mode 100644 src/main/java/net/dv8tion/jda/api/entities/channel/unions/IThreadContainerUnion.java
 create mode 100644 src/main/java/net/dv8tion/jda/api/entities/channel/unions/IWebhookContainerUnion.java
 create mode 100644 src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java
 create mode 100644 src/main/java/net/dv8tion/jda/api/entities/channel/unions/StandardGuildChannelUnion.java
 create mode 100644 src/main/java/net/dv8tion/jda/api/managers/channel/middleman/StandardGuildChannelManager.java
 rename src/main/java/net/dv8tion/jda/api/managers/channel/middleman/{BaseGuildMessageChannelManager.java => StandardGuildMessageChannelManager.java} (53%)
 create mode 100644 src/main/java/net/dv8tion/jda/internal/entities/AbstractStandardGuildChannelImpl.java
 create mode 100644 src/main/java/net/dv8tion/jda/internal/entities/AbstractStandardGuildMessageChannelImpl.java
 rename src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/{middleman/BaseGuildMessageChannelMixin.java => attribute/IWebhookContainerMixin.java} (76%)
 create mode 100644 src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/StandardGuildChannelMixin.java
 create mode 100644 src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/StandardGuildMessageChannelMixin.java

diff --git a/src/main/java/net/dv8tion/jda/api/entities/ChannelField.java b/src/main/java/net/dv8tion/jda/api/entities/ChannelField.java
index efc50428ff..85168f7046 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/ChannelField.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/ChannelField.java
@@ -78,16 +78,16 @@ public enum ChannelField
      *
      * Limited to {@link NewsChannel NewsChannels} and {@link TextChannel TextChannels}.
      *
-     * @see BaseGuildMessageChannel#getTopic()
+     * @see StandardGuildMessageChannel#getTopic()
      */
     TOPIC("topic", AuditLogKey.CHANNEL_TOPIC),
 
     /**
      * The NSFW state of the channel.
      *
-     * Limited to {@link BaseGuildMessageChannel Base Guild Channels} (and implementations).
+     * Limited to {@link StandardGuildMessageChannel StandardGuildMessageChannels} (and implementations).
      *
-     * @see BaseGuildMessageChannel#isNSFW()
+     * @see StandardGuildMessageChannel#isNSFW()
      */
     NSFW("nsfw", AuditLogKey.CHANNEL_NSFW),
 
diff --git a/src/main/java/net/dv8tion/jda/api/entities/Guild.java b/src/main/java/net/dv8tion/jda/api/entities/Guild.java
index fbddaa75fa..22d1f87bd1 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/Guild.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/Guild.java
@@ -19,6 +19,7 @@
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.Region;
 import net.dv8tion.jda.api.entities.channel.IGuildChannelContainer;
+import net.dv8tion.jda.api.entities.channel.unions.DefaultGuildChannelUnion;
 import net.dv8tion.jda.api.entities.templates.Template;
 import net.dv8tion.jda.api.exceptions.InsufficientPermissionException;
 import net.dv8tion.jda.api.interactions.commands.Command;
@@ -1943,17 +1944,17 @@ default RestAction<ListedEmote> retrieveEmote(@Nonnull Emote emote)
     Role getPublicRole();
 
     /**
-     * The default {@link net.dv8tion.jda.api.entities.BaseGuildMessageChannel BaseGuildMessageChannel} for a {@link net.dv8tion.jda.api.entities.Guild Guild}.
+     * The default {@link net.dv8tion.jda.api.entities.StandardGuildChannel} for a {@link net.dv8tion.jda.api.entities.Guild Guild}.
      * <br>This is the channel that the Discord client will default to opening when a Guild is opened for the first time when accepting an invite
-     * that is not directed at a specific {@link net.dv8tion.jda.api.entities.BaseGuildMessageChannel BaseGuildMessageChannel}.
+     * that is not directed at a specific {@link IInviteContainer channel}.
      *
      * <p>Note: This channel is the first channel in the guild (ordered by position) that the {@link #getPublicRole()}
      * has the {@link net.dv8tion.jda.api.Permission#VIEW_CHANNEL Permission.VIEW_CHANNEL} in.
      *
-     * @return The {@link net.dv8tion.jda.api.entities.BaseGuildMessageChannel BaseGuildMessageChannel} representing the default channel for this guild
+     * @return The {@link net.dv8tion.jda.api.entities.StandardGuildChannel channel} representing the default channel for this guild
      */
     @Nullable
-    BaseGuildMessageChannel getDefaultChannel();
+    DefaultGuildChannelUnion getDefaultChannel();
 
     /**
      * Returns the {@link GuildManager GuildManager} for this Guild, used to modify
diff --git a/src/main/java/net/dv8tion/jda/api/entities/GuildMessageChannel.java b/src/main/java/net/dv8tion/jda/api/entities/GuildMessageChannel.java
index ec1d9a578e..9c49822020 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/GuildMessageChannel.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/GuildMessageChannel.java
@@ -15,10 +15,9 @@
 /**
  * Represents all message channels present in guilds.
  *
- * This includes channels that are not included in {@link BaseGuildMessageChannel BaseGuildMessageChannel}, such as {@link ThreadChannel}.
- *
- * @see BaseGuildMessageChannel
+ * This includes channels that are not included in {@link StandardGuildMessageChannel}, such as {@link ThreadChannel}.
  *
+ * @see StandardGuildMessageChannel
  */
 public interface GuildMessageChannel extends GuildChannel, MessageChannel
 {
diff --git a/src/main/java/net/dv8tion/jda/api/entities/BaseGuildMessageChannel.java b/src/main/java/net/dv8tion/jda/api/entities/IWebhookContainer.java
similarity index 73%
rename from src/main/java/net/dv8tion/jda/api/entities/BaseGuildMessageChannel.java
rename to src/main/java/net/dv8tion/jda/api/entities/IWebhookContainer.java
index da4e8a38b5..b19f30037a 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/BaseGuildMessageChannel.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/IWebhookContainer.java
@@ -1,51 +1,38 @@
+/*
+ * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package net.dv8tion.jda.api.entities;
 
-import net.dv8tion.jda.api.managers.channel.middleman.BaseGuildMessageChannelManager;
 import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.requests.restaction.AuditableRestAction;
-import net.dv8tion.jda.api.requests.restaction.ChannelAction;
 import net.dv8tion.jda.api.requests.restaction.WebhookAction;
 
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.util.List;
 
-
 /**
- * Represents a standard {@link Guild Guild} {@link MessageChannel MessageChannel}.
- * <br>These are the "<i>normal</i>" message channels that are present in the channel sidebar.
- * These are <b>not</b> {@link ThreadChannel ThreadChannels}.
+ * Represents a {@link GuildChannel} that is capable of utilizing <a href="https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks" target="_blank">webhooks</a>.
  *
- * @see net.dv8tion.jda.api.entities.GuildMessageChannel
- * @see TextChannel
- * @see NewsChannel
+ * Webhooks can be used to integrate third-party systems into Discord by way of sending information via messages.
  */
-public interface BaseGuildMessageChannel extends GuildMessageChannel, IThreadContainer, GuildChannel, ICategorizableChannel, ICopyableChannel, IPermissionContainer, IMemberContainer, IInviteContainer, IPositionableChannel
+public interface IWebhookContainer extends GuildChannel
 {
-    //TODO-v5: Docs
-    @Override
-    @Nonnull
-    BaseGuildMessageChannelManager<?, ?> getManager();
-
-    /**
-     * The topic set for this TextChannel.
-     * <br>If no topic has been set, this returns null.
-     *
-     * @return Possibly-null String containing the topic of this TextChannel.
-     */
-    @Nullable
-    String getTopic();
-
-    /**
-     * Whether or not this channel is considered as "NSFW" (Not-Safe-For-Work)
-     *
-     * @return True, If this TextChannel is considered NSFW by the official Discord Client
-     */
-    boolean isNSFW();
-
-    /**
-     * Retrieves the {@link net.dv8tion.jda.api.entities.Webhook Webhooks} attached to this TextChannel.
+     /**
+     * Retrieves the {@link net.dv8tion.jda.api.entities.Webhook Webhooks} attached to this channel.
      *
      * <p>Possible ErrorResponses include:
      * <ul>
@@ -102,7 +89,7 @@ public interface BaseGuildMessageChannel extends GuildMessageChannel, IThreadCon
      * <p>Possible ErrorResponses include:
      * <ul>
      *     <li>{@link net.dv8tion.jda.api.requests.ErrorResponse#UNKNOWN_WEBHOOK}
-     *     <br>The provided id does not refer to a WebHook present in this TextChannel, either due
+     *     <br>The provided id does not refer to a WebHook present in this chanel, either due
      *         to it not existing or having already been deleted.</li>
      *
      *     <li>{@link net.dv8tion.jda.api.requests.ErrorResponse#UNKNOWN_CHANNEL UNKNOWN_CHANNEL}
@@ -130,14 +117,4 @@ public interface BaseGuildMessageChannel extends GuildMessageChannel, IThreadCon
     @Nonnull
     @CheckReturnValue
     AuditableRestAction<Void> deleteWebhookById(@Nonnull String id);
-
-    @Override
-    @Nonnull
-    @CheckReturnValue
-    ChannelAction<? extends BaseGuildMessageChannel> createCopy(@Nonnull Guild guild);
-
-    @Override
-    @Nonnull
-    @CheckReturnValue
-    ChannelAction<? extends BaseGuildMessageChannel> createCopy();
 }
diff --git a/src/main/java/net/dv8tion/jda/api/entities/Member.java b/src/main/java/net/dv8tion/jda/api/entities/Member.java
index fbb347b253..e2a2cfe358 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/Member.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/Member.java
@@ -19,6 +19,7 @@
 import net.dv8tion.jda.annotations.Incubating;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.OnlineStatus;
+import net.dv8tion.jda.api.entities.channel.unions.DefaultGuildChannelUnion;
 import net.dv8tion.jda.api.requests.restaction.AuditableRestAction;
 import net.dv8tion.jda.api.utils.ImageProxy;
 
@@ -422,18 +423,18 @@ default ImageProxy getEffectiveAvatar()
     boolean isPending();
 
     /**
-     * The default {@link net.dv8tion.jda.api.entities.BaseGuildMessageChannel BaseGuildMessageChannel} for a {@link net.dv8tion.jda.api.entities.Member Member}.
+     * The default {@link net.dv8tion.jda.api.entities.StandardGuildChannel channel} for a {@link net.dv8tion.jda.api.entities.Member Member}.
      * <br>This is the channel that the Discord client will default to opening when a Guild is opened for the first time
      * after joining the guild.
      * <br>The default channel is the channel with the highest position in which the member has
      * {@link net.dv8tion.jda.api.Permission#VIEW_CHANNEL Permission.VIEW_CHANNEL} permissions. If this requirement doesn't apply for
      * any channel in the guild, this method returns {@code null}.
      *
-     * @return The {@link net.dv8tion.jda.api.entities.BaseGuildMessageChannel BaseGuildMessageChannel} representing the default channel for this member
+     * @return The {@link StandardGuildChannel channel} representing the default channel for this member
      *         or null if no such channel exists.
      */
     @Nullable
-    BaseGuildMessageChannel getDefaultChannel();
+    DefaultGuildChannelUnion getDefaultChannel();
 
     /**
      * Bans this Member and deletes messages sent by the user based on the amount of delDays.
diff --git a/src/main/java/net/dv8tion/jda/api/entities/Message.java b/src/main/java/net/dv8tion/jda/api/entities/Message.java
index 863d5c0e05..94c45ac438 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/Message.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/Message.java
@@ -20,6 +20,8 @@
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.MessageBuilder;
 import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.channel.unions.GuildMessageChannelUnion;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.exceptions.HttpException;
 import net.dv8tion.jda.api.exceptions.InsufficientPermissionException;
 import net.dv8tion.jda.api.interactions.InteractionType;
@@ -493,7 +495,7 @@ default boolean isFromGuild()
      * @return The MessageChannel of this Message
      */
     @Nonnull
-    MessageChannel getChannel();
+    MessageChannelUnion getChannel();
 
     /**
      * Returns the {@link net.dv8tion.jda.api.entities.GuildMessageChannel GuildMessageChannel} that this message was sent in
@@ -507,7 +509,7 @@ default boolean isFromGuild()
      * @return The MessageChannel of this Message
      */
     @Nonnull
-    GuildMessageChannel getGuildChannel();
+    GuildMessageChannelUnion getGuildChannel();
 
     /**
      * Returns the {@link net.dv8tion.jda.api.entities.PrivateChannel PrivateChannel} that this message was sent in.
diff --git a/src/main/java/net/dv8tion/jda/api/entities/MessageHistory.java b/src/main/java/net/dv8tion/jda/api/entities/MessageHistory.java
index 5dedaf0386..b06aa6389a 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/MessageHistory.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/MessageHistory.java
@@ -18,6 +18,7 @@
 
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.exceptions.InsufficientPermissionException;
 import net.dv8tion.jda.api.exceptions.MissingAccessException;
 import net.dv8tion.jda.api.requests.Request;
@@ -124,9 +125,9 @@ public boolean isEmpty()
      * @return The MessageChannel of this history.
      */
     @Nonnull
-    public MessageChannel getChannel()
+    public MessageChannelUnion getChannel()
     {
-        return channel;
+        return (MessageChannelUnion) channel;
     }
 
     /**
diff --git a/src/main/java/net/dv8tion/jda/api/entities/MessageReaction.java b/src/main/java/net/dv8tion/jda/api/entities/MessageReaction.java
index bc38cf89b5..4d7d7de14a 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/MessageReaction.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/MessageReaction.java
@@ -18,6 +18,8 @@
 
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.channel.unions.GuildMessageChannelUnion;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.exceptions.InsufficientPermissionException;
 import net.dv8tion.jda.api.exceptions.PermissionException;
 import net.dv8tion.jda.api.requests.RestAction;
@@ -203,21 +205,20 @@ public PrivateChannel getPrivateChannel()
      * @return The channel this Reaction was used in
      */
     @Nonnull
-    public MessageChannel getChannel()
+    public MessageChannelUnion getChannel()
     {
-        return channel;
+        return (MessageChannelUnion) channel;
     }
 
     /**
-     * The {@link net.dv8tion.jda.api.entities.GuildMessageChannel GuildMessageChannel}
-     * this Reaction was used in.
+     * The {@link net.dv8tion.jda.api.entities.GuildMessageChannel channel} this Reaction was used in.
      *
      * @return The channel this Reaction was used in or null if it wasn't used in a Guild
      */
     @Nullable
-    public GuildMessageChannel getGuildChannel()
+    public GuildMessageChannelUnion getGuildChannel()
     {
-        return getChannel() instanceof GuildMessageChannel ? (GuildMessageChannel) getChannel() : null;
+        return getChannel() instanceof GuildMessageChannel ? (GuildMessageChannelUnion) getChannel() : null;
     }
 
     /**
diff --git a/src/main/java/net/dv8tion/jda/api/entities/MessageReference.java b/src/main/java/net/dv8tion/jda/api/entities/MessageReference.java
index c7dd5a152e..c6117d6b50 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/MessageReference.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/MessageReference.java
@@ -17,6 +17,7 @@
 
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.exceptions.InsufficientPermissionException;
 import net.dv8tion.jda.api.exceptions.MissingAccessException;
 import net.dv8tion.jda.api.requests.RestAction;
@@ -187,9 +188,9 @@ public Message getMessage()
      * @see    #getChannelId()
      */
     @Nullable
-    public MessageChannel getChannel()
+    public MessageChannelUnion getChannel()
     {
-        return channel;
+        return (MessageChannelUnion) channel;
     }
 
 
diff --git a/src/main/java/net/dv8tion/jda/api/entities/NewsChannel.java b/src/main/java/net/dv8tion/jda/api/entities/NewsChannel.java
index 76ae965a52..c2a6af9061 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/NewsChannel.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/NewsChannel.java
@@ -14,7 +14,7 @@
 import javax.annotation.Nonnull;
 
 /**
- * Represents {@link BaseGuildMessageChannel} that are News Channels.
+ * Represents {@link StandardGuildMessageChannel} that are News Channels.
  *
  * The Discord client may refer to these as Announcement Channels.
  *
@@ -26,7 +26,7 @@
  * @see Message#getFlags()
  * @see net.dv8tion.jda.api.entities.Message.MessageFlag#CROSSPOSTED
  */
-public interface NewsChannel extends BaseGuildMessageChannel
+public interface NewsChannel extends StandardGuildMessageChannel
 {
     /**
      * Subscribes to the crossposted messages in this channel.
diff --git a/src/main/java/net/dv8tion/jda/api/entities/StageChannel.java b/src/main/java/net/dv8tion/jda/api/entities/StageChannel.java
index 9a930a65c7..61d71c88c6 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/StageChannel.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/StageChannel.java
@@ -35,7 +35,7 @@
  *
  * <p>This is a specialized AudioChannel that can be used to host events with speakers and listeners.
  */
-public interface StageChannel extends GuildChannel, AudioChannel, ICategorizableChannel, ICopyableChannel, IPositionableChannel, IPermissionContainer, IMemberContainer, IInviteContainer
+public interface StageChannel extends GuildChannel, AudioChannel, StandardGuildChannel
 {
     /**
      * {@link StageInstance} attached to this stage channel.
diff --git a/src/main/java/net/dv8tion/jda/api/entities/StandardGuildChannel.java b/src/main/java/net/dv8tion/jda/api/entities/StandardGuildChannel.java
new file mode 100644
index 0000000000..06c4f09a4a
--- /dev/null
+++ b/src/main/java/net/dv8tion/jda/api/entities/StandardGuildChannel.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dv8tion.jda.api.entities;
+
+import net.dv8tion.jda.api.managers.channel.middleman.StandardGuildChannelManager;
+import net.dv8tion.jda.api.requests.restaction.ChannelAction;
+
+import javax.annotation.CheckReturnValue;
+import javax.annotation.Nonnull;
+
+/**
+ * Represents a standard {@link GuildChannel} which are the "<i>normal</i>" channels that are present in the channel sidebar.
+ * They include functionality "expected" of normal Discord channels like {@link IPermissionContainer permissions},
+ * {@link IInviteContainer invite support}, {@link IPositionableChannel positioning}, the ability
+ * {@link ICategorizableChannel to be categorized}, and more.
+ *
+ * @see net.dv8tion.jda.api.entities.GuildMessageChannel
+ * @see TextChannel
+ * @see NewsChannel
+ * @see StageChannel
+ * @see VoiceChannel
+ */
+public interface StandardGuildChannel extends GuildChannel, IPermissionContainer, IPositionableChannel, ICopyableChannel, IMemberContainer, IInviteContainer, ICategorizableChannel
+{
+    @Nonnull
+    @Override
+    StandardGuildChannelManager<?, ?> getManager();
+
+    @Override
+    @Nonnull
+    @CheckReturnValue
+    ChannelAction<? extends StandardGuildChannel> createCopy(@Nonnull Guild guild);
+
+    @Override
+    @Nonnull
+    @CheckReturnValue
+    ChannelAction<? extends StandardGuildChannel> createCopy();
+}
diff --git a/src/main/java/net/dv8tion/jda/api/entities/StandardGuildMessageChannel.java b/src/main/java/net/dv8tion/jda/api/entities/StandardGuildMessageChannel.java
new file mode 100644
index 0000000000..cb760a0bc0
--- /dev/null
+++ b/src/main/java/net/dv8tion/jda/api/entities/StandardGuildMessageChannel.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dv8tion.jda.api.entities;
+
+import net.dv8tion.jda.api.managers.channel.middleman.StandardGuildMessageChannelManager;
+import net.dv8tion.jda.api.requests.restaction.ChannelAction;
+
+import javax.annotation.CheckReturnValue;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * Represents a standard {@link GuildMessageChannel} which are the "<i>normal</i>" message channels that are present in the channel sidebar.
+ * They include all the functionality of {@link StandardGuildChannel StandardGuildChannels} along with the extra functionality
+ *  expected of normal guild message channels like {@link GuildMessageChannel messaging}, {@link IThreadContainer thread support}, and {@link IWebhookContainer webhooks}.
+ *
+ * <br>These are <b>not</b> {@link ThreadChannel ThreadChannels}.
+ *
+ * @see net.dv8tion.jda.api.entities.GuildMessageChannel
+ * @see TextChannel
+ * @see NewsChannel
+ * @see StandardGuildChannel
+ */
+public interface StandardGuildMessageChannel extends StandardGuildChannel, GuildMessageChannel, IThreadContainer, IWebhookContainer
+{
+    @Nonnull
+    @Override
+    StandardGuildMessageChannelManager<?, ?> getManager();
+
+    /**
+     * The topic set for this TextChannel.
+     * <br>If no topic has been set, this returns null.
+     *
+     * @return Possibly-null String containing the topic of this TextChannel.
+     */
+    @Nullable
+    String getTopic();
+
+    /**
+     * Whether or not this channel is considered as "NSFW" (Not-Safe-For-Work)
+     *
+     * @return True, If this TextChannel is considered NSFW by the official Discord Client
+     */
+    boolean isNSFW();
+
+    @Override
+    @Nonnull
+    @CheckReturnValue
+    ChannelAction<? extends StandardGuildMessageChannel> createCopy(@Nonnull Guild guild);
+
+    @Override
+    @Nonnull
+    @CheckReturnValue
+    ChannelAction<? extends StandardGuildMessageChannel> createCopy();
+}
diff --git a/src/main/java/net/dv8tion/jda/api/entities/TextChannel.java b/src/main/java/net/dv8tion/jda/api/entities/TextChannel.java
index 6990baf7fe..e3bcba79d2 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/TextChannel.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/TextChannel.java
@@ -22,7 +22,7 @@
 import javax.annotation.Nonnull;
 
 /**
- * Represents a standard Discord Text GuildChannel.
+ * Represents a Discord Text GuildChannel.
  * <br>Adds additional functionality and information for text channels in Discord,
  * on top of the common functionality present in other guild message channels.
  *
@@ -30,7 +30,7 @@
  *
  * @see GuildChannel
  * @see MessageChannel
- * @see BaseGuildMessageChannel
+ * @see StandardGuildMessageChannel
  *
  * @see   Guild#getTextChannelCache()
  * @see   Guild#getTextChannels()
@@ -42,7 +42,7 @@
  * @see   JDA#getTextChannelsByName(String, boolean)
  * @see   JDA#getTextChannelById(long)
  */
-public interface TextChannel extends BaseGuildMessageChannel
+public interface TextChannel extends StandardGuildMessageChannel
 {
     /**
      * The maximum duration of slowmode in seconds
diff --git a/src/main/java/net/dv8tion/jda/api/entities/ThreadChannel.java b/src/main/java/net/dv8tion/jda/api/entities/ThreadChannel.java
index 4c81486a9d..ba68c8b496 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/ThreadChannel.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/ThreadChannel.java
@@ -16,6 +16,8 @@
 
 package net.dv8tion.jda.api.entities;
 
+import net.dv8tion.jda.api.entities.channel.unions.GuildMessageChannelUnion;
+import net.dv8tion.jda.api.entities.channel.unions.IThreadContainerUnion;
 import net.dv8tion.jda.api.managers.channel.concrete.ThreadChannelManager;
 import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.utils.MiscUtil;
@@ -117,7 +119,7 @@ default boolean isJoined()
      * @return The parent channel of this thread.
      */
     @Nonnull
-    IThreadContainer getParentChannel();
+    IThreadContainerUnion getParentChannel();
 
     //todo-v5: document additional subclasses of GuildMessageChannel (VoiceChannels and ForumChannels, when needed)
     /**
@@ -131,10 +133,10 @@ default boolean isJoined()
      *         If the parent channel is not a {@link GuildMessageChannel}.
      */
     @Nonnull
-    default GuildMessageChannel getParentMessageChannel()
+    default GuildMessageChannelUnion getParentMessageChannel()
     {
         if (getParentChannel() instanceof GuildMessageChannel) {
-            return (GuildMessageChannel) getParentChannel();
+            return (GuildMessageChannelUnion) getParentChannel();
         }
 
         throw new UnsupportedOperationException("Parent of this thread is not a MessageChannel. Parent is type: " + getParentChannel().getType().getId());
diff --git a/src/main/java/net/dv8tion/jda/api/entities/VoiceChannel.java b/src/main/java/net/dv8tion/jda/api/entities/VoiceChannel.java
index 596578aa69..48b654c0bb 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/VoiceChannel.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/VoiceChannel.java
@@ -39,7 +39,7 @@
  * @see   JDA#getVoiceChannelsByName(String, boolean)
  * @see   JDA#getVoiceChannelById(long)
  */
-public interface VoiceChannel extends AudioChannel, ICategorizableChannel, ICopyableChannel, IPermissionContainer, IPositionableChannel, IInviteContainer
+public interface VoiceChannel extends AudioChannel, StandardGuildChannel
 {
     /**
      * The maximum amount of {@link net.dv8tion.jda.api.entities.Member Members} that can be in this
diff --git a/src/main/java/net/dv8tion/jda/api/entities/Webhook.java b/src/main/java/net/dv8tion/jda/api/entities/Webhook.java
index 23c46d8163..66be298612 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/Webhook.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/Webhook.java
@@ -17,6 +17,7 @@
 package net.dv8tion.jda.api.entities;
 
 import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.entities.channel.unions.IWebhookContainerUnion;
 import net.dv8tion.jda.api.managers.WebhookManager;
 import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.requests.restaction.AuditableRestAction;
@@ -111,16 +112,19 @@ public interface Webhook extends ISnowflake
     Guild getGuild();
 
     /**
-     * The {@link net.dv8tion.jda.api.entities.BaseGuildMessageChannel BaseGuildMessageChannel} instance this Webhook is attached to.
+     * The {@link net.dv8tion.jda.api.entities.IWebhookContainer channel} instance this Webhook is attached to.
+     * Webhooks are created on specific channels so that they can interact with that channel.
+     * With regard to {@link ThreadChannel threads}, Webhooks are attached to their {@link IThreadContainer parent channel}
+     * and then the Webhooks can post to the {@link IThreadContainer parent} <i>and</i> the {@link ThreadChannel thread} too.
      *
      * @throws IllegalStateException
      *         If this webhooks {@link #isPartial() is partial}
      *
-     * @return The current TextChannel of this Webhook
+     * @return The current {@link IWebhookContainer channel} that this webhook is attached to.
      */
     @Nonnull
-    //TODO-v5: might be a problem exposing the Base class here as something like Threads could get Webhook support and break our stuff..
-    BaseGuildMessageChannel getChannel();
+    //TODO-v5: Should we introduce StandardIWebhookContainer? (IWebhookContainer + StandardGuildChannel)
+    IWebhookContainerUnion getChannel();
 
     /**
      * The owner of this Webhook. This will be null for some Webhooks, such as those retrieved from Audit Logs.
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java
new file mode 100644
index 0000000000..d7c3e1db9d
--- /dev/null
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dv8tion.jda.api.entities.channel.unions;
+
+import net.dv8tion.jda.api.entities.NewsChannel;
+import net.dv8tion.jda.api.entities.StandardGuildChannel;
+import net.dv8tion.jda.api.entities.StandardGuildMessageChannel;
+import net.dv8tion.jda.api.entities.TextChannel;
+
+import javax.annotation.Nonnull;
+
+public interface DefaultGuildChannelUnion extends StandardGuildChannel
+{
+    @Nonnull
+    TextChannel asTextChannel();
+
+    @Nonnull
+    NewsChannel asNewsChannel();
+
+    //TODO: add asForumChannel() (I think ForumChannels can be the default?)
+
+    @Nonnull
+    StandardGuildMessageChannel asStandardGuildMessageChannel();
+}
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildMessageChannelUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildMessageChannelUnion.java
new file mode 100644
index 0000000000..7f21b6ba52
--- /dev/null
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildMessageChannelUnion.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dv8tion.jda.api.entities.channel.unions;
+
+import net.dv8tion.jda.api.entities.*;
+
+import javax.annotation.Nonnull;
+
+public interface GuildMessageChannelUnion extends GuildMessageChannel
+{
+    @Nonnull
+    TextChannel asTextChannel();
+
+    @Nonnull
+    NewsChannel asNewsChannel();
+
+    @Nonnull
+    ThreadChannel asThreadChannel();
+
+    //TODO: Add asVoiceChannel once TiV is launched
+
+    @Nonnull
+    GuildMessageChannel asGuildMessageChannel();
+
+    @Nonnull
+    StandardGuildChannel asStandardGuildChannel();
+
+    @Nonnull
+    StandardGuildMessageChannel asStandardGuildMessageChannel();
+}
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IThreadContainerUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IThreadContainerUnion.java
new file mode 100644
index 0000000000..3e9fba3bc0
--- /dev/null
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IThreadContainerUnion.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dv8tion.jda.api.entities.channel.unions;
+
+import net.dv8tion.jda.api.entities.*;
+
+import javax.annotation.Nonnull;
+
+public interface IThreadContainerUnion extends IThreadContainer
+{
+    @Nonnull
+    TextChannel asTextChannel();
+
+    @Nonnull
+    NewsChannel asNewsChannel();
+
+    //TODO: Add asForumChannel
+
+    @Nonnull
+    GuildMessageChannel asGuildMessageChannel();
+
+    @Nonnull
+    StandardGuildChannel asStandardGuildChannel();
+
+    @Nonnull
+    StandardGuildMessageChannel asStandardGuildMessageChannel();
+}
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IWebhookContainerUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IWebhookContainerUnion.java
new file mode 100644
index 0000000000..66e5b14535
--- /dev/null
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IWebhookContainerUnion.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dv8tion.jda.api.entities.channel.unions;
+
+import net.dv8tion.jda.api.entities.*;
+
+import javax.annotation.Nonnull;
+
+public interface IWebhookContainerUnion extends IWebhookContainer
+{
+    @Nonnull
+    TextChannel asTextChannel();
+
+    @Nonnull
+    NewsChannel asNewsChannel();
+
+    //TODO: Add asForumChannel
+
+    @Nonnull
+    GuildMessageChannel asGuildMessageChannel();
+
+    @Nonnull
+    StandardGuildChannel asStandardGuildChannel();
+
+    @Nonnull
+    StandardGuildMessageChannel asStandardGuildMessageChannel();
+}
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java
new file mode 100644
index 0000000000..121729e104
--- /dev/null
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dv8tion.jda.api.entities.channel.unions;
+
+import net.dv8tion.jda.api.entities.*;
+
+import javax.annotation.Nonnull;
+
+public interface MessageChannelUnion extends MessageChannel
+{
+    @Nonnull
+    PrivateChannel asPrivateChannel();
+
+    @Nonnull
+    TextChannel asTextChannel();
+
+    @Nonnull
+    NewsChannel asNewsChannel();
+
+    @Nonnull
+    ThreadChannel asThreadChannel();
+
+    //TODO: Add asVoiceChannel once TiV is launched
+
+    //TODO: should we also expose the getThreadContainer/getStandardX getters like in GuildMessageChannelUnion?
+}
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/StandardGuildChannelUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/StandardGuildChannelUnion.java
new file mode 100644
index 0000000000..f98acfe703
--- /dev/null
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/StandardGuildChannelUnion.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dv8tion.jda.api.entities.channel.unions;
+
+import net.dv8tion.jda.api.entities.*;
+
+import javax.annotation.Nonnull;
+
+public interface StandardGuildChannelUnion extends StandardGuildChannel
+{
+    @Nonnull
+    TextChannel asTextChannel();
+
+    @Nonnull
+    NewsChannel asNewsChannel();
+
+    @Nonnull
+    VoiceChannel asVoiceChannel();
+
+    @Nonnull
+    StageChannel asStageChannel();
+
+    //TODO: add asForumChannel()
+}
diff --git a/src/main/java/net/dv8tion/jda/api/events/interaction/command/MessageContextInteractionEvent.java b/src/main/java/net/dv8tion/jda/api/events/interaction/command/MessageContextInteractionEvent.java
index 4716b66513..11dda92a1f 100644
--- a/src/main/java/net/dv8tion/jda/api/events/interaction/command/MessageContextInteractionEvent.java
+++ b/src/main/java/net/dv8tion/jda/api/events/interaction/command/MessageContextInteractionEvent.java
@@ -18,7 +18,7 @@
 
 import net.dv8tion.jda.api.JDA;
 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.interactions.callbacks.IReplyCallback;
 import net.dv8tion.jda.api.interactions.commands.context.MessageContextInteraction;
 
@@ -51,8 +51,8 @@ public MessageContextInteraction getInteraction()
 
     @Nullable
     @Override
-    public MessageChannel getChannel()
+    public MessageChannelUnion getChannel()
     {
-        return getInteraction().getChannel();
+        return (MessageChannelUnion) getInteraction().getChannel();
     }
 }
diff --git a/src/main/java/net/dv8tion/jda/api/events/interaction/command/SlashCommandInteractionEvent.java b/src/main/java/net/dv8tion/jda/api/events/interaction/command/SlashCommandInteractionEvent.java
index ebaa3b2194..711e9ed063 100644
--- a/src/main/java/net/dv8tion/jda/api/events/interaction/command/SlashCommandInteractionEvent.java
+++ b/src/main/java/net/dv8tion/jda/api/events/interaction/command/SlashCommandInteractionEvent.java
@@ -18,6 +18,7 @@
 
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.MessageChannel;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.interactions.commands.SlashCommandInteraction;
 
 import javax.annotation.Nonnull;
@@ -50,8 +51,8 @@ public SlashCommandInteraction getInteraction()
 
     @Nonnull
     @Override
-    public MessageChannel getChannel()
+    public MessageChannelUnion getChannel()
     {
-        return interaction.getChannel();
+        return (MessageChannelUnion) interaction.getChannel();
     }
 }
diff --git a/src/main/java/net/dv8tion/jda/api/events/interaction/component/GenericComponentInteractionCreateEvent.java b/src/main/java/net/dv8tion/jda/api/events/interaction/component/GenericComponentInteractionCreateEvent.java
index 6eae16b214..999e5bf07d 100644
--- a/src/main/java/net/dv8tion/jda/api/events/interaction/component/GenericComponentInteractionCreateEvent.java
+++ b/src/main/java/net/dv8tion/jda/api/events/interaction/component/GenericComponentInteractionCreateEvent.java
@@ -18,7 +18,7 @@
 
 import net.dv8tion.jda.api.JDA;
 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.events.interaction.GenericInteractionCreateEvent;
 import net.dv8tion.jda.api.interactions.InteractionHook;
 import net.dv8tion.jda.api.interactions.components.ActionComponent;
@@ -28,8 +28,6 @@
 import net.dv8tion.jda.api.requests.restaction.interactions.MessageEditCallbackAction;
 import net.dv8tion.jda.api.requests.restaction.interactions.ModalCallbackAction;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction;
-import net.dv8tion.jda.internal.requests.restaction.interactions.ModalCallbackActionImpl;
-import net.dv8tion.jda.internal.utils.Checks;
 
 import javax.annotation.Nonnull;
 
@@ -60,9 +58,9 @@ public ComponentInteraction getInteraction()
 
     @Nonnull
     @Override
-    public MessageChannel getChannel()
+    public MessageChannelUnion getChannel()
     {
-        return interaction.getChannel();
+        return (MessageChannelUnion) interaction.getChannel();
     }
 
     @Nonnull
diff --git a/src/main/java/net/dv8tion/jda/api/events/message/GenericMessageEvent.java b/src/main/java/net/dv8tion/jda/api/events/message/GenericMessageEvent.java
index f00f41567d..c1f9477b42 100644
--- a/src/main/java/net/dv8tion/jda/api/events/message/GenericMessageEvent.java
+++ b/src/main/java/net/dv8tion/jda/api/events/message/GenericMessageEvent.java
@@ -17,6 +17,8 @@
 
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.unions.GuildMessageChannelUnion;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.events.Event;
 import net.dv8tion.jda.internal.utils.Helpers;
 
@@ -54,9 +56,9 @@ public GenericMessageEvent(@Nonnull JDA api, long responseNumber, long messageId
      * @return The MessageChannel
      */
     @Nonnull
-    public MessageChannel getChannel()
+    public MessageChannelUnion getChannel()
     {
-        return channel;
+        return (MessageChannelUnion) channel;
     }
 
     /**
@@ -71,11 +73,11 @@ public MessageChannel getChannel()
      * @return The GuildMessageChannel
      */
     @Nonnull
-    public GuildMessageChannel getGuildChannel()
+    public GuildMessageChannelUnion getGuildChannel()
     {
         if (!isFromGuild())
             throw new IllegalStateException("This message event did not happen in a guild");
-        return (GuildMessageChannel) channel;
+        return (GuildMessageChannelUnion) channel;
     }
 
     /**
diff --git a/src/main/java/net/dv8tion/jda/api/events/message/MessageBulkDeleteEvent.java b/src/main/java/net/dv8tion/jda/api/events/message/MessageBulkDeleteEvent.java
index 5d18489181..92b1821f84 100644
--- a/src/main/java/net/dv8tion/jda/api/events/message/MessageBulkDeleteEvent.java
+++ b/src/main/java/net/dv8tion/jda/api/events/message/MessageBulkDeleteEvent.java
@@ -18,6 +18,7 @@
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.GuildMessageChannel;
+import net.dv8tion.jda.api.entities.channel.unions.GuildMessageChannelUnion;
 import net.dv8tion.jda.api.events.Event;
 
 import javax.annotation.Nonnull;
@@ -56,9 +57,9 @@ public MessageBulkDeleteEvent(@Nonnull JDA api, long responseNumber, @Nonnull Gu
      * @return The TextChannel
      */
     @Nonnull
-    public GuildMessageChannel getChannel()
+    public GuildMessageChannelUnion getChannel()
     {
-        return channel;
+        return (GuildMessageChannelUnion) channel;
     }
 
     /**
diff --git a/src/main/java/net/dv8tion/jda/api/events/user/UserTypingEvent.java b/src/main/java/net/dv8tion/jda/api/events/user/UserTypingEvent.java
index 81197dbf70..c1a07d9695 100644
--- a/src/main/java/net/dv8tion/jda/api/events/user/UserTypingEvent.java
+++ b/src/main/java/net/dv8tion/jda/api/events/user/UserTypingEvent.java
@@ -17,6 +17,7 @@
 
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -65,9 +66,9 @@ public OffsetDateTime getTimestamp()
      * @return The channel
      */
     @Nonnull
-    public MessageChannel getChannel()
+    public MessageChannelUnion getChannel()
     {
-        return channel;
+        return (MessageChannelUnion) channel;
     }
 
     /**
diff --git a/src/main/java/net/dv8tion/jda/api/interactions/Interaction.java b/src/main/java/net/dv8tion/jda/api/interactions/Interaction.java
index 415ee10ab2..871b22b99e 100644
--- a/src/main/java/net/dv8tion/jda/api/interactions/Interaction.java
+++ b/src/main/java/net/dv8tion/jda/api/interactions/Interaction.java
@@ -18,6 +18,7 @@
 
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.interactions.callbacks.*;
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.components.Modal;
@@ -177,11 +178,11 @@ default GuildChannel getGuildChannel()
      * @return The {@link MessageChannel}
      */
     @Nonnull
-    default MessageChannel getMessageChannel()
+    default MessageChannelUnion getMessageChannel()
     {
         Channel channel = getChannel();
         if (channel instanceof MessageChannel)
-            return (MessageChannel) channel;
+            return (MessageChannelUnion) channel;
         throw new IllegalStateException("Cannot convert channel of type " + getChannelType() + " to MessageChannel");
     }
 
diff --git a/src/main/java/net/dv8tion/jda/api/interactions/commands/OptionMapping.java b/src/main/java/net/dv8tion/jda/api/interactions/commands/OptionMapping.java
index 5a4185f2ba..6b1d3516b2 100644
--- a/src/main/java/net/dv8tion/jda/api/interactions/commands/OptionMapping.java
+++ b/src/main/java/net/dv8tion/jda/api/interactions/commands/OptionMapping.java
@@ -20,6 +20,7 @@
 import gnu.trove.map.hash.TLongObjectHashMap;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.unions.GuildMessageChannelUnion;
 import net.dv8tion.jda.api.interactions.Interaction;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import net.dv8tion.jda.api.utils.data.DataObject;
@@ -342,10 +343,10 @@ public GuildChannel getAsGuildChannel()
      * @return The resolved {@link GuildMessageChannel}, or null if this was not a message channel
      */
     @Nullable
-    public GuildMessageChannel getAsMessageChannel()
+    public GuildMessageChannelUnion getAsMessageChannel()
     {
         Channel value = getAsChannel();
-        return value instanceof GuildMessageChannel ? (GuildMessageChannel) value : null;
+        return value instanceof GuildMessageChannel ? (GuildMessageChannelUnion) value : null;
     }
 
     /**
diff --git a/src/main/java/net/dv8tion/jda/api/interactions/commands/SlashCommandInteraction.java b/src/main/java/net/dv8tion/jda/api/interactions/commands/SlashCommandInteraction.java
index 331890efa9..dbee14f341 100644
--- a/src/main/java/net/dv8tion/jda/api/interactions/commands/SlashCommandInteraction.java
+++ b/src/main/java/net/dv8tion/jda/api/interactions/commands/SlashCommandInteraction.java
@@ -16,8 +16,8 @@
 
 package net.dv8tion.jda.api.interactions.commands;
 
-import net.dv8tion.jda.api.entities.GuildMessageChannel;
-import net.dv8tion.jda.api.entities.MessageChannel;
+import net.dv8tion.jda.api.entities.channel.unions.GuildMessageChannelUnion;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 
 import javax.annotation.Nonnull;
 
@@ -28,12 +28,12 @@ public interface SlashCommandInteraction extends CommandInteraction
 {
     @Nonnull
     @Override
-    MessageChannel getChannel();
+    MessageChannelUnion getChannel();
 
     @Nonnull
     @Override
-    default GuildMessageChannel getGuildChannel()
+    default GuildMessageChannelUnion getGuildChannel()
     {
-        return (GuildMessageChannel) CommandInteraction.super.getGuildChannel();
+        return (GuildMessageChannelUnion) CommandInteraction.super.getGuildChannel();
     }
 }
diff --git a/src/main/java/net/dv8tion/jda/api/interactions/commands/context/MessageContextInteraction.java b/src/main/java/net/dv8tion/jda/api/interactions/commands/context/MessageContextInteraction.java
index 130dc62ef1..d4a0f50713 100644
--- a/src/main/java/net/dv8tion/jda/api/interactions/commands/context/MessageContextInteraction.java
+++ b/src/main/java/net/dv8tion/jda/api/interactions/commands/context/MessageContextInteraction.java
@@ -16,9 +16,9 @@
 
 package net.dv8tion.jda.api.interactions.commands.context;
 
-import net.dv8tion.jda.api.entities.GuildMessageChannel;
 import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.MessageChannel;
+import net.dv8tion.jda.api.entities.channel.unions.GuildMessageChannelUnion;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -37,12 +37,12 @@ default ContextTarget getTargetType()
 
     @Nullable
     @Override
-    MessageChannel getChannel();
+    MessageChannelUnion getChannel();
 
     @Nonnull
     @Override
-    default GuildMessageChannel getGuildChannel()
+    default GuildMessageChannelUnion getGuildChannel()
     {
-        return (GuildMessageChannel) ContextInteraction.super.getGuildChannel();
+        return (GuildMessageChannelUnion) ContextInteraction.super.getGuildChannel();
     }
 }
diff --git a/src/main/java/net/dv8tion/jda/api/interactions/components/ComponentInteraction.java b/src/main/java/net/dv8tion/jda/api/interactions/components/ComponentInteraction.java
index 1e58d79e62..a531c43be9 100644
--- a/src/main/java/net/dv8tion/jda/api/interactions/components/ComponentInteraction.java
+++ b/src/main/java/net/dv8tion/jda/api/interactions/components/ComponentInteraction.java
@@ -18,6 +18,7 @@
 
 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.interactions.callbacks.IMessageEditCallback;
 import net.dv8tion.jda.api.interactions.callbacks.IModalCallback;
 import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback;
@@ -94,5 +95,5 @@ default String getMessageId()
      */
     @Nonnull
     @Override
-    MessageChannel getChannel();
+    MessageChannelUnion getChannel();
 }
diff --git a/src/main/java/net/dv8tion/jda/api/managers/WebhookManager.java b/src/main/java/net/dv8tion/jda/api/managers/WebhookManager.java
index 50a7095565..aa4741a950 100644
--- a/src/main/java/net/dv8tion/jda/api/managers/WebhookManager.java
+++ b/src/main/java/net/dv8tion/jda/api/managers/WebhookManager.java
@@ -16,7 +16,11 @@
 
 package net.dv8tion.jda.api.managers;
 
-import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Icon;
+import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.Webhook;
+import net.dv8tion.jda.api.entities.channel.unions.IWebhookContainerUnion;
 
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nonnull;
@@ -99,14 +103,14 @@ public interface WebhookManager extends Manager<WebhookManager>
     Webhook getWebhook();
 
     /**
-     * The {@link net.dv8tion.jda.api.entities.BaseGuildMessageChannel BaseGuildMessageChannel} this Manager's
+     * The {@link net.dv8tion.jda.api.entities.IWebhookContainer channel} that this Manager's
      * {@link net.dv8tion.jda.api.entities.Webhook Webhook} is in.
      * <br>This is logically the same as calling {@code getWebhook().getChannel()}
      *
-     * @return The parent {@link net.dv8tion.jda.api.entities.BaseGuildMessageChannel BaseGuildMessageChannel}
+     * @return The parent {@link net.dv8tion.jda.api.entities.IWebhookContainer} instance.
      */
     @Nonnull
-    default BaseGuildMessageChannel getChannel()
+    default IWebhookContainerUnion getChannel()
     {
         return getWebhook().getChannel();
     }
diff --git a/src/main/java/net/dv8tion/jda/api/managers/channel/concrete/NewsChannelManager.java b/src/main/java/net/dv8tion/jda/api/managers/channel/concrete/NewsChannelManager.java
index a723b2b321..cf698bd417 100644
--- a/src/main/java/net/dv8tion/jda/api/managers/channel/concrete/NewsChannelManager.java
+++ b/src/main/java/net/dv8tion/jda/api/managers/channel/concrete/NewsChannelManager.java
@@ -20,12 +20,12 @@
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.NewsChannel;
 import net.dv8tion.jda.api.entities.TextChannel;
-import net.dv8tion.jda.api.managers.channel.middleman.BaseGuildMessageChannelManager;
+import net.dv8tion.jda.api.managers.channel.middleman.StandardGuildMessageChannelManager;
 
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nonnull;
 
-public interface NewsChannelManager extends BaseGuildMessageChannelManager<NewsChannel, NewsChannelManager>
+public interface NewsChannelManager extends StandardGuildMessageChannelManager<NewsChannel, NewsChannelManager>
 {
     /**
      * Converts the selected channel to a different {@link ChannelType}.
diff --git a/src/main/java/net/dv8tion/jda/api/managers/channel/concrete/StageChannelManager.java b/src/main/java/net/dv8tion/jda/api/managers/channel/concrete/StageChannelManager.java
index c06d4f383e..b61304d333 100644
--- a/src/main/java/net/dv8tion/jda/api/managers/channel/concrete/StageChannelManager.java
+++ b/src/main/java/net/dv8tion/jda/api/managers/channel/concrete/StageChannelManager.java
@@ -17,14 +17,12 @@
 package net.dv8tion.jda.api.managers.channel.concrete;
 
 import net.dv8tion.jda.api.entities.StageChannel;
-import net.dv8tion.jda.api.managers.channel.attribute.ICategorizableChannelManager;
-import net.dv8tion.jda.api.managers.channel.attribute.IPositionableChannelManager;
 import net.dv8tion.jda.api.managers.channel.middleman.AudioChannelManager;
+import net.dv8tion.jda.api.managers.channel.middleman.StandardGuildChannelManager;
 
 //TODO-v5: Docs
 public interface StageChannelManager extends
         AudioChannelManager<StageChannel, StageChannelManager>,
-        ICategorizableChannelManager<StageChannel, StageChannelManager>,
-        IPositionableChannelManager<StageChannel, StageChannelManager>
+        StandardGuildChannelManager<StageChannel, StageChannelManager>
 {
 }
diff --git a/src/main/java/net/dv8tion/jda/api/managers/channel/concrete/TextChannelManager.java b/src/main/java/net/dv8tion/jda/api/managers/channel/concrete/TextChannelManager.java
index be649ceede..43805dab87 100644
--- a/src/main/java/net/dv8tion/jda/api/managers/channel/concrete/TextChannelManager.java
+++ b/src/main/java/net/dv8tion/jda/api/managers/channel/concrete/TextChannelManager.java
@@ -18,7 +18,7 @@
 
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.*;
-import net.dv8tion.jda.api.managers.channel.middleman.BaseGuildMessageChannelManager;
+import net.dv8tion.jda.api.managers.channel.middleman.StandardGuildMessageChannelManager;
 
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nonnull;
@@ -38,7 +38,7 @@
  *
  * @see TextChannel#getManager()
  */
-public interface TextChannelManager extends BaseGuildMessageChannelManager<TextChannel, TextChannelManager>
+public interface TextChannelManager extends StandardGuildMessageChannelManager<TextChannel, TextChannelManager>
 {
     /**
      * Sets the <b><u>slowmode</u></b> of the selected {@link TextChannel TextChannel}.
diff --git a/src/main/java/net/dv8tion/jda/api/managers/channel/concrete/VoiceChannelManager.java b/src/main/java/net/dv8tion/jda/api/managers/channel/concrete/VoiceChannelManager.java
index f4ede5694e..439839198b 100644
--- a/src/main/java/net/dv8tion/jda/api/managers/channel/concrete/VoiceChannelManager.java
+++ b/src/main/java/net/dv8tion/jda/api/managers/channel/concrete/VoiceChannelManager.java
@@ -19,9 +19,8 @@
 import net.dv8tion.jda.api.entities.ChannelType;
 import net.dv8tion.jda.api.entities.GuildChannel;
 import net.dv8tion.jda.api.entities.VoiceChannel;
-import net.dv8tion.jda.api.managers.channel.attribute.ICategorizableChannelManager;
-import net.dv8tion.jda.api.managers.channel.attribute.IPositionableChannelManager;
 import net.dv8tion.jda.api.managers.channel.middleman.AudioChannelManager;
+import net.dv8tion.jda.api.managers.channel.middleman.StandardGuildChannelManager;
 
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nonnull;
@@ -29,8 +28,7 @@
 //TODO-v5: Docs
 public interface VoiceChannelManager extends
         AudioChannelManager<VoiceChannel, VoiceChannelManager>,
-        ICategorizableChannelManager<VoiceChannel, VoiceChannelManager>,
-        IPositionableChannelManager<VoiceChannel, VoiceChannelManager>
+        StandardGuildChannelManager<VoiceChannel, VoiceChannelManager>
 {
     /**
      * Sets the <b><u>user-limit</u></b> of the selected {@link VoiceChannel VoiceChannel}.
diff --git a/src/main/java/net/dv8tion/jda/api/managers/channel/middleman/StandardGuildChannelManager.java b/src/main/java/net/dv8tion/jda/api/managers/channel/middleman/StandardGuildChannelManager.java
new file mode 100644
index 0000000000..92ef6189fd
--- /dev/null
+++ b/src/main/java/net/dv8tion/jda/api/managers/channel/middleman/StandardGuildChannelManager.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dv8tion.jda.api.managers.channel.middleman;
+
+import net.dv8tion.jda.api.entities.StandardGuildChannel;
+import net.dv8tion.jda.api.managers.channel.attribute.ICategorizableChannelManager;
+import net.dv8tion.jda.api.managers.channel.attribute.IPermissionContainerManager;
+import net.dv8tion.jda.api.managers.channel.attribute.IPositionableChannelManager;
+
+/**
+ * Manager providing functionality common for all {@link net.dv8tion.jda.api.entities.StandardGuildChannel StandardGuildChannels}.
+ *
+ * <p><b>Example</b>
+ * <pre>{@code
+ * manager.setName("help")
+ *        .setParent(categoryChannel)
+ *        .queue();
+ * manager.reset(ChannelManager.PARENT | ChannelManager.NAME)
+ *        .putPermissionOverride(member, 0, Permission.ALL_PERMISSIONS)
+ *        .queue();
+ * }</pre>
+ *
+ * @see StandardGuildChannel#getManager()
+ */
+public interface StandardGuildChannelManager<T extends StandardGuildChannel, M extends StandardGuildChannelManager<T, M>>
+        extends IPermissionContainerManager<T, M>,
+        IPositionableChannelManager<T, M>,
+        ICategorizableChannelManager<T, M>
+{
+}
diff --git a/src/main/java/net/dv8tion/jda/api/managers/channel/middleman/BaseGuildMessageChannelManager.java b/src/main/java/net/dv8tion/jda/api/managers/channel/middleman/StandardGuildMessageChannelManager.java
similarity index 53%
rename from src/main/java/net/dv8tion/jda/api/managers/channel/middleman/BaseGuildMessageChannelManager.java
rename to src/main/java/net/dv8tion/jda/api/managers/channel/middleman/StandardGuildMessageChannelManager.java
index 0f220b6c81..debee62b12 100644
--- a/src/main/java/net/dv8tion/jda/api/managers/channel/middleman/BaseGuildMessageChannelManager.java
+++ b/src/main/java/net/dv8tion/jda/api/managers/channel/middleman/StandardGuildMessageChannelManager.java
@@ -16,22 +16,19 @@
 
 package net.dv8tion.jda.api.managers.channel.middleman;
 
-import net.dv8tion.jda.api.entities.*;
-import net.dv8tion.jda.api.managers.channel.attribute.ICategorizableChannelManager;
-import net.dv8tion.jda.api.managers.channel.attribute.IPermissionContainerManager;
-import net.dv8tion.jda.api.managers.channel.attribute.IPositionableChannelManager;
+import net.dv8tion.jda.api.entities.StandardGuildMessageChannel;
 
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 /**
- * Manager providing functionality common for all {@link BaseGuildMessageChannel BaseGuildMessageChannels}.
+ * Manager providing functionality common for all {@link net.dv8tion.jda.api.entities.StandardGuildMessageChannel StandardGuildMessageChannels}.
  *
  * <p><b>Example</b>
  * <pre>{@code
  * manager.setName("help")
-          .setTopic("Java is to Javascript as ham is to hamster")
+ *        .setTopic("Java is to Javascript as ham is to hamster")
  *        .queue();
  * manager.reset(ChannelManager.PARENT | ChannelManager.NAME)
  *        .setTopic("nsfw-commits")
@@ -39,26 +36,20 @@
  *        .queue();
  * }</pre>
  *
- * @see BaseGuildMessageChannel#getManager()
+ * @see StandardGuildMessageChannel#getManager()
  */
-public interface BaseGuildMessageChannelManager<T extends BaseGuildMessageChannel, M extends BaseGuildMessageChannelManager<T, M>>
-        extends IPermissionContainerManager<T, M>,
-        IPositionableChannelManager<T, M>,
-        ICategorizableChannelManager<T, M>
+public interface StandardGuildMessageChannelManager<T extends StandardGuildMessageChannel, M extends StandardGuildMessageChannelManager<T, M>>
+        extends StandardGuildChannelManager<T, M>
 {
-    /**
-     * Sets the <b><u>topic</u></b> of the selected
-     * {@link TextChannel TextChannel} or {@link StageChannel StageChannel}.
+     /**
+     * Sets the <b><u>topic</u></b> of the selected {@link StandardGuildMessageChannel channel}.
      *
      * <p>A channel topic <b>must not</b> be more than {@code 1024} characters long!
-     * <br><b>This is only available to {@link TextChannel TextChannels}</b>
      *
      * @param  topic
      *         The new topic for the selected channel,
      *         {@code null} or empty String to reset
      *
-     * @throws UnsupportedOperationException
-     *         If the selected {@link GuildChannel GuildChannel}'s type is not {@link ChannelType#TEXT TEXT}
      * @throws IllegalArgumentException
      *         If the provided topic is greater than {@code 1024} in length
      *
@@ -69,13 +60,10 @@ public interface BaseGuildMessageChannelManager<T extends BaseGuildMessageChanne
     M setTopic(@Nullable String topic);
 
     /**
-     * Sets the <b><u>nsfw flag</u></b> of the selected {@link TextChannel TextChannel} or {@link NewsChannel}.
+     * Sets the <b><u>nsfw flag</u></b> of the selected {@link StandardGuildMessageChannel channel}.
      *
      * @param  nsfw
-     *         The new nsfw flag for the selected {@link TextChannel TextChannel},
-     *
-     * @throws IllegalStateException
-     *         If the selected {@link GuildChannel GuildChannel}'s type is not {@link ChannelType#TEXT TEXT}
+     *         The new nsfw flag for the selected {@link StandardGuildMessageChannel channel}.
      *
      * @return ChannelManager for chaining convenience
      */
diff --git a/src/main/java/net/dv8tion/jda/api/requests/restaction/MessageAction.java b/src/main/java/net/dv8tion/jda/api/requests/restaction/MessageAction.java
index 8bdd5b0429..ab94a6f45d 100644
--- a/src/main/java/net/dv8tion/jda/api/requests/restaction/MessageAction.java
+++ b/src/main/java/net/dv8tion/jda/api/requests/restaction/MessageAction.java
@@ -20,6 +20,7 @@
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.MessageChannel;
 import net.dv8tion.jda.api.entities.MessageEmbed;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.interactions.components.ActionComponent;
 import net.dv8tion.jda.api.interactions.components.ActionRow;
 import net.dv8tion.jda.api.interactions.components.ItemComponent;
@@ -200,7 +201,7 @@ static boolean isDefaultFailOnInvalidReply()
      * @return The target channel
      */
     @Nonnull
-    MessageChannel getChannel();
+    MessageChannelUnion getChannel();
 
     /**
      * Whether this MessageAction has no values set.
diff --git a/src/main/java/net/dv8tion/jda/api/requests/restaction/WebhookAction.java b/src/main/java/net/dv8tion/jda/api/requests/restaction/WebhookAction.java
index 99273ab7c2..912d1968fc 100644
--- a/src/main/java/net/dv8tion/jda/api/requests/restaction/WebhookAction.java
+++ b/src/main/java/net/dv8tion/jda/api/requests/restaction/WebhookAction.java
@@ -16,10 +16,10 @@
 
 package net.dv8tion.jda.api.requests.restaction;
 
-import net.dv8tion.jda.api.entities.BaseGuildMessageChannel;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Icon;
 import net.dv8tion.jda.api.entities.Webhook;
+import net.dv8tion.jda.api.entities.channel.unions.IWebhookContainerUnion;
 
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nonnull;
@@ -48,12 +48,12 @@ public interface WebhookAction extends AuditableRestAction<Webhook>
     WebhookAction deadline(long timestamp);
 
     /**
-     * The {@link net.dv8tion.jda.api.entities.BaseGuildMessageChannel BaseGuildMessageChannel} to create this webhook in.
+     * The {@link net.dv8tion.jda.api.entities.IWebhookContainer channel} to create this webhook in.
      *
      * @return The channel
      */
     @Nonnull
-    BaseGuildMessageChannel getChannel();
+    IWebhookContainerUnion getChannel();
 
     /**
      * The {@link net.dv8tion.jda.api.entities.Guild Guild} to create this webhook in
diff --git a/src/main/java/net/dv8tion/jda/api/requests/restaction/pagination/MessagePaginationAction.java b/src/main/java/net/dv8tion/jda/api/requests/restaction/pagination/MessagePaginationAction.java
index 2a96d11194..77fe515d76 100644
--- a/src/main/java/net/dv8tion/jda/api/requests/restaction/pagination/MessagePaginationAction.java
+++ b/src/main/java/net/dv8tion/jda/api/requests/restaction/pagination/MessagePaginationAction.java
@@ -19,6 +19,7 @@
 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.channel.unions.MessageChannelUnion;
 
 import javax.annotation.Nonnull;
 
@@ -78,5 +79,5 @@ default ChannelType getType()
      * @return The MessageChannel instance
      */
     @Nonnull
-    MessageChannel getChannel();
+    MessageChannelUnion getChannel();
 }
diff --git a/src/main/java/net/dv8tion/jda/api/requests/restaction/pagination/ThreadChannelPaginationAction.java b/src/main/java/net/dv8tion/jda/api/requests/restaction/pagination/ThreadChannelPaginationAction.java
index 47e1949424..411428f4b1 100644
--- a/src/main/java/net/dv8tion/jda/api/requests/restaction/pagination/ThreadChannelPaginationAction.java
+++ b/src/main/java/net/dv8tion/jda/api/requests/restaction/pagination/ThreadChannelPaginationAction.java
@@ -19,6 +19,7 @@
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.IThreadContainer;
 import net.dv8tion.jda.api.entities.ThreadChannel;
+import net.dv8tion.jda.api.entities.channel.unions.IThreadContainerUnion;
 
 import javax.annotation.Nonnull;
 
@@ -60,7 +61,7 @@ public interface ThreadChannelPaginationAction extends PaginationAction<ThreadCh
 {
     //TODO-v5: Docs
     @Nonnull
-    IThreadContainer getChannel();
+    IThreadContainerUnion getChannel();
 
     /**
      * The current target {@link net.dv8tion.jda.api.entities.Guild Guild} for this ThreadChannelPaginationAction.
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/AbstractChannelImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/AbstractChannelImpl.java
index 276493520c..18c514fecc 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/AbstractChannelImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/AbstractChannelImpl.java
@@ -17,8 +17,10 @@
 package net.dv8tion.jda.internal.entities;
 
 import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.entities.*;
 import net.dv8tion.jda.internal.JDAImpl;
 import net.dv8tion.jda.internal.entities.mixin.channel.middleman.ChannelMixin;
+import net.dv8tion.jda.internal.utils.Helpers;
 
 import javax.annotation.Nonnull;
 
@@ -62,4 +64,69 @@ public T setName(String name)
         this.name = name;
         return (T) this;
     }
+
+    // -- Union Hooks --
+
+    @Nonnull
+    public PrivateChannel asPrivateChannel()
+    {
+        return transformChannel(PrivateChannel.class);
+    }
+
+    @Nonnull
+    public TextChannel asTextChannel()
+    {
+        return transformChannel(TextChannel.class);
+    }
+
+    @Nonnull
+    public NewsChannel asNewsChannel()
+    {
+        return transformChannel(NewsChannel.class);
+    }
+
+    @Nonnull
+    public VoiceChannel asVoiceChannel()
+    {
+        return transformChannel(VoiceChannel.class);
+    }
+
+    @Nonnull
+    public StageChannel asStageChannel()
+    {
+        return transformChannel(StageChannel.class);
+    }
+
+    @Nonnull
+    public ThreadChannel asThreadChannel()
+    {
+        return transformChannel(ThreadChannel.class);
+    }
+
+    @Nonnull
+    public GuildMessageChannel asGuildMessageChannel()
+    {
+        return transformChannel(GuildMessageChannel.class);
+    }
+
+    @Nonnull
+    public StandardGuildChannel asStandardGuildChannel()
+    {
+        return transformChannel(StandardGuildChannel.class);
+    }
+
+    @Nonnull
+    public StandardGuildMessageChannel asStandardGuildMessageChannel()
+    {
+        return transformChannel(StandardGuildMessageChannel.class);
+    }
+
+    private <TOut extends Channel> TOut transformChannel(Class<TOut> toObjectClass)
+    {
+        if (toObjectClass.isInstance(this))
+            return toObjectClass.cast(this);
+
+        String cleanedClassName = this.getClass().getSimpleName().replace("Impl", "");
+        throw new IllegalStateException(Helpers.format("Cannot convert channel of type %s to %s!", cleanedClassName, toObjectClass.getSimpleName()));
+    }
 }
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/AbstractMessage.java b/src/main/java/net/dv8tion/jda/internal/entities/AbstractMessage.java
index ebda0bf8ab..68aa32fbdf 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/AbstractMessage.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/AbstractMessage.java
@@ -18,6 +18,8 @@
 
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.unions.GuildMessageChannelUnion;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.interactions.components.ActionRow;
 import net.dv8tion.jda.api.interactions.components.LayoutComponent;
 import net.dv8tion.jda.api.requests.RestAction;
@@ -206,7 +208,7 @@ public boolean isWebhookMessage()
 
     @Nonnull
     @Override
-    public MessageChannel getChannel()
+    public MessageChannelUnion getChannel()
     {
         unsupported();
         return null;
@@ -214,7 +216,7 @@ public MessageChannel getChannel()
 
     @Nonnull
     @Override
-    public GuildMessageChannel getGuildChannel()
+    public GuildMessageChannelUnion getGuildChannel()
     {
         unsupported();
         return null;
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/AbstractStandardGuildChannelImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/AbstractStandardGuildChannelImpl.java
new file mode 100644
index 0000000000..f491b8f88d
--- /dev/null
+++ b/src/main/java/net/dv8tion/jda/internal/entities/AbstractStandardGuildChannelImpl.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dv8tion.jda.internal.entities;
+
+import gnu.trove.map.TLongObjectMap;
+import net.dv8tion.jda.api.entities.PermissionOverride;
+import net.dv8tion.jda.api.utils.MiscUtil;
+import net.dv8tion.jda.internal.entities.mixin.channel.middleman.StandardGuildChannelMixin;
+
+public abstract class AbstractStandardGuildChannelImpl<T extends AbstractStandardGuildChannelImpl<T>> extends AbstractGuildChannelImpl<T>
+        implements StandardGuildChannelMixin<T>
+{
+    protected final TLongObjectMap<PermissionOverride> overrides = MiscUtil.newLongMap();
+
+    protected long parentCategoryId;
+    protected int position;
+
+    public AbstractStandardGuildChannelImpl(long id, GuildImpl guild)
+    {
+        super(id, guild);
+    }
+
+    @Override
+    public long getParentCategoryIdLong()
+    {
+        return parentCategoryId;
+    }
+
+    @Override
+    public int getPositionRaw()
+    {
+        return position;
+    }
+
+    @Override
+    public TLongObjectMap<PermissionOverride> getPermissionOverrideMap()
+    {
+        return overrides;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public T setParentCategory(long parentCategoryId)
+    {
+        this.parentCategoryId = parentCategoryId;
+        return (T) this;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public T setPosition(int position)
+    {
+        onPositionChange();
+        this.position = position;
+        return (T) this;
+    }
+
+    abstract void onPositionChange();
+}
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/AbstractStandardGuildMessageChannelImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/AbstractStandardGuildMessageChannelImpl.java
new file mode 100644
index 0000000000..ec7cf554fc
--- /dev/null
+++ b/src/main/java/net/dv8tion/jda/internal/entities/AbstractStandardGuildMessageChannelImpl.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dv8tion.jda.internal.entities;
+
+import net.dv8tion.jda.internal.entities.mixin.channel.middleman.StandardGuildMessageChannelMixin;
+
+import javax.annotation.Nullable;
+
+public abstract class AbstractStandardGuildMessageChannelImpl<T extends AbstractStandardGuildMessageChannelImpl<T>> extends AbstractStandardGuildChannelImpl<T>
+        implements StandardGuildMessageChannelMixin<T>
+{
+    protected String topic;
+    protected boolean nsfw;
+    protected long latestMessageId;
+
+    public AbstractStandardGuildMessageChannelImpl(long id, GuildImpl guild)
+    {
+        super(id, guild);
+    }
+
+    @Nullable
+    @Override
+    public String getTopic()
+    {
+        return topic;
+    }
+
+    @Override
+    public boolean isNSFW()
+    {
+        return nsfw;
+    }
+
+    @Override
+    public long getLatestMessageIdLong()
+    {
+        return latestMessageId;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public T setTopic(String topic)
+    {
+        this.topic = topic;
+        return (T) this;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public T setNSFW(boolean nsfw)
+    {
+        this.nsfw = nsfw;
+        return (T) this;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public T setLatestMessageIdLong(long latestMessageId)
+    {
+        this.latestMessageId = latestMessageId;
+        return (T) this;
+    }
+}
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/EntityBuilder.java b/src/main/java/net/dv8tion/jda/internal/entities/EntityBuilder.java
index f273bf512e..619b1b358f 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/EntityBuilder.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/EntityBuilder.java
@@ -1805,12 +1805,9 @@ public WebhookImpl createWebhook(DataObject object, boolean allowMissingChannel)
         final String token = object.getString("token", null);
         final WebhookType type = WebhookType.fromKey(object.getInt("type", -1));
 
-        //TODO-v5-unified-channel-cache
-        BaseGuildMessageChannel channel = getJDA().getTextChannelById(channelId);
-        if (channel == null)
-            channel = getJDA().getNewsChannelById(channelId);
+        IWebhookContainer channel = getJDA().getChannelById(IWebhookContainer.class, channelId);
         if (channel == null && !allowMissingChannel)
-            throw new NullPointerException(String.format("Tried to create Webhook for an un-cached Guild MessageChannel! WebhookId: %s ChannelId: %s GuildId: %s",
+            throw new NullPointerException(String.format("Tried to create Webhook for an un-cached IWebhookContainer channel! WebhookId: %s ChannelId: %s GuildId: %s",
                     id, channelId, guildId));
 
         Object name = !object.isNull("name") ? object.get("name") : null;
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/GuildImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/GuildImpl.java
index 2fae3ff70d..355192397a 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/GuildImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/GuildImpl.java
@@ -23,6 +23,7 @@
 import net.dv8tion.jda.api.Region;
 import net.dv8tion.jda.api.audio.hooks.ConnectionStatus;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.unions.DefaultGuildChannelUnion;
 import net.dv8tion.jda.api.entities.templates.Template;
 import net.dv8tion.jda.api.exceptions.HierarchyException;
 import net.dv8tion.jda.api.exceptions.InsufficientPermissionException;
@@ -868,10 +869,10 @@ public Role getPublicRole()
 
     @Nullable
     @Override
-    public BaseGuildMessageChannel getDefaultChannel()
+    public DefaultGuildChannelUnion getDefaultChannel()
     {
         final Role role = getPublicRole();
-        return Stream.concat(getTextChannelCache().stream(), getNewsChannelCache().stream())
+        return (DefaultGuildChannelUnion) Stream.concat(getTextChannelCache().stream(), getNewsChannelCache().stream())
                 .filter(c -> role.hasPermission(c, Permission.VIEW_CHANNEL))
                 .min(Comparator.naturalOrder())
                 .orElse(null);
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/MemberImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/MemberImpl.java
index 7af8bf00b6..28d1160247 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/MemberImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/MemberImpl.java
@@ -21,6 +21,7 @@
 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.unions.DefaultGuildChannelUnion;
 import net.dv8tion.jda.api.utils.cache.CacheFlag;
 import net.dv8tion.jda.api.utils.cache.CacheView;
 import net.dv8tion.jda.internal.JDAImpl;
@@ -450,9 +451,9 @@ public String getAsMention()
 
     @Nullable
     @Override
-    public BaseGuildMessageChannel getDefaultChannel()
+    public DefaultGuildChannelUnion getDefaultChannel()
     {
-        return Stream.concat(getGuild().getTextChannelCache().stream(), getGuild().getNewsChannelCache().stream())
+        return (DefaultGuildChannelUnion) Stream.concat(getGuild().getTextChannelCache().stream(), getGuild().getNewsChannelCache().stream())
                 .filter(c -> hasPermission(c, Permission.VIEW_CHANNEL))
                 .min(Comparator.naturalOrder())
                 .orElse(null);
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/NewsChannelImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/NewsChannelImpl.java
index 209f87b0a4..8b15670e7c 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/NewsChannelImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/NewsChannelImpl.java
@@ -16,36 +16,27 @@
 
 package net.dv8tion.jda.internal.entities;
 
-import gnu.trove.map.TLongObjectMap;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.unions.DefaultGuildChannelUnion;
 import net.dv8tion.jda.api.managers.channel.concrete.NewsChannelManager;
 import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.requests.restaction.ChannelAction;
-import net.dv8tion.jda.api.utils.MiscUtil;
 import net.dv8tion.jda.api.utils.data.DataObject;
-import net.dv8tion.jda.internal.entities.mixin.channel.middleman.BaseGuildMessageChannelMixin;
+import net.dv8tion.jda.internal.managers.channel.concrete.NewsChannelManagerImpl;
 import net.dv8tion.jda.internal.requests.RestActionImpl;
 import net.dv8tion.jda.internal.requests.Route;
-import net.dv8tion.jda.internal.managers.channel.concrete.NewsChannelManagerImpl;
 import net.dv8tion.jda.internal.utils.Checks;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class NewsChannelImpl extends AbstractGuildChannelImpl<NewsChannelImpl> implements NewsChannel, BaseGuildMessageChannelMixin<NewsChannelImpl>
+public class NewsChannelImpl extends AbstractStandardGuildMessageChannelImpl<NewsChannelImpl>
+        implements NewsChannel,
+        DefaultGuildChannelUnion
 {
-    private final TLongObjectMap<PermissionOverride> overrides = MiscUtil.newLongMap();
-
-    private String topic;
-    private long parentCategoryId;
-    private long latestMessageId;
-    private int position;
-    private boolean nsfw;
-
     public NewsChannelImpl(long id, GuildImpl guild)
     {
         super(id, guild);
@@ -57,25 +48,6 @@ public ChannelType getType()
     {
         return ChannelType.NEWS;
     }
-    
-    @Nullable
-    @Override
-    public String getTopic()
-    {
-        return topic;
-    }
-
-    @Override
-    public boolean isNSFW()
-    {
-        return nsfw;
-    }
-
-    @Override
-    public long getParentCategoryIdLong()
-    {
-        return parentCategoryId;
-    }
 
     @Nonnull
     @Override
@@ -86,18 +58,6 @@ public List<Member> getMembers()
             .collect(Collectors.toList()));
     }
 
-    @Override
-    public int getPositionRaw()
-    {
-        return position;
-    }
-
-    @Override
-    public long getLatestMessageIdLong()
-    {
-        return latestMessageId;
-    }
-
     @Nonnull
     @Override
     public RestAction<Webhook.WebhookReference> follow(@Nonnull String targetChannelId)
@@ -141,46 +101,11 @@ public NewsChannelManager getManager()
         return new NewsChannelManagerImpl(this);
     }
 
+    // -- Abstract hooks --
     @Override
-    public TLongObjectMap<PermissionOverride> getPermissionOverrideMap()
-    {
-        return overrides;
-    }
-
-    @Override
-    public NewsChannelImpl setParentCategory(long parentCategoryId)
-    {
-        this.parentCategoryId = parentCategoryId;
-        return this;
-    }
-
-    @Override
-    public NewsChannelImpl setPosition(int position)
+    protected void onPositionChange()
     {
         getGuild().getNewsChannelView().clearCachedLists();
-        this.position = position;
-        return this;
-    }
-
-    @Override
-    public NewsChannelImpl setTopic(String topic)
-    {
-        this.topic = topic;
-        return this;
-    }
-
-    @Override
-    public NewsChannelImpl setNSFW(boolean nsfw)
-    {
-        this.nsfw = nsfw;
-        return this;
-    }
-
-    @Override
-    public NewsChannelImpl setLatestMessageIdLong(long latestMessageId)
-    {
-        this.latestMessageId = latestMessageId;
-        return this;
     }
 
     // -- Object Overrides --
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/ReceivedMessage.java b/src/main/java/net/dv8tion/jda/internal/entities/ReceivedMessage.java
index 37ec851c60..5ebe1afcaf 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/ReceivedMessage.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/ReceivedMessage.java
@@ -19,6 +19,8 @@
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.unions.GuildMessageChannelUnion;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.exceptions.InsufficientPermissionException;
 import net.dv8tion.jda.api.exceptions.MissingAccessException;
 import net.dv8tion.jda.api.exceptions.PermissionException;
@@ -459,18 +461,18 @@ public ChannelType getChannelType()
 
     @Nonnull
     @Override
-    public MessageChannel getChannel()
+    public MessageChannelUnion getChannel()
     {
-        return channel;
+        return (MessageChannelUnion) channel;
     }
 
     @Nonnull
     @Override
-    public GuildMessageChannel getGuildChannel()
+    public GuildMessageChannelUnion getGuildChannel()
     {
         if (!isFromGuild())
             throw new IllegalStateException("This message was not sent in a guild.");
-        return (GuildMessageChannel) channel;
+        return (GuildMessageChannelUnion) channel;
     }
 
     @Nonnull
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/StageChannelImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/StageChannelImpl.java
index 445f169b33..c254860abf 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/StageChannelImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/StageChannelImpl.java
@@ -26,9 +26,6 @@
 import net.dv8tion.jda.api.requests.restaction.StageInstanceAction;
 import net.dv8tion.jda.api.utils.MiscUtil;
 import net.dv8tion.jda.api.utils.data.DataObject;
-import net.dv8tion.jda.internal.entities.mixin.channel.attribute.ICategorizableChannelMixin;
-import net.dv8tion.jda.internal.entities.mixin.channel.attribute.IInviteContainerMixin;
-import net.dv8tion.jda.internal.entities.mixin.channel.attribute.IPositionableChannelMixin;
 import net.dv8tion.jda.internal.entities.mixin.channel.middleman.AudioChannelMixin;
 import net.dv8tion.jda.internal.managers.channel.concrete.StageChannelManagerImpl;
 import net.dv8tion.jda.internal.requests.RestActionImpl;
@@ -44,21 +41,15 @@
 import java.util.EnumSet;
 import java.util.List;
 
-public class StageChannelImpl extends AbstractGuildChannelImpl<StageChannelImpl> implements 
+public class StageChannelImpl extends AbstractStandardGuildChannelImpl<StageChannelImpl> implements
         StageChannel, 
-        AudioChannelMixin<StageChannelImpl>,
-        ICategorizableChannelMixin<StageChannelImpl>,
-        IPositionableChannelMixin<StageChannelImpl>,
-        IInviteContainerMixin<StageChannelImpl>
+        AudioChannelMixin<StageChannelImpl>
 {
     private final TLongObjectMap<Member> connectedMembers = MiscUtil.newLongMap();
-    private final TLongObjectMap<PermissionOverride> overrides = MiscUtil.newLongMap();
 
     private StageInstance instance;
     private String region;
-    private long parentCategoryId;
     private int bitrate;
-    private int position;
 
     public StageChannelImpl(long id, GuildImpl guild)
     {
@@ -85,18 +76,6 @@ public String getRegionRaw()
         return region;
     }
 
-    @Override
-    public long getParentCategoryIdLong()
-    {
-        return parentCategoryId;
-    }
-
-    @Override
-    public int getPositionRaw()
-    {
-        return position;
-    }
-
     @Nullable
     @Override
     public StageInstance getStageInstance()
@@ -190,33 +169,12 @@ public RestAction<Void> cancelRequestToSpeak()
         return new RestActionImpl<>(getJDA(), route, body);
     }
 
-    @Override
-    public TLongObjectMap<PermissionOverride> getPermissionOverrideMap()
-    {
-        return overrides;
-    }
-
     @Override
     public TLongObjectMap<Member> getConnectedMembersMap()
     {
         return connectedMembers;
     }
 
-    @Override
-    public StageChannelImpl setParentCategory(long parentCategoryId)
-    {
-        this.parentCategoryId = parentCategoryId;
-        return this;
-    }
-
-    @Override
-    public StageChannelImpl setPosition(int position)
-    {
-        getGuild().getStageChannelsView().clearCachedLists();
-        this.position = position;
-        return this;
-    }
-
     @Override
     public StageChannelImpl setBitrate(int bitrate)
     {
@@ -236,4 +194,11 @@ public StageChannelImpl setStageInstance(StageInstance instance)
         this.instance = instance;
         return this;
     }
+
+    // -- Abstract Hooks --
+    @Override
+    protected void onPositionChange()
+    {
+        getGuild().getStageChannelsView().clearCachedLists();
+    }
 }
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/TextChannelImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/TextChannelImpl.java
index 54a6072d70..9f73f095b3 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/TextChannelImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/TextChannelImpl.java
@@ -16,51 +16,30 @@
 
 package net.dv8tion.jda.internal.entities;
 
-import gnu.trove.map.TLongObjectMap;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.unions.DefaultGuildChannelUnion;
 import net.dv8tion.jda.api.managers.channel.concrete.TextChannelManager;
 import net.dv8tion.jda.api.requests.restaction.ChannelAction;
-import net.dv8tion.jda.api.utils.MiscUtil;
-import net.dv8tion.jda.internal.entities.mixin.channel.middleman.BaseGuildMessageChannelMixin;
 import net.dv8tion.jda.internal.managers.channel.concrete.TextChannelManagerImpl;
 import net.dv8tion.jda.internal.utils.Checks;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class TextChannelImpl extends AbstractGuildChannelImpl<TextChannelImpl> implements TextChannel, BaseGuildMessageChannelMixin<TextChannelImpl>
+public class TextChannelImpl extends AbstractStandardGuildMessageChannelImpl<TextChannelImpl> implements
+        TextChannel,
+        DefaultGuildChannelUnion
 {
-    private final TLongObjectMap<PermissionOverride> overrides = MiscUtil.newLongMap();
-
-    private String topic;
-    private long parentCategoryId;
-    private long latestMessageId;
-    private int position;
     private int slowmode;
-    private boolean nsfw;
 
     public TextChannelImpl(long id, GuildImpl guild)
     {
         super(id, guild);
     }
 
-    @Nullable
-    @Override
-    public String getTopic()
-    {
-        return topic;
-    }
-
-    @Override
-    public boolean isNSFW()
-    {
-        return nsfw;
-    }
-
     @Nonnull
     @Override
     public ChannelType getType()
@@ -68,12 +47,6 @@ public ChannelType getType()
         return ChannelType.TEXT;
     }
 
-    @Override
-    public long getParentCategoryIdLong()
-    {
-        return parentCategoryId;
-    }
-
     @Nonnull
     @Override
     public List<Member> getMembers()
@@ -83,18 +56,6 @@ public List<Member> getMembers()
             .collect(Collectors.toList()));
     }
 
-    @Override
-    public int getPositionRaw()
-    {
-        return position;
-    }
-
-    @Override
-    public long getLatestMessageIdLong()
-    {
-        return latestMessageId;
-    }
-
     @Override
     public int getSlowmode()
     {
@@ -130,52 +91,17 @@ public TextChannelManager getManager()
         return new TextChannelManagerImpl(this);
     }
 
-    @Override
-    public TLongObjectMap<PermissionOverride> getPermissionOverrideMap()
-    {
-        return overrides;
-    }
-
-    @Override
-    public TextChannelImpl setParentCategory(long parentCategoryId)
+    public TextChannelImpl setSlowmode(int slowmode)
     {
-        this.parentCategoryId = parentCategoryId;
+        this.slowmode = slowmode;
         return this;
     }
 
+    // -- Abstract hooks --
     @Override
-    public TextChannelImpl setPosition(int position)
+    protected void onPositionChange()
     {
         getGuild().getTextChannelsView().clearCachedLists();
-        this.position = position;
-        return this;
-    }
-
-    @Override
-    public TextChannelImpl setTopic(String topic)
-    {
-        this.topic = topic;
-        return this;
-    }
-
-    @Override
-    public TextChannelImpl setNSFW(boolean nsfw)
-    {
-        this.nsfw = nsfw;
-        return this;
-    }
-
-    @Override
-    public TextChannelImpl setLatestMessageIdLong(long latestMessageId)
-    {
-        this.latestMessageId = latestMessageId;
-        return this;
-    }
-
-    public TextChannelImpl setSlowmode(int slowmode)
-    {
-        this.slowmode = slowmode;
-        return this;
     }
 
     // -- Object overrides --
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/ThreadChannelImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/ThreadChannelImpl.java
index 2d61c74192..81f970cae9 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/ThreadChannelImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/ThreadChannelImpl.java
@@ -18,6 +18,7 @@
 
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.unions.IThreadContainerUnion;
 import net.dv8tion.jda.api.managers.channel.concrete.ThreadChannelManager;
 import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.utils.TimeUtil;
@@ -114,9 +115,9 @@ public List<Member> getMembers()
     @Nonnull
     @Override
     @SuppressWarnings("ConstantConditions")
-    public IThreadContainer getParentChannel()
+    public IThreadContainerUnion getParentChannel()
     {
-        return (IThreadContainer) guild.getGuildChannelById(parentChannelId);
+        return (IThreadContainerUnion) guild.getGuildChannelById(parentChannelId);
     }
 
     @Nonnull
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/VoiceChannelImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/VoiceChannelImpl.java
index c9ca0e8170..84bf826662 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/VoiceChannelImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/VoiceChannelImpl.java
@@ -21,9 +21,6 @@
 import net.dv8tion.jda.api.managers.channel.concrete.VoiceChannelManager;
 import net.dv8tion.jda.api.requests.restaction.ChannelAction;
 import net.dv8tion.jda.api.utils.MiscUtil;
-import net.dv8tion.jda.internal.entities.mixin.channel.attribute.ICategorizableChannelMixin;
-import net.dv8tion.jda.internal.entities.mixin.channel.attribute.IInviteContainerMixin;
-import net.dv8tion.jda.internal.entities.mixin.channel.attribute.IPositionableChannelMixin;
 import net.dv8tion.jda.internal.entities.mixin.channel.middleman.AudioChannelMixin;
 import net.dv8tion.jda.internal.managers.channel.concrete.VoiceChannelManagerImpl;
 import net.dv8tion.jda.internal.utils.Checks;
@@ -34,20 +31,14 @@
 import java.util.Collections;
 import java.util.List;
 
-public class VoiceChannelImpl extends AbstractGuildChannelImpl<VoiceChannelImpl> implements
+public class VoiceChannelImpl extends AbstractStandardGuildChannelImpl<VoiceChannelImpl> implements
         VoiceChannel,
-        AudioChannelMixin<VoiceChannelImpl>,
-        ICategorizableChannelMixin<VoiceChannelImpl>,
-        IPositionableChannelMixin<VoiceChannelImpl>,
-        IInviteContainerMixin<VoiceChannelImpl>
+        AudioChannelMixin<VoiceChannelImpl>
 {
     private final TLongObjectMap<Member> connectedMembers = MiscUtil.newLongMap();
-    private final TLongObjectMap<PermissionOverride> overrides = MiscUtil.newLongMap();
 
     private String region;
-    private long parentCategoryId;
     private int bitrate;
-    private int position;
     private int userLimit;
 
     public VoiceChannelImpl(long id, GuildImpl guild)
@@ -75,18 +66,6 @@ public String getRegionRaw()
         return region;
     }
 
-    @Override
-    public long getParentCategoryIdLong()
-    {
-        return parentCategoryId;
-    }
-
-    @Override
-    public int getPositionRaw()
-    {
-        return position;
-    }
-
     @Override
     public int getUserLimit()
     {
@@ -130,24 +109,12 @@ public VoiceChannelManager getManager()
         return new VoiceChannelManagerImpl(this);
     }
 
-    @Override
-    public TLongObjectMap<PermissionOverride> getPermissionOverrideMap()
-    {
-        return overrides;
-    }
-
     @Override
     public TLongObjectMap<Member> getConnectedMembersMap()
     {
         return connectedMembers;
     }
 
-    @Override
-    public VoiceChannelImpl setParentCategory(long parentCategoryId)
-    {
-        this.parentCategoryId = parentCategoryId;
-        return this;
-    }
 
     @Override
     public VoiceChannelImpl setBitrate(int bitrate)
@@ -163,17 +130,16 @@ public VoiceChannelImpl setRegion(String region)
         return this;
     }
 
-    @Override
-    public VoiceChannelImpl setPosition(int position)
+    public VoiceChannelImpl setUserLimit(int userLimit)
     {
-        getGuild().getVoiceChannelsView().clearCachedLists();
-        this.position = position;
+        this.userLimit = userLimit;
         return this;
     }
 
-    public VoiceChannelImpl setUserLimit(int userLimit)
+    // -- Abstract Hooks --
+    @Override
+    protected void onPositionChange()
     {
-        this.userLimit = userLimit;
-        return this;
+        getGuild().getVoiceChannelsView().clearCachedLists();
     }
 }
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/WebhookImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/WebhookImpl.java
index 46625adeb6..218e71cb82 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/WebhookImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/WebhookImpl.java
@@ -19,6 +19,7 @@
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.unions.IWebhookContainerUnion;
 import net.dv8tion.jda.api.exceptions.InsufficientPermissionException;
 import net.dv8tion.jda.api.managers.WebhookManager;
 import net.dv8tion.jda.api.requests.RestAction;
@@ -40,7 +41,7 @@
  */
 public class WebhookImpl extends AbstractWebhookClient<Void> implements Webhook
 {
-    private final BaseGuildMessageChannel channel;
+    private final IWebhookContainer channel;
     private final WebhookType type;
 
     private Member owner;
@@ -48,12 +49,12 @@ public class WebhookImpl extends AbstractWebhookClient<Void> implements Webhook
     private ChannelReference sourceChannel;
     private GuildReference sourceGuild;
 
-    public WebhookImpl(BaseGuildMessageChannel channel, long id, WebhookType type)
+    public WebhookImpl(IWebhookContainer channel, long id, WebhookType type)
     {
         this(channel, channel.getJDA(), id, type);
     }
 
-    public WebhookImpl(BaseGuildMessageChannel channel, JDA api, long id, WebhookType type)
+    public WebhookImpl(IWebhookContainer channel, JDA api, long id, WebhookType type)
     {
         super(id, null, api);
         this.channel = channel;
@@ -91,11 +92,11 @@ public Guild getGuild()
 
     @Nonnull
     @Override
-    public BaseGuildMessageChannel getChannel()
+    public IWebhookContainerUnion getChannel()
     {
         if (channel == null)
             throw new IllegalStateException("Cannot provide channel for this Webhook instance because it does not belong to this shard");
-        return channel;
+        return (IWebhookContainerUnion) channel;
     }
 
     @Override
@@ -252,7 +253,12 @@ public WebhookMessageActionImpl<Void> sendRequest()
     {
         checkToken();
         Route.CompiledRoute route = Route.Webhooks.EXECUTE_WEBHOOK.compile(getId(), token);
-        WebhookMessageActionImpl<Void> action = new WebhookMessageActionImpl<>(api, channel, route, (json) -> null);
+
+        //TODO: This MessageChannel cast seems problematic, especially once ForumChannels come along.
+        // Note for Minn: Can we make this cast here because the WebhookClient is only used when responding to interactions
+        //                actually present in a MessageChannel?
+        //                Also might not actually be needed as it doesn't look like WebhookMessageActionImpl actually uses the channel variable?
+        WebhookMessageActionImpl<Void> action = new WebhookMessageActionImpl<>(api, (MessageChannel) channel, route, (json) -> null);
         action.run();
         return action;
     }
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/attribute/IThreadContainerMixin.java b/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/attribute/IThreadContainerMixin.java
index 6e91dc0370..21789b7f3d 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/attribute/IThreadContainerMixin.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/attribute/IThreadContainerMixin.java
@@ -19,6 +19,7 @@
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.ChannelType;
 import net.dv8tion.jda.api.entities.IThreadContainer;
+import net.dv8tion.jda.api.entities.channel.unions.IThreadContainerUnion;
 import net.dv8tion.jda.api.requests.restaction.ThreadChannelAction;
 import net.dv8tion.jda.api.requests.restaction.pagination.ThreadChannelPaginationAction;
 import net.dv8tion.jda.internal.entities.mixin.channel.middleman.GuildChannelMixin;
@@ -30,7 +31,10 @@
 import javax.annotation.Nonnull;
 
 //TODO-v5: add checks for valid ThreadChannel names (0-100 chars)
-public interface IThreadContainerMixin<T extends IThreadContainerMixin<T>> extends IThreadContainer, GuildChannelMixin<T>
+public interface IThreadContainerMixin<T extends IThreadContainerMixin<T>> extends
+        IThreadContainer,
+        IThreadContainerUnion,
+        GuildChannelMixin<T>
 {
     // ---- Default implementations of interface ----
     @Nonnull
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/BaseGuildMessageChannelMixin.java b/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/attribute/IWebhookContainerMixin.java
similarity index 76%
rename from src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/BaseGuildMessageChannelMixin.java
rename to src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/attribute/IWebhookContainerMixin.java
index 1eab64ba9a..908c102314 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/BaseGuildMessageChannelMixin.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/attribute/IWebhookContainerMixin.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package net.dv8tion.jda.internal.entities.mixin.channel.middleman;
+package net.dv8tion.jda.internal.entities.mixin.channel.attribute;
 
 import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.entities.BaseGuildMessageChannel;
-import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.IWebhookContainer;
 import net.dv8tion.jda.api.entities.Webhook;
+import net.dv8tion.jda.api.entities.channel.unions.IWebhookContainerUnion;
 import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.requests.restaction.AuditableRestAction;
 import net.dv8tion.jda.api.requests.restaction.WebhookAction;
 import net.dv8tion.jda.api.utils.data.DataArray;
 import net.dv8tion.jda.internal.JDAImpl;
 import net.dv8tion.jda.internal.entities.EntityBuilder;
-import net.dv8tion.jda.internal.entities.mixin.channel.attribute.*;
+import net.dv8tion.jda.internal.entities.mixin.channel.middleman.GuildChannelMixin;
 import net.dv8tion.jda.internal.requests.RestActionImpl;
 import net.dv8tion.jda.internal.requests.Route;
 import net.dv8tion.jda.internal.requests.restaction.AuditableRestActionImpl;
@@ -39,25 +39,12 @@
 import java.util.Collections;
 import java.util.List;
 
-public interface BaseGuildMessageChannelMixin<T extends BaseGuildMessageChannelMixin<T>> extends
-        BaseGuildMessageChannel,
-        GuildMessageChannelMixin<T>,
-        IThreadContainerMixin<T>,
-        ICategorizableChannelMixin<T>,
-        IPositionableChannelMixin<T>,
-        IPermissionContainerMixin<T>,
-        IInviteContainerMixin<T>
+public interface IWebhookContainerMixin<T extends IWebhookContainerMixin<T>> extends
+        IWebhookContainer,
+        IWebhookContainerUnion,
+        GuildChannelMixin<T>
 {
     // ---- Default implementations of interface ----
-    @Override
-    default boolean canTalk(@Nonnull Member member)
-    {
-        if (!getGuild().equals(member.getGuild()))
-            throw new IllegalArgumentException("Provided Member is not from the Guild that this NewsChannel is part of.");
-
-        return member.hasPermission(this, Permission.VIEW_CHANNEL, Permission.MESSAGE_SEND);
-    }
-
     @Nonnull
     @Override
     default RestAction<List<Webhook>> retrieveWebhooks()
@@ -113,9 +100,4 @@ default AuditableRestAction<Void> deleteWebhookById(@Nonnull String id)
         Route.CompiledRoute route = Route.Webhooks.DELETE_WEBHOOK.compile(id);
         return new AuditableRestActionImpl<>(getJDA(), route);
     }
-
-    // ---- State Accessors ----
-    T setTopic(String topic);
-
-    T setNSFW(boolean nsfw);
 }
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/GuildMessageChannelMixin.java b/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/GuildMessageChannelMixin.java
index 5162a5c29b..83ab445a8c 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/GuildMessageChannelMixin.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/GuildMessageChannelMixin.java
@@ -19,6 +19,7 @@
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.GuildMessageChannel;
 import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.channel.unions.GuildMessageChannelUnion;
 import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.utils.MiscUtil;
 import net.dv8tion.jda.api.utils.TimeUtil;
@@ -31,7 +32,11 @@
 import javax.annotation.Nonnull;
 import java.util.Collection;
 
-public interface GuildMessageChannelMixin<T extends GuildMessageChannelMixin<T>> extends GuildMessageChannel, GuildChannelMixin<T>, MessageChannelMixin<T>
+public interface GuildMessageChannelMixin<T extends GuildMessageChannelMixin<T>> extends
+        GuildMessageChannel,
+        GuildMessageChannelUnion,
+        GuildChannelMixin<T>,
+        MessageChannelMixin<T>
 {
     // ---- Default implementations of interface ----
     @Nonnull
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/MessageChannelMixin.java b/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/MessageChannelMixin.java
index 9c789628dd..b614827511 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/MessageChannelMixin.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/MessageChannelMixin.java
@@ -18,6 +18,7 @@
 
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.exceptions.InsufficientPermissionException;
 import net.dv8tion.jda.api.interactions.components.LayoutComponent;
 import net.dv8tion.jda.api.requests.RestAction;
@@ -37,7 +38,9 @@
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 
-public interface MessageChannelMixin<T extends MessageChannelMixin<T>> extends MessageChannel
+public interface MessageChannelMixin<T extends MessageChannelMixin<T>> extends
+        MessageChannel,
+        MessageChannelUnion
 {
     // ---- Default implementations of interface ----
     @Nonnull
@@ -60,7 +63,7 @@ default List<CompletableFuture<Void>> purgeMessages(@Nonnull List<? extends Mess
             }
         }
 
-        return MessageChannel.super.purgeMessages(messages);
+        return MessageChannelUnion.super.purgeMessages(messages);
     }
 
     @Nonnull
@@ -71,7 +74,7 @@ default List<CompletableFuture<Void>> purgeMessagesById(@Nonnull long... message
 
         //If we can't use the bulk delete system, then use the standard purge defined in MessageChannel
         if (!canDeleteOtherUsersMessages())
-            return MessageChannel.super.purgeMessagesById(messageIds);
+            return MessageChannelUnion.super.purgeMessagesById(messageIds);
 
         // remove duplicates and sort messages
         List<CompletableFuture<Void>> list = new LinkedList<>();
@@ -120,7 +123,7 @@ default MessageAction sendMessage(@Nonnull CharSequence text)
     {
         checkCanAccessChannel();
         checkCanSendMessage();
-        return MessageChannel.super.sendMessage(text);
+        return MessageChannelUnion.super.sendMessage(text);
     }
 
     @Nonnull
@@ -130,7 +133,7 @@ default MessageAction sendMessageEmbeds(@Nonnull MessageEmbed embed, @Nonnull Me
         checkCanAccessChannel();
         checkCanSendMessage();
         checkCanSendMessageEmbeds();
-        return MessageChannel.super.sendMessageEmbeds(embed, other);
+        return MessageChannelUnion.super.sendMessageEmbeds(embed, other);
     }
 
     @Nonnull
@@ -140,7 +143,7 @@ default MessageAction sendMessageEmbeds(@Nonnull Collection<? extends MessageEmb
         checkCanAccessChannel();
         checkCanSendMessage();
         checkCanSendMessageEmbeds();
-        return MessageChannel.super.sendMessageEmbeds(embeds);
+        return MessageChannelUnion.super.sendMessageEmbeds(embeds);
     }
 
     @Nonnull
@@ -149,7 +152,7 @@ default MessageAction sendMessage(@Nonnull Message msg)
     {
         checkCanAccessChannel();
         checkCanSendMessage();
-        return MessageChannel.super.sendMessage(msg);
+        return MessageChannelUnion.super.sendMessage(msg);
     }
 
     @Nonnull
@@ -159,7 +162,7 @@ default MessageAction sendFile(@Nonnull InputStream data, @Nonnull String fileNa
         checkCanAccessChannel();
         checkCanSendMessage();
         checkCanSendFiles();
-        return MessageChannel.super.sendFile(data, fileName, options);
+        return MessageChannelUnion.super.sendFile(data, fileName, options);
     }
 
     @Nonnull
@@ -168,7 +171,7 @@ default RestAction<Message> retrieveMessageById(@Nonnull String messageId)
     {
         checkCanAccessChannel();
         checkCanViewHistory();
-        return MessageChannel.super.retrieveMessageById(messageId);
+        return MessageChannelUnion.super.retrieveMessageById(messageId);
     }
 
     @Nonnull
@@ -177,7 +180,7 @@ default AuditableRestAction<Void> deleteMessageById(@Nonnull String messageId)
     {
        checkCanAccessChannel();
        //We don't know if this is a Message sent by us or another user, so we can't run checks for Permission.MESSAGE_MANAGE
-       return MessageChannel.super.deleteMessageById(messageId);
+       return MessageChannelUnion.super.deleteMessageById(messageId);
     }
 
     @Nonnull
@@ -186,7 +189,7 @@ default MessageHistory getHistory()
     {
         checkCanAccessChannel();
         checkCanViewHistory();
-        return MessageChannel.super.getHistory();
+        return MessageChannelUnion.super.getHistory();
     }
 
     @Nonnull
@@ -195,7 +198,7 @@ default MessagePaginationAction getIterableHistory()
     {
         checkCanAccessChannel();
         checkCanViewHistory();
-        return MessageChannel.super.getIterableHistory();
+        return MessageChannelUnion.super.getIterableHistory();
     }
 
     @Nonnull
@@ -204,7 +207,7 @@ default MessageHistory.MessageRetrieveAction getHistoryAround(@Nonnull String me
     {
         checkCanAccessChannel();
         checkCanViewHistory();
-        return MessageChannel.super.getHistoryAround(messageId, limit);
+        return MessageChannelUnion.super.getHistoryAround(messageId, limit);
     }
 
     @Nonnull
@@ -213,7 +216,7 @@ default MessageHistory.MessageRetrieveAction getHistoryAfter(@Nonnull String mes
     {
         checkCanAccessChannel();
         checkCanViewHistory();
-        return MessageChannel.super.getHistoryAfter(messageId, limit);
+        return MessageChannelUnion.super.getHistoryAfter(messageId, limit);
     }
 
     @Nonnull
@@ -222,7 +225,7 @@ default MessageHistory.MessageRetrieveAction getHistoryBefore(@Nonnull String me
     {
         checkCanAccessChannel();
         checkCanViewHistory();
-        return MessageChannel.super.getHistoryBefore(messageId, limit);
+        return MessageChannelUnion.super.getHistoryBefore(messageId, limit);
     }
 
     @Nonnull
@@ -239,7 +242,7 @@ default MessageHistory.MessageRetrieveAction getHistoryFromBeginning(int limit)
     default RestAction<Void> sendTyping()
     {
         checkCanAccessChannel();
-        return MessageChannel.super.sendTyping();
+        return MessageChannelUnion.super.sendTyping();
     }
 
     @Nonnull
@@ -248,7 +251,7 @@ default RestAction<Void> addReactionById(@Nonnull String messageId, @Nonnull Str
     {
         checkCanAccessChannel();
         checkCanAddReactions();
-        return MessageChannel.super.addReactionById(messageId, unicode);
+        return MessageChannelUnion.super.addReactionById(messageId, unicode);
     }
 
     @Nonnull
@@ -257,7 +260,7 @@ default RestAction<Void> removeReactionById(@Nonnull String messageId, @Nonnull
     {
         checkCanAccessChannel();
         checkCanRemoveReactions();
-        return MessageChannel.super.removeReactionById(messageId, unicode);
+        return MessageChannelUnion.super.removeReactionById(messageId, unicode);
     }
 
     @Nonnull
@@ -266,7 +269,7 @@ default ReactionPaginationAction retrieveReactionUsersById(@Nonnull String messa
     {
         checkCanAccessChannel();
         checkCanRemoveReactions();
-        return MessageChannel.super.retrieveReactionUsersById(messageId, unicode);
+        return MessageChannelUnion.super.retrieveReactionUsersById(messageId, unicode);
     }
 
     @Nonnull
@@ -275,7 +278,7 @@ default RestAction<Void> pinMessageById(@Nonnull String messageId)
     {
         checkCanAccessChannel();
         checkCanControlMessagePins();
-        return MessageChannel.super.pinMessageById(messageId);
+        return MessageChannelUnion.super.pinMessageById(messageId);
     }
 
     @Nonnull
@@ -284,7 +287,7 @@ default RestAction<Void> unpinMessageById(@Nonnull String messageId)
     {
         checkCanAccessChannel();
         checkCanControlMessagePins();
-        return MessageChannel.super.unpinMessageById(messageId);
+        return MessageChannelUnion.super.unpinMessageById(messageId);
     }
 
     @Nonnull
@@ -292,7 +295,7 @@ default RestAction<Void> unpinMessageById(@Nonnull String messageId)
     default RestAction<List<Message>> retrievePinnedMessages()
     {
         checkCanAccessChannel();
-        return MessageChannel.super.retrievePinnedMessages();
+        return MessageChannelUnion.super.retrievePinnedMessages();
     }
 
     @Nonnull
@@ -301,7 +304,7 @@ default MessageAction editMessageById(@Nonnull String messageId, @Nonnull CharSe
     {
         checkCanAccessChannel();
         checkCanSendMessage();
-        return MessageChannel.super.editMessageById(messageId, newContent);
+        return MessageChannelUnion.super.editMessageById(messageId, newContent);
     }
 
     @Nonnull
@@ -310,7 +313,7 @@ default MessageAction editMessageById(@Nonnull String messageId, @Nonnull Messag
     {
        checkCanAccessChannel();
        checkCanSendMessage();
-       return MessageChannel.super.editMessageById(messageId, newContent);
+       return MessageChannelUnion.super.editMessageById(messageId, newContent);
     }
 
 
@@ -321,7 +324,7 @@ default MessageAction editMessageEmbedsById(@Nonnull String messageId, @Nonnull
         checkCanAccessChannel();
         checkCanSendMessage();
         checkCanSendMessageEmbeds();
-        return MessageChannel.super.editMessageEmbedsById(messageId, newEmbeds);
+        return MessageChannelUnion.super.editMessageEmbedsById(messageId, newEmbeds);
     }
 
     @Nonnull
@@ -330,7 +333,7 @@ default MessageAction editMessageComponentsById(@Nonnull String messageId, @Nonn
     {
         checkCanAccessChannel();
         checkCanSendMessage();
-        return MessageChannel.super.editMessageComponentsById(messageId, components);
+        return MessageChannelUnion.super.editMessageComponentsById(messageId, components);
     }
 
     // ---- State Accessors ----
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/StandardGuildChannelMixin.java b/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/StandardGuildChannelMixin.java
new file mode 100644
index 0000000000..cc11355e76
--- /dev/null
+++ b/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/StandardGuildChannelMixin.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dv8tion.jda.internal.entities.mixin.channel.middleman;
+
+import net.dv8tion.jda.api.entities.StandardGuildChannel;
+import net.dv8tion.jda.api.entities.channel.unions.StandardGuildChannelUnion;
+import net.dv8tion.jda.internal.entities.mixin.channel.attribute.ICategorizableChannelMixin;
+import net.dv8tion.jda.internal.entities.mixin.channel.attribute.IInviteContainerMixin;
+import net.dv8tion.jda.internal.entities.mixin.channel.attribute.IPermissionContainerMixin;
+import net.dv8tion.jda.internal.entities.mixin.channel.attribute.IPositionableChannelMixin;
+
+public interface StandardGuildChannelMixin<T extends StandardGuildChannelMixin<T>> extends
+        StandardGuildChannel,
+        StandardGuildChannelUnion,
+        ICategorizableChannelMixin<T>,
+        IPositionableChannelMixin<T>,
+        IPermissionContainerMixin<T>,
+        IInviteContainerMixin<T>
+{
+}
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/StandardGuildMessageChannelMixin.java b/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/StandardGuildMessageChannelMixin.java
new file mode 100644
index 0000000000..82a808c488
--- /dev/null
+++ b/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/StandardGuildMessageChannelMixin.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dv8tion.jda.internal.entities.mixin.channel.middleman;
+
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.StandardGuildMessageChannel;
+import net.dv8tion.jda.internal.entities.mixin.channel.attribute.IThreadContainerMixin;
+import net.dv8tion.jda.internal.entities.mixin.channel.attribute.IWebhookContainerMixin;
+
+import javax.annotation.Nonnull;
+
+public interface StandardGuildMessageChannelMixin<T extends StandardGuildMessageChannelMixin<T>> extends
+        StandardGuildMessageChannel,
+        StandardGuildChannelMixin<T>,
+        GuildMessageChannelMixin<T>,
+        IThreadContainerMixin<T>,
+        IWebhookContainerMixin<T>
+{
+    // ---- Default implementations of interface ----
+    @Override
+    default boolean canTalk(@Nonnull Member member)
+    {
+        if (!getGuild().equals(member.getGuild()))
+            throw new IllegalArgumentException("Provided Member is not from the Guild that this channel is part of.");
+
+        return member.hasPermission(this, Permission.VIEW_CHANNEL, Permission.MESSAGE_SEND);
+    }
+
+    // ---- State Accessors ----
+    T setTopic(String topic);
+
+    T setNSFW(boolean nsfw);
+}
diff --git a/src/main/java/net/dv8tion/jda/internal/interactions/command/CommandInteractionPayloadImpl.java b/src/main/java/net/dv8tion/jda/internal/interactions/command/CommandInteractionPayloadImpl.java
index 7d73ec80d9..0b37bf5f0f 100644
--- a/src/main/java/net/dv8tion/jda/internal/interactions/command/CommandInteractionPayloadImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/interactions/command/CommandInteractionPayloadImpl.java
@@ -20,7 +20,7 @@
 import gnu.trove.map.hash.TLongObjectHashMap;
 import net.dv8tion.jda.api.entities.ISnowflake;
 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.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.CommandInteractionPayload;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
@@ -141,9 +141,9 @@ private void parseResolved(JDAImpl jda, DataObject resolveJson)
     @Nonnull
     @Override
     @SuppressWarnings("ConstantConditions")
-    public MessageChannel getChannel()
+    public MessageChannelUnion getChannel()
     {
-        return (MessageChannel) super.getChannel();
+        return (MessageChannelUnion) super.getChannel();
     }
 
     @Nonnull
diff --git a/src/main/java/net/dv8tion/jda/internal/interactions/command/MessageContextInteractionImpl.java b/src/main/java/net/dv8tion/jda/internal/interactions/command/MessageContextInteractionImpl.java
index 4b2ad9344c..eb4ae6635b 100644
--- a/src/main/java/net/dv8tion/jda/internal/interactions/command/MessageContextInteractionImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/interactions/command/MessageContextInteractionImpl.java
@@ -18,7 +18,7 @@
 
 import net.dv8tion.jda.api.entities.Guild;
 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.interactions.commands.context.MessageContextInteraction;
 import net.dv8tion.jda.api.utils.data.DataObject;
 import net.dv8tion.jda.internal.JDAImpl;
@@ -31,9 +31,9 @@ public MessageContextInteractionImpl(JDAImpl jda, DataObject data)
     }
 
     @Override
-    public MessageChannel getChannel()
+    public MessageChannelUnion getChannel()
     {
-        return (MessageChannel) super.getChannel();
+        return (MessageChannelUnion) super.getChannel();
     }
 
     private static Message parse(JDAImpl api, DataObject interactionData, DataObject resolved)
diff --git a/src/main/java/net/dv8tion/jda/internal/interactions/command/SlashCommandInteractionImpl.java b/src/main/java/net/dv8tion/jda/internal/interactions/command/SlashCommandInteractionImpl.java
index c65c96d8c5..0d58892be1 100644
--- a/src/main/java/net/dv8tion/jda/internal/interactions/command/SlashCommandInteractionImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/interactions/command/SlashCommandInteractionImpl.java
@@ -16,7 +16,7 @@
 
 package net.dv8tion.jda.internal.interactions.command;
 
-import net.dv8tion.jda.api.entities.MessageChannel;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.interactions.commands.SlashCommandInteraction;
 import net.dv8tion.jda.api.utils.data.DataObject;
 import net.dv8tion.jda.internal.JDAImpl;
@@ -33,8 +33,8 @@ public SlashCommandInteractionImpl(JDAImpl jda, DataObject data)
     @Nonnull
     @Override
     @SuppressWarnings("ConstantConditions")
-    public MessageChannel getChannel()
+    public MessageChannelUnion getChannel()
     {
-        return (MessageChannel) super.getChannel();
+        return (MessageChannelUnion) super.getChannel();
     }
 }
diff --git a/src/main/java/net/dv8tion/jda/internal/interactions/component/ComponentInteractionImpl.java b/src/main/java/net/dv8tion/jda/internal/interactions/component/ComponentInteractionImpl.java
index 58daf30d02..2653ea139a 100644
--- a/src/main/java/net/dv8tion/jda/internal/interactions/component/ComponentInteractionImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/interactions/component/ComponentInteractionImpl.java
@@ -17,7 +17,7 @@
 package net.dv8tion.jda.internal.interactions.component;
 
 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.interactions.components.ComponentInteraction;
 import net.dv8tion.jda.api.interactions.components.Modal;
 import net.dv8tion.jda.api.requests.restaction.interactions.ModalCallbackAction;
@@ -54,9 +54,9 @@ public ComponentInteractionImpl(JDAImpl jda, DataObject data)
     @Nonnull
     @Override
     @SuppressWarnings("ConstantConditions")
-    public MessageChannel getChannel()
+    public MessageChannelUnion getChannel()
     {
-        return (MessageChannel) super.getChannel();
+        return (MessageChannelUnion) super.getChannel();
     }
 
     @Nonnull
diff --git a/src/main/java/net/dv8tion/jda/internal/managers/WebhookManagerImpl.java b/src/main/java/net/dv8tion/jda/internal/managers/WebhookManagerImpl.java
index 7a46cb7f69..a45090ed57 100644
--- a/src/main/java/net/dv8tion/jda/internal/managers/WebhookManagerImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/managers/WebhookManagerImpl.java
@@ -144,11 +144,11 @@ protected RequestBody finalizeData()
     protected boolean checkPermissions()
     {
         Member selfMember = getGuild().getSelfMember();
-        BaseGuildMessageChannel channel = getChannel();
-        if (!selfMember.hasAccess(channel))
-            throw new MissingAccessException(channel, Permission.VIEW_CHANNEL);
-        if (!selfMember.hasPermission(channel, Permission.MANAGE_WEBHOOKS))
-            throw new InsufficientPermissionException(channel, Permission.MANAGE_WEBHOOKS);
+        IPermissionContainer permContainer = getChannel().getPermissionContainer();
+        if (!selfMember.hasAccess(permContainer))
+            throw new MissingAccessException(permContainer, Permission.VIEW_CHANNEL);
+        if (!selfMember.hasPermission(permContainer, Permission.MANAGE_WEBHOOKS))
+            throw new InsufficientPermissionException(permContainer, Permission.MANAGE_WEBHOOKS);
         return super.checkPermissions();
     }
 }
diff --git a/src/main/java/net/dv8tion/jda/internal/requests/restaction/MessageActionImpl.java b/src/main/java/net/dv8tion/jda/internal/requests/restaction/MessageActionImpl.java
index 8538505873..61370e3081 100644
--- a/src/main/java/net/dv8tion/jda/internal/requests/restaction/MessageActionImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/requests/restaction/MessageActionImpl.java
@@ -19,6 +19,7 @@
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.exceptions.InsufficientPermissionException;
 import net.dv8tion.jda.api.exceptions.MissingAccessException;
 import net.dv8tion.jda.api.interactions.InteractionHook;
@@ -143,9 +144,9 @@ public MessageAction deadline(long timestamp)
 
     @Nonnull
     @Override
-    public MessageChannel getChannel()
+    public MessageChannelUnion getChannel()
     {
-        return channel;
+        return (MessageChannelUnion) channel;
     }
 
     @Override
diff --git a/src/main/java/net/dv8tion/jda/internal/requests/restaction/WebhookActionImpl.java b/src/main/java/net/dv8tion/jda/internal/requests/restaction/WebhookActionImpl.java
index 52598e9a60..f88dbb80f2 100644
--- a/src/main/java/net/dv8tion/jda/internal/requests/restaction/WebhookActionImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/requests/restaction/WebhookActionImpl.java
@@ -17,9 +17,10 @@
 package net.dv8tion.jda.internal.requests.restaction;
 
 import net.dv8tion.jda.api.JDA;
-import net.dv8tion.jda.api.entities.BaseGuildMessageChannel;
+import net.dv8tion.jda.api.entities.IWebhookContainer;
 import net.dv8tion.jda.api.entities.Icon;
 import net.dv8tion.jda.api.entities.Webhook;
+import net.dv8tion.jda.api.entities.channel.unions.IWebhookContainerUnion;
 import net.dv8tion.jda.api.requests.Request;
 import net.dv8tion.jda.api.requests.Response;
 import net.dv8tion.jda.api.requests.restaction.WebhookAction;
@@ -39,11 +40,11 @@
  */
 public class WebhookActionImpl extends AuditableRestActionImpl<Webhook> implements WebhookAction
 {
-    protected final BaseGuildMessageChannel channel;
+    protected final IWebhookContainer channel;
     protected String name;
     protected Icon avatar = null;
 
-    public WebhookActionImpl(JDA api, BaseGuildMessageChannel channel, String name)
+    public WebhookActionImpl(JDA api, IWebhookContainer channel, String name)
     {
         super(api, Route.Channels.CREATE_WEBHOOK.compile(channel.getId()));
         this.channel = channel;
@@ -73,9 +74,9 @@ public WebhookActionImpl deadline(long timestamp)
 
     @Nonnull
     @Override
-    public BaseGuildMessageChannel getChannel()
+    public IWebhookContainerUnion getChannel()
     {
-        return channel;
+        return (IWebhookContainerUnion) channel;
     }
 
     @Nonnull
diff --git a/src/main/java/net/dv8tion/jda/internal/requests/restaction/pagination/MessagePaginationActionImpl.java b/src/main/java/net/dv8tion/jda/internal/requests/restaction/pagination/MessagePaginationActionImpl.java
index 0bbb697167..8c03f959e7 100644
--- a/src/main/java/net/dv8tion/jda/internal/requests/restaction/pagination/MessagePaginationActionImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/requests/restaction/pagination/MessagePaginationActionImpl.java
@@ -18,6 +18,7 @@
 
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.exceptions.InsufficientPermissionException;
 import net.dv8tion.jda.api.exceptions.MissingAccessException;
 import net.dv8tion.jda.api.exceptions.ParsingException;
@@ -59,9 +60,9 @@ public MessagePaginationActionImpl(MessageChannel channel)
 
     @Nonnull
     @Override
-    public MessageChannel getChannel()
+    public MessageChannelUnion getChannel()
     {
-        return channel;
+        return (MessageChannelUnion) channel;
     }
 
     @Override
diff --git a/src/main/java/net/dv8tion/jda/internal/requests/restaction/pagination/ThreadChannelPaginationActionImpl.java b/src/main/java/net/dv8tion/jda/internal/requests/restaction/pagination/ThreadChannelPaginationActionImpl.java
index 078bfdbabb..1dab5bbd16 100644
--- a/src/main/java/net/dv8tion/jda/internal/requests/restaction/pagination/ThreadChannelPaginationActionImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/requests/restaction/pagination/ThreadChannelPaginationActionImpl.java
@@ -5,6 +5,7 @@
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.IThreadContainer;
 import net.dv8tion.jda.api.entities.ThreadChannel;
+import net.dv8tion.jda.api.entities.channel.unions.IThreadContainerUnion;
 import net.dv8tion.jda.api.exceptions.ParsingException;
 import net.dv8tion.jda.api.requests.Request;
 import net.dv8tion.jda.api.requests.Response;
@@ -34,9 +35,9 @@ public ThreadChannelPaginationActionImpl(JDA api, Route.CompiledRoute route, ITh
 
     @Nonnull
     @Override
-    public IThreadContainer getChannel()
+    public IThreadContainerUnion getChannel()
     {
-        return channel;
+        return (IThreadContainerUnion) channel;
     }
 
     @Nonnull

From bda7ac354f2b7892e3310c7c4350b70b315d4516 Mon Sep 17 00:00:00 2001
From: Austin Keener <keeneraustin@yahoo.com>
Date: Sun, 22 May 2022 00:16:04 -0400
Subject: [PATCH 02/17] Added documentation

---
 .../unions/DefaultGuildChannelUnion.java      |  71 +++++++++++-
 .../unions/GuildMessageChannelUnion.java      | 103 +++++++++++++++++-
 .../channel/unions/IThreadContainerUnion.java | 103 ++++++++++++++++++
 .../unions/IWebhookContainerUnion.java        | 103 ++++++++++++++++++
 .../channel/unions/MessageChannelUnion.java   |  77 +++++++++++++
 5 files changed, 450 insertions(+), 7 deletions(-)

diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java
index d7c3e1db9d..ddf7b7ac8c 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java
@@ -16,23 +16,86 @@
 
 package net.dv8tion.jda.api.entities.channel.unions;
 
-import net.dv8tion.jda.api.entities.NewsChannel;
-import net.dv8tion.jda.api.entities.StandardGuildChannel;
-import net.dv8tion.jda.api.entities.StandardGuildMessageChannel;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.*;
 
 import javax.annotation.Nonnull;
 
+/**
+ * A specialized union representing all channel types that can be used for the "default" channel for
+ * {@link Guild#getDefaultChannel()} or {@link Member#getDefaultChannel()}.
+ * <br>This class extends {@link StandardGuildChannel} and primarily acts as a discovery tool for
+ * developers to understand which channels might be returned as default channels.
+ *
+ * <br><br><b>Not all {@link StandardGuildChannel} channels can be used as a default channel!</b>
+ *
+ * <br><br>This interface represents the follow concrete channel types:
+ * <ul>
+ *     <li>{@link TextChannel}</li>
+ *     <li>{@link NewsChannel}</li>
+ * </ul>
+ */
 public interface DefaultGuildChannelUnion extends StandardGuildChannel
 {
+    /**
+     * Casts this union to a {@link TextChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * TextChannel channel = union.asTextChannel();
+     * TextChannel channel2 = (TextChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link TextChannel}.
+     *
+     * @return The channel as a {@link TextChannel}
+     */
     @Nonnull
     TextChannel asTextChannel();
 
+    /**
+     * Casts this union to a {@link NewsChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * NewsChannel channel = union.asNewsChannel();
+     * NewsChannel channel2 = (NewsChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link NewsChannel}.
+     *
+     * @return The channel as a {@link NewsChannel}
+     */
     @Nonnull
     NewsChannel asNewsChannel();
 
     //TODO: add asForumChannel() (I think ForumChannels can be the default?)
 
+    /**
+     * Casts this union to a {@link StandardGuildMessageChannel}.
+     * <br>This only works for the following channel types represented by this union:
+     * <ul>
+     *     <li>{@link TextChannel}</li>
+     *     <li>{@link NewsChannel}</li>
+     * </ul>
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * StandardGuildMessageChannel channel = union.asStandardGuildMessageChannel();
+     * StandardGuildMessageChannel channel2 = (StandardGuildMessageChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link StandardGuildMessageChannel}.
+     *
+     * @return The channel as a {@link StandardGuildMessageChannel}
+     */
     @Nonnull
     StandardGuildMessageChannel asStandardGuildMessageChannel();
 }
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildMessageChannelUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildMessageChannelUnion.java
index 7f21b6ba52..b018b4b0db 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildMessageChannelUnion.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildMessageChannelUnion.java
@@ -20,25 +20,122 @@
 
 import javax.annotation.Nonnull;
 
+/**
+ * A union representing all channel types that implement {@link GuildMessageChannel}.
+ * <br>This class extends {@link GuildMessageChannel} and primarily acts as a discovery tool for
+ * developers to discover some common interfaces that a {@link GuildMessageChannel} could be cast to.
+ *
+ * <br>This interface represents the follow concrete channel types:
+ * <ul>
+ *     <li>{@link TextChannel}</li>
+ *     <li>{@link NewsChannel}</li>
+ *     <li>{@link ThreadChannel}</li>
+ * </ul>
+ */
 public interface GuildMessageChannelUnion extends GuildMessageChannel
 {
+    /**
+     * Casts this union to a {@link TextChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * TextChannel channel = union.asTextChannel();
+     * TextChannel channel2 = (TextChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link TextChannel}.
+     *
+     * @return The channel as a {@link TextChannel}
+     */
     @Nonnull
     TextChannel asTextChannel();
 
+    /**
+     * Casts this union to a {@link NewsChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * NewsChannel channel = union.asNewsChannel();
+     * NewsChannel channel2 = (NewsChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link NewsChannel}.
+     *
+     * @return The channel as a {@link NewsChannel}
+     */
     @Nonnull
     NewsChannel asNewsChannel();
 
+    /**
+     * Casts this union to a {@link ThreadChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * ThreadChannel channel = union.asThreadChannel();
+     * ThreadChannel channel2 = (ThreadChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link ThreadChannel}.
+     *
+     * @return The channel as a {@link ThreadChannel}
+     */
     @Nonnull
     ThreadChannel asThreadChannel();
 
     //TODO: Add asVoiceChannel once TiV is launched
 
-    @Nonnull
-    GuildMessageChannel asGuildMessageChannel();
-
+    /**
+     * Casts this union to a {@link StandardGuildChannel}.
+     * <br>This only works for the following channel types represented by this union:
+     * <ul>
+     *     <li>{@link TextChannel}</li>
+     *     <li>{@link NewsChannel}</li>
+     * </ul>
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * StandardGuildChannel channel = union.asStandardGuildChannel();
+     * StandardGuildChannel channel2 = (StandardGuildChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link StandardGuildChannel}.
+     *
+     * @return The channel as a {@link StandardGuildChannel}
+     */
     @Nonnull
     StandardGuildChannel asStandardGuildChannel();
 
+    /**
+     * Casts this union to a {@link StandardGuildMessageChannel}.
+     * <br>This only works for the following channel types represented by this union:
+     * <ul>
+     *     <li>{@link TextChannel}</li>
+     *     <li>{@link NewsChannel}</li>
+     * </ul>
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * StandardGuildMessageChannel channel = union.asStandardGuildMessageChannel();
+     * StandardGuildMessageChannel channel2 = (StandardGuildMessageChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link StandardGuildMessageChannel}.
+     *
+     * @return The channel as a {@link StandardGuildMessageChannel}
+     */
     @Nonnull
     StandardGuildMessageChannel asStandardGuildMessageChannel();
 }
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IThreadContainerUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IThreadContainerUnion.java
index 3e9fba3bc0..51836c6838 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IThreadContainerUnion.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IThreadContainerUnion.java
@@ -20,22 +20,125 @@
 
 import javax.annotation.Nonnull;
 
+/**
+ * A union representing all channel types that implement {@link IThreadContainer}.
+ * <br>This class extends {@link IThreadContainer} and primarily acts as a discovery tool for
+ * developers to discover some common interfaces that a {@link IThreadContainer} could be cast to.
+ *
+ * <br>This interface represents the follow concrete channel types:
+ * <ul>
+ *     <li>{@link TextChannel}</li>
+ *     <li>{@link NewsChannel}</li>
+ * </ul>
+ */
 public interface IThreadContainerUnion extends IThreadContainer
 {
+    /**
+     * Casts this union to a {@link TextChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * TextChannel channel = union.asTextChannel();
+     * TextChannel channel2 = (TextChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link TextChannel}.
+     *
+     * @return The channel as a {@link TextChannel}
+     */
     @Nonnull
     TextChannel asTextChannel();
 
+    /**
+     * Casts this union to a {@link NewsChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * NewsChannel channel = union.asNewsChannel();
+     * NewsChannel channel2 = (NewsChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link NewsChannel}.
+     *
+     * @return The channel as a {@link NewsChannel}
+     */
     @Nonnull
     NewsChannel asNewsChannel();
 
     //TODO: Add asForumChannel
 
+    /**
+     * Casts this union to a {@link GuildMessageChannel}.
+     * <br>This works for the following channel types represented by this union:
+     * <ul>
+     *     <li>{@link TextChannel}</li>
+     *     <li>{@link NewsChannel}</li>
+     * </ul>
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * GuildMessageChannel channel = union.asGuildMessageChannel();
+     * GuildMessageChannel channel2 = (GuildMessageChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link GuildMessageChannel}.
+     *
+     * @return The channel as a {@link GuildMessageChannel}
+     */
     @Nonnull
     GuildMessageChannel asGuildMessageChannel();
 
+    /**
+     * Casts this union to a {@link StandardGuildChannel}.
+     * <br>This works for the following channel types represented by this union:
+     * <ul>
+     *     <li>{@link TextChannel}</li>
+     *     <li>{@link NewsChannel}</li>
+     * </ul>
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * StandardGuildChannel channel = union.asStandardGuildChannel();
+     * StandardGuildChannel channel2 = (StandardGuildChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link StandardGuildChannel}.
+     *
+     * @return The channel as a {@link StandardGuildChannel}
+     */
     @Nonnull
     StandardGuildChannel asStandardGuildChannel();
 
+    /**
+     * Casts this union to a {@link StandardGuildMessageChannel}.
+     * <br>This works for the following channel types represented by this union:
+     * <ul>
+     *     <li>{@link TextChannel}</li>
+     *     <li>{@link NewsChannel}</li>
+     * </ul>
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * StandardGuildMessageChannel channel = union.asStandardGuildMessageChannel();
+     * StandardGuildMessageChannel channel2 = (StandardGuildMessageChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link StandardGuildMessageChannel}.
+     *
+     * @return The channel as a {@link StandardGuildMessageChannel}
+     */
     @Nonnull
     StandardGuildMessageChannel asStandardGuildMessageChannel();
 }
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IWebhookContainerUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IWebhookContainerUnion.java
index 66e5b14535..9fd64fd91c 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IWebhookContainerUnion.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IWebhookContainerUnion.java
@@ -20,22 +20,125 @@
 
 import javax.annotation.Nonnull;
 
+/**
+ * A union representing all channel types that implement {@link IWebhookContainer}.
+ * <br>This class extends {@link IWebhookContainer} and primarily acts as a discovery tool for
+ * developers to discover some common interfaces that a {@link IWebhookContainer} could be cast to.
+ *
+ * <br>This interface represents the follow concrete channel types:
+ * <ul>
+ *     <li>{@link TextChannel}</li>
+ *     <li>{@link NewsChannel}</li>
+ * </ul>
+ */
 public interface IWebhookContainerUnion extends IWebhookContainer
 {
+    /**
+     * Casts this union to a {@link TextChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * TextChannel channel = union.asTextChannel();
+     * TextChannel channel2 = (TextChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link TextChannel}.
+     *
+     * @return The channel as a {@link TextChannel}
+     */
     @Nonnull
     TextChannel asTextChannel();
 
+    /**
+     * Casts this union to a {@link NewsChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * NewsChannel channel = union.asNewsChannel();
+     * NewsChannel channel2 = (NewsChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link NewsChannel}.
+     *
+     * @return The channel as a {@link NewsChannel}
+     */
     @Nonnull
     NewsChannel asNewsChannel();
 
     //TODO: Add asForumChannel
 
+    /**
+     * Casts this union to a {@link GuildMessageChannel}.
+     * <br>This works for the following channel types represented by this union:
+     * <ul>
+     *     <li>{@link TextChannel}</li>
+     *     <li>{@link NewsChannel}</li>
+     * </ul>
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * GuildMessageChannel channel = union.asGuildMessageChannel();
+     * GuildMessageChannel channel2 = (GuildMessageChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link GuildMessageChannel}.
+     *
+     * @return The channel as a {@link GuildMessageChannel}
+     */
     @Nonnull
     GuildMessageChannel asGuildMessageChannel();
 
+    /**
+     * Casts this union to a {@link StandardGuildChannel}.
+     * <br>This only works for the following channel types represented by this union:
+     * <ul>
+     *     <li>{@link TextChannel}</li>
+     *     <li>{@link NewsChannel}</li>
+     * </ul>
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * StandardGuildChannel channel = union.asStandardGuildChannel();
+     * StandardGuildChannel channel2 = (StandardGuildChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link StandardGuildChannel}.
+     *
+     * @return The channel as a {@link StandardGuildChannel}
+     */
     @Nonnull
     StandardGuildChannel asStandardGuildChannel();
 
+    /**
+     * Casts this union to a {@link StandardGuildMessageChannel}.
+     * <br>This only works for the following channel types represented by this union:
+     * <ul>
+     *     <li>{@link TextChannel}</li>
+     *     <li>{@link NewsChannel}</li>
+     * </ul>
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * StandardGuildMessageChannel channel = union.asStandardGuildMessageChannel();
+     * StandardGuildMessageChannel channel2 = (StandardGuildMessageChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link StandardGuildMessageChannel}.
+     *
+     * @return The channel as a {@link StandardGuildMessageChannel}
+     */
     @Nonnull
     StandardGuildMessageChannel asStandardGuildMessageChannel();
 }
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java
index 121729e104..422db86af4 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java
@@ -20,17 +20,94 @@
 
 import javax.annotation.Nonnull;
 
+/**
+ * A union representing all channel types that implement {@link MessageChannel}.
+ * <br>This class extends {@link MessageChannel} and primarily acts as a discovery tool for
+ * developers to discover some common interfaces that a {@link MessageChannel} could be cast to.
+ *
+ * <br>This interface represents the follow concrete channel types:
+ * <ul>
+ *     <li>{@link TextChannel}</li>
+ *     <li>{@link NewsChannel}</li>
+ *     <li>{@link ThreadChannel}</li>
+ *     <li>{@link PrivateChannel}</li>
+ * </ul>
+ */
 public interface MessageChannelUnion extends MessageChannel
 {
+    /**
+     * Casts this union to a {@link PrivateChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * PrivateChannel channel = union.asPrivateChannel();
+     * PrivateChannel channel2 = (PrivateChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link PrivateChannel}.
+     *
+     * @return The channel as a {@link PrivateChannel}
+     */
     @Nonnull
     PrivateChannel asPrivateChannel();
 
+    /**
+     * Casts this union to a {@link TextChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * TextChannel channel = union.asTextChannel();
+     * TextChannel channel2 = (TextChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link TextChannel}.
+     *
+     * @return The channel as a {@link TextChannel}
+     */
     @Nonnull
     TextChannel asTextChannel();
 
+    /**
+     * Casts this union to a {@link NewsChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * NewsChannel channel = union.asNewsChannel();
+     * NewsChannel channel2 = (NewsChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link NewsChannel}.
+     *
+     * @return The channel as a {@link NewsChannel}
+     */
     @Nonnull
     NewsChannel asNewsChannel();
 
+    /**
+     * Casts this union to a {@link ThreadChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * ThreadChannel channel = union.asThreadChannel();
+     * ThreadChannel channel2 = (ThreadChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link ThreadChannel}.
+     *
+     * @return The channel as a {@link ThreadChannel}
+     */
     @Nonnull
     ThreadChannel asThreadChannel();
 

From 7c1f5024828678ae1294c21c28b53f003fa7e917 Mon Sep 17 00:00:00 2001
From: Austin Keener <keeneraustin@yahoo.com>
Date: Sun, 22 May 2022 00:16:38 -0400
Subject: [PATCH 03/17] Removed pointless union

If we find that we need this union in the future we can re-add it, but currently nothing is using it.
---
 .../unions/StandardGuildChannelUnion.java     | 38 -------------------
 .../middleman/StandardGuildChannelMixin.java  |  2 -
 2 files changed, 40 deletions(-)
 delete mode 100644 src/main/java/net/dv8tion/jda/api/entities/channel/unions/StandardGuildChannelUnion.java

diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/StandardGuildChannelUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/StandardGuildChannelUnion.java
deleted file mode 100644
index f98acfe703..0000000000
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/StandardGuildChannelUnion.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dv8tion.jda.api.entities.channel.unions;
-
-import net.dv8tion.jda.api.entities.*;
-
-import javax.annotation.Nonnull;
-
-public interface StandardGuildChannelUnion extends StandardGuildChannel
-{
-    @Nonnull
-    TextChannel asTextChannel();
-
-    @Nonnull
-    NewsChannel asNewsChannel();
-
-    @Nonnull
-    VoiceChannel asVoiceChannel();
-
-    @Nonnull
-    StageChannel asStageChannel();
-
-    //TODO: add asForumChannel()
-}
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/StandardGuildChannelMixin.java b/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/StandardGuildChannelMixin.java
index cc11355e76..e09e395a42 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/StandardGuildChannelMixin.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/StandardGuildChannelMixin.java
@@ -17,7 +17,6 @@
 package net.dv8tion.jda.internal.entities.mixin.channel.middleman;
 
 import net.dv8tion.jda.api.entities.StandardGuildChannel;
-import net.dv8tion.jda.api.entities.channel.unions.StandardGuildChannelUnion;
 import net.dv8tion.jda.internal.entities.mixin.channel.attribute.ICategorizableChannelMixin;
 import net.dv8tion.jda.internal.entities.mixin.channel.attribute.IInviteContainerMixin;
 import net.dv8tion.jda.internal.entities.mixin.channel.attribute.IPermissionContainerMixin;
@@ -25,7 +24,6 @@
 
 public interface StandardGuildChannelMixin<T extends StandardGuildChannelMixin<T>> extends
         StandardGuildChannel,
-        StandardGuildChannelUnion,
         ICategorizableChannelMixin<T>,
         IPositionableChannelMixin<T>,
         IPermissionContainerMixin<T>,

From 119bb0ccb628d116d193192b18baa29fb82a8592 Mon Sep 17 00:00:00 2001
From: Austin Keener <keeneraustin@yahoo.com>
Date: Sun, 22 May 2022 00:19:03 -0400
Subject: [PATCH 04/17] Update
 src/main/java/net/dv8tion/jda/api/entities/IWebhookContainer.java

---
 .../java/net/dv8tion/jda/api/entities/IWebhookContainer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/dv8tion/jda/api/entities/IWebhookContainer.java b/src/main/java/net/dv8tion/jda/api/entities/IWebhookContainer.java
index b19f30037a..eff5b2557e 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/IWebhookContainer.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/IWebhookContainer.java
@@ -89,7 +89,7 @@ public interface IWebhookContainer extends GuildChannel
      * <p>Possible ErrorResponses include:
      * <ul>
      *     <li>{@link net.dv8tion.jda.api.requests.ErrorResponse#UNKNOWN_WEBHOOK}
-     *     <br>The provided id does not refer to a WebHook present in this chanel, either due
+     *     <br>The provided id does not refer to a WebHook present in this channel, either due
      *         to it not existing or having already been deleted.</li>
      *
      *     <li>{@link net.dv8tion.jda.api.requests.ErrorResponse#UNKNOWN_CHANNEL UNKNOWN_CHANNEL}

From aee55a087e14a2b32da1b5a272062388ccecf84e Mon Sep 17 00:00:00 2001
From: Austin Keener <keeneraustin@yahoo.com>
Date: Sat, 18 Jun 2022 13:28:19 -0400
Subject: [PATCH 05/17] Updated docs based on PR feedback

---
 .../java/net/dv8tion/jda/api/entities/Member.java    |  4 ++--
 .../channel/unions/DefaultGuildChannelUnion.java     |  9 +++++++++
 .../channel/unions/GuildMessageChannelUnion.java     |  9 +++++++++
 .../channel/unions/IThreadContainerUnion.java        |  9 +++++++++
 .../channel/unions/IWebhookContainerUnion.java       |  9 +++++++++
 .../entities/channel/unions/MessageChannelUnion.java | 12 ++++++++++++
 6 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/dv8tion/jda/api/entities/Member.java b/src/main/java/net/dv8tion/jda/api/entities/Member.java
index e2a2cfe358..1043306cc0 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/Member.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/Member.java
@@ -423,14 +423,14 @@ default ImageProxy getEffectiveAvatar()
     boolean isPending();
 
     /**
-     * The default {@link net.dv8tion.jda.api.entities.StandardGuildChannel channel} for a {@link net.dv8tion.jda.api.entities.Member Member}.
+     * The {@link DefaultGuildChannelUnion default channel} for a {@link net.dv8tion.jda.api.entities.Member Member}.
      * <br>This is the channel that the Discord client will default to opening when a Guild is opened for the first time
      * after joining the guild.
      * <br>The default channel is the channel with the highest position in which the member has
      * {@link net.dv8tion.jda.api.Permission#VIEW_CHANNEL Permission.VIEW_CHANNEL} permissions. If this requirement doesn't apply for
      * any channel in the guild, this method returns {@code null}.
      *
-     * @return The {@link StandardGuildChannel channel} representing the default channel for this member
+     * @return The {@link DefaultGuildChannelUnion channel} representing the default channel for this member
      *         or null if no such channel exists.
      */
     @Nullable
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java
index ddf7b7ac8c..e3e1d71ee0 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java
@@ -23,6 +23,9 @@
 /**
  * A specialized union representing all channel types that can be used for the "default" channel for
  * {@link Guild#getDefaultChannel()} or {@link Member#getDefaultChannel()}.
+ * <br>This is the channel that the Discord client will default to opening when a Guild is opened for the first time
+ * when accepting an invite that is not directed at a specific {@link IInviteContainer channel}.
+ *
  * <br>This class extends {@link StandardGuildChannel} and primarily acts as a discovery tool for
  * developers to understand which channels might be returned as default channels.
  *
@@ -47,6 +50,9 @@ public interface DefaultGuildChannelUnion extends StandardGuildChannel
      * TextChannel channel2 = (TextChannel) union;
      * </code></pre>
      *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#TEXT} to validate
+     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof TextChannel</code>
+     *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link TextChannel}.
      *
@@ -66,6 +72,9 @@ public interface DefaultGuildChannelUnion extends StandardGuildChannel
      * NewsChannel channel2 = (NewsChannel) union;
      * </code></pre>
      *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#NEWS} to validate
+     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof NewsChannel</code>
+     *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link NewsChannel}.
      *
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildMessageChannelUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildMessageChannelUnion.java
index b018b4b0db..17679eff9c 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildMessageChannelUnion.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildMessageChannelUnion.java
@@ -45,6 +45,9 @@ public interface GuildMessageChannelUnion extends GuildMessageChannel
      * TextChannel channel2 = (TextChannel) union;
      * </code></pre>
      *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#TEXT} to validate
+     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof TextChannel</code>
+     *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link TextChannel}.
      *
@@ -64,6 +67,9 @@ public interface GuildMessageChannelUnion extends GuildMessageChannel
      * NewsChannel channel2 = (NewsChannel) union;
      * </code></pre>
      *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#NEWS} to validate
+     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof NewsChannel</code>
+     *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link NewsChannel}.
      *
@@ -83,6 +89,9 @@ public interface GuildMessageChannelUnion extends GuildMessageChannel
      * ThreadChannel channel2 = (ThreadChannel) union;
      * </code></pre>
      *
+     * You can use {@link #getType()}{@link ChannelType#isThread() .isThread()} to validate
+     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof ThreadChannel</code>
+     *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link ThreadChannel}.
      *
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IThreadContainerUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IThreadContainerUnion.java
index 51836c6838..f6951ae807 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IThreadContainerUnion.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IThreadContainerUnion.java
@@ -44,6 +44,9 @@ public interface IThreadContainerUnion extends IThreadContainer
      * TextChannel channel2 = (TextChannel) union;
      * </code></pre>
      *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#TEXT} to validate
+     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof TextChannel</code>
+     *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link TextChannel}.
      *
@@ -63,6 +66,9 @@ public interface IThreadContainerUnion extends IThreadContainer
      * NewsChannel channel2 = (NewsChannel) union;
      * </code></pre>
      *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#NEWS} to validate
+     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof NewsChannel</code>
+     *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link NewsChannel}.
      *
@@ -88,6 +94,9 @@ public interface IThreadContainerUnion extends IThreadContainer
      * GuildMessageChannel channel2 = (GuildMessageChannel) union;
      * </code></pre>
      *
+     * You can use {@link #getType()}{@link ChannelType#isMessage() .isMessage()} to validate
+     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof GuildMessageChannel</code>
+     *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link GuildMessageChannel}.
      *
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IWebhookContainerUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IWebhookContainerUnion.java
index 9fd64fd91c..a45211da33 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IWebhookContainerUnion.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IWebhookContainerUnion.java
@@ -44,6 +44,9 @@ public interface IWebhookContainerUnion extends IWebhookContainer
      * TextChannel channel2 = (TextChannel) union;
      * </code></pre>
      *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#TEXT} to validate
+     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof TextChannel</code>
+     *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link TextChannel}.
      *
@@ -63,6 +66,9 @@ public interface IWebhookContainerUnion extends IWebhookContainer
      * NewsChannel channel2 = (NewsChannel) union;
      * </code></pre>
      *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#NEWS} to validate
+     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof NewsChannel</code>
+     *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link NewsChannel}.
      *
@@ -88,6 +94,9 @@ public interface IWebhookContainerUnion extends IWebhookContainer
      * GuildMessageChannel channel2 = (GuildMessageChannel) union;
      * </code></pre>
      *
+     * You can use {@link #getType()}{@link ChannelType#isMessage() .isMessage()} to validate
+     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof GuildMessageChannel</code>
+     *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link GuildMessageChannel}.
      *
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java
index 422db86af4..6bf37d9136 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java
@@ -46,6 +46,9 @@ public interface MessageChannelUnion extends MessageChannel
      * PrivateChannel channel2 = (PrivateChannel) union;
      * </code></pre>
      *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#PRIVATE} to validate
+     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof PrivateChannel</code>
+     *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link PrivateChannel}.
      *
@@ -65,6 +68,9 @@ public interface MessageChannelUnion extends MessageChannel
      * TextChannel channel2 = (TextChannel) union;
      * </code></pre>
      *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#TEXT} to validate
+     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof TextChannel</code>
+     *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link TextChannel}.
      *
@@ -84,6 +90,9 @@ public interface MessageChannelUnion extends MessageChannel
      * NewsChannel channel2 = (NewsChannel) union;
      * </code></pre>
      *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#NEWS} to validate
+     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof NewsChannel</code>
+     *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link NewsChannel}.
      *
@@ -103,6 +112,9 @@ public interface MessageChannelUnion extends MessageChannel
      * ThreadChannel channel2 = (ThreadChannel) union;
      * </code></pre>
      *
+     * You can use {@link #getType()}{@link ChannelType#isThread() .isThread()} to validate
+     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof ThreadChannel</code>
+     *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link ThreadChannel}.
      *

From 98042115b0cbe8557909eb3b833fe6efef7faf0f Mon Sep 17 00:00:00 2001
From: Austin Keener <keeneraustin@yahoo.com>
Date: Sat, 18 Jun 2022 13:38:13 -0400
Subject: [PATCH 06/17] added asGuildMessageChannel to MessageChannelUnion

---
 .../channel/unions/MessageChannelUnion.java   | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java
index 6bf37d9136..28c2576ab4 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java
@@ -125,5 +125,32 @@ public interface MessageChannelUnion extends MessageChannel
 
     //TODO: Add asVoiceChannel once TiV is launched
 
+    /**
+     * Casts this union to a {@link GuildMessageChannel}.
+     * <br>This works for the following channel types represented by this union:
+     * <ul>
+     *     <li>{@link TextChannel}</li>
+     *     <li>{@link NewsChannel}</li>
+     *     <li>{@link ThreadChannel}</li>
+     * </ul>
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * GuildMessageChannel channel = union.asGuildMessageChannel();
+     * GuildMessageChannel channel2 = (GuildMessageChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()}{@link ChannelType#isGuild() .isGuild()} to validate
+     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof GuildMessageChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link GuildMessageChannel}.
+     *
+     * @return The channel as a {@link GuildMessageChannel}
+     */
+    @Nonnull
+    GuildMessageChannel asGuildMessageChannel();
+
     //TODO: should we also expose the getThreadContainer/getStandardX getters like in GuildMessageChannelUnion?
 }

From 3a5db336c816476a966e515f0784eebb5c252943 Mon Sep 17 00:00:00 2001
From: Austin Keener <keeneraustin@yahoo.com>
Date: Sat, 18 Jun 2022 13:48:14 -0400
Subject: [PATCH 07/17] Introduced asThreadContainer to unions

---
 .../unions/DefaultGuildChannelUnion.java      | 28 +++++++++++++--
 .../unions/GuildMessageChannelUnion.java      | 30 ++++++++++++++--
 .../channel/unions/IThreadContainerUnion.java |  6 ++--
 .../unions/IWebhookContainerUnion.java        | 30 ++++++++++++++--
 .../channel/unions/MessageChannelUnion.java   | 36 +++++++++++++++----
 .../entities/AbstractChannelImpl.java         |  6 ++++
 6 files changed, 118 insertions(+), 18 deletions(-)

diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java
index e3e1d71ee0..c6105587f0 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java
@@ -51,7 +51,7 @@ public interface DefaultGuildChannelUnion extends StandardGuildChannel
      * </code></pre>
      *
      * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#TEXT} to validate
-     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof TextChannel</code>
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof TextChannel</code>
      *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link TextChannel}.
@@ -73,7 +73,7 @@ public interface DefaultGuildChannelUnion extends StandardGuildChannel
      * </code></pre>
      *
      * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#NEWS} to validate
-     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof NewsChannel</code>
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof NewsChannel</code>
      *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link NewsChannel}.
@@ -85,6 +85,30 @@ public interface DefaultGuildChannelUnion extends StandardGuildChannel
 
     //TODO: add asForumChannel() (I think ForumChannels can be the default?)
 
+    /**
+     * Casts this union to a {@link IThreadContainer}.
+     * <br>This only works for the following channel types represented by this union:
+     * <ul>
+     *     <li>{@link TextChannel}</li>
+     *     <li>{@link NewsChannel}</li>
+     * </ul>
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * IThreadContainer channel = union.asThreadContainer();
+     * IThreadContainer channel2 = (IThreadContainer) union;
+     * </code></pre>
+     *
+     * You can use <code>channel instanceof IThreadContainer</code> to validate whether you can call this method.
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link IThreadContainer}.
+     *
+     * @return The channel as a {@link IThreadContainer}
+     */
+    IThreadContainer asThreadContainer();
+
     /**
      * Casts this union to a {@link StandardGuildMessageChannel}.
      * <br>This only works for the following channel types represented by this union:
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildMessageChannelUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildMessageChannelUnion.java
index 17679eff9c..b4e76f6cbf 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildMessageChannelUnion.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildMessageChannelUnion.java
@@ -46,7 +46,7 @@ public interface GuildMessageChannelUnion extends GuildMessageChannel
      * </code></pre>
      *
      * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#TEXT} to validate
-     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof TextChannel</code>
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof TextChannel</code>
      *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link TextChannel}.
@@ -68,7 +68,7 @@ public interface GuildMessageChannelUnion extends GuildMessageChannel
      * </code></pre>
      *
      * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#NEWS} to validate
-     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof NewsChannel</code>
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof NewsChannel</code>
      *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link NewsChannel}.
@@ -90,7 +90,7 @@ public interface GuildMessageChannelUnion extends GuildMessageChannel
      * </code></pre>
      *
      * You can use {@link #getType()}{@link ChannelType#isThread() .isThread()} to validate
-     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof ThreadChannel</code>
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof ThreadChannel</code>
      *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link ThreadChannel}.
@@ -102,6 +102,30 @@ public interface GuildMessageChannelUnion extends GuildMessageChannel
 
     //TODO: Add asVoiceChannel once TiV is launched
 
+    /**
+     * Casts this union to a {@link IThreadContainer}.
+     * <br>This only works for the following channel types represented by this union:
+     * <ul>
+     *     <li>{@link TextChannel}</li>
+     *     <li>{@link NewsChannel}</li>
+     * </ul>
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * IThreadContainer channel = union.asThreadContainer();
+     * IThreadContainer channel2 = (IThreadContainer) union;
+     * </code></pre>
+     *
+     * You can use <code>channel instanceof IThreadContainer</code> to validate whether you can call this method.
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link IThreadContainer}.
+     *
+     * @return The channel as a {@link IThreadContainer}
+     */
+    IThreadContainer asThreadContainer();
+
     /**
      * Casts this union to a {@link StandardGuildChannel}.
      * <br>This only works for the following channel types represented by this union:
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IThreadContainerUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IThreadContainerUnion.java
index f6951ae807..c4d55b2bbe 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IThreadContainerUnion.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IThreadContainerUnion.java
@@ -45,7 +45,7 @@ public interface IThreadContainerUnion extends IThreadContainer
      * </code></pre>
      *
      * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#TEXT} to validate
-     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof TextChannel</code>
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof TextChannel</code>
      *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link TextChannel}.
@@ -67,7 +67,7 @@ public interface IThreadContainerUnion extends IThreadContainer
      * </code></pre>
      *
      * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#NEWS} to validate
-     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof NewsChannel</code>
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof NewsChannel</code>
      *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link NewsChannel}.
@@ -95,7 +95,7 @@ public interface IThreadContainerUnion extends IThreadContainer
      * </code></pre>
      *
      * You can use {@link #getType()}{@link ChannelType#isMessage() .isMessage()} to validate
-     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof GuildMessageChannel</code>
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof GuildMessageChannel</code>
      *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link GuildMessageChannel}.
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IWebhookContainerUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IWebhookContainerUnion.java
index a45211da33..1017a023bd 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IWebhookContainerUnion.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IWebhookContainerUnion.java
@@ -45,7 +45,7 @@ public interface IWebhookContainerUnion extends IWebhookContainer
      * </code></pre>
      *
      * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#TEXT} to validate
-     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof TextChannel</code>
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof TextChannel</code>
      *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link TextChannel}.
@@ -67,7 +67,7 @@ public interface IWebhookContainerUnion extends IWebhookContainer
      * </code></pre>
      *
      * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#NEWS} to validate
-     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof NewsChannel</code>
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof NewsChannel</code>
      *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link NewsChannel}.
@@ -79,6 +79,30 @@ public interface IWebhookContainerUnion extends IWebhookContainer
 
     //TODO: Add asForumChannel
 
+    /**
+     * Casts this union to a {@link IThreadContainer}.
+     * <br>This only works for the following channel types represented by this union:
+     * <ul>
+     *     <li>{@link TextChannel}</li>
+     *     <li>{@link NewsChannel}</li>
+     * </ul>
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * IThreadContainer channel = union.asThreadContainer();
+     * IThreadContainer channel2 = (IThreadContainer) union;
+     * </code></pre>
+     *
+     * You can use <code>channel instanceof IThreadContainer</code> to validate whether you can call this method.
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link IThreadContainer}.
+     *
+     * @return The channel as a {@link IThreadContainer}
+     */
+    IThreadContainer asThreadContainer();
+
     /**
      * Casts this union to a {@link GuildMessageChannel}.
      * <br>This works for the following channel types represented by this union:
@@ -95,7 +119,7 @@ public interface IWebhookContainerUnion extends IWebhookContainer
      * </code></pre>
      *
      * You can use {@link #getType()}{@link ChannelType#isMessage() .isMessage()} to validate
-     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof GuildMessageChannel</code>
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof GuildMessageChannel</code>
      *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link GuildMessageChannel}.
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java
index 28c2576ab4..d7134eedd3 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java
@@ -47,7 +47,7 @@ public interface MessageChannelUnion extends MessageChannel
      * </code></pre>
      *
      * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#PRIVATE} to validate
-     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof PrivateChannel</code>
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof PrivateChannel</code>
      *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link PrivateChannel}.
@@ -69,7 +69,7 @@ public interface MessageChannelUnion extends MessageChannel
      * </code></pre>
      *
      * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#TEXT} to validate
-     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof TextChannel</code>
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof TextChannel</code>
      *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link TextChannel}.
@@ -91,7 +91,7 @@ public interface MessageChannelUnion extends MessageChannel
      * </code></pre>
      *
      * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#NEWS} to validate
-     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof NewsChannel</code>
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof NewsChannel</code>
      *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link NewsChannel}.
@@ -113,7 +113,7 @@ public interface MessageChannelUnion extends MessageChannel
      * </code></pre>
      *
      * You can use {@link #getType()}{@link ChannelType#isThread() .isThread()} to validate
-     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof ThreadChannel</code>
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof ThreadChannel</code>
      *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link ThreadChannel}.
@@ -125,6 +125,30 @@ public interface MessageChannelUnion extends MessageChannel
 
     //TODO: Add asVoiceChannel once TiV is launched
 
+    /**
+     * Casts this union to a {@link IThreadContainer}.
+     * <br>This only works for the following channel types represented by this union:
+     * <ul>
+     *     <li>{@link TextChannel}</li>
+     *     <li>{@link NewsChannel}</li>
+     * </ul>
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * IThreadContainer channel = union.asThreadContainer();
+     * IThreadContainer channel2 = (IThreadContainer) union;
+     * </code></pre>
+     *
+     * You can use <code>channel instanceof IThreadContainer</code> to validate whether you can call this method.
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link IThreadContainer}.
+     *
+     * @return The channel as a {@link IThreadContainer}
+     */
+    IThreadContainer asThreadContainer();
+
     /**
      * Casts this union to a {@link GuildMessageChannel}.
      * <br>This works for the following channel types represented by this union:
@@ -142,7 +166,7 @@ public interface MessageChannelUnion extends MessageChannel
      * </code></pre>
      *
      * You can use {@link #getType()}{@link ChannelType#isGuild() .isGuild()} to validate
-     * whether you should call this method in addition to normal instanceof checks: <code>channel instanceof GuildMessageChannel</code>
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof GuildMessageChannel</code>
      *
      * @throws IllegalStateException
      *         If the channel represented by this union is not actually a {@link GuildMessageChannel}.
@@ -151,6 +175,4 @@ public interface MessageChannelUnion extends MessageChannel
      */
     @Nonnull
     GuildMessageChannel asGuildMessageChannel();
-
-    //TODO: should we also expose the getThreadContainer/getStandardX getters like in GuildMessageChannelUnion?
 }
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/AbstractChannelImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/AbstractChannelImpl.java
index 18c514fecc..4dec5f935d 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/AbstractChannelImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/AbstractChannelImpl.java
@@ -103,6 +103,12 @@ public ThreadChannel asThreadChannel()
         return transformChannel(ThreadChannel.class);
     }
 
+    @Nonnull
+    public IThreadContainer asThreadContainer()
+    {
+        return transformChannel(IThreadContainer.class);
+    }
+
     @Nonnull
     public GuildMessageChannel asGuildMessageChannel()
     {

From 35c45fc50135de9a0c5cac1b940c41e6ea5b9eb3 Mon Sep 17 00:00:00 2001
From: Austin Keener <keeneraustin@yahoo.com>
Date: Wed, 29 Jun 2022 21:42:30 -0400
Subject: [PATCH 08/17] Fixed <br><br> issue

---
 .../api/entities/channel/unions/DefaultGuildChannelUnion.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java
index c6105587f0..deb900464c 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java
@@ -29,9 +29,9 @@
  * <br>This class extends {@link StandardGuildChannel} and primarily acts as a discovery tool for
  * developers to understand which channels might be returned as default channels.
  *
- * <br><br><b>Not all {@link StandardGuildChannel} channels can be used as a default channel!</b>
+ * <p><b>Not all {@link StandardGuildChannel} channels can be used as a default channel!</b>
  *
- * <br><br>This interface represents the follow concrete channel types:
+ * <p>This interface represents the follow concrete channel types:
  * <ul>
  *     <li>{@link TextChannel}</li>
  *     <li>{@link NewsChannel}</li>

From 2c2e6e16fc220dc900fa869e197bbe9a5b776fae Mon Sep 17 00:00:00 2001
From: Austin Keener <keeneraustin@yahoo.com>
Date: Wed, 29 Jun 2022 21:43:49 -0400
Subject: [PATCH 09/17] Created GuildChannelUnion to simplify OptionMapping
 interface

---
 .../channel/unions/GuildChannelUnion.java     | 263 ++++++++++++++++++
 .../commands/CommandInteractionPayload.java   |   2 +-
 .../interactions/commands/OptionMapping.java  | 137 +--------
 3 files changed, 273 insertions(+), 129 deletions(-)
 create mode 100644 src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildChannelUnion.java

diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildChannelUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildChannelUnion.java
new file mode 100644
index 0000000000..6823c3572e
--- /dev/null
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildChannelUnion.java
@@ -0,0 +1,263 @@
+/*
+ * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dv8tion.jda.api.entities.channel.unions;
+
+import net.dv8tion.jda.api.entities.*;
+
+import javax.annotation.Nonnull;
+
+/**
+ * A union representing all channel types that implement {@link GuildChannel}.
+ * <br>This class extends {@link GuildChannel} and primarily acts as a discovery tool for
+ * developers to discover some common interfaces that a {@link GuildChannel} could be cast to.
+ *
+ * <br>This interface represents the follow concrete channel types:
+ * <ul>
+ *     <li>{@link TextChannel}</li>
+ *     <li>{@link NewsChannel}</li>
+ *     <li>{@link ThreadChannel}</li>
+ *     <li>{@link VoiceChannel}</li>
+ *     <li>{@link StageChannel}</li>
+ * </ul>
+ */
+public interface GuildChannelUnion extends GuildChannel
+{
+    /**
+     * Casts this union to a {@link TextChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * TextChannel channel = union.asTextChannel();
+     * TextChannel channel2 = (TextChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#TEXT} to validate
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof TextChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link TextChannel}.
+     *
+     * @return The channel as a {@link TextChannel}
+     */
+    @Nonnull
+    TextChannel asTextChannel();
+
+    /**
+     * Casts this union to a {@link NewsChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * NewsChannel channel = union.asNewsChannel();
+     * NewsChannel channel2 = (NewsChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#NEWS} to validate
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof NewsChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link NewsChannel}.
+     *
+     * @return The channel as a {@link NewsChannel}
+     */
+    @Nonnull
+    NewsChannel asNewsChannel();
+
+    /**
+     * Casts this union to a {@link ThreadChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * ThreadChannel channel = union.asThreadChannel();
+     * ThreadChannel channel2 = (ThreadChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()}{@link ChannelType#isThread() .isThread()} to validate
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof ThreadChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link ThreadChannel}.
+     *
+     * @return The channel as a {@link ThreadChannel}
+     */
+    @Nonnull
+    ThreadChannel asThreadChannel();
+
+    /**
+     * Casts this union to a {@link VoiceChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * VoiceChannel channel = union.asVoiceChannel();
+     * VoiceChannel channel2 = (VoiceChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#VOICE} to validate
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof VoiceChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link VoiceChannel}.
+     *
+     * @return The channel as a {@link VoiceChannel}
+     */
+    @Nonnull
+    VoiceChannel asVoiceChannel();
+
+    /**
+     * Casts this union to a {@link StageChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * StageChannel channel = union.asStageChannel();
+     * StageChannel channel2 = (StageChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#STAGE} to validate
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof StageChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link StageChannel}.
+     *
+     * @return The channel as a {@link StageChannel}
+     */
+    @Nonnull
+    StageChannel asStageChannel();
+
+    /**
+     * Casts this union to a {@link GuildMessageChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * GuildMessageChannel channel = union.asGuildMessageChannel();
+     * GuildMessageChannel channel2 = (GuildMessageChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()}{@link ChannelType#isMessage() .isMessage()}
+     * and {@link #getType()}{@link ChannelType#isGuild() .isGuild()} to validate whether you can call this
+     * method in addition to normal instanceof checks: <code>channel instanceof GuildMessageChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link GuildMessageChannel}.
+     *
+     * @return The channel as a {@link GuildMessageChannel}
+     */
+    @Nonnull
+    GuildMessageChannel asGuildMessageChannel();
+
+    /**
+     * Casts this union to a {@link AudioChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * AudioChannel channel = union.asAudioChannel();
+     * AudioChannel channel2 = (AudioChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()}{@link ChannelType#isAudio() .isAudio()} to validate
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof AudioChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link AudioChannel}.
+     *
+     * @return The channel as a {@link AudioChannel}
+     */
+    @Nonnull
+    AudioChannel asAudioChannel();
+
+    /**
+     * Casts this union to a {@link IThreadContainer}.
+     * <br>This only works for the following channel types represented by this union:
+     * <ul>
+     *     <li>{@link TextChannel}</li>
+     *     <li>{@link NewsChannel}</li>
+     * </ul>
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * IThreadContainer channel = union.asThreadContainer();
+     * IThreadContainer channel2 = (IThreadContainer) union;
+     * </code></pre>
+     *
+     * You can use <code>channel instanceof IThreadContainer</code> to validate whether you can call this method.
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link IThreadContainer}.
+     *
+     * @return The channel as a {@link IThreadContainer}
+     */
+    IThreadContainer asThreadContainer();
+
+    /**
+     * Casts this union to a {@link StandardGuildChannel}.
+     * <br>This only works for the following channel types represented by this union:
+     * <ul>
+     *     <li>{@link TextChannel}</li>
+     *     <li>{@link NewsChannel}</li>
+     * </ul>
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * StandardGuildChannel channel = union.asStandardGuildChannel();
+     * StandardGuildChannel channel2 = (StandardGuildChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link StandardGuildChannel}.
+     *
+     * @return The channel as a {@link StandardGuildChannel}
+     */
+    @Nonnull
+    StandardGuildChannel asStandardGuildChannel();
+
+    /**
+     * Casts this union to a {@link StandardGuildMessageChannel}.
+     * <br>This only works for the following channel types represented by this union:
+     * <ul>
+     *     <li>{@link TextChannel}</li>
+     *     <li>{@link NewsChannel}</li>
+     * </ul>
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * StandardGuildMessageChannel channel = union.asStandardGuildMessageChannel();
+     * StandardGuildMessageChannel channel2 = (StandardGuildMessageChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link StandardGuildMessageChannel}.
+     *
+     * @return The channel as a {@link StandardGuildMessageChannel}
+     */
+    @Nonnull
+    StandardGuildMessageChannel asStandardGuildMessageChannel();
+}
diff --git a/src/main/java/net/dv8tion/jda/api/interactions/commands/CommandInteractionPayload.java b/src/main/java/net/dv8tion/jda/api/interactions/commands/CommandInteractionPayload.java
index a8fadddbe8..d57fbc421f 100644
--- a/src/main/java/net/dv8tion/jda/api/interactions/commands/CommandInteractionPayload.java
+++ b/src/main/java/net/dv8tion/jda/api/interactions/commands/CommandInteractionPayload.java
@@ -152,7 +152,7 @@ default String getCommandString()
             switch (o.getType())
             {
             case CHANNEL:
-                builder.append("#").append(o.getAsGuildChannel().getName());
+                builder.append("#").append(o.getAsChannel().getName());
                 break;
             case USER:
                 builder.append("@").append(o.getAsUser().getName());
diff --git a/src/main/java/net/dv8tion/jda/api/interactions/commands/OptionMapping.java b/src/main/java/net/dv8tion/jda/api/interactions/commands/OptionMapping.java
index 6b1d3516b2..011af58a4d 100644
--- a/src/main/java/net/dv8tion/jda/api/interactions/commands/OptionMapping.java
+++ b/src/main/java/net/dv8tion/jda/api/interactions/commands/OptionMapping.java
@@ -20,6 +20,7 @@
 import gnu.trove.map.hash.TLongObjectHashMap;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.unions.GuildChannelUnion;
 import net.dv8tion.jda.api.entities.channel.unions.GuildMessageChannelUnion;
 import net.dv8tion.jda.api.interactions.Interaction;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
@@ -309,8 +310,7 @@ public Role getAsRole()
     @Nonnull
     public ChannelType getChannelType()
     {
-        Channel channel = getAsChannel();
-        return channel == null ? ChannelType.UNKNOWN : channel.getType();
+        return getAsChannel().getType();
     }
 
     /**
@@ -324,129 +324,18 @@ public ChannelType getChannelType()
      * @return The resolved {@link GuildChannel}
      */
     @Nonnull
-    public GuildChannel getAsGuildChannel()
+    public GuildChannelUnion getAsChannel()
     {
-        Channel value = getAsChannel();
-        if (value instanceof GuildChannel)
-            return (GuildChannel) value;
-        throw new IllegalStateException("Could not resolve GuildChannel!");
-    }
-
-
-    /**
-     * The resolved {@link GuildMessageChannel} for this option value.
-     * <br>Note that {@link OptionType#CHANNEL OptionType.CHANNEL} can accept channels of any type!
-     *
-     * @throws IllegalStateException
-     *         If this option is not of type {@link OptionType#CHANNEL CHANNEL}
-     *
-     * @return The resolved {@link GuildMessageChannel}, or null if this was not a message channel
-     */
-    @Nullable
-    public GuildMessageChannelUnion getAsMessageChannel()
-    {
-        Channel value = getAsChannel();
-        return value instanceof GuildMessageChannel ? (GuildMessageChannelUnion) value : null;
-    }
-
-    /**
-     * The resolved {@link TextChannel} for this option value.
-     * <br>Note that {@link OptionType#CHANNEL OptionType.CHANNEL} can accept channels of any type!
-     *
-     * @throws IllegalStateException
-     *         If this option is not of type {@link OptionType#CHANNEL CHANNEL}
-     *
-     * @return The resolved {@link TextChannel}, or null if this was not a text channel
-     */
-    @Nullable
-    public TextChannel getAsTextChannel()
-    {
-        Channel channel = getAsChannel();
-        return channel instanceof TextChannel ? (TextChannel) channel : null;
-    }
-
-    /**
-     * The resolved {@link NewsChannel} for this option value.
-     * <br>Note that {@link OptionType#CHANNEL OptionType.CHANNEL} can accept channels of any type!
-     *
-     * @throws IllegalStateException
-     *         If this option is not of type {@link OptionType#CHANNEL CHANNEL}
-     *
-     * @return The resolved {@link NewsChannel}, or null if this was not a news channel
-     */
-    @Nullable
-    public NewsChannel getAsNewsChannel()
-    {
-        Channel channel = getAsChannel();
-        return channel instanceof NewsChannel ? (NewsChannel) channel : null;
-    }
-
-    /**
-     * The resolved {@link ThreadChannel} for this option value.
-     * <br>Note that {@link OptionType#CHANNEL OptionType.CHANNEL} can accept channels of any type!
-     *
-     * @throws IllegalStateException
-     *         If this option is not of type {@link OptionType#CHANNEL CHANNEL}
-     *
-     * @return The resolved {@link ThreadChannel}, or null if this was not a thread channel
-     */
-    @Nullable
-    public ThreadChannel getAsThreadChannel()
-    {
-        Channel channel = getAsChannel();
-        return channel instanceof ThreadChannel ? (ThreadChannel) channel : null;
-    }
-
-
-    /**
-     * The resolved {@link AudioChannel} for this option value.
-     * <br>Note that {@link OptionType#CHANNEL OptionType.CHANNEL} can accept channels of any type!
-     *
-     * @throws IllegalStateException
-     *         If this option is not of type {@link OptionType#CHANNEL CHANNEL}
-     *
-     * @return The resolved {@link AudioChannel}, or null if this was not an audio channel
-     */
-    @Nullable
-    public AudioChannel getAsAudioChannel()
-    {
-        Channel channel = getAsChannel();
-        return channel instanceof AudioChannel ? (AudioChannel) channel : null;
-    }
+        if (type != OptionType.CHANNEL)
+            throw new IllegalStateException("Cannot resolve Channel for option " + getName() + " of type " + type);
 
-    /**
-     * The resolved {@link VoiceChannel} for this option value.
-     * <br>Note that {@link OptionType#CHANNEL OptionType.CHANNEL} can accept channels of any type!
-     *
-     * @throws IllegalStateException
-     *         If this option is not of type {@link OptionType#CHANNEL CHANNEL}
-     *
-     * @return The resolved {@link VoiceChannel}, or null if this was not a voice channel
-     */
-    @Nullable
-    public VoiceChannel getAsVoiceChannel()
-    {
-        Channel channel = getAsChannel();
-        return channel instanceof VoiceChannel ? (VoiceChannel) channel : null;
-    }
+        Object entity = resolved.get(getAsLong());
+        if (entity instanceof GuildChannel)
+            return (GuildChannelUnion) entity;
 
-    /**
-     * The resolved {@link StageChannel} for this option value.
-     * <br>Note that {@link OptionType#CHANNEL OptionType.CHANNEL} can accept channels of any type!
-     *
-     * @throws IllegalStateException
-     *         If this option is not of type {@link OptionType#CHANNEL CHANNEL}
-     *
-     * @return The resolved {@link StageChannel}, or null if this was not a stage channel
-     */
-    @Nullable
-    public StageChannel getAsStageChannel()
-    {
-        Channel channel = getAsChannel();
-        return channel instanceof StageChannel ? (StageChannel) channel : null;
+        throw new IllegalStateException("Could not resolve GuildChannel!");
     }
 
-
     @Override
     public String toString()
     {
@@ -469,12 +358,4 @@ public boolean equals(Object obj)
         OptionMapping data = (OptionMapping) obj;
         return getType() == data.getType() && getName().equals(data.getName());
     }
-
-    @Nullable
-    private Channel getAsChannel()
-    {
-        if (type != OptionType.CHANNEL)
-            throw new IllegalStateException("Cannot resolve Channel for option " + getName() + " of type " + type);
-        return (Channel) resolved.get(getAsLong());
-    }
 }

From d5bc09d3a36ac7bd77967c8934599f96f9a84b5d Mon Sep 17 00:00:00 2001
From: Austin Keener <keeneraustin@yahoo.com>
Date: Fri, 1 Jul 2022 23:09:47 -0400
Subject: [PATCH 10/17] Addressed comments about docs maintainability

---
 .../unions/DefaultGuildChannelUnion.java      | 12 ++----------
 .../channel/unions/GuildChannelUnion.java     | 18 +++---------------
 .../unions/GuildMessageChannelUnion.java      | 19 +++----------------
 .../unions/IWebhookContainerUnion.java        | 18 +++---------------
 .../channel/unions/MessageChannelUnion.java   |  6 +-----
 5 files changed, 12 insertions(+), 61 deletions(-)

diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java
index deb900464c..6342c21401 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/DefaultGuildChannelUnion.java
@@ -87,11 +87,7 @@ public interface DefaultGuildChannelUnion extends StandardGuildChannel
 
     /**
      * Casts this union to a {@link IThreadContainer}.
-     * <br>This only works for the following channel types represented by this union:
-     * <ul>
-     *     <li>{@link TextChannel}</li>
-     *     <li>{@link NewsChannel}</li>
-     * </ul>
+     * This method exists for developer discoverability.
      *
      * Note: This is effectively equivalent to using the cast operator:
      * <pre><code>
@@ -111,11 +107,7 @@ public interface DefaultGuildChannelUnion extends StandardGuildChannel
 
     /**
      * Casts this union to a {@link StandardGuildMessageChannel}.
-     * <br>This only works for the following channel types represented by this union:
-     * <ul>
-     *     <li>{@link TextChannel}</li>
-     *     <li>{@link NewsChannel}</li>
-     * </ul>
+     * This method exists for developer discoverability.
      *
      * Note: This is effectively equivalent to using the cast operator:
      * <pre><code>
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildChannelUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildChannelUnion.java
index 6823c3572e..58e1889380 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildChannelUnion.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildChannelUnion.java
@@ -193,11 +193,7 @@ public interface GuildChannelUnion extends GuildChannel
 
     /**
      * Casts this union to a {@link IThreadContainer}.
-     * <br>This only works for the following channel types represented by this union:
-     * <ul>
-     *     <li>{@link TextChannel}</li>
-     *     <li>{@link NewsChannel}</li>
-     * </ul>
+     * This method exists for developer discoverability.
      *
      * Note: This is effectively equivalent to using the cast operator:
      * <pre><code>
@@ -217,11 +213,7 @@ public interface GuildChannelUnion extends GuildChannel
 
     /**
      * Casts this union to a {@link StandardGuildChannel}.
-     * <br>This only works for the following channel types represented by this union:
-     * <ul>
-     *     <li>{@link TextChannel}</li>
-     *     <li>{@link NewsChannel}</li>
-     * </ul>
+     * This method exists for developer discoverability.
      *
      * Note: This is effectively equivalent to using the cast operator:
      * <pre><code>
@@ -240,11 +232,7 @@ public interface GuildChannelUnion extends GuildChannel
 
     /**
      * Casts this union to a {@link StandardGuildMessageChannel}.
-     * <br>This only works for the following channel types represented by this union:
-     * <ul>
-     *     <li>{@link TextChannel}</li>
-     *     <li>{@link NewsChannel}</li>
-     * </ul>
+     * This method exists for developer discoverability.
      *
      * Note: This is effectively equivalent to using the cast operator:
      * <pre><code>
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildMessageChannelUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildMessageChannelUnion.java
index b4e76f6cbf..b4855c8290 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildMessageChannelUnion.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildMessageChannelUnion.java
@@ -104,11 +104,7 @@ public interface GuildMessageChannelUnion extends GuildMessageChannel
 
     /**
      * Casts this union to a {@link IThreadContainer}.
-     * <br>This only works for the following channel types represented by this union:
-     * <ul>
-     *     <li>{@link TextChannel}</li>
-     *     <li>{@link NewsChannel}</li>
-     * </ul>
+     * This method exists for developer discoverability.
      *
      * Note: This is effectively equivalent to using the cast operator:
      * <pre><code>
@@ -127,12 +123,7 @@ public interface GuildMessageChannelUnion extends GuildMessageChannel
     IThreadContainer asThreadContainer();
 
     /**
-     * Casts this union to a {@link StandardGuildChannel}.
-     * <br>This only works for the following channel types represented by this union:
-     * <ul>
-     *     <li>{@link TextChannel}</li>
-     *     <li>{@link NewsChannel}</li>
-     * </ul>
+     * Casts this union to a {@link StandardGuildChannel}.you can call this method
      *
      * Note: This is effectively equivalent to using the cast operator:
      * <pre><code>
@@ -151,11 +142,7 @@ public interface GuildMessageChannelUnion extends GuildMessageChannel
 
     /**
      * Casts this union to a {@link StandardGuildMessageChannel}.
-     * <br>This only works for the following channel types represented by this union:
-     * <ul>
-     *     <li>{@link TextChannel}</li>
-     *     <li>{@link NewsChannel}</li>
-     * </ul>
+     * This method exists for developer discoverability.
      *
      * Note: This is effectively equivalent to using the cast operator:
      * <pre><code>
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IWebhookContainerUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IWebhookContainerUnion.java
index 1017a023bd..2f11f54e74 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IWebhookContainerUnion.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IWebhookContainerUnion.java
@@ -81,11 +81,7 @@ public interface IWebhookContainerUnion extends IWebhookContainer
 
     /**
      * Casts this union to a {@link IThreadContainer}.
-     * <br>This only works for the following channel types represented by this union:
-     * <ul>
-     *     <li>{@link TextChannel}</li>
-     *     <li>{@link NewsChannel}</li>
-     * </ul>
+     * This method exists for developer discoverability.
      *
      * Note: This is effectively equivalent to using the cast operator:
      * <pre><code>
@@ -131,11 +127,7 @@ public interface IWebhookContainerUnion extends IWebhookContainer
 
     /**
      * Casts this union to a {@link StandardGuildChannel}.
-     * <br>This only works for the following channel types represented by this union:
-     * <ul>
-     *     <li>{@link TextChannel}</li>
-     *     <li>{@link NewsChannel}</li>
-     * </ul>
+     * This method exists for developer discoverability.
      *
      * Note: This is effectively equivalent to using the cast operator:
      * <pre><code>
@@ -154,11 +146,7 @@ public interface IWebhookContainerUnion extends IWebhookContainer
 
     /**
      * Casts this union to a {@link StandardGuildMessageChannel}.
-     * <br>This only works for the following channel types represented by this union:
-     * <ul>
-     *     <li>{@link TextChannel}</li>
-     *     <li>{@link NewsChannel}</li>
-     * </ul>
+     * This method exists for developer discoverability.
      *
      * Note: This is effectively equivalent to using the cast operator:
      * <pre><code>
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java
index d7134eedd3..a5b37f74a8 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/MessageChannelUnion.java
@@ -127,11 +127,7 @@ public interface MessageChannelUnion extends MessageChannel
 
     /**
      * Casts this union to a {@link IThreadContainer}.
-     * <br>This only works for the following channel types represented by this union:
-     * <ul>
-     *     <li>{@link TextChannel}</li>
-     *     <li>{@link NewsChannel}</li>
-     * </ul>
+     * This method exists for developer discoverability.
      *
      * Note: This is effectively equivalent to using the cast operator:
      * <pre><code>

From 49f249317bfad8c91c1c9afd813eb2eadb362db1 Mon Sep 17 00:00:00 2001
From: Austin Keener <keeneraustin@yahoo.com>
Date: Sat, 2 Jul 2022 20:28:56 -0400
Subject: [PATCH 11/17] Removed channel from WebhookMessageActionImpl as it
 wasn't needed

---
 .../net/dv8tion/jda/internal/entities/WebhookImpl.java     | 7 +------
 .../jda/internal/interactions/InteractionHookImpl.java     | 2 +-
 .../requests/restaction/WebhookMessageActionImpl.java      | 4 +---
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/main/java/net/dv8tion/jda/internal/entities/WebhookImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/WebhookImpl.java
index 218e71cb82..f72c1c1c04 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/WebhookImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/WebhookImpl.java
@@ -253,12 +253,7 @@ public WebhookMessageActionImpl<Void> sendRequest()
     {
         checkToken();
         Route.CompiledRoute route = Route.Webhooks.EXECUTE_WEBHOOK.compile(getId(), token);
-
-        //TODO: This MessageChannel cast seems problematic, especially once ForumChannels come along.
-        // Note for Minn: Can we make this cast here because the WebhookClient is only used when responding to interactions
-        //                actually present in a MessageChannel?
-        //                Also might not actually be needed as it doesn't look like WebhookMessageActionImpl actually uses the channel variable?
-        WebhookMessageActionImpl<Void> action = new WebhookMessageActionImpl<>(api, (MessageChannel) channel, route, (json) -> null);
+        WebhookMessageActionImpl<Void> action = new WebhookMessageActionImpl<>(api, route, (json) -> null);
         action.run();
         return action;
     }
diff --git a/src/main/java/net/dv8tion/jda/internal/interactions/InteractionHookImpl.java b/src/main/java/net/dv8tion/jda/internal/interactions/InteractionHookImpl.java
index f10dc16f15..5d83a44a7b 100644
--- a/src/main/java/net/dv8tion/jda/internal/interactions/InteractionHookImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/interactions/InteractionHookImpl.java
@@ -146,7 +146,7 @@ public WebhookMessageActionImpl<Message> sendRequest()
         Route.CompiledRoute route = Route.Interactions.CREATE_FOLLOWUP.compile(getJDA().getSelfUser().getApplicationId(), interaction.getToken());
         route = route.withQueryParams("wait", "true");
         Function<DataObject, Message> transform = (json) -> ((JDAImpl) api).getEntityBuilder().createMessageWithChannel(json, getInteraction().getMessageChannel(), false).withHook(this);
-        return onReady(new WebhookMessageActionImpl<>(getJDA(), interaction.getMessageChannel(), route, transform)).setEphemeral(ephemeral);
+        return onReady(new WebhookMessageActionImpl<>(getJDA(), route, transform)).setEphemeral(ephemeral);
     }
 
     @Nonnull
diff --git a/src/main/java/net/dv8tion/jda/internal/requests/restaction/WebhookMessageActionImpl.java b/src/main/java/net/dv8tion/jda/internal/requests/restaction/WebhookMessageActionImpl.java
index 7a0458cb8c..e754fd8b86 100644
--- a/src/main/java/net/dv8tion/jda/internal/requests/restaction/WebhookMessageActionImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/requests/restaction/WebhookMessageActionImpl.java
@@ -52,16 +52,14 @@ public class WebhookMessageActionImpl<T>
     private final List<AttachedFile> files = new ArrayList<>();
     private final AllowedMentionsImpl allowedMentions = new AllowedMentionsImpl();
     private final List<ActionRow> components = new ArrayList<>();
-    private final MessageChannel channel;
     private final Function<DataObject, T> transformer;
 
     private boolean ephemeral, tts;
     private String username, avatarUrl;
 
-    public WebhookMessageActionImpl(JDA api, MessageChannel channel, Route.CompiledRoute route, Function<DataObject, T> transformer)
+    public WebhookMessageActionImpl(JDA api, Route.CompiledRoute route, Function<DataObject, T> transformer)
     {
         super(api, route);
-        this.channel = channel;
         this.transformer = transformer;
     }
 

From 6cdbf0c3989365a976505f57e2f2e6537b91238b Mon Sep 17 00:00:00 2001
From: Austin Keener <keeneraustin@yahoo.com>
Date: Sat, 2 Jul 2022 20:41:00 -0400
Subject: [PATCH 12/17] Introduced ChannelUnion and removed majority of
 getXChannel getters in system

Part of this change involved changed MessageReaction#getGuildChannel to throw instead of returning null when not in a guild context.
---
 .../net/dv8tion/jda/api/entities/Message.java |  84 +----
 .../jda/api/entities/MessageReaction.java     |  33 +-
 .../entities/channel/unions/ChannelUnion.java | 342 ++++++++++++++++++
 .../channel/unions/GuildChannelUnion.java     |  27 +-
 .../events/channel/GenericChannelEvent.java   |   5 +-
 .../guild/invite/GenericGuildInviteEvent.java | 100 +----
 .../events/message/GenericMessageEvent.java   |  89 -----
 .../react/GenericMessageReactionEvent.java    |   4 +-
 .../jda/api/events/user/UserTypingEvent.java  |  36 --
 .../jda/api/interactions/Interaction.java     | 121 +------
 .../entities/AbstractChannelImpl.java         |  53 ++-
 .../internal/entities/AbstractMessage.java    |  24 --
 .../internal/entities/ReceivedMessage.java    |  28 --
 .../mixin/channel/middleman/ChannelMixin.java |   5 +-
 .../channel/middleman/GuildChannelMixin.java  |   6 +-
 .../dv8tion/jda/internal/utils/Helpers.java   |  10 +
 16 files changed, 455 insertions(+), 512 deletions(-)
 create mode 100644 src/main/java/net/dv8tion/jda/api/entities/channel/unions/ChannelUnion.java

diff --git a/src/main/java/net/dv8tion/jda/api/entities/Message.java b/src/main/java/net/dv8tion/jda/api/entities/Message.java
index 21e17a53d5..8cce931c5b 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/Message.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/Message.java
@@ -333,8 +333,8 @@ default Message getReferencedMessage()
 
     /**
      * Returns the author of this Message as a {@link net.dv8tion.jda.api.entities.Member member}.
-     * <br><b>This is only valid if the Message was actually sent in a TextChannel.</b> This will return {@code null}
-     * if the message was not sent in a TextChannel, or if the message was sent by a Webhook.
+     * <br><b>This is only valid if the Message was actually sent in a GuildMessageChannel.</b> This will return {@code null}
+     * if the message was not sent in a GuildMessageChannel, or if the message was sent by a Webhook.
      * <br>You can check the type of channel this message was sent from using {@link #isFromType(ChannelType)} or {@link #getChannelType()}.
      *
      * <p>Discord does not provide a member object for messages returned by {@link RestAction RestActions} of any kind.
@@ -344,7 +344,7 @@ default Message getReferencedMessage()
      * @throws UnsupportedOperationException
      *         If this is a Data Message (output of {@link MessageBuilder MessageBuilder})
      *
-     * @return Message author, or {@code null} if the message was not sent in a TextChannel, or if the message was sent by a Webhook.
+     * @return Message author, or {@code null} if the message was not sent in a GuildMessageChannel, or if the message was sent by a Webhook.
      *
      * @see    #isWebhookMessage()
      */
@@ -525,76 +525,10 @@ default boolean isFromGuild()
     @Nonnull
     GuildMessageChannelUnion getGuildChannel();
 
-    /**
-     * Returns the {@link net.dv8tion.jda.api.entities.PrivateChannel PrivateChannel} that this message was sent in.
-     * <br><b>This is only valid if the Message was actually sent in a PrivateChannel.</b>
-     * <br>You can check the type of channel this message was sent from using {@link #isFromType(ChannelType)} or {@link #getChannelType()}.
-     *
-     * <p>Use {@link #getChannel()} for an ambiguous {@link net.dv8tion.jda.api.entities.MessageChannel MessageChannel}
-     * if you do not need functionality specific to {@link net.dv8tion.jda.api.entities.PrivateChannel PrivateChannel}.
-     *
-     * @throws UnsupportedOperationException
-     *         If this is a Data Message (output of {@link MessageBuilder MessageBuilder})
-     * @throws java.lang.IllegalStateException
-     *         If this was not sent in a {@link net.dv8tion.jda.api.entities.PrivateChannel}.
-     *
-     * @return The PrivateChannel this message was sent in
-     *
-     * @see    #isFromGuild()
-     * @see    #isFromType(ChannelType)
-     * @see    #getChannelType()
-     */
-    @Nonnull
-    PrivateChannel getPrivateChannel();
-
-    /**
-     * Returns the {@link net.dv8tion.jda.api.entities.TextChannel TextChannel} that this message was sent in.
-     * <br><b>This is only valid if the Message was actually sent in a TextChannel.</b>
-     * <br>You can check the type of channel this message was sent from using {@link #isFromType(ChannelType)} or {@link #getChannelType()}.
-     *
-     * <p>Use {@link #getChannel()} for an ambiguous {@link net.dv8tion.jda.api.entities.MessageChannel MessageChannel}
-     * if you do not need functionality specific to {@link net.dv8tion.jda.api.entities.TextChannel TextChannel}.
-     *
-     * @throws UnsupportedOperationException
-     *         If this is a Data Message (output of {@link MessageBuilder MessageBuilder})
-     * @throws java.lang.IllegalStateException
-     *         If this was not sent in a {@link net.dv8tion.jda.api.entities.TextChannel}.
-     *
-     * @return The TextChannel this message was sent in
-     *
-     * @see    #isFromGuild()
-     * @see    #isFromType(ChannelType)
-     * @see    #getChannelType()
-     */
-    @Nonnull
-    TextChannel getTextChannel();
-
-    /**
-     * Returns the {@link net.dv8tion.jda.api.entities.NewsChannel NewsChannel} that this message was sent in.
-     * <br><b>This is only valid if the Message was actually sent in a NewsChannel.</b>
-     * <br>You can check the type of channel this message was sent from using {@link #isFromType(ChannelType)} or {@link #getChannelType()}.
-     *
-     * <p>Use {@link #getChannel()} for an ambiguous {@link net.dv8tion.jda.api.entities.MessageChannel MessageChannel}
-     * if you do not need functionality specific to {@link net.dv8tion.jda.api.entities.NewsChannel NewsChannel}.
-     *
-     * @throws UnsupportedOperationException
-     *         If this is a Data Message (output of {@link MessageBuilder MessageBuilder})
-     * @throws java.lang.IllegalStateException
-     *         If this was not sent in a {@link net.dv8tion.jda.api.entities.NewsChannel}.
-     *
-     * @return The NewsChannel this message was sent in
-     *
-     * @see    #isFromGuild()
-     * @see    #isFromType(ChannelType)
-     * @see    #getChannelType()
-     */
-    @Nonnull
-    NewsChannel getNewsChannel();
-
     /**
      * The {@link net.dv8tion.jda.api.entities.Category Category} this
      * message was sent in. This will always be {@code null} for DMs.
-     * <br>Equivalent to {@code getTextChannel().getParentCategory()} if this was sent in a {@link net.dv8tion.jda.api.entities.TextChannel}.
+     * <br>Equivalent to {@code getGuildChannel().getParentCategory()} if this was sent in a {@link GuildMessageChannel}.
      *
      * @throws UnsupportedOperationException
      *         If this is a Data Message (output of {@link MessageBuilder MessageBuilder})
@@ -606,14 +540,14 @@ default boolean isFromGuild()
 
     /**
      * Returns the {@link net.dv8tion.jda.api.entities.Guild Guild} that this message was sent in.
-     * <br>This is just a shortcut to {@link #getTextChannel()}.{@link net.dv8tion.jda.api.entities.TextChannel#getGuild() getGuild()}.
-     * <br><b>This is only valid if the Message was actually sent in a TextChannel.</b>
+     * <br>This is just a shortcut to {@link #getGuildChannel()}{@link net.dv8tion.jda.api.entities.GuildChannel#getGuild() .getGuild()}.
+     * <br><b>This is only valid if the Message was actually sent in a GuildMessageChannel.</b>
      * <br>You can check the type of channel this message was sent from using {@link #isFromType(ChannelType)} or {@link #getChannelType()}.
      *
      * @throws UnsupportedOperationException
      *         If this is a Data Message (output of {@link MessageBuilder MessageBuilder})
      * @throws java.lang.IllegalStateException
-     *         If this was not sent in a {@link net.dv8tion.jda.api.entities.TextChannel}.
+     *         If this was not sent in a {@link net.dv8tion.jda.api.entities.GuildChannel}.
      *
      * @return The Guild this message was sent in
      *
@@ -775,7 +709,7 @@ default List<Button> getButtonsByLabel(@Nonnull String label, boolean ignoreCase
      *
      *     <li>{@link net.dv8tion.jda.api.requests.ErrorResponse#MISSING_PERMISSIONS MISSING_PERMISSIONS}
      *     <br>The edit was attempted after the account lost {@link Permission#MESSAGE_SEND Permission.MESSAGE_SEND} in
-     *         the {@link net.dv8tion.jda.api.entities.TextChannel TextChannel}.</li>
+     *         the {@link net.dv8tion.jda.api.entities.GuildMessageChannel GuildMessageChannel}.</li>
      *
      *     <li>{@link net.dv8tion.jda.api.requests.ErrorResponse#UNKNOWN_MESSAGE UNKNOWN_MESSAGE}
      *     <br>If the message has already been deleted. This might also be triggered for ephemeral messages.</li>
@@ -1978,7 +1912,7 @@ default MessageAction reply(@Nonnull byte[] data, @Nonnull String name, @Nonnull
      *
      *     <li>{@link net.dv8tion.jda.api.requests.ErrorResponse#MISSING_PERMISSIONS MISSING_PERMISSIONS}
      *     <br>The request was attempted after the account lost
-     *         {@link Permission#MESSAGE_MANAGE Permission.MESSAGE_MANAGE} in the TextChannel.</li>
+     *         {@link Permission#MESSAGE_MANAGE Permission.MESSAGE_MANAGE} in the GuildMessageChannel.</li>
      *
      *     <li>{@link net.dv8tion.jda.api.requests.ErrorResponse#UNKNOWN_MESSAGE UNKNOWN_MESSAGE}
      *     <br>If the message has already been deleted. This might also be triggered for ephemeral messages.</li>
diff --git a/src/main/java/net/dv8tion/jda/api/entities/MessageReaction.java b/src/main/java/net/dv8tion/jda/api/entities/MessageReaction.java
index d2217d325e..7000348a3d 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/MessageReaction.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/MessageReaction.java
@@ -172,30 +172,6 @@ public Guild getGuild()
         return channel != null ? channel.getGuild() : null;
     }
 
-    /**
-     * The {@link net.dv8tion.jda.api.entities.TextChannel TextChannel} this Reaction was used in
-     * or {@code null} if this is not from type {@link net.dv8tion.jda.api.entities.ChannelType#TEXT ChannelType.TEXT}!
-     *
-     * @return The {@link net.dv8tion.jda.api.entities.TextChannel TextChannel} or {@code null}
-     */
-    @Nullable
-    public TextChannel getTextChannel()
-    {
-        return getChannel() instanceof TextChannel ? (TextChannel) getChannel() : null;
-    }
-
-    /**
-     * The {@link net.dv8tion.jda.api.entities.PrivateChannel PrivateChannel} this Reaction was used in
-     * or {@code null} if this is not from type {@link net.dv8tion.jda.api.entities.ChannelType#PRIVATE ChannelType.PRIVATE}!
-     *
-     * @return The {@link net.dv8tion.jda.api.entities.PrivateChannel PrivateChannel} or {@code null}
-     */
-    @Nullable
-    public PrivateChannel getPrivateChannel()
-    {
-        return getChannel() instanceof PrivateChannel ? (PrivateChannel) getChannel() : null;
-    }
-
     /**
      * The {@link MessageChannel MessageChannel}
      * this Reaction was used in.
@@ -211,12 +187,15 @@ public MessageChannelUnion getChannel()
     /**
      * The {@link net.dv8tion.jda.api.entities.GuildMessageChannel channel} this Reaction was used in.
      *
-     * @return The channel this Reaction was used in or null if it wasn't used in a Guild
+     * @throws IllegalStateException
+     *          If {@link #getChannel()} is not a guild channel
+     *
+     * @return The guild channel this Reaction was used in
      */
-    @Nullable
+    @Nonnull
     public GuildMessageChannelUnion getGuildChannel()
     {
-        return getChannel() instanceof GuildMessageChannel ? (GuildMessageChannelUnion) getChannel() : null;
+        return (GuildMessageChannelUnion) getChannel().asGuildMessageChannel();
     }
 
     /**
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/ChannelUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/ChannelUnion.java
new file mode 100644
index 0000000000..0826c6a198
--- /dev/null
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/ChannelUnion.java
@@ -0,0 +1,342 @@
+/*
+ * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dv8tion.jda.api.entities.channel.unions;
+
+import net.dv8tion.jda.api.entities.*;
+
+import javax.annotation.Nonnull;
+
+/**
+ * A union representing all channel types that implement {@link Channel}.
+ * <br>This class extends {@link Channel} and primarily acts as a discovery tool for
+ * developers to discover some common interfaces that a {@link Channel} could be cast to.
+ *
+ * <br>This interface represents the follow concrete channel types:
+ * <ul>
+ *     <li>{@link PrivateChannel}</li>
+ *     <li>{@link TextChannel}</li>
+ *     <li>{@link NewsChannel}</li>
+ *     <li>{@link ThreadChannel}</li>
+ *     <li>{@link VoiceChannel}</li>
+ *     <li>{@link StageChannel}</li>
+ *     <li>{@link Category}</li>
+ * </ul>
+ */
+public interface ChannelUnion extends Channel
+{
+    /**
+     * Casts this union to a {@link PrivateChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * PrivateChannel channel = union.asPrivateChannel();
+     * PrivateChannel channel2 = (PrivateChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#PRIVATE} to validate
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof PrivateChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link PrivateChannel}.
+     *
+     * @return The channel as a {@link PrivateChannel}
+     */
+    @Nonnull
+    PrivateChannel asPrivateChannel();
+
+
+    /**
+     * Casts this union to a {@link TextChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * TextChannel channel = union.asTextChannel();
+     * TextChannel channel2 = (TextChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#TEXT} to validate
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof TextChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link TextChannel}.
+     *
+     * @return The channel as a {@link TextChannel}
+     */
+    @Nonnull
+    TextChannel asTextChannel();
+
+    /**
+     * Casts this union to a {@link NewsChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * NewsChannel channel = union.asNewsChannel();
+     * NewsChannel channel2 = (NewsChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#NEWS} to validate
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof NewsChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link NewsChannel}.
+     *
+     * @return The channel as a {@link NewsChannel}
+     */
+    @Nonnull
+    NewsChannel asNewsChannel();
+
+    /**
+     * Casts this union to a {@link ThreadChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * ThreadChannel channel = union.asThreadChannel();
+     * ThreadChannel channel2 = (ThreadChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()}{@link ChannelType#isThread() .isThread()} to validate
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof ThreadChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link ThreadChannel}.
+     *
+     * @return The channel as a {@link ThreadChannel}
+     */
+    @Nonnull
+    ThreadChannel asThreadChannel();
+
+    /**
+     * Casts this union to a {@link VoiceChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * VoiceChannel channel = union.asVoiceChannel();
+     * VoiceChannel channel2 = (VoiceChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#VOICE} to validate
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof VoiceChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link VoiceChannel}.
+     *
+     * @return The channel as a {@link VoiceChannel}
+     */
+    @Nonnull
+    VoiceChannel asVoiceChannel();
+
+    /**
+     * Casts this union to a {@link StageChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * StageChannel channel = union.asStageChannel();
+     * StageChannel channel2 = (StageChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#STAGE} to validate
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof StageChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link StageChannel}.
+     *
+     * @return The channel as a {@link StageChannel}
+     */
+    @Nonnull
+    StageChannel asStageChannel();
+
+    /**
+     * Casts this union to a {@link Category}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * Category channel = union.asCategory();
+     * Category channel2 = (Category) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#CATEGORY} to validate
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof Category</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link Category}.
+     *
+     * @return The channel as a {@link Category}
+     */
+    @Nonnull
+    Category asCategory();
+
+    /**
+     * Casts this union to a {@link MessageChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * MessageChannel channel = union.asMessageChannel();
+     * MessageChannel channel2 = (MessageChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()}{@link ChannelType#isMessage() .isMessage()} to validate whether you can call this
+     * method in addition to normal instanceof checks: <code>channel instanceof MessageChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link MessageChannel}.
+     *
+     * @return The channel as a {@link MessageChannel}
+     */
+    @Nonnull
+    MessageChannel asMessageChannel();
+
+    /**
+     * Casts this union to a {@link GuildChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * GuildChannel channel = union.asGuildChannel();
+     * GuildChannel channel2 = (GuildChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()}{@link ChannelType#isGuild() isGuild()} to validate whether you can call this
+     * method in addition to normal instanceof checks: <code>channel instanceof GuildChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link GuildChannel}.
+     *
+     * @return The channel as a {@link GuildChannel}
+     */
+    @Nonnull
+    GuildChannel asGuildChannel();
+
+    /**
+     * Casts this union to a {@link GuildMessageChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * GuildMessageChannel channel = union.asGuildMessageChannel();
+     * GuildMessageChannel channel2 = (GuildMessageChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()}{@link ChannelType#isGuild() .isGuild()}
+     * and {@link #getType()}{@link ChannelType#isMessage() .isMessage()} to validate whether you can call this
+     * method in addition to normal instanceof checks: <code>channel instanceof GuildMessageChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link GuildMessageChannel}.
+     *
+     * @return The channel as a {@link GuildMessageChannel}
+     */
+    @Nonnull
+    GuildMessageChannel asGuildMessageChannel();
+
+    /**
+     * Casts this union to a {@link AudioChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * AudioChannel channel = union.asAudioChannel();
+     * AudioChannel channel2 = (AudioChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()}{@link ChannelType#isAudio() .isAudio()} to validate
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof AudioChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link AudioChannel}.
+     *
+     * @return The channel as a {@link AudioChannel}
+     */
+    @Nonnull
+    AudioChannel asAudioChannel();
+
+    /**
+     * Casts this union to a {@link IThreadContainer}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * IThreadContainer channel = union.asThreadContainer();
+     * IThreadContainer channel2 = (IThreadContainer) union;
+     * </code></pre>
+     *
+     * You can use <code>channel instanceof IThreadContainer</code> to validate whether you can call this method.
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link IThreadContainer}.
+     *
+     * @return The channel as a {@link IThreadContainer}
+     */
+    IThreadContainer asThreadContainer();
+
+    /**
+     * Casts this union to a {@link StandardGuildChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * StandardGuildChannel channel = union.asStandardGuildChannel();
+     * StandardGuildChannel channel2 = (StandardGuildChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link StandardGuildChannel}.
+     *
+     * @return The channel as a {@link StandardGuildChannel}
+     */
+    @Nonnull
+    StandardGuildChannel asStandardGuildChannel();
+
+    /**
+     * Casts this union to a {@link StandardGuildMessageChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * StandardGuildMessageChannel channel = union.asStandardGuildMessageChannel();
+     * StandardGuildMessageChannel channel2 = (StandardGuildMessageChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link StandardGuildMessageChannel}.
+     *
+     * @return The channel as a {@link StandardGuildMessageChannel}
+     */
+    @Nonnull
+    StandardGuildMessageChannel asStandardGuildMessageChannel();
+}
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildChannelUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildChannelUnion.java
index 58e1889380..77977ba6b1 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildChannelUnion.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildChannelUnion.java
@@ -32,6 +32,7 @@
  *     <li>{@link ThreadChannel}</li>
  *     <li>{@link VoiceChannel}</li>
  *     <li>{@link StageChannel}</li>
+ *     <li>{@link Category}</li>
  * </ul>
  */
 public interface GuildChannelUnion extends GuildChannel
@@ -146,6 +147,28 @@ public interface GuildChannelUnion extends GuildChannel
     @Nonnull
     StageChannel asStageChannel();
 
+    /**
+     * Casts this union to a {@link Category}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * Category channel = union.asCategory();
+     * Category channel2 = (Category) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#CATEGORY} to validate
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof Category</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link Category}.
+     *
+     * @return The channel as a {@link Category}
+     */
+    @Nonnull
+    Category asCategory();
+
     /**
      * Casts this union to a {@link GuildMessageChannel}.
      * This method exists for developer discoverability.
@@ -157,8 +180,8 @@ public interface GuildChannelUnion extends GuildChannel
      * GuildMessageChannel channel2 = (GuildMessageChannel) union;
      * </code></pre>
      *
-     * You can use {@link #getType()}{@link ChannelType#isMessage() .isMessage()}
-     * and {@link #getType()}{@link ChannelType#isGuild() .isGuild()} to validate whether you can call this
+     * You can use {@link #getType()}{@link ChannelType#isGuild() .isGuild()}
+     * and {@link #getType()}{@link ChannelType#isMessage() .isMessage()} to validate whether you can call this
      * method in addition to normal instanceof checks: <code>channel instanceof GuildMessageChannel</code>
      *
      * @throws IllegalStateException
diff --git a/src/main/java/net/dv8tion/jda/api/events/channel/GenericChannelEvent.java b/src/main/java/net/dv8tion/jda/api/events/channel/GenericChannelEvent.java
index 60a9ae3c6b..3fcc8fd1c5 100644
--- a/src/main/java/net/dv8tion/jda/api/events/channel/GenericChannelEvent.java
+++ b/src/main/java/net/dv8tion/jda/api/events/channel/GenericChannelEvent.java
@@ -21,6 +21,7 @@
 import net.dv8tion.jda.api.entities.ChannelType;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.GuildChannel;
+import net.dv8tion.jda.api.entities.channel.unions.ChannelUnion;
 import net.dv8tion.jda.api.events.Event;
 
 import javax.annotation.Nonnull;
@@ -60,9 +61,9 @@ public boolean isFromType(ChannelType type)
     }
 
     @Nonnull
-    public Channel getChannel()
+    public ChannelUnion getChannel()
     {
-        return this.channel;
+        return (ChannelUnion) this.channel;
     }
 
     /**
diff --git a/src/main/java/net/dv8tion/jda/api/events/guild/invite/GenericGuildInviteEvent.java b/src/main/java/net/dv8tion/jda/api/events/guild/invite/GenericGuildInviteEvent.java
index 5c861e466c..c15ba23dea 100644
--- a/src/main/java/net/dv8tion/jda/api/events/guild/invite/GenericGuildInviteEvent.java
+++ b/src/main/java/net/dv8tion/jda/api/events/guild/invite/GenericGuildInviteEvent.java
@@ -18,6 +18,7 @@
 
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.unions.GuildChannelUnion;
 import net.dv8tion.jda.api.events.guild.GenericGuildEvent;
 
 import javax.annotation.Nonnull;
@@ -75,9 +76,9 @@ public String getUrl()
      * @return {@link GuildChannel}
      */
     @Nonnull
-    public GuildChannel getChannel()
+    public GuildChannelUnion getChannel()
     {
-        return channel;
+        return (GuildChannelUnion) channel;
     }
 
     /**
@@ -90,99 +91,4 @@ public ChannelType getChannelType()
     {
         return channel.getType();
     }
-
-    /**
-     * The {@link TextChannel} this invite points to.
-     *
-     * @throws IllegalStateException
-     *         If this did not happen in a channel of type {@link ChannelType#TEXT ChannelType.TEXT}
-     *
-     * @return {@link TextChannel}
-     *
-     * @see    #getChannel()
-     * @see    #getChannelType()
-     */
-    @Nonnull
-    public TextChannel getTextChannel()
-    {
-        if (getChannelType() != ChannelType.TEXT)
-            throw new IllegalStateException("The channel is not of type TEXT");
-        return (TextChannel) getChannel();
-    }
-
-    /**
-     * The {@link NewsChannel} this invite points to.
-     *
-     * @throws IllegalStateException
-     *         If this did not happen in a channel of type {@link ChannelType#NEWS ChannelType.NEWS}
-     *
-     * @return {@link NewsChannel}
-     *
-     * @see    #getChannel()
-     * @see    #getChannelType()
-     */
-    @Nonnull
-    public NewsChannel getNewsChannel()
-    {
-        if (getChannelType() != ChannelType.NEWS)
-            throw new IllegalStateException("The channel is not of type NEWS");
-        return (NewsChannel) getChannel();
-    }
-
-    /**
-     * The {@link VoiceChannel} this invite points to.
-     *
-     * @throws IllegalStateException
-     *         If this did not happen in a voice channel or stage channel
-     *
-     * @return {@link VoiceChannel}
-     *
-     * @see    #getChannel()
-     * @see    #getChannelType()
-     */
-    @Nonnull
-    public VoiceChannel getVoiceChannel()
-    {
-        if (!(channel instanceof VoiceChannel))
-            throw new IllegalStateException("The channel is not of type VOICE or STAGE");
-        return (VoiceChannel) getChannel();
-    }
-
-    /**
-     * The {@link StageChannel} this invite points to.
-     *
-     * @throws IllegalStateException
-     *         If this did not happen in a channel of type {@link ChannelType#STAGE ChannelType.STAGE}
-     *
-     * @return {@link StageChannel}
-     *
-     * @see    #getChannel()
-     * @see    #getChannelType()
-     */
-    @Nonnull
-    public StageChannel getStageChannel()
-    {
-        if (getChannelType() != ChannelType.STAGE)
-            throw new IllegalStateException("The channel is not of type STAGE");
-        return (StageChannel) getChannel();
-    }
-
-    /**
-     * The {@link Category} this invite points to.
-     *
-     * @throws IllegalStateException
-     *         If this did not happen in a channel of type {@link ChannelType#CATEGORY ChannelType.CATEGORY}
-     *
-     * @return {@link Category}
-     *
-     * @see    #getChannel()
-     * @see    #getChannelType()
-     */
-    @Nonnull
-    public Category getCategory()
-    {
-        if (getChannelType() != ChannelType.CATEGORY)
-            throw new IllegalStateException("The channel is not of type CATEGORY");
-        return (Category) getChannel();
-    }
 }
diff --git a/src/main/java/net/dv8tion/jda/api/events/message/GenericMessageEvent.java b/src/main/java/net/dv8tion/jda/api/events/message/GenericMessageEvent.java
index c1f9477b42..f69b4ff0c4 100644
--- a/src/main/java/net/dv8tion/jda/api/events/message/GenericMessageEvent.java
+++ b/src/main/java/net/dv8tion/jda/api/events/message/GenericMessageEvent.java
@@ -171,95 +171,6 @@ public String getJumpUrl()
         return Helpers.format(Message.JUMP_URL, isFromGuild() ? getGuild().getId() : "@me", getChannel().getId(), getMessageId());
     }
 
-    /**
-     * The {@link net.dv8tion.jda.api.entities.TextChannel TextChannel} the Message was received in.
-     * <br>If this Message was not received in a {@link net.dv8tion.jda.api.entities.TextChannel TextChannel},
-     * this will throw an {@link java.lang.IllegalStateException}.
-     *
-     * @throws java.lang.IllegalStateException
-     *         If this was not sent in a {@link net.dv8tion.jda.api.entities.TextChannel}.
-     *
-     * @return The TextChannel the Message was received in
-     *
-     * @see    #isFromGuild()
-     * @see    #isFromType(ChannelType)
-     * @see    #getChannelType()
-     */
-    @Nonnull
-    public TextChannel getTextChannel()
-    {
-        if (!isFromType(ChannelType.TEXT))
-            throw new IllegalStateException("This message event did not happen in a text channel");
-        return (TextChannel) channel;
-    }
-
-    /**
-     * The {@link net.dv8tion.jda.api.entities.NewsChannel NewsChannel} the Message was received in.
-     * <br>If this Message was not received in a {@link net.dv8tion.jda.api.entities.NewsChannel NewsChannel},
-     * this will throw an {@link java.lang.IllegalStateException}.
-     *
-     * @throws java.lang.IllegalStateException
-     *         If this was not sent in a {@link net.dv8tion.jda.api.entities.NewsChannel}.
-     *
-     * @return The NewsChannel the Message was received in
-     *
-     * @see    #isFromGuild()
-     * @see    #isFromType(ChannelType)
-     * @see    #getChannelType()
-     */
-    @Nonnull
-    public NewsChannel getNewsChannel()
-    {
-        if (!isFromType(ChannelType.NEWS))
-            throw new IllegalStateException("This message event did not happen in a news channel");
-        return (NewsChannel) channel;
-    }
-
-    /**
-     * The {@link net.dv8tion.jda.api.entities.PrivateChannel PrivateChannel} the Message was received in.
-     * <br>If this Message was not received in a {@link net.dv8tion.jda.api.entities.PrivateChannel PrivateChannel},
-     * this will throw an {@link java.lang.IllegalStateException}.
-     *
-     * @throws java.lang.IllegalStateException
-     *         If this was not sent in a {@link net.dv8tion.jda.api.entities.PrivateChannel}.
-     *
-     * @return The PrivateChannel the Message was received in
-     *
-     * @see    #isFromGuild()
-     * @see    #isFromType(ChannelType)
-     * @see    #getChannelType()
-     */
-    @Nonnull
-    public PrivateChannel getPrivateChannel()
-    {
-        if (!isFromType(ChannelType.PRIVATE))
-            throw new IllegalStateException("This message event did not happen in a private channel");
-        return (PrivateChannel) channel;
-    }
-
-    /**
-     * The {@link net.dv8tion.jda.api.entities.ThreadChannel ThreadChannel} the Message was received in.
-     * <br>If this Message was not received in a {@link net.dv8tion.jda.api.entities.ThreadChannel ThreadChannel},
-     * this will throw an {@link java.lang.IllegalStateException}.
-     *
-     * @throws java.lang.IllegalStateException
-     *         If this was not sent in a {@link net.dv8tion.jda.api.entities.ThreadChannel}.
-     *
-     * @return The ThreadChannel the Message was received in
-     *
-     * @see    #isFromGuild()
-     * @see    #isFromType(ChannelType)
-     * @see    #getChannelType()
-     * @see    #isFromThread()
-     */
-    @Nonnull
-    public ThreadChannel getThreadChannel()
-    {
-        if (!isFromThread())
-            throw new IllegalStateException("This message event did not happen in a thread channel");
-        return (ThreadChannel) channel;
-    }
-
     /**
      * If the message event was from a {@link net.dv8tion.jda.api.entities.ThreadChannel ThreadChannel}
      *
diff --git a/src/main/java/net/dv8tion/jda/api/events/message/react/GenericMessageReactionEvent.java b/src/main/java/net/dv8tion/jda/api/events/message/react/GenericMessageReactionEvent.java
index 4945d8329a..b5d2308fcb 100644
--- a/src/main/java/net/dv8tion/jda/api/events/message/react/GenericMessageReactionEvent.java
+++ b/src/main/java/net/dv8tion/jda/api/events/message/react/GenericMessageReactionEvent.java
@@ -90,7 +90,7 @@ public long getUserIdLong()
     public User getUser()
     {
         return issuer == null && isFromType(ChannelType.PRIVATE)
-                ? getPrivateChannel().getUser() // this can't be the self user because then issuer would be nonnull
+                ? getChannel().asPrivateChannel().getUser() // this can't be the self user because then issuer would be nonnull
                 : issuer;
     }
 
@@ -101,7 +101,7 @@ public User getUser()
      * Use {@link #retrieveMember()} to load the member.
      *
      * @throws java.lang.IllegalStateException
-     *         If this was not sent in a {@link net.dv8tion.jda.api.entities.TextChannel}.
+     *         If this was not sent in a {@link net.dv8tion.jda.api.entities.Guild}.
      *
      * @return Member of the reacting user or null if they are no longer member of this guild
      *
diff --git a/src/main/java/net/dv8tion/jda/api/events/user/UserTypingEvent.java b/src/main/java/net/dv8tion/jda/api/events/user/UserTypingEvent.java
index c1a07d9695..61b233856d 100644
--- a/src/main/java/net/dv8tion/jda/api/events/user/UserTypingEvent.java
+++ b/src/main/java/net/dv8tion/jda/api/events/user/UserTypingEvent.java
@@ -95,42 +95,6 @@ public ChannelType getType()
         return channel.getType();
     }
 
-    /**
-     * {@link net.dv8tion.jda.api.entities.PrivateChannel PrivateChannel} in which this users started typing,
-     * or {@code null} if this was not in a PrivateChannel.
-     *
-     * @return Possibly-null {@link net.dv8tion.jda.api.entities.PrivateChannel PrivateChannel}
-     */
-    @Nullable
-    public PrivateChannel getPrivateChannel()
-    {
-        return isFromType(ChannelType.PRIVATE) ? (PrivateChannel) channel : null;
-    }
-
-    /**
-     * {@link net.dv8tion.jda.api.entities.TextChannel TextChannel} in which this users started typing,
-     * or {@code null} if this was not in a TextChannel.
-     *
-     * @return Possibly-null {@link net.dv8tion.jda.api.entities.TextChannel TextChannel}
-     */
-    @Nullable
-    public TextChannel getTextChannel()
-    {
-        return isFromType(ChannelType.TEXT) ? (TextChannel) channel : null;
-    }
-
-    /**
-     * {@link net.dv8tion.jda.api.entities.NewsChannel NewsChannel} in which this users started typing,
-     * or {@code null} if this was not in a NewsChannel.
-     *
-     * @return Possibly-null {@link net.dv8tion.jda.api.entities.NewsChannel NewsChannel}
-     */
-    @Nullable
-    public NewsChannel getNewsChannel()
-    {
-        return isFromType(ChannelType.NEWS) ? (NewsChannel) channel : null;
-    }
-
     /**
      * {@link net.dv8tion.jda.api.entities.Guild Guild} in which this users started typing,
      * or {@code null} if this was not in a Guild.
diff --git a/src/main/java/net/dv8tion/jda/api/interactions/Interaction.java b/src/main/java/net/dv8tion/jda/api/interactions/Interaction.java
index 871b22b99e..625c122851 100644
--- a/src/main/java/net/dv8tion/jda/api/interactions/Interaction.java
+++ b/src/main/java/net/dv8tion/jda/api/interactions/Interaction.java
@@ -18,10 +18,10 @@
 
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.*;
-import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.interactions.callbacks.*;
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.components.Modal;
+import net.dv8tion.jda.internal.utils.Helpers;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -132,15 +132,6 @@ default ChannelType getChannelType()
     @Nullable
     Member getMember();
 
-    /**
-     * The channel this interaction happened in.
-     * <br>This is currently never null, but might be nullable in the future.
-     *
-     * @return The channel or null if this interaction is not from a channel context
-     */
-    @Nullable
-    Channel getChannel();
-
     /**
      * Whether this interaction has already been acknowledged.
      * <br><b>Each interaction can only be acknowledged once.</b>
@@ -149,6 +140,14 @@ default ChannelType getChannelType()
      */
     boolean isAcknowledged();
 
+    /**
+     * The channel this interaction happened in.
+     * <br>This is currently never null, but might be nullable in the future.
+     *
+     * @return The channel or null if this interaction is not from a channel context
+     */
+    @Nullable
+    Channel getChannel();
 
     /**
      * The {@link GuildChannel} this interaction happened in.
@@ -162,10 +161,7 @@ default ChannelType getChannelType()
     @Nonnull
     default GuildChannel getGuildChannel()
     {
-        Channel channel = getChannel();
-        if (channel instanceof GuildChannel)
-            return (GuildChannel) channel;
-        throw new IllegalStateException("Cannot convert channel of type " + getChannelType() + " to GuildChannel");
+       return Helpers.safeChannelCast(getChannel(), GuildChannel.class);
     }
 
     /**
@@ -178,102 +174,9 @@ default GuildChannel getGuildChannel()
      * @return The {@link MessageChannel}
      */
     @Nonnull
-    default MessageChannelUnion getMessageChannel()
+    default MessageChannel getMessageChannel()
     {
-        Channel channel = getChannel();
-        if (channel instanceof MessageChannel)
-            return (MessageChannelUnion) channel;
-        throw new IllegalStateException("Cannot convert channel of type " + getChannelType() + " to MessageChannel");
-    }
-
-    /**
-     * The {@link TextChannel} this interaction happened in.
-     * <br>If {@link #getChannelType()} is not {@link ChannelType#TEXT}, this throws {@link IllegalStateException}!
-     *
-     * @throws IllegalStateException
-     *         If {@link #getChannel()} is not a text channel
-     *
-     * @return The {@link TextChannel}
-     */
-    @Nonnull
-    default TextChannel getTextChannel()
-    {
-        Channel channel = getChannel();
-        if (channel instanceof TextChannel)
-            return (TextChannel) channel;
-        throw new IllegalStateException("Cannot convert channel of type " + getChannelType() + " to TextChannel");
-    }
-
-    /**
-     * The {@link NewsChannel} this interaction happened in.
-     * <br>If {@link #getChannelType()} is not {@link ChannelType#NEWS}, this throws {@link IllegalStateException}!
-     *
-     * @throws IllegalStateException
-     *         If {@link #getChannel()} is not a news channel
-     *
-     * @return The {@link NewsChannel}
-     */
-    @Nonnull
-    default NewsChannel getNewsChannel()
-    {
-        Channel channel = getChannel();
-        if (channel instanceof NewsChannel)
-            return (NewsChannel) channel;
-        throw new IllegalStateException("Cannot convert channel of type " + getChannelType() + " to NewsChannel");
-    }
-
-    /**
-     * The {@link VoiceChannel} this interaction happened in.
-     * <br>If {@link #getChannelType()} is not {@link ChannelType#VOICE}, this throws {@link IllegalStateException}!
-     *
-     * @throws IllegalStateException
-     *         If {@link #getChannel()} is not a voice channel
-     *
-     * @return The {@link VoiceChannel}
-     */
-    @Nonnull
-    default VoiceChannel getVoiceChannel()
-    {
-        Channel channel = getChannel();
-        if (channel instanceof VoiceChannel)
-            return (VoiceChannel) channel;
-        throw new IllegalStateException("Cannot convert channel of type " + getChannelType() + " to VoiceChannel");
-    }
-
-    /**
-     * The {@link PrivateChannel} this interaction happened in.
-     * <br>If {@link #getChannelType()} is not {@link ChannelType#PRIVATE}, this throws {@link IllegalStateException}!
-     *
-     * @throws IllegalStateException
-     *         If {@link #getChannel()} is not a private channel
-     *
-     * @return The {@link PrivateChannel}
-     */
-    @Nonnull
-    default PrivateChannel getPrivateChannel()
-    {
-        Channel channel = getChannel();
-        if (channel instanceof PrivateChannel)
-            return (PrivateChannel) channel;
-        throw new IllegalStateException("Cannot convert channel of type " + getChannelType() + " to PrivateChannel");
-    }
-
-    /**
-     * The {@link ThreadChannel} this interaction happened in.
-     * <br>If {@link #getChannelType()} is not {@link ChannelType#isThread()}, this throws {@link IllegalStateException}!
-     *
-     * @throws IllegalStateException
-     *         If {@link #getChannel()} is not a thread channel
-     *
-     * @return The {@link ThreadChannel}
-     */
-    @Nonnull
-    default ThreadChannel getThreadChannel()
-    {
-        Channel channel = getChannel();
-        if (channel instanceof ThreadChannel)
-            return (ThreadChannel) channel;
-        throw new IllegalStateException("Cannot convert channel of type " + getChannelType() + " to ThreadChannel");
+        return Helpers.safeChannelCast(getChannel(), MessageChannel.class);
     }
 
     /**
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/AbstractChannelImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/AbstractChannelImpl.java
index 4dec5f935d..1debada4ba 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/AbstractChannelImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/AbstractChannelImpl.java
@@ -70,69 +70,84 @@ public T setName(String name)
     @Nonnull
     public PrivateChannel asPrivateChannel()
     {
-        return transformChannel(PrivateChannel.class);
+        return Helpers.safeChannelCast(this, PrivateChannel.class);
     }
 
     @Nonnull
     public TextChannel asTextChannel()
     {
-        return transformChannel(TextChannel.class);
+        return Helpers.safeChannelCast(this, TextChannel.class);
     }
 
     @Nonnull
     public NewsChannel asNewsChannel()
     {
-        return transformChannel(NewsChannel.class);
+        return Helpers.safeChannelCast(this, NewsChannel.class);
     }
 
     @Nonnull
     public VoiceChannel asVoiceChannel()
     {
-        return transformChannel(VoiceChannel.class);
+        return Helpers.safeChannelCast(this, VoiceChannel.class);
     }
 
     @Nonnull
     public StageChannel asStageChannel()
     {
-        return transformChannel(StageChannel.class);
+        return Helpers.safeChannelCast(this, StageChannel.class);
     }
 
     @Nonnull
     public ThreadChannel asThreadChannel()
     {
-        return transformChannel(ThreadChannel.class);
+        return Helpers.safeChannelCast(this, ThreadChannel.class);
     }
 
     @Nonnull
-    public IThreadContainer asThreadContainer()
+    public Category asCategory()
     {
-        return transformChannel(IThreadContainer.class);
+        return Helpers.safeChannelCast(this, Category.class);
     }
 
     @Nonnull
-    public GuildMessageChannel asGuildMessageChannel()
+    public MessageChannel asMessageChannel()
     {
-        return transformChannel(GuildMessageChannel.class);
+        return Helpers.safeChannelCast(this, MessageChannel.class);
     }
 
     @Nonnull
-    public StandardGuildChannel asStandardGuildChannel()
+    public AudioChannel asAudioChannel()
     {
-        return transformChannel(StandardGuildChannel.class);
+        return Helpers.safeChannelCast(this, AudioChannel.class);
     }
 
     @Nonnull
-    public StandardGuildMessageChannel asStandardGuildMessageChannel()
+    public IThreadContainer asThreadContainer()
+    {
+        return Helpers.safeChannelCast(this, IThreadContainer.class);
+    }
+
+    @Nonnull
+    public GuildChannel asGuildChannel()
+    {
+        return Helpers.safeChannelCast(this, GuildChannel.class);
+    }
+
+    @Nonnull
+    public GuildMessageChannel asGuildMessageChannel()
     {
-        return transformChannel(StandardGuildMessageChannel.class);
+        return Helpers.safeChannelCast(this, GuildMessageChannel.class);
     }
 
-    private <TOut extends Channel> TOut transformChannel(Class<TOut> toObjectClass)
+    @Nonnull
+    public StandardGuildChannel asStandardGuildChannel()
     {
-        if (toObjectClass.isInstance(this))
-            return toObjectClass.cast(this);
+        return Helpers.safeChannelCast(this, StandardGuildChannel.class);
+    }
 
-        String cleanedClassName = this.getClass().getSimpleName().replace("Impl", "");
-        throw new IllegalStateException(Helpers.format("Cannot convert channel of type %s to %s!", cleanedClassName, toObjectClass.getSimpleName()));
+    @Nonnull
+    public StandardGuildMessageChannel asStandardGuildMessageChannel()
+    {
+        return Helpers.safeChannelCast(this, StandardGuildMessageChannel.class);
     }
 }
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/AbstractMessage.java b/src/main/java/net/dv8tion/jda/internal/entities/AbstractMessage.java
index c7679b5069..7aa99dc4a8 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/AbstractMessage.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/AbstractMessage.java
@@ -225,30 +225,6 @@ public GuildMessageChannelUnion getGuildChannel()
         return null;
     }
 
-    @Nonnull
-    @Override
-    public PrivateChannel getPrivateChannel()
-    {
-        unsupported();
-        return null;
-    }
-
-    @Nonnull
-    @Override
-    public TextChannel getTextChannel()
-    {
-        unsupported();
-        return null;
-    }
-
-    @Nonnull
-    @Override
-    public NewsChannel getNewsChannel()
-    {
-        unsupported();
-        return null;
-    }
-
     @Override
     public Category getCategory()
     {
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/ReceivedMessage.java b/src/main/java/net/dv8tion/jda/internal/entities/ReceivedMessage.java
index d2dc86d363..518b7806a2 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/ReceivedMessage.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/ReceivedMessage.java
@@ -416,37 +416,9 @@ public GuildMessageChannelUnion getGuildChannel()
         return (GuildMessageChannelUnion) channel;
     }
 
-    @Nonnull
-    @Override
-    public PrivateChannel getPrivateChannel()
-    {
-        if (!isFromType(ChannelType.PRIVATE))
-            throw new IllegalStateException("This message was not sent in a private channel");
-        return (PrivateChannel) channel;
-    }
-
-    @Nonnull
-    @Override
-    public TextChannel getTextChannel()
-    {
-        if (!isFromType(ChannelType.TEXT))
-            throw new IllegalStateException("This message was not sent in a text channel");
-        return (TextChannel) channel;
-    }
-
-    @Nonnull
-    @Override
-    public NewsChannel getNewsChannel()
-    {
-        if (!isFromType(ChannelType.NEWS))
-            throw new IllegalStateException("This message was not sent in a news channel");
-        return (NewsChannel) channel;
-    }
-
     @Override
     public Category getCategory()
     {
-        //TODO-v5: Should this actually throw an error here if the GuildMessageChannel doesn't implement ICategorizableChannel?
         GuildMessageChannel chan = getGuildChannel();
         return chan instanceof ICategorizableChannel
             ? ((ICategorizableChannel) chan).getParentCategory()
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/ChannelMixin.java b/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/ChannelMixin.java
index 2b9a787284..0161eda95c 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/ChannelMixin.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/ChannelMixin.java
@@ -17,6 +17,7 @@
 package net.dv8tion.jda.internal.entities.mixin.channel.middleman;
 
 import net.dv8tion.jda.api.entities.Channel;
+import net.dv8tion.jda.api.entities.channel.unions.ChannelUnion;
 import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.internal.requests.RestActionImpl;
 import net.dv8tion.jda.internal.requests.Route;
@@ -24,7 +25,9 @@
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nonnull;
 
-public interface ChannelMixin<T extends ChannelMixin<T>> extends Channel
+public interface ChannelMixin<T extends ChannelMixin<T>> extends
+        Channel,
+        ChannelUnion
 {
     // ---- Default implementations of interface ----
     @Override
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/GuildChannelMixin.java b/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/GuildChannelMixin.java
index dda641e635..41cf6af354 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/GuildChannelMixin.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/middleman/GuildChannelMixin.java
@@ -19,6 +19,7 @@
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.GuildChannel;
 import net.dv8tion.jda.api.entities.IPermissionContainer;
+import net.dv8tion.jda.api.entities.channel.unions.GuildChannelUnion;
 import net.dv8tion.jda.api.exceptions.InsufficientPermissionException;
 import net.dv8tion.jda.api.requests.restaction.AuditableRestAction;
 import net.dv8tion.jda.internal.requests.Route;
@@ -27,7 +28,10 @@
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nonnull;
 
-public interface GuildChannelMixin<T extends GuildChannelMixin<T>> extends GuildChannel, ChannelMixin<T>
+public interface GuildChannelMixin<T extends GuildChannelMixin<T>> extends
+        GuildChannel,
+        GuildChannelUnion,
+        ChannelMixin<T>
 {
     // ---- Default implementations of interface ----
     @Override
diff --git a/src/main/java/net/dv8tion/jda/internal/utils/Helpers.java b/src/main/java/net/dv8tion/jda/internal/utils/Helpers.java
index d2877ef3bf..03b36c493b 100644
--- a/src/main/java/net/dv8tion/jda/internal/utils/Helpers.java
+++ b/src/main/java/net/dv8tion/jda/internal/utils/Helpers.java
@@ -18,6 +18,7 @@
 
 import gnu.trove.map.TLongObjectMap;
 import gnu.trove.map.hash.TLongObjectHashMap;
+import net.dv8tion.jda.api.entities.Channel;
 import net.dv8tion.jda.api.utils.data.DataArray;
 import net.dv8tion.jda.api.utils.data.DataObject;
 
@@ -46,6 +47,15 @@ public static <T> Consumer<T> emptyConsumer()
         return (Consumer<T>) EMPTY_CONSUMER;
     }
 
+    public static <T extends Channel> T safeChannelCast(Object instance, Class<T> toObjectClass)
+    {
+        if (toObjectClass.isInstance(instance))
+            return toObjectClass.cast(instance);
+
+        String cleanedClassName = instance.getClass().getSimpleName().replace("Impl", "");
+        throw new IllegalStateException(Helpers.format("Cannot convert channel of type %s to %s!", cleanedClassName, toObjectClass.getSimpleName()));
+    }
+
     public static OffsetDateTime toOffset(long instant)
     {
         return OffsetDateTime.ofInstant(Instant.ofEpochMilli(instant), OFFSET);

From a98b730e6aae73935180766a9249cc82ac290850 Mon Sep 17 00:00:00 2001
From: Austin Keener <keeneraustin@yahoo.com>
Date: Sat, 2 Jul 2022 20:41:18 -0400
Subject: [PATCH 13/17] Introduced IPermissionContainerUnion

---
 .../jda/api/entities/PermissionOverride.java  |   3 +-
 .../unions/IPermissionContainerUnion.java     | 251 ++++++++++++++++++
 .../GenericPermissionOverrideEvent.java       |  91 +------
 .../PermissionOverrideCreateEvent.java        |   5 +-
 .../PermissionOverrideDeleteEvent.java        |   5 +-
 .../PermissionOverrideUpdateEvent.java        |   5 +-
 .../jda/api/managers/PermOverrideManager.java |   3 +-
 .../entities/PermissionOverrideImpl.java      |   6 +-
 .../attribute/IPermissionContainerMixin.java  |   6 +-
 9 files changed, 280 insertions(+), 95 deletions(-)
 create mode 100644 src/main/java/net/dv8tion/jda/api/entities/channel/unions/IPermissionContainerUnion.java

diff --git a/src/main/java/net/dv8tion/jda/api/entities/PermissionOverride.java b/src/main/java/net/dv8tion/jda/api/entities/PermissionOverride.java
index 2c5da9fbf0..ec1b3a6134 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/PermissionOverride.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/PermissionOverride.java
@@ -17,6 +17,7 @@
 
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.channel.unions.IPermissionContainerUnion;
 import net.dv8tion.jda.api.requests.restaction.AuditableRestAction;
 import net.dv8tion.jda.api.requests.restaction.PermissionOverrideAction;
 
@@ -141,7 +142,7 @@ public interface PermissionOverride extends ISnowflake
      * @return Never-null related {@link IPermissionContainer GuildChannel} that this override is part of.
      */
     @Nonnull
-    IPermissionContainer getChannel();
+    IPermissionContainerUnion getChannel();
 
     /**
      * The {@link net.dv8tion.jda.api.entities.Guild Guild} that the {@link GuildChannel GuildChannel}
diff --git a/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IPermissionContainerUnion.java b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IPermissionContainerUnion.java
new file mode 100644
index 0000000000..9792fc1982
--- /dev/null
+++ b/src/main/java/net/dv8tion/jda/api/entities/channel/unions/IPermissionContainerUnion.java
@@ -0,0 +1,251 @@
+/*
+ * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dv8tion.jda.api.entities.channel.unions;
+
+import net.dv8tion.jda.api.entities.*;
+
+import javax.annotation.Nonnull;
+
+/**
+ * A union representing all channel types that implement {@link IPermissionContainer}.
+ * <br>This class extends {@link IPermissionContainer} and primarily acts as a discovery tool for
+ * developers to discover some common interfaces that a {@link IPermissionContainer} could be cast to.
+ *
+ * <br>This interface represents the follow concrete channel types:
+ * <ul>
+ *     <li>{@link TextChannel}</li>
+ *     <li>{@link NewsChannel}</li>
+ *     <li>{@link VoiceChannel}</li>
+ *     <li>{@link StageChannel}</li>
+ *     <li>{@link Category}</li>
+ * </ul>
+ */
+public interface IPermissionContainerUnion extends IPermissionContainer
+{
+    /**
+     * Casts this union to a {@link TextChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * TextChannel channel = union.asTextChannel();
+     * TextChannel channel2 = (TextChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#TEXT} to validate
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof TextChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link TextChannel}.
+     *
+     * @return The channel as a {@link TextChannel}
+     */
+    @Nonnull
+    TextChannel asTextChannel();
+
+    /**
+     * Casts this union to a {@link NewsChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * NewsChannel channel = union.asNewsChannel();
+     * NewsChannel channel2 = (NewsChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#NEWS} to validate
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof NewsChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link NewsChannel}.
+     *
+     * @return The channel as a {@link NewsChannel}
+     */
+    @Nonnull
+    NewsChannel asNewsChannel();
+
+    /**
+     * Casts this union to a {@link VoiceChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * VoiceChannel channel = union.asVoiceChannel();
+     * VoiceChannel channel2 = (VoiceChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#VOICE} to validate
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof VoiceChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link VoiceChannel}.
+     *
+     * @return The channel as a {@link VoiceChannel}
+     */
+    @Nonnull
+    VoiceChannel asVoiceChannel();
+
+    /**
+     * Casts this union to a {@link StageChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * StageChannel channel = union.asStageChannel();
+     * StageChannel channel2 = (StageChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#STAGE} to validate
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof StageChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link StageChannel}.
+     *
+     * @return The channel as a {@link StageChannel}
+     */
+    @Nonnull
+    StageChannel asStageChannel();
+
+    /**
+     * Casts this union to a {@link Category}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * Category channel = union.asCategory();
+     * Category channel2 = (Category) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()} to see if the channel is of type {@link ChannelType#CATEGORY} to validate
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof Category</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link Category}.
+     *
+     * @return The channel as a {@link Category}
+     */
+    @Nonnull
+    Category asCategory();
+
+    /**
+     * Casts this union to a {@link GuildMessageChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * GuildMessageChannel channel = union.asGuildMessageChannel();
+     * GuildMessageChannel channel2 = (GuildMessageChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()}{@link ChannelType#isGuild() .isGuild()}
+     * and {@link #getType()}{@link ChannelType#isMessage() .isMessage()} to validate whether you can call this
+     * method in addition to normal instanceof checks: <code>channel instanceof GuildMessageChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link GuildMessageChannel}.
+     *
+     * @return The channel as a {@link GuildMessageChannel}
+     */
+    @Nonnull
+    GuildMessageChannel asGuildMessageChannel();
+
+    /**
+     * Casts this union to a {@link AudioChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * AudioChannel channel = union.asAudioChannel();
+     * AudioChannel channel2 = (AudioChannel) union;
+     * </code></pre>
+     *
+     * You can use {@link #getType()}{@link ChannelType#isAudio() .isAudio()} to validate
+     * whether you can call this method in addition to normal instanceof checks: <code>channel instanceof AudioChannel</code>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link AudioChannel}.
+     *
+     * @return The channel as a {@link AudioChannel}
+     */
+    @Nonnull
+    AudioChannel asAudioChannel();
+
+    /**
+     * Casts this union to a {@link IThreadContainer}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * IThreadContainer channel = union.asThreadContainer();
+     * IThreadContainer channel2 = (IThreadContainer) union;
+     * </code></pre>
+     *
+     * You can use <code>channel instanceof IThreadContainer</code> to validate whether you can call this method.
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link IThreadContainer}.
+     *
+     * @return The channel as a {@link IThreadContainer}
+     */
+    IThreadContainer asThreadContainer();
+
+    /**
+     * Casts this union to a {@link StandardGuildChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * StandardGuildChannel channel = union.asStandardGuildChannel();
+     * StandardGuildChannel channel2 = (StandardGuildChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link StandardGuildChannel}.
+     *
+     * @return The channel as a {@link StandardGuildChannel}
+     */
+    @Nonnull
+    StandardGuildChannel asStandardGuildChannel();
+
+    /**
+     * Casts this union to a {@link StandardGuildMessageChannel}.
+     * This method exists for developer discoverability.
+     *
+     * Note: This is effectively equivalent to using the cast operator:
+     * <pre><code>
+     * //These are the same!
+     * StandardGuildMessageChannel channel = union.asStandardGuildMessageChannel();
+     * StandardGuildMessageChannel channel2 = (StandardGuildMessageChannel) union;
+     * </code></pre>
+     *
+     * @throws IllegalStateException
+     *         If the channel represented by this union is not actually a {@link StandardGuildMessageChannel}.
+     *
+     * @return The channel as a {@link StandardGuildMessageChannel}
+     */
+    @Nonnull
+    StandardGuildMessageChannel asStandardGuildMessageChannel();
+}
diff --git a/src/main/java/net/dv8tion/jda/api/events/guild/override/GenericPermissionOverrideEvent.java b/src/main/java/net/dv8tion/jda/api/events/guild/override/GenericPermissionOverrideEvent.java
index ca1a26f158..6d8fc7a647 100644
--- a/src/main/java/net/dv8tion/jda/api/events/guild/override/GenericPermissionOverrideEvent.java
+++ b/src/main/java/net/dv8tion/jda/api/events/guild/override/GenericPermissionOverrideEvent.java
@@ -18,6 +18,7 @@
 
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.unions.IPermissionContainerUnion;
 import net.dv8tion.jda.api.events.guild.GenericGuildEvent;
 
 import javax.annotation.Nonnull;
@@ -31,10 +32,10 @@
  */
 public class GenericPermissionOverrideEvent extends GenericGuildEvent
 {
-    protected final GuildChannel channel;
+    protected final IPermissionContainer channel;
     protected final PermissionOverride override;
 
-    public GenericPermissionOverrideEvent(@Nonnull JDA api, long responseNumber, @Nonnull GuildChannel channel, @Nonnull PermissionOverride override)
+    public GenericPermissionOverrideEvent(@Nonnull JDA api, long responseNumber, @Nonnull IPermissionContainer channel, @Nonnull PermissionOverride override)
     {
         super(api, responseNumber, channel.getGuild());
         this.channel = channel;
@@ -53,92 +54,14 @@ public ChannelType getChannelType()
     }
 
     /**
-     * The {@link GuildChannel} this override belongs to.
+     * The {@link IPermissionContainer guild channel} this override belongs to.
      *
-     * @return The {@link GuildChannel}
+     * @return The {@link IPermissionContainer channel}
      */
     @Nonnull
-    //TODO-v5: Make this IPermissionContainer?
-    public GuildChannel getChannel()
+    public IPermissionContainerUnion getChannel()
     {
-        return channel;
-    }
-
-    /**
-     * The {@link TextChannel} this override belongs to.
-     *
-     * @throws IllegalStateException
-     *         If the override does not belong to a TextChannel
-     *
-     * @return {@link TextChannel}
-     *
-     * @see    #getChannel()
-     * @see    #getChannelType()
-     */
-    @Nonnull
-    public TextChannel getTextChannel()
-    {
-        if (channel instanceof TextChannel)
-            return (TextChannel) channel;
-        throw new IllegalStateException("This override is for a channel of type " + getChannelType());
-    }
-
-    /**
-     * The {@link NewsChannel} this override belongs to.
-     *
-     * @throws IllegalStateException
-     *         If the override does not belong to a NewsChannel
-     *
-     * @return {@link NewsChannel}
-     *
-     * @see    #getChannel()
-     * @see    #getChannelType()
-     */
-    @Nonnull
-    public NewsChannel getNewsChannel()
-    {
-        if (channel instanceof NewsChannel)
-            return (NewsChannel) channel;
-        throw new IllegalStateException("This override is for a channel of type " + getChannelType());
-    }
-
-    /**
-     * The {@link VoiceChannel} this override belongs to.
-     *
-     * @throws IllegalStateException
-     *         If the override does not belong to a VoiceChannel
-     *
-     * @return {@link VoiceChannel}
-     *
-     * @see    #getChannel()
-     * @see    #getChannelType()
-     */
-    @Nonnull
-    public VoiceChannel getVoiceChannel()
-    {
-        if (channel instanceof VoiceChannel)
-            return (VoiceChannel) channel;
-        throw new IllegalStateException("This override is for a channel of type " + getChannelType());
-    }
-
-    /**
-     * The {@link Category} this override belongs to.
-     * <br>Note: This is not the same as {@code getChannel().getParentCategory()}!
-     *
-     * @throws IllegalStateException
-     *         If the override does not belong to a Category
-     *
-     * @return {@link Category}
-     *
-     * @see    #getChannel()
-     * @see    #getChannelType()
-     */
-    @Nonnull
-    public Category getCategory()
-    {
-        if (channel instanceof Category)
-            return (Category) channel;
-        throw new IllegalStateException("This override is for a channel of type " + getChannelType());
+        return (IPermissionContainerUnion) channel;
     }
 
     /**
diff --git a/src/main/java/net/dv8tion/jda/api/events/guild/override/PermissionOverrideCreateEvent.java b/src/main/java/net/dv8tion/jda/api/events/guild/override/PermissionOverrideCreateEvent.java
index 26062b8fc9..9b5f57764d 100644
--- a/src/main/java/net/dv8tion/jda/api/events/guild/override/PermissionOverrideCreateEvent.java
+++ b/src/main/java/net/dv8tion/jda/api/events/guild/override/PermissionOverrideCreateEvent.java
@@ -18,18 +18,19 @@
 
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.GuildChannel;
+import net.dv8tion.jda.api.entities.IPermissionContainer;
 import net.dv8tion.jda.api.entities.PermissionOverride;
 
 import javax.annotation.Nonnull;
 
 /**
- * Indicates that a {@link PermissionOverride} of a {@link GuildChannel} has been created.
+ * Indicates that a {@link PermissionOverride} in a {@link IPermissionContainer guild channel} has been created.
  *
  * <p>Can be used to retrieve the new override.
  */
 public class PermissionOverrideCreateEvent extends GenericPermissionOverrideEvent
 {
-    public PermissionOverrideCreateEvent(@Nonnull JDA api, long responseNumber, @Nonnull GuildChannel channel, @Nonnull PermissionOverride override)
+    public PermissionOverrideCreateEvent(@Nonnull JDA api, long responseNumber, @Nonnull IPermissionContainer channel, @Nonnull PermissionOverride override)
     {
         super(api, responseNumber, channel, override);
     }
diff --git a/src/main/java/net/dv8tion/jda/api/events/guild/override/PermissionOverrideDeleteEvent.java b/src/main/java/net/dv8tion/jda/api/events/guild/override/PermissionOverrideDeleteEvent.java
index ce695bd0fb..fe83cd1cf4 100644
--- a/src/main/java/net/dv8tion/jda/api/events/guild/override/PermissionOverrideDeleteEvent.java
+++ b/src/main/java/net/dv8tion/jda/api/events/guild/override/PermissionOverrideDeleteEvent.java
@@ -18,18 +18,19 @@
 
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.GuildChannel;
+import net.dv8tion.jda.api.entities.IPermissionContainer;
 import net.dv8tion.jda.api.entities.PermissionOverride;
 
 import javax.annotation.Nonnull;
 
 /**
- * Indicates that a {@link PermissionOverride} of a {@link GuildChannel} has been deleted.
+ * Indicates that a {@link PermissionOverride} in a {@link IPermissionContainer guild channel} has been deleted.
  *
  * <p>Can be used to retrieve the old override.
  */
 public class PermissionOverrideDeleteEvent extends GenericPermissionOverrideEvent
 {
-    public PermissionOverrideDeleteEvent(@Nonnull JDA api, long responseNumber, @Nonnull GuildChannel channel, @Nonnull PermissionOverride override)
+    public PermissionOverrideDeleteEvent(@Nonnull JDA api, long responseNumber, @Nonnull IPermissionContainer channel, @Nonnull PermissionOverride override)
     {
         super(api, responseNumber, channel, override);
     }
diff --git a/src/main/java/net/dv8tion/jda/api/events/guild/override/PermissionOverrideUpdateEvent.java b/src/main/java/net/dv8tion/jda/api/events/guild/override/PermissionOverrideUpdateEvent.java
index 70da00d8c2..4c39c0822a 100644
--- a/src/main/java/net/dv8tion/jda/api/events/guild/override/PermissionOverrideUpdateEvent.java
+++ b/src/main/java/net/dv8tion/jda/api/events/guild/override/PermissionOverrideUpdateEvent.java
@@ -19,13 +19,14 @@
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.GuildChannel;
+import net.dv8tion.jda.api.entities.IPermissionContainer;
 import net.dv8tion.jda.api.entities.PermissionOverride;
 
 import javax.annotation.Nonnull;
 import java.util.EnumSet;
 
 /**
- * Indicates that a {@link PermissionOverride} of a {@link GuildChannel} has been updated.
+ * Indicates that a {@link PermissionOverride} in a {@link IPermissionContainer guild channel} has been updated.
  *
  * <p>Can be used to retrieve the updated override and old {@link #getOldAllow() allow} and {@link #getOldDeny() deny}.
  */
@@ -34,7 +35,7 @@ public class PermissionOverrideUpdateEvent extends GenericPermissionOverrideEven
 {
     private final long oldAllow, oldDeny;
 
-    public PermissionOverrideUpdateEvent(@Nonnull JDA api, long responseNumber, @Nonnull GuildChannel channel, @Nonnull PermissionOverride override, long oldAllow, long oldDeny)
+    public PermissionOverrideUpdateEvent(@Nonnull JDA api, long responseNumber, @Nonnull IPermissionContainer channel, @Nonnull PermissionOverride override, long oldAllow, long oldDeny)
     {
         super(api, responseNumber, channel, override);
         this.oldAllow = oldAllow;
diff --git a/src/main/java/net/dv8tion/jda/api/managers/PermOverrideManager.java b/src/main/java/net/dv8tion/jda/api/managers/PermOverrideManager.java
index b2dfc107d9..000826e312 100644
--- a/src/main/java/net/dv8tion/jda/api/managers/PermOverrideManager.java
+++ b/src/main/java/net/dv8tion/jda/api/managers/PermOverrideManager.java
@@ -21,6 +21,7 @@
 import net.dv8tion.jda.api.entities.GuildChannel;
 import net.dv8tion.jda.api.entities.IPermissionContainer;
 import net.dv8tion.jda.api.entities.PermissionOverride;
+import net.dv8tion.jda.api.entities.channel.unions.IPermissionContainerUnion;
 import net.dv8tion.jda.internal.utils.Checks;
 
 import javax.annotation.CheckReturnValue;
@@ -115,7 +116,7 @@ default Guild getGuild()
      * @return The parent {@link GuildChannel GuildChannel}
      */
     @Nonnull
-    default IPermissionContainer getChannel()
+    default IPermissionContainerUnion getChannel()
     {
         return getPermissionOverride().getChannel();
     }
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/PermissionOverrideImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/PermissionOverrideImpl.java
index d7b32b23f8..5e7c7efc9a 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/PermissionOverrideImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/PermissionOverrideImpl.java
@@ -19,6 +19,7 @@
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.unions.IPermissionContainerUnion;
 import net.dv8tion.jda.api.exceptions.InsufficientPermissionException;
 import net.dv8tion.jda.api.exceptions.MissingAccessException;
 import net.dv8tion.jda.api.requests.restaction.AuditableRestAction;
@@ -116,12 +117,13 @@ public Role getRole()
 
     @Nonnull
     @Override
-    public IPermissionContainer getChannel()
+    public IPermissionContainerUnion getChannel()
     {
         IPermissionContainer realChannel = (IPermissionContainer) api.getGuildChannelById(channel.getIdLong());
         if (realChannel != null)
             channel = realChannel;
-        return channel;
+
+        return (IPermissionContainerUnion) channel;
     }
 
     @Nonnull
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/attribute/IPermissionContainerMixin.java b/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/attribute/IPermissionContainerMixin.java
index 7c18612fc9..54005c7672 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/attribute/IPermissionContainerMixin.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/mixin/channel/attribute/IPermissionContainerMixin.java
@@ -21,6 +21,7 @@
 import net.dv8tion.jda.api.entities.IPermissionContainer;
 import net.dv8tion.jda.api.entities.IPermissionHolder;
 import net.dv8tion.jda.api.entities.PermissionOverride;
+import net.dv8tion.jda.api.entities.channel.unions.IPermissionContainerUnion;
 import net.dv8tion.jda.api.requests.restaction.PermissionOverrideAction;
 import net.dv8tion.jda.internal.entities.mixin.channel.middleman.GuildChannelMixin;
 import net.dv8tion.jda.internal.requests.restaction.PermissionOverrideActionImpl;
@@ -30,7 +31,10 @@
 import java.util.Arrays;
 import java.util.List;
 
-public interface IPermissionContainerMixin<T extends IPermissionContainerMixin<T>> extends IPermissionContainer, GuildChannelMixin<T>
+public interface IPermissionContainerMixin<T extends IPermissionContainerMixin<T>> extends
+        IPermissionContainer,
+        IPermissionContainerUnion,
+        GuildChannelMixin<T>
 {
     // ---- Default implementations of interface ----
     @Override

From 5b24fcc99f17bf68e9a86b4e2cc054dae8215a47 Mon Sep 17 00:00:00 2001
From: Austin Keener <keeneraustin@yahoo.com>
Date: Sat, 2 Jul 2022 20:43:16 -0400
Subject: [PATCH 14/17] Fixed 6+ year old typo

---
 src/main/java/net/dv8tion/jda/api/JDA.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/dv8tion/jda/api/JDA.java b/src/main/java/net/dv8tion/jda/api/JDA.java
index 659a7929dd..2e7fc19c9b 100644
--- a/src/main/java/net/dv8tion/jda/api/JDA.java
+++ b/src/main/java/net/dv8tion/jda/api/JDA.java
@@ -62,7 +62,7 @@
 import java.util.regex.Matcher;
 
 /**
- * The core of JDA. Acts as a registry system of JDA. All parts of the the API can be accessed starting from this class.
+ * The core of JDA. Acts as a registry system of JDA. All parts of the API can be accessed starting from this class.
  *
  * @see JDABuilder
  */

From 5b09a3c701445cb55b9752b81c7da8189745e188 Mon Sep 17 00:00:00 2001
From: Austin Keener <keeneraustin@yahoo.com>
Date: Sun, 3 Jul 2022 13:05:59 -0400
Subject: [PATCH 15/17] Update MessageReaction#getGuild contract to throw on
 non-guild channel.

---
 .../net/dv8tion/jda/api/entities/MessageReaction.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/dv8tion/jda/api/entities/MessageReaction.java b/src/main/java/net/dv8tion/jda/api/entities/MessageReaction.java
index 7000348a3d..9126721e95 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/MessageReaction.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/MessageReaction.java
@@ -161,15 +161,16 @@ public boolean isFromType(@Nonnull ChannelType type)
 
     /**
      * The {@link net.dv8tion.jda.api.entities.Guild Guild} this Reaction was used in.
-     * This will return null if the channel this Reaction was used in is not part of a Guild.
      *
-     * @return {@link net.dv8tion.jda.api.entities.Guild Guild} this Reaction was used in, or {@code null}
+     * @throws IllegalStateException
+     *         If {@link #getChannel()} is not a guild channel
+     *
+     * @return {@link net.dv8tion.jda.api.entities.Guild Guild} this Reaction was used in
      */
-    @Nullable
+    @Nonnull
     public Guild getGuild()
     {
-        GuildMessageChannel channel = getGuildChannel();
-        return channel != null ? channel.getGuild() : null;
+        return getGuildChannel().getGuild();
     }
 
     /**

From 5026636df6bf9898cb6a0bc662cbd741fa053b64 Mon Sep 17 00:00:00 2001
From: Austin Keener <keeneraustin@yahoo.com>
Date: Sun, 3 Jul 2022 13:11:41 -0400
Subject: [PATCH 16/17] Fix Javadoc

---
 .../net/dv8tion/jda/api/interactions/commands/OptionType.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/dv8tion/jda/api/interactions/commands/OptionType.java b/src/main/java/net/dv8tion/jda/api/interactions/commands/OptionType.java
index 59f237d617..5fafa06d5f 100644
--- a/src/main/java/net/dv8tion/jda/api/interactions/commands/OptionType.java
+++ b/src/main/java/net/dv8tion/jda/api/interactions/commands/OptionType.java
@@ -63,7 +63,7 @@ public enum OptionType
     USER(6),
     /**
      * Options which accept a single {@link net.dv8tion.jda.api.entities.GuildChannel GuildChannel}
-     * @see OptionMapping#getAsGuildChannel()
+     * @see OptionMapping#getAsChannel()
      */
     CHANNEL(7),
     /**

From 0377e874d96aca1f2264a52944b676429691375f Mon Sep 17 00:00:00 2001
From: Austin Keener <keeneraustin@yahoo.com>
Date: Sun, 3 Jul 2022 13:16:34 -0400
Subject: [PATCH 17/17] Fix examples

---
 src/examples/java/MessageListenerExample.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/examples/java/MessageListenerExample.java b/src/examples/java/MessageListenerExample.java
index bc827f22a5..0fdb468ea4 100644
--- a/src/examples/java/MessageListenerExample.java
+++ b/src/examples/java/MessageListenerExample.java
@@ -18,6 +18,7 @@
 import net.dv8tion.jda.api.JDABuilder;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.exceptions.PermissionException;
 import net.dv8tion.jda.api.exceptions.RateLimitedException;
@@ -85,8 +86,8 @@ public void onMessageReceived(MessageReceivedEvent event)
         //Event specific information
         User author = event.getAuthor();                //The user that sent the message
         Message message = event.getMessage();           //The message that was received.
-        MessageChannel channel = event.getChannel();    //This is the MessageChannel that the message was sent to.
-                                                        //  This could be a TextChannel, PrivateChannel, or Group!
+        MessageChannelUnion channel = event.getChannel();    //This is the MessageChannel that the message was sent to.
+                                                        //  This could be a TextChannel, PrivateChannel, or more!
 
         String msg = message.getContentDisplay();              //This returns a human readable version of the Message. Similar to
                                                         // what you would see in the client.
@@ -101,7 +102,7 @@ public void onMessageReceived(MessageReceivedEvent event)
             // the message possibly not being from a Guild!
 
             Guild guild = event.getGuild();             //The Guild that this message was sent in. (note, in the API, Guilds are Servers)
-            TextChannel textChannel = event.getTextChannel(); //The TextChannel that this message was sent to.
+            TextChannel textChannel = channel.asTextChannel(); //The TextChannel that this message was sent to.
             Member member = event.getMember();          //This Member that sent the message. Contains Guild specific information about the User!
 
             String name;
@@ -120,7 +121,7 @@ else if (event.isFromType(ChannelType.PRIVATE)) //If this message was sent to a
         {
             //The message was sent in a PrivateChannel.
             //In this example we don't directly use the privateChannel, however, be sure, there are uses for it!
-            PrivateChannel privateChannel = event.getPrivateChannel();
+            PrivateChannel privateChannel = channel.asPrivateChannel();
 
             System.out.printf("[PRIV]<%s>: %s\n", author.getName(), msg);
         }