Handle text in voice channels

src/main/java/net/dv8tion/jda/api/audit/AuditLogKey.java

@@ -244,8 +244,7 @@ public enum AuditLogKey
     CHANNEL_USER_LIMIT("user_limit"),
 
     /**
-     * Change of the {@link net.dv8tion.jda.api.entities.TextChannel#isNSFW() TextChannel.isNSFW()} value.
-     * <br>Only for {@link net.dv8tion.jda.api.entities.ChannelType#TEXT ChannelType.TEXT}
+     * Change of the {@link net.dv8tion.jda.api.entities.channel.attribute.IAgeRestrictedChannel#isNSFW() IAgeRestrictedChannel.isNSFW()} value.
      *
      * <p>Expected type: <b>Boolean</b>
      */

src/main/java/net/dv8tion/jda/api/entities/ChannelType.java

@@ -135,6 +135,7 @@ public boolean isMessage()
         switch (this)
         {
             case TEXT:
+            case VOICE:
             case NEWS:
             case PRIVATE:
             case GROUP:

src/main/java/net/dv8tion/jda/api/entities/IPermissionHolder.java

@@ -173,7 +173,7 @@ public interface IPermissionHolder extends ISnowflake
     default boolean hasAccess(@Nonnull GuildChannel channel)
     {
         Checks.notNull(channel, "Channel");
-        return channel.getType() == ChannelType.VOICE || channel.getType() == ChannelType.STAGE
+        return channel.getType().isAudio()
                 ? hasPermission(channel, Permission.VOICE_CONNECT, Permission.VIEW_CHANNEL)
                 : hasPermission(channel, Permission.VIEW_CHANNEL);
     }

src/main/java/net/dv8tion/jda/api/entities/Message.java

@@ -1414,6 +1414,8 @@ default MessageAction reply(@Nonnull byte[] data, @Nonnull String name, @Nonnull
      *
      * @throws java.lang.UnsupportedOperationException
      *         If this is a Data Message (output of {@link MessageBuilder MessageBuilder})
+     * @throws MissingAccessException
+     *         If the currently logged in account does not have {@link Member#hasAccess(GuildChannel) access} in this channel.
      * @throws net.dv8tion.jda.api.exceptions.InsufficientPermissionException
      *         If this Message was not sent by the currently logged in account, the Message was sent in a
      *         {@link GuildChannel GuildChannel}, and the currently logged in account
@@ -1928,6 +1930,8 @@ default MessageAction reply(@Nonnull byte[] data, @Nonnull String name, @Nonnull
      *             <li>If the channel is not a {@link NewsChannel}.</li>
      *             <li>If the message is ephemeral.</li>
      *         </ul>
+     * @throws MissingAccessException
+     *         If the currently logged in account does not have {@link Member#hasAccess(GuildChannel) access} in this channel.
      * @throws net.dv8tion.jda.api.exceptions.InsufficientPermissionException
      *         If the currently logged in account does not have
      *         {@link Permission#VIEW_CHANNEL Permission.VIEW_CHANNEL} in this channel

src/main/java/net/dv8tion/jda/api/entities/MessageHistory.java

@@ -20,7 +20,6 @@
 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;
 import net.dv8tion.jda.api.requests.Response;
 import net.dv8tion.jda.api.requests.RestAction;
@@ -72,15 +71,13 @@ public MessageHistory(@Nonnull MessageChannel channel)
         Checks.notNull(channel, "Channel");
         this.channel = channel;
 
-        //TODO-v5: Fix permissions here.
-        if (channel instanceof TextChannel)
+        if (channel instanceof GuildChannel)
         {
-            TextChannel tc = (TextChannel) channel;
-            Member selfMember = tc.getGuild().getSelfMember();
-            if (!selfMember.hasAccess(tc))
-                throw new MissingAccessException(tc, Permission.VIEW_CHANNEL);
-            if (!selfMember.hasPermission(tc, Permission.MESSAGE_HISTORY))
-                throw new InsufficientPermissionException(tc, Permission.MESSAGE_HISTORY);
+            GuildChannel guildChannel = (GuildChannel) channel;
+            Member selfMember = guildChannel.getGuild().getSelfMember();
+            Checks.checkAccess(selfMember, guildChannel);
+            if (!selfMember.hasPermission(guildChannel, Permission.MESSAGE_HISTORY))
+                throw new InsufficientPermissionException(guildChannel, Permission.MESSAGE_HISTORY);
         }
     }
 
@@ -534,14 +531,13 @@ private static void checkArguments(MessageChannel channel, String messageId)
     {
         Checks.isSnowflake(messageId, "Message ID");
         Checks.notNull(channel, "Channel");
-        if (channel.getType() == ChannelType.TEXT)
+        if (channel instanceof GuildChannel)
         {
-            TextChannel t = (TextChannel) channel;
-            Member selfMember = t.getGuild().getSelfMember();
-            if (!selfMember.hasAccess(t))
-                throw new MissingAccessException(t, Permission.VIEW_CHANNEL);
-            if (!selfMember.hasPermission(t, Permission.MESSAGE_HISTORY))
-                throw new InsufficientPermissionException(t, Permission.MESSAGE_HISTORY);
+            GuildChannel guildChannel = (GuildChannel) channel;
+            Member selfMember = guildChannel.getGuild().getSelfMember();
+            Checks.checkAccess(selfMember, guildChannel);
+            if (!selfMember.hasPermission(guildChannel, Permission.MESSAGE_HISTORY))
+                throw new InsufficientPermissionException(guildChannel, Permission.MESSAGE_HISTORY);
         }
     }
 

src/main/java/net/dv8tion/jda/api/entities/MessageReaction.java

@@ -33,7 +33,6 @@
 
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.util.Objects;
 
 /**
@@ -329,9 +328,9 @@ public RestAction<Void> removeReaction(@Nonnull User user)
             if (!channel.getType().isGuild())
                 throw new PermissionException("Unable to remove Reaction of other user in non-guild channels!");
 
-            IPermissionContainer permChannel = getGuildChannel().getPermissionContainer();
-            if (!permChannel.getGuild().getSelfMember().hasPermission(permChannel, Permission.MESSAGE_MANAGE))
-                throw new InsufficientPermissionException(permChannel, Permission.MESSAGE_MANAGE);
+            GuildChannel guildChannel = (GuildChannel) channel;
+            if (!guildChannel.getGuild().getSelfMember().hasPermission(guildChannel, Permission.MESSAGE_MANAGE))
+                throw new InsufficientPermissionException(guildChannel, Permission.MESSAGE_MANAGE);
         }
 
         String code = EncodingUtil.encodeReaction(emoji.getAsReactionCode());

src/main/java/net/dv8tion/jda/api/entities/MessageReference.java

@@ -19,12 +19,12 @@
 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;
 import net.dv8tion.jda.internal.JDAImpl;
 import net.dv8tion.jda.internal.requests.CompletedRestAction;
 import net.dv8tion.jda.internal.requests.RestActionImpl;
 import net.dv8tion.jda.internal.requests.Route;
+import net.dv8tion.jda.internal.utils.Checks;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -54,7 +54,7 @@ public MessageReference(long messageId, long channelId, long guildId, @Nullable
         if (guildId == 0L)
             this.channel = api.getPrivateChannelById(channelId);
         else
-            this.channel = (MessageChannel) api.getGuildChannelById(channelId);
+            this.channel = api.getChannelById(MessageChannel.class, channelId);
 
         this.guild = api.getGuildById(guildId); // is null if guildId = 0 anyway
 
@@ -84,9 +84,10 @@ public MessageReference(long messageId, long channelId, long guildId, @Nullable
      * </ul>
      *
      * @throws net.dv8tion.jda.api.exceptions.InsufficientPermissionException
-     *         If this reference refers to a {@link net.dv8tion.jda.api.entities.TextChannel TextChannel} and the logged in account does not have
+     *         If this reference refers to a {@link net.dv8tion.jda.api.entities.GuildChannel GuildChannel} and the logged in account does not have
      *         <ul>
      *             <li>{@link net.dv8tion.jda.api.Permission#VIEW_CHANNEL Permission.VIEW_CHANNEL}</li>
+     *             <li>{@link net.dv8tion.jda.api.Permission#VOICE_CONNECT Permission.VOICE_CONNECT} (applicable if {@code getChannel().getType().isAudio()})</li>
      *             <li>{@link net.dv8tion.jda.api.Permission#MESSAGE_HISTORY Permission.MESSAGE_HISTORY}</li>
      *         </ul>
      *
@@ -127,9 +128,10 @@ public RestAction<Message> resolve()
      *         Whether to update the already stored message
      *
      * @throws net.dv8tion.jda.api.exceptions.InsufficientPermissionException
-     *         If this reference refers to a {@link net.dv8tion.jda.api.entities.TextChannel TextChannel} and the logged in account does not have
+     *         If this reference refers to a {@link net.dv8tion.jda.api.entities.GuildChannel GuildChannel} and the logged in account does not have
      *         <ul>
      *             <li>{@link net.dv8tion.jda.api.Permission#VIEW_CHANNEL Permission.VIEW_CHANNEL}</li>
+     *             <li>{@link net.dv8tion.jda.api.Permission#VOICE_CONNECT Permission.VOICE_CONNECT} (applicable if {@code getChannel().getType().isAudio()})</li>
      *             <li>{@link net.dv8tion.jda.api.Permission#MESSAGE_HISTORY Permission.MESSAGE_HISTORY}</li>
      *         </ul>
      *
@@ -284,16 +286,13 @@ public JDA getJDA()
 
     private void checkPermission(Permission permission)
     {
-        if (guild == null || !(channel instanceof IPermissionContainer)) return;
+        if (guild == null || !(channel instanceof GuildChannel)) return;
 
         Member selfMember = guild.getSelfMember();
+        GuildChannel guildChannel = (GuildChannel) channel;
 
-
-        IPermissionContainer permChannel = (IPermissionContainer) channel;
-
-        if (!selfMember.hasAccess(permChannel))
-            throw new MissingAccessException(permChannel, Permission.VIEW_CHANNEL);
-        if (!selfMember.hasPermission(permChannel, permission))
-            throw new InsufficientPermissionException(permChannel, permission);
+        Checks.checkAccess(selfMember, guildChannel);
+        if (!selfMember.hasPermission(guildChannel, permission))
+            throw new InsufficientPermissionException(guildChannel, permission);
     }
 }

src/main/java/net/dv8tion/jda/api/entities/NewsChannel.java

@@ -107,6 +107,8 @@ default RestAction<Webhook.WebhookReference> follow(long targetChannelId)
      * @param  targetChannel
      *         The target channel
      *
+     * @throws MissingAccessException
+     *         If the currently logged in account does not have {@link Member#hasAccess(GuildChannel) access} in the <b>target channel</b>.
      * @throws InsufficientPermissionException
      *         If the currently logged in account does not have {@link Permission#MANAGE_WEBHOOKS} in the <b>target channel</b>.
      * @throws IllegalArgumentException
@@ -122,8 +124,7 @@ default RestAction<Webhook.WebhookReference> follow(@Nonnull TextChannel targetC
     {
         Checks.notNull(targetChannel, "Target Channel");
         Member selfMember = targetChannel.getGuild().getSelfMember();
-        if (!selfMember.hasAccess(targetChannel))
-            throw new MissingAccessException(targetChannel, Permission.VIEW_CHANNEL);
+        Checks.checkAccess(selfMember, targetChannel);
         if (!selfMember.hasPermission(targetChannel, Permission.MANAGE_WEBHOOKS))
             throw new InsufficientPermissionException(targetChannel, Permission.MANAGE_WEBHOOKS);
         return follow(targetChannel.getId());
@@ -160,6 +161,8 @@ default RestAction<Webhook.WebhookReference> follow(@Nonnull TextChannel targetC
      *
      * @throws java.lang.IllegalArgumentException
      *         If provided {@code messageId} is {@code null} or empty.
+     * @throws MissingAccessException
+     *         If the currently logged in account does not have {@link Member#hasAccess(GuildChannel) access} in this channel.
      * @throws net.dv8tion.jda.api.exceptions.InsufficientPermissionException
      *         If the currently logged in account does not have
      *         {@link net.dv8tion.jda.api.Permission#VIEW_CHANNEL Permission.VIEW_CHANNEL} in this channel.
@@ -173,8 +176,7 @@ default RestAction<Webhook.WebhookReference> follow(@Nonnull TextChannel targetC
     default RestAction<Message> crosspostMessageById(@Nonnull String messageId)
     {
         Checks.isSnowflake(messageId);
-        if (!getGuild().getSelfMember().hasAccess(this))
-            throw new MissingAccessException(this, Permission.VIEW_CHANNEL);
+        Checks.checkAccess(getGuild().getSelfMember(), this);
         Route.CompiledRoute route = Route.Messages.CROSSPOST_MESSAGE.compile(getId(), messageId);
         return new RestActionImpl<>(getJDA(), route,
                 (response, request) -> request.getJDA().getEntityBuilder().createMessageWithChannel(response.getObject(), this, false));

src/main/java/net/dv8tion/jda/api/entities/StandardGuildMessageChannel.java

@@ -16,6 +16,7 @@
 
 package net.dv8tion.jda.api.entities;
 
+import net.dv8tion.jda.api.entities.channel.attribute.IAgeRestrictedChannel;
 import net.dv8tion.jda.api.managers.channel.middleman.StandardGuildMessageChannelManager;
 import net.dv8tion.jda.api.requests.restaction.ChannelAction;
 
@@ -35,28 +36,21 @@
  * @see NewsChannel
  * @see StandardGuildChannel
  */
-public interface StandardGuildMessageChannel extends StandardGuildChannel, GuildMessageChannel, IThreadContainer, IWebhookContainer
+public interface StandardGuildMessageChannel extends StandardGuildChannel, GuildMessageChannel, IThreadContainer, IWebhookContainer, IAgeRestrictedChannel
 {
     @Nonnull
     @Override
     StandardGuildMessageChannelManager<?, ?> getManager();
 
     /**
-     * The topic set for this TextChannel.
+     * The topic set for this channel.
      * <br>If no topic has been set, this returns null.
      *
-     * @return Possibly-null String containing the topic of this TextChannel.
+     * @return Possibly-null String containing the topic of this channel.
      */
     @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

src/main/java/net/dv8tion/jda/api/entities/VoiceChannel.java

@@ -16,6 +16,7 @@
 package net.dv8tion.jda.api.entities;
 
 import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.entities.channel.attribute.IAgeRestrictedChannel;
 import net.dv8tion.jda.api.managers.channel.concrete.VoiceChannelManager;
 import net.dv8tion.jda.api.requests.restaction.ChannelAction;
 
@@ -39,7 +40,7 @@
  * @see   JDA#getVoiceChannelsByName(String, boolean)
  * @see   JDA#getVoiceChannelById(long)
  */
-public interface VoiceChannel extends AudioChannel, StandardGuildChannel
+public interface VoiceChannel extends AudioChannel, StandardGuildChannel, GuildMessageChannel, IWebhookContainer, IAgeRestrictedChannel
 {
     /**
      * The maximum amount of {@link net.dv8tion.jda.api.entities.Member Members} that can be in this

src/main/java/net/dv8tion/jda/api/entities/channel/attribute/IAgeRestrictedChannel.java

@@ -0,0 +1,33 @@
+/*
+ * 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.attribute;
+
+import net.dv8tion.jda.api.entities.GuildChannel;
+
+/**
+ * Channels which can be set to age-restricted.
+ * <br>These channels only allow users with a verified mature age to participate.
+ */
+public interface IAgeRestrictedChannel extends GuildChannel
+{
+    /**
+     * Whether this channel is considered as age-restricted, also known as NSFW (Not-Safe-For-Work)
+     *
+     * @return True, If this channel is age-restricted by the official Discord Client
+     */
+    boolean isNSFW();
+}

src/main/java/net/dv8tion/jda/api/entities/channel/unions/GuildMessageChannelUnion.java

@@ -100,7 +100,27 @@ public interface GuildMessageChannelUnion extends GuildMessageChannel
     @Nonnull
     ThreadChannel asThreadChannel();
 
-    //TODO: Add asVoiceChannel once TiV is launched
+    /**
+     * 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 IThreadContainer}.

src/main/java/net/dv8tion/jda/api/entities/channel/unions/IWebhookContainerUnion.java

@@ -97,8 +97,31 @@ public interface IWebhookContainerUnion extends IWebhookContainer
      *
      * @return The channel as a {@link IThreadContainer}
      */
+    @Nonnull
     IThreadContainer asThreadContainer();
 
+    /**
+     * 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 GuildMessageChannel}.
      * <br>This works for the following channel types represented by this union: